diff --git a/rse/plugins/org.eclipse.rse.ui/systemmessages.xml b/rse/plugins/org.eclipse.rse.ui/systemmessages.xml index 72e6eebd19d..2a651a4e0e0 100644 --- a/rse/plugins/org.eclipse.rse.ui/systemmessages.xml +++ b/rse/plugins/org.eclipse.rse.ui/systemmessages.xml @@ -409,87 +409,7 @@ Kevin Doyle (IBM) - [160769] Added message for invalid filter when moving files Value %1 not in range The value specified is not within the valid range of %2 to %3 - - Enter action name - You must enter a name for this action - - - Action name is not unique - There is already an action with the given name in the selected profile. Specify a name that is not already in use - - - Action name is not valid - The given name is not a valid action name - - - Enter comment - You must enter a comment for this action - - - Action comment is not valid - The given comment has syntactical errors - - - Enter command - You must enter a command for this action - - - Action command is not valid - The given command has syntactical errors - - - Enter type name - You must enter a name for this collection of resource types - - - Type name %1 in use - There is already a named type with the given name. Specify a name that is not already in use - - - Type name %1 is not valid - The given name is not valid for a named type. It must not contain blanks - - - Specify one or more resource types - You must specify one or more simple or generic resource types to constitute this named type - - - Types not valid - Syntactical errors were found in the list of resource types - - - Enter source type - You must enter a source type - - - Source type "%1" not valid - The source type you entered is not valid. - - - Source type "%1" already exists - The source type you entered has already been specified. Specify a unique source type. - - - Enter a label for this compile command - You must enter a label for this compile command, that will be shown in menus and lists - - - Compile command label "%1" is in use - There is already a compile command with the given label. Specify a label that is not already in use - - - Compile command label "%1" is not valid - The given label is not a valid compile label - - - Enter command string for this compile command - You must enter a command string for this compile command. This is what is run when this compile command is selected. - - - Compile command string "%1" is not valid - The given string is not a valid command. - - + Host name '%1' not found or valid A remote system of host name '%1' was not found. If you are working disconnected, de-select the checkbox to verify the host name @@ -498,14 +418,7 @@ Kevin Doyle (IBM) - [160769] Added message for invalid filter when moving files Verifying host name... - - Delete selected user actions? - This is a permanent deletion of the selected actions and cannot be undone.Select Yes to delete and No to cancel the delete action - - - Delete selected types? - This is a permanent deletion of the selected types and cannot be undone.Select Yes to delete and No to cancel the delete action - + There is an error on another page Another page of the wizard has an error that must be corrected before the wizard can be finished diff --git a/rse/plugins/org.eclipse.rse.useractions/plugin.xml b/rse/plugins/org.eclipse.rse.useractions/plugin.xml index 03b3e837292..1e22aab2deb 100644 --- a/rse/plugins/org.eclipse.rse.useractions/plugin.xml +++ b/rse/plugins/org.eclipse.rse.useractions/plugin.xml @@ -38,4 +38,22 @@ + + + + + + + + + + + + + + + diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/Activator.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/Activator.java index 8ac8f71f518..48056ed302c 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/Activator.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/Activator.java @@ -24,7 +24,7 @@ import org.osgi.framework.BundleContext; public class Activator extends AbstractUIPlugin { //The shared instance. private static Activator plugin; - + public static final String PLUGIN_ID = "org.eclipse.rse.useractions"; //$NON-NLS-1$ /** * The constructor. */ diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/IUserActionsMessageIds.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/IUserActionsMessageIds.java deleted file mode 100644 index 3858ccabeaa..00000000000 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/IUserActionsMessageIds.java +++ /dev/null @@ -1,38 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * David Dykstal (IBM) - [186589] move user types, user actions, and compile commands - * API to the user actions plugin - *******************************************************************************/ -package org.eclipse.rse.internal.useractions; - -public interface IUserActionsMessageIds { - - public static final String MSG_VALIDATE_UDANAME_EMPTY = "RSEG1180"; //$NON-NLS-1$ - public static final String MSG_VALIDATE_UDANAME_NOTUNIQUE= "RSEG1181"; //$NON-NLS-1$ - public static final String MSG_VALIDATE_UDANAME_NOTVALID = "RSEG1182"; //$NON-NLS-1$ - public static final String MSG_VALIDATE_UDACMT_EMPTY = "RSEG1183"; //$NON-NLS-1$ - public static final String MSG_VALIDATE_UDACMT_NOTVALID = "RSEG1184"; //$NON-NLS-1$ - public static final String MSG_VALIDATE_UDACMD_EMPTY = "RSEG1185"; //$NON-NLS-1$ - public static final String MSG_VALIDATE_UDACMD_NOTVALID = "RSEG1186"; //$NON-NLS-1$ - public static final String MSG_VALIDATE_UDTNAME_EMPTY = "RSEG1187"; //$NON-NLS-1$ - public static final String MSG_VALIDATE_UDTNAME_NOTUNIQUE= "RSEG1188"; //$NON-NLS-1$ - public static final String MSG_VALIDATE_UDTNAME_NOTVALID = "RSEG1189"; //$NON-NLS-1$ - public static final String MSG_VALIDATE_UDTTYPES_EMPTY = "RSEG1190"; //$NON-NLS-1$ - public static final String MSG_VALIDATE_UDTTYPES_NOTVALID = "RSEG1191"; //$NON-NLS-1$ - public static final String MSG_VALIDATE_COMPILELABEL_EMPTY = "RSEG1195"; //$NON-NLS-1$ - public static final String MSG_VALIDATE_COMPILELABEL_NOTUNIQUE= "RSEG1196"; //$NON-NLS-1$ - public static final String MSG_VALIDATE_COMPILELABEL_NOTVALID = "RSEG1197"; //$NON-NLS-1$ - public static final String MSG_VALIDATE_COMPILESTRING_EMPTY = "RSEG1198"; //$NON-NLS-1$ - public static final String MSG_VALIDATE_COMPILESTRING_NOTVALID = "RSEG1199"; //$NON-NLS-1$ - public static final String MSG_UDA_LOAD_ERROR = "RSEG1140"; //$NON-NLS-1$ - public static final String MSG_UDA_ROOTTAG_ERROR = "RSEG1141"; //$NON-NLS-1$ - public static final String MSG_CONFIRM_DELETE_USERACTION = "RSEG1230"; //$NON-NLS-1$ - public static final String MSG_CONFIRM_DELETE_USERTYPE = "RSEG1231"; //$NON-NLS-1$ - -} diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionsResources.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionsResources.java index 7fae7c77fd5..eb6ec4d3e8a 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionsResources.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionsResources.java @@ -73,6 +73,49 @@ public class UserActionsResources extends NLS { public static String RESID_PROPERTY_COMMENT_LABEL; public static String RESID_PROPERTY_COMMENT_TOOLTIP; + public static String MSG_VALIDATE_UDANAME_EMPTY; + public static String MSG_VALIDATE_UDANAME_NOTUNIQUE; + public static String MSG_VALIDATE_UDANAME_NOTVALID; + public static String MSG_VALIDATE_UDACMT_EMPTY; + public static String MSG_VALIDATE_UDACMT_NOTVALID; + public static String MSG_VALIDATE_UDACMD_EMPTY; + public static String MSG_VALIDATE_UDACMD_NOTVALID; + public static String MSG_VALIDATE_UDTNAME_EMPTY; + public static String MSG_VALIDATE_UDTNAME_NOTUNIQUE; + public static String MSG_VALIDATE_UDTNAME_NOTVALID; + public static String MSG_VALIDATE_UDTTYPES_EMPTY; + public static String MSG_VALIDATE_UDTTYPES_NOTVALID; + public static String MSG_VALIDATE_COMPILELABEL_EMPTY; + public static String MSG_VALIDATE_COMPILELABEL_NOTUNIQUE; + public static String MSG_VALIDATE_COMPILELABEL_NOTVALID; + public static String MSG_VALIDATE_COMPILESTRING_EMPTY; + public static String MSG_VALIDATE_COMPILESTRING_NOTVALID; + public static String MSG_UDA_LOAD_ERROR; + public static String MSG_UDA_ROOTTAG_ERROR; + public static String MSG_CONFIRM_DELETE_USERACTION; + public static String MSG_CONFIRM_DELETE_USERTYPE; + + public static String MSG_VALIDATE_UDANAME_EMPTY_DETAILS; + public static String MSG_VALIDATE_UDANAME_NOTUNIQUE_DETAILS; + public static String MSG_VALIDATE_UDANAME_NOTVALID_DETAILS; + public static String MSG_VALIDATE_UDACMT_EMPTY_DETAILS; + public static String MSG_VALIDATE_UDACMT_NOTVALID_DETAILS; + public static String MSG_VALIDATE_UDACMD_EMPTY_DETAILS; + public static String MSG_VALIDATE_UDACMD_NOTVALID_DETAILS; + public static String MSG_VALIDATE_UDTNAME_EMPTY_DETAILS; + public static String MSG_VALIDATE_UDTNAME_NOTUNIQUE_DETAILS; + public static String MSG_VALIDATE_UDTNAME_NOTVALID_DETAILS; + public static String MSG_VALIDATE_UDTTYPES_EMPTY_DETAILS; + public static String MSG_VALIDATE_UDTTYPES_NOTVALID_DETAILS; + public static String MSG_VALIDATE_COMPILELABEL_EMPTY_DETAILS; + public static String MSG_VALIDATE_COMPILELABEL_NOTUNIQUE_DETAILS; + public static String MSG_VALIDATE_COMPILELABEL_NOTVALID_DETAILS; + public static String MSG_VALIDATE_COMPILESTRING_EMPTY_DETAILS; + public static String MSG_VALIDATE_COMPILESTRING_NOTVALID_DETAILS; + + public static String MSG_UDA_ROOTTAG_ERROR_DETAILS; + public static String MSG_CONFIRM_DELETE_USERACTION_DETAILS; + public static String MSG_CONFIRM_DELETE_USERTYPE_DETAILS; static { // load message values from bundle file diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionsResources.properties b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionsResources.properties index e0ea298e022..45bcb5a95a6 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionsResources.properties +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionsResources.properties @@ -91,3 +91,68 @@ RESID_PROPERTY_COMMAND_TOOLTIP=The command that will be executed RESID_PROPERTY_COMMENT_LABEL=Comment RESID_PROPERTY_COMMENT_TOOLTIP=A description + +MSG_VALIDATE_UDANAME_EMPTY = Enter action name +MSG_VALIDATE_UDANAME_EMPTY_DETAILS = You must enter a name for this action + +MSG_VALIDATE_UDANAME_NOTUNIQUE= Action name is not unique +MSG_VALIDATE_UDANAME_NOTUNIQUE_DETAILS = There is already an action with the given name in the selected profile. Specify a name that is not already in use + +MSG_VALIDATE_UDANAME_NOTVALID =Action name is not valid +MSG_VALIDATE_UDANAME_NOTVALID_DETAILS =The given name is not a valid action name + +MSG_VALIDATE_UDACMT_EMPTY = Enter comment +MSG_VALIDATE_UDACMT_EMPTY_DETAILS = You must enter a comment for this action + +MSG_VALIDATE_UDACMT_NOTVALID = Action comment is not valid +MSG_VALIDATE_UDACMT_NOTVALID_DETAILS =The given comment has syntactical errors + +MSG_VALIDATE_UDACMD_EMPTY = Enter command +MSG_VALIDATE_UDACMD_EMPTY_DETAILS = You must enter a command for this action + +MSG_VALIDATE_UDACMD_NOTVALID = Action command is not valid +MSG_VALIDATE_UDACMD_NOTVALID = The given command has syntactical errors + +MSG_VALIDATE_UDTNAME_EMPTY = Enter type name +MSG_VALIDATE_UDTNAME_EMPTY_DETAILS = You must enter a name for this collection of resource types + +MSG_VALIDATE_UDTNAME_NOTUNIQUE= Type name {0} in use +MSG_VALIDATE_UDTNAME_NOTUNIQUE_DETAILS = There is already a named type with the given name. Specify a name that is not already in use + +MSG_VALIDATE_UDTNAME_NOTVALID = Type name {0} is not valid +MSG_VALIDATE_UDTNAME_NOTVALID_DETAILS =The given name is not valid for a named type. It must not contain blanks + +MSG_VALIDATE_UDTTYPES_EMPTY = Specify one or more resource types +MSG_VALIDATE_UDTTYPES_EMPTY_DETAILS = You must specify one or more simple or generic resource types to constitute this named type + +MSG_VALIDATE_UDTTYPES_NOTVALID = Types not valid +MSG_VALIDATE_UDTTYPES_NOTVALID_DETAILS = Syntactical errors were found in the list of resource types + +MSG_VALIDATE_COMPILELABEL_EMPTY = Enter a label for this compile command +MSG_VALIDATE_COMPILELABEL_EMPTY_DETAILS = You must enter a label for this compile command, that will be shown in menus and lists + +MSG_VALIDATE_COMPILELABEL_NOTUNIQUE= Compile command label "{0}" is in use +MSG_VALIDATE_COMPILELABEL_NOTUNIQUE_DETAILS =There is already a compile command with the given label. Specify a label that is not already in use + +MSG_VALIDATE_COMPILELABEL_NOTVALID = Compile command label "{0}" is not valid +MSG_VALIDATE_COMPILELABEL_NOTVALID_DETAILS =The given label is not a valid compile label + +MSG_VALIDATE_COMPILESTRING_EMPTY = Enter command string for this compile command +MSG_VALIDATE_COMPILESTRING_EMPTY_DETAILS = You must enter a command string for this compile command. This is what is run when this compile command is selected. + +MSG_VALIDATE_COMPILESTRING_NOTVALID = Compile command string "{0}" is not valid +MSG_VALIDATE_COMPILESTRING_NOTVALID_DETAILS = The given string is not a valid command. + +MSG_UDA_LOAD_ERROR = Error occurred while loading the user-defined action information from file: {0} + +MSG_UDA_ROOTTAG_ERROR = The xml file '{0}' appears to be corrupted. It has been replaced +MSG_UDA_ROOTTAG_ERROR_DETAILS=Expected root tag to be named '{0}'. The corrupted file has been renamed to '{1}' and a new file created for you + +MSG_CONFIRM_DELETE_USERACTION = Delete selected user actions? +MSG_CONFIRM_DELETE_USERACTION_DETAILS=This is a permanent deletion of the selected actions and cannot be undone.Select Yes to delete and No to cancel the delete action + +MSG_CONFIRM_DELETE_USERTYPE = Delete selected types? +MSG_CONFIRM_DELETE_USERTYPE_DETAILS =This is a permanent deletion of the selected types and cannot be undone.Select Yes to delete and No to cancel the delete action + + + \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/files/uda/UDTypesEditorFiles.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/files/uda/UDTypesEditorFiles.java index bdd076335e2..dd2ae6c463e 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/files/uda/UDTypesEditorFiles.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/files/uda/UDTypesEditorFiles.java @@ -18,12 +18,15 @@ import java.util.Iterator; import java.util.StringTokenizer; import java.util.Vector; +import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.viewers.CheckStateChangedEvent; import org.eclipse.jface.viewers.CheckboxTableViewer; import org.eclipse.jface.viewers.ICheckStateListener; -import org.eclipse.rse.internal.useractions.IUserActionsMessageIds; +import org.eclipse.rse.internal.useractions.Activator; +import org.eclipse.rse.internal.useractions.UserActionsResources; import org.eclipse.rse.internal.useractions.ui.uda.ISystemUDTypeEditPaneTypesSelector; import org.eclipse.rse.internal.useractions.ui.uda.SystemUDAResources; +import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString; import org.eclipse.rse.ui.RSEUIPlugin; @@ -246,7 +249,14 @@ public class UDTypesEditorFiles implements ISystemUDTypeEditPaneTypesSelector, I */ public SystemMessage validate() { if (typesSelectionList == null) return null; - if (!areTypesSelected()) return RSEUIPlugin.getPluginMessage(IUserActionsMessageIds.MSG_VALIDATE_UDTTYPES_EMPTY); + + + + if (!areTypesSelected()) { + return new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, + UserActionsResources.MSG_VALIDATE_UDTTYPES_EMPTY, + UserActionsResources.MSG_VALIDATE_UDTTYPES_EMPTY_DETAILS); + } // validate that user-defined entry field! return validateUserDefinedTypes(); } @@ -263,8 +273,9 @@ public class UDTypesEditorFiles implements ISystemUDTypeEditPaneTypesSelector, I int index = filename.indexOf('.'); if (index == filename.length() - 1) { if (index == 0 || (index == 1 && filename.charAt(0) == '*')) { - //setErrorMessage(GenericMessages.getString("FileExtension.extensionEmptyMessage")); //$NON-NLS-1$ - return RSEUIPlugin.getPluginMessage(IUserActionsMessageIds.MSG_VALIDATE_UDTTYPES_NOTVALID); + return new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, + UserActionsResources.MSG_VALIDATE_UDTTYPES_NOTVALID, + UserActionsResources.MSG_VALIDATE_UDTTYPES_NOTVALID_DETAILS); } } int startScan = 0; @@ -276,12 +287,14 @@ public class UDTypesEditorFiles implements ISystemUDTypeEditPaneTypesSelector, I index = filename.indexOf('*', startScan); if (index > -1) { if (filename.length() == 1) { - //setErrorMessage(GenericMessages.getString("FileExtension.extensionEmptyMessage")); //$NON-NLS-1$ - return RSEUIPlugin.getPluginMessage(IUserActionsMessageIds.MSG_VALIDATE_UDTTYPES_NOTVALID); + return new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, + UserActionsResources.MSG_VALIDATE_UDTTYPES_NOTVALID, + UserActionsResources.MSG_VALIDATE_UDTTYPES_NOTVALID_DETAILS); } if (index != 0 || filename.charAt(1) != '.') { - //setErrorMessage(GenericMessages.getString("FileExtension.fileNameInvalidMessage")); //$NON-NLS-1$ - return RSEUIPlugin.getPluginMessage(IUserActionsMessageIds.MSG_VALIDATE_UDTTYPES_NOTVALID); + return new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, + UserActionsResources.MSG_VALIDATE_UDTTYPES_NOTVALID, + UserActionsResources.MSG_VALIDATE_UDTTYPES_NOTVALID_DETAILS); } } return null; diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/DynamicMenuTest.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/DynamicMenuTest.java new file mode 100644 index 00000000000..039e90757f5 --- /dev/null +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/DynamicMenuTest.java @@ -0,0 +1,46 @@ +/******************************************************************************** + * Copyright (c) 2008 IBM Corporation. All rights reserved. + * This program and the accompanying materials are made available under the terms + * of the Eclipse Public License v1.0 which accompanies this distribution, and is + * available at http://www.eclipse.org/legal/epl-v10.html + * + * Initial Contributors: + * The following IBM employees contributed to the Remote System Explorer + * component that contains this file: David McKnight. + * + * Contributors: + * {Name} (company) - description of contribution. + ********************************************************************************/ +package org.eclipse.rse.internal.useractions.ui; + +import org.eclipse.jface.action.ContributionItem; +import org.eclipse.jface.action.IContributionItem; +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Menu; +import org.eclipse.swt.widgets.MenuItem; +import org.eclipse.ui.actions.CompoundContributionItem; + +public class DynamicMenuTest extends CompoundContributionItem +{ + private class TestContribution extends ContributionItem { + public void fill(Menu menu, int index) + { + MenuItem menuItem = new MenuItem(menu, SWT.RADIO); + menuItem.setText("My First Contribution"); + } + } + + protected IContributionItem[] getContributionItems() { + // Here's where you would dynamically generate your list + IContributionItem[] list = new IContributionItem[1]; + + list[0] = new TestContribution(); + + + //IAction searchAction = new SystemSearchAction(null); + // ActionContributionItem item = new ActionContributionItem(searchAction); + // list[1] = item; + return list; + } + +} diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDBaseManager.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDBaseManager.java index f513a6428b0..564398d91da 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDBaseManager.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDBaseManager.java @@ -43,8 +43,10 @@ import org.eclipse.core.resources.IResourceChangeListener; import org.eclipse.core.resources.IResourceDelta; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.osgi.util.NLS; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemResourceHelpers; import org.eclipse.rse.core.SystemResourceManager; @@ -52,7 +54,9 @@ import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.internal.ui.SystemResources; -import org.eclipse.rse.internal.useractions.IUserActionsMessageIds; +import org.eclipse.rse.internal.useractions.Activator; +import org.eclipse.rse.internal.useractions.UserActionsResources; +import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.ISystemMessages; @@ -425,7 +429,8 @@ public abstract class SystemUDBaseManager implements ErrorHandler, IResourceChan // Phil. 08/2002 if ((null == docroot) || !docroot.getTagName().equals(getDocumentRootTagName())) { Shell activeShell = getActiveShell(); - SystemMessage docRootMsg = RSEUIPlugin.getPluginMessage(IUserActionsMessageIds.MSG_UDA_ROOTTAG_ERROR); + + String oldFileName = getFilePath(profile); String newFileName = getFileName() + ".bad"; //$NON-NLS-1$ IFile file = getFolder(profile).getFile(getFileName()); @@ -433,6 +438,13 @@ public abstract class SystemUDBaseManager implements ErrorHandler, IResourceChan SystemResourceHelpers.getResourceHelpers().renameFile(file, newFileName); } catch (Exception exc) { } + + + String msgTxt = NLS.bind(UserActionsResources.MSG_UDA_ROOTTAG_ERROR, getFilePath(profile)); + String msgDetails = NLS.bind(UserActionsResources.MSG_UDA_ROOTTAG_ERROR_DETAILS, getDocumentRootTagName(), newFileName); + + SystemMessage docRootMsg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails); + doc = createAndPrimeDocument(profile); docRootMsg.makeSubstitution(oldFileName, getDocumentRootTagName(), newFileName); SystemBasePlugin.logWarning(docRootMsg.getLevelOneText()); @@ -445,9 +457,10 @@ public abstract class SystemUDBaseManager implements ErrorHandler, IResourceChan // Provide a non-null value. Might as well prime // with a "proper" doc structure. Document doc = initializeDocument(); - SystemMessageDialog msgdlg = new SystemMessageDialog(SystemBasePlugin.getActiveWorkbenchShell(), RSEUIPlugin.getPluginMessage( - // ISystemMessages.MSG_RESTORE_FAILED).makeSubstitution(exc)); - IUserActionsMessageIds.MSG_UDA_LOAD_ERROR).makeSubstitution(fileName, exc)); + + String msgTxt = NLS.bind(UserActionsResources.MSG_UDA_LOAD_ERROR, fileName); + SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, exc); + SystemMessageDialog msgdlg = new SystemMessageDialog(SystemBasePlugin.getActiveWorkbenchShell(), msg); msgdlg.open(); return doc; } diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDBaseTreeView.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDBaseTreeView.java index 602f6ba3b07..e48f867b989 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDBaseTreeView.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDBaseTreeView.java @@ -15,6 +15,7 @@ package org.eclipse.rse.internal.useractions.ui.uda; +import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; @@ -31,10 +32,11 @@ import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.internal.ui.view.SystemViewMenuListener; -import org.eclipse.rse.internal.useractions.IUserActionsMessageIds; +import org.eclipse.rse.internal.useractions.Activator; +import org.eclipse.rse.internal.useractions.UserActionsResources; +import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.ISystemContextMenuConstants; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemBasePlugin; import org.eclipse.rse.ui.actions.ISystemAction; import org.eclipse.rse.ui.messages.SystemMessageDialog; @@ -400,7 +402,7 @@ public class SystemUDBaseTreeView extends TreeViewer implements IMenuListener, I * Return message for delete confirmation */ protected SystemMessage getDeleteConfirmationMessage() { - return RSEUIPlugin.getPluginMessage(IUserActionsMessageIds.MSG_CONFIRM_DELETE_USERACTION); + return new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, UserActionsResources.MSG_CONFIRM_DELETE_USERACTION, UserActionsResources.MSG_CONFIRM_DELETE_USERTYPE_DETAILS); } /** diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDTypeTreeView.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDTypeTreeView.java index ead465e2c3d..a19091ef2d1 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDTypeTreeView.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDTypeTreeView.java @@ -13,14 +13,16 @@ *******************************************************************************/ package org.eclipse.rse.internal.useractions.ui.uda; +import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.viewers.IBasicPropertyConstants; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; -import org.eclipse.rse.internal.useractions.IUserActionsMessageIds; +import org.eclipse.rse.internal.useractions.Activator; import org.eclipse.rse.internal.useractions.IUserActionsModelChangeEvents; +import org.eclipse.rse.internal.useractions.UserActionsResources; +import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.swt.widgets.Composite; /** @@ -74,7 +76,7 @@ public class SystemUDTypeTreeView extends SystemUDBaseTreeView { * Return message for delete confirmation */ protected SystemMessage getDeleteConfirmationMessage() { - return RSEUIPlugin.getPluginMessage(IUserActionsMessageIds.MSG_CONFIRM_DELETE_USERTYPE); + return new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.WARNING, UserActionsResources.MSG_CONFIRM_DELETE_USERTYPE, UserActionsResources.MSG_CONFIRM_DELETE_USERTYPE_DETAILS); } /** diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorCompileCommandLabel.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorCompileCommandLabel.java index 292dd2faa79..da3292742ce 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorCompileCommandLabel.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorCompileCommandLabel.java @@ -21,9 +21,11 @@ import java.util.Collection; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.rse.internal.useractions.IUserActionsMessageIds; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.rse.internal.useractions.Activator; +import org.eclipse.rse.internal.useractions.UserActionsResources; +import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ValidatorUniqueString; @@ -64,10 +66,23 @@ public class ValidatorCompileCommandLabel extends ValidatorUniqueString implemen } private void init() { - super.setErrorMessages(RSEUIPlugin.getPluginMessage(IUserActionsMessageIds.MSG_VALIDATE_COMPILELABEL_EMPTY), RSEUIPlugin - .getPluginMessage(IUserActionsMessageIds.MSG_VALIDATE_COMPILELABEL_NOTUNIQUE)); + String msg1Txt = UserActionsResources.MSG_VALIDATE_COMPILELABEL_EMPTY; + String msg1Details = UserActionsResources.MSG_VALIDATE_COMPILELABEL_EMPTY_DETAILS; + + SystemMessage msg1 = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg1Txt, msg1Details); + + String msg2Txt = UserActionsResources.MSG_VALIDATE_COMPILELABEL_NOTUNIQUE; + String msg2Details = UserActionsResources.MSG_VALIDATE_COMPILELABEL_NOTUNIQUE_DETAILS; + + SystemMessage msg2 = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg2Txt, msg2Details); + + super.setErrorMessages(msg1, msg2); fUnique = true; - msg_Invalid = RSEUIPlugin.getPluginMessage(IUserActionsMessageIds.MSG_VALIDATE_COMPILELABEL_NOTVALID); + + String msg3Txt = UserActionsResources.MSG_VALIDATE_COMPILELABEL_NOTVALID; + String msg3Details= UserActionsResources.MSG_VALIDATE_COMPILELABEL_NOTVALID_DETAILS; + + msg_Invalid = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg3Txt, msg3Details); } /** diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorUserActionCommand.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorUserActionCommand.java index f763b69b69c..3efa7d9b549 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorUserActionCommand.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorUserActionCommand.java @@ -17,9 +17,11 @@ package org.eclipse.rse.internal.useractions.ui.validators; -import org.eclipse.rse.internal.useractions.IUserActionsMessageIds; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.rse.internal.useractions.Activator; +import org.eclipse.rse.internal.useractions.UserActionsResources; +import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.validators.ISystemValidator; /** @@ -35,7 +37,16 @@ public class ValidatorUserActionCommand implements ISystemValidator { * but use the default for the "Value not valid" error message */ public ValidatorUserActionCommand() { - setErrorMessages(RSEUIPlugin.getPluginMessage(IUserActionsMessageIds.MSG_VALIDATE_UDACMD_EMPTY), RSEUIPlugin.getPluginMessage(IUserActionsMessageIds.MSG_VALIDATE_UDACMD_NOTVALID)); + String msg1Txt = UserActionsResources.MSG_VALIDATE_UDACMD_EMPTY; + String msg1Details = UserActionsResources.MSG_VALIDATE_UDACMD_EMPTY_DETAILS; + + SystemMessage msg1 = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg1Txt, msg1Details); + + String msg2Txt = UserActionsResources.MSG_VALIDATE_UDACMD_NOTVALID; + String msg2Details = UserActionsResources.MSG_VALIDATE_UDACMD_NOTVALID_DETAILS; + + SystemMessage msg2 = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg2Txt, msg2Details); + setErrorMessages(msg1,msg2); } /** diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorUserActionComment.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorUserActionComment.java index c710f481c40..36c6d3f382a 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorUserActionComment.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorUserActionComment.java @@ -17,9 +17,11 @@ package org.eclipse.rse.internal.useractions.ui.validators; -import org.eclipse.rse.internal.useractions.IUserActionsMessageIds; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.rse.internal.useractions.Activator; +import org.eclipse.rse.internal.useractions.UserActionsResources; +import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.validators.ISystemValidator; /** @@ -35,7 +37,17 @@ public class ValidatorUserActionComment implements ISystemValidator { * but use the default for the "Value not valid" error message */ public ValidatorUserActionComment() { - setErrorMessages(RSEUIPlugin.getPluginMessage(IUserActionsMessageIds.MSG_VALIDATE_UDACMT_EMPTY), RSEUIPlugin.getPluginMessage(IUserActionsMessageIds.MSG_VALIDATE_UDACMT_NOTVALID)); + String msg1Txt = UserActionsResources.MSG_VALIDATE_UDACMT_EMPTY; + String msg1Details = UserActionsResources.MSG_VALIDATE_UDACMT_EMPTY_DETAILS; + + SystemMessage msg1 = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg1Txt, msg1Details); + + String msg2Txt = UserActionsResources.MSG_VALIDATE_UDACMT_NOTVALID; + String msg2Details = UserActionsResources.MSG_VALIDATE_UDACMT_NOTVALID_DETAILS; + + SystemMessage msg2 = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg2Txt, msg2Details); + + setErrorMessages(msg1, msg2); } /** diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorUserActionName.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorUserActionName.java index 105bb89180c..224c02c942b 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorUserActionName.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorUserActionName.java @@ -21,9 +21,11 @@ import java.util.Collection; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.rse.internal.useractions.IUserActionsMessageIds; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.rse.internal.useractions.Activator; +import org.eclipse.rse.internal.useractions.UserActionsResources; +import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ValidatorUniqueString; @@ -66,9 +68,25 @@ public class ValidatorUserActionName extends ValidatorUniqueString implements IS } private void init() { - super.setErrorMessages(RSEUIPlugin.getPluginMessage(IUserActionsMessageIds.MSG_VALIDATE_UDANAME_EMPTY), RSEUIPlugin.getPluginMessage(IUserActionsMessageIds.MSG_VALIDATE_UDANAME_NOTUNIQUE)); + String msg1Txt = UserActionsResources.MSG_VALIDATE_UDANAME_EMPTY; + String msg1Details = UserActionsResources.MSG_VALIDATE_UDANAME_EMPTY_DETAILS; + + SystemMessage msg1 = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg1Txt, msg1Details); + + String msg2Txt = UserActionsResources.MSG_VALIDATE_UDANAME_NOTUNIQUE; + String msg2Details = UserActionsResources.MSG_VALIDATE_UDANAME_NOTUNIQUE_DETAILS; + + SystemMessage msg2 = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg2Txt, msg2Details); + + + super.setErrorMessages(msg1, msg2); fUnique = true; - msg_Invalid = RSEUIPlugin.getPluginMessage(IUserActionsMessageIds.MSG_VALIDATE_UDANAME_NOTVALID); + + String msg3Txt = UserActionsResources.MSG_VALIDATE_UDANAME_NOTVALID; + String msg3Details = UserActionsResources.MSG_VALIDATE_UDANAME_NOTVALID_DETAILS; + + SystemMessage msg3 = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg3Txt, msg3Details); + msg_Invalid = msg3; } /** diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorUserTypeName.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorUserTypeName.java index 15565c23381..5c3c213f75f 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorUserTypeName.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorUserTypeName.java @@ -17,9 +17,11 @@ package org.eclipse.rse.internal.useractions.ui.validators; -import org.eclipse.rse.internal.useractions.IUserActionsMessageIds; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.rse.internal.useractions.Activator; +import org.eclipse.rse.internal.useractions.UserActionsResources; +import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ValidatorUniqueString; @@ -40,8 +42,23 @@ public class ValidatorUserTypeName extends ValidatorUniqueString implements ISys } private void init() { - super.setErrorMessages(RSEUIPlugin.getPluginMessage(IUserActionsMessageIds.MSG_VALIDATE_UDTNAME_EMPTY), RSEUIPlugin.getPluginMessage(IUserActionsMessageIds.MSG_VALIDATE_UDTNAME_NOTUNIQUE)); - msg_Invalid = RSEUIPlugin.getPluginMessage(IUserActionsMessageIds.MSG_VALIDATE_UDTNAME_NOTVALID); + String msg1Txt = UserActionsResources.MSG_VALIDATE_UDTNAME_EMPTY; + String msg1Details = UserActionsResources.MSG_VALIDATE_UDTNAME_EMPTY_DETAILS; + + SystemMessage msg1 = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg1Txt, msg1Details); + + String msg2Txt = UserActionsResources.MSG_VALIDATE_UDTNAME_NOTUNIQUE; + String msg2Details = UserActionsResources.MSG_VALIDATE_UDTNAME_NOTUNIQUE_DETAILS; + + SystemMessage msg2 = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg2Txt, msg2Details); + + super.setErrorMessages(msg1, msg2); + + String msg3Txt = UserActionsResources.MSG_VALIDATE_UDTNAME_NOTVALID; + String msg3Details = UserActionsResources.MSG_VALIDATE_UDTNAME_NOTVALID_DETAILS; + + SystemMessage msg3 = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg3Txt, msg3Details); + msg_Invalid = msg3; } /** diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorUserTypeTypes.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorUserTypeTypes.java index ba883f4fa40..77250005888 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorUserTypeTypes.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorUserTypeTypes.java @@ -17,9 +17,11 @@ package org.eclipse.rse.internal.useractions.ui.validators; -import org.eclipse.rse.internal.useractions.IUserActionsMessageIds; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.rse.internal.useractions.Activator; +import org.eclipse.rse.internal.useractions.UserActionsResources; +import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.validators.ISystemValidator; /** @@ -35,7 +37,18 @@ public class ValidatorUserTypeTypes implements ISystemValidator { * but use the default for the "Value not valid" error message */ public ValidatorUserTypeTypes() { - setErrorMessages(RSEUIPlugin.getPluginMessage(IUserActionsMessageIds.MSG_VALIDATE_UDTTYPES_EMPTY), RSEUIPlugin.getPluginMessage(IUserActionsMessageIds.MSG_VALIDATE_UDTTYPES_NOTVALID)); + String msg1Txt = UserActionsResources.MSG_VALIDATE_UDTTYPES_EMPTY; + String msg1Details = UserActionsResources.MSG_VALIDATE_UDTTYPES_EMPTY_DETAILS; + + SystemMessage msg1 = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg1Txt, msg1Details); + + String msg2Txt = UserActionsResources.MSG_VALIDATE_UDTTYPES_NOTVALID; + String msg2Details = UserActionsResources.MSG_VALIDATE_UDTTYPES_NOTVALID_DETAILS; + + SystemMessage msg2 = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg2Txt, msg2Details); + + + setErrorMessages(msg1, msg2); } /**