diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/FileResources.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/FileResources.java index 1008d9260a2..69905063ae0 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/FileResources.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/FileResources.java @@ -487,6 +487,9 @@ public class FileResources extends NLS // universal commands public static String MSG_UCMD_INVOCATION_EMPTY; + + // preferences + public static String MSG_ERROR_FILENAME_INVALID; static { diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/FileResources.properties b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/FileResources.properties index a18a799d477..6ed27d9a8fb 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/FileResources.properties +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/FileResources.properties @@ -492,7 +492,8 @@ MSG_CREATEFOLDERGENERIC_PROGRESS =Creating folder {0}... # universal commands MSG_UCMD_INVOCATION_EMPTY = The invocation may not be blank - +# preferences +MSG_ERROR_FILENAME_INVALID = File type extension must not contain '*' or '.' \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/ISystemFileConstants.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/ISystemFileConstants.java index f30d5386262..54972edd69d 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/ISystemFileConstants.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/ISystemFileConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2008 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 @@ -12,148 +12,24 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * David McKnight (IBM) - [216252] cleaning up message ids and strings *******************************************************************************/ package org.eclipse.rse.internal.files.ui; -// TODO is this file still used or necessary? /** * Constants used throughout the System plugin */ public interface ISystemFileConstants { - public static final String PLUGIN_ID ="org.eclipse.rse.files.ui"; //$NON-NLS-1$ - public static final String PREFIX = PLUGIN_ID+".files."; //$NON-NLS-1$ - // Icons - public static final String ICON_DIR = "icons"; //$NON-NLS-1$ - public static final String ICON_PATH = java.io.File.separator + ICON_DIR + java.io.File.separator; - public static final String ICON_SUFFIX = "Icon"; //$NON-NLS-1$ - public static final String ICON_EXT = ".gif"; //$NON-NLS-1$ - - // Resource Bundle ids - public static final String RESID_PREFIX = PREFIX+"ui."; //$NON-NLS-1$ - - // ------------------- - // DEFAULT FILTERS... - // ------------------- - public static final String RESID_FILTER_ROOTS = RESID_PREFIX + "RootsFileFilter.label"; //$NON-NLS-1$ - public static final String RESID_FILTER_ROOTFILES = RESID_PREFIX + "RootFileFilter.label"; //$NON-NLS-1$ - public static final String RESID_FILTER_ROOTFOLDERS= RESID_PREFIX + "RootFolderFilter.label"; //$NON-NLS-1$ - public static final String RESID_FILTER_DRIVES = RESID_PREFIX + "DrivesFileFilter.label"; //$NON-NLS-1$ - public static final String RESID_FILTER_HOME = RESID_PREFIX + "HomeFileFilter.label"; //$NON-NLS-1$ - public static final String RESID_FILTER_USERHOME = RESID_PREFIX + "UserHomeFileFilter.label"; //$NON-NLS-1$ - public static final String RESID_FILTER_MYHOME = RESID_PREFIX + "MyHomeFileFilter.label"; //$NON-NLS-1$ - // ------------------------- - // MISCELLANEOUS... - // ------------------------- - public static final String RESID_PROPERTY_FILE_FILTER_VALUE = RESID_PREFIX + "FileFilterProperty.value"; //$NON-NLS-1$ - - // ------------------------- - // WIZARDS... - // ------------------------- - - // New System File Filter wizard... - public static final String RESID_NEWFILEFILTER_PAGE1_TITLE = RESID_PREFIX+"NewFileFilter.page1.title"; //$NON-NLS-1$ - public static final String RESID_NEWFILEFILTER_PAGE1_DESCRIPTION = RESID_PREFIX+"NewFileFilter.page1.description"; //$NON-NLS-1$ - public static final String RESID_FILEFILTER_ROOT = RESID_PREFIX+"filefilter."; //$NON-NLS-1$ - public static final String RESID_FILEFILTER_NAME_ROOT = RESID_FILEFILTER_ROOT+"name."; //$NON-NLS-1$ - public static final String RESID_FILEFILTER_FOLDER_ROOT = RESID_FILEFILTER_ROOT+"folder."; //$NON-NLS-1$ - public static final String RESID_FILEFILTER_FILE_ROOT = RESID_FILEFILTER_ROOT+"file."; //$NON-NLS-1$ - public static final String RESID_FILEFILTER_STRING_ROOT = RESID_FILEFILTER_ROOT+"strings."; //$NON-NLS-1$ - - // New Filter String wizard... - public static final String RESID_NEWFILTERSTRING_TITLE = RESID_PREFIX+"NewFilterString.title"; //$NON-NLS-1$ - public static final String RESID_NEWFILTERSTRING_PAGE1_TITLE = RESID_PREFIX+"NewFilterString.page1.title"; //$NON-NLS-1$ - public static final String RESID_NEWFILTERSTRING_PAGE1_DESCRIPTION = RESID_PREFIX+"NewFilterString.page1.description"; //$NON-NLS-1$ - - // File Filter String Re-Usable form (used in dialog and wizard) - public static final String RESID_FILEFILTERSTRING_ROOT = RESID_PREFIX+"filefilterstring."; //$NON-NLS-1$ - public static final String RESID_FILEFILTERSTRING_FOLDER_ROOT = RESID_FILEFILTERSTRING_ROOT+"folder."; //$NON-NLS-1$ - public static final String RESID_FILEFILTERSTRING_FILE_ROOT = RESID_FILEFILTERSTRING_ROOT+"file."; //$NON-NLS-1$ - public static final String RESID_FILEFILTERSTRING_INCFOLDERS_ROOT = RESID_FILEFILTERSTRING_ROOT+"include.folders."; //$NON-NLS-1$ - public static final String RESID_FILEFILTERSTRING_INCFILES_ROOT = RESID_FILEFILTERSTRING_ROOT+"include.files."; //$NON-NLS-1$ - public static final String RESID_FILEFILTERSTRING_INCFILESONLY_ROOT = RESID_FILEFILTERSTRING_ROOT+"include.filesonly."; //$NON-NLS-1$ - public static final String RESID_FILEFILTERSTRING_BYFILENAME_ROOT = RESID_FILEFILTERSTRING_ROOT+"include.byfilename."; //$NON-NLS-1$ - public static final String RESID_FILEFILTERSTRING_BYFILETYPES_ROOT= RESID_FILEFILTERSTRING_ROOT+"include.byfiletypes."; //$NON-NLS-1$ - public static final String RESID_FILEFILTERSTRING_TYPES_ROOT = RESID_FILEFILTERSTRING_ROOT+"types."; //$NON-NLS-1$ - public static final String RESID_FILEFILTERSTRING_SELECTTYPES_ROOT= RESID_FILEFILTERSTRING_ROOT+"selectTypes."; //$NON-NLS-1$ - public static final String RESID_FILEFILTERSTRING_TEST_ROOT = RESID_FILEFILTERSTRING_ROOT+"test."; //$NON-NLS-1$ - // ------------------------- - // DIALOGS... - // ------------------------- - // Change System File Filter dialog... - public static final String RESID_CHGFILEFILTER_TITLE = RESID_PREFIX+"ChgFileFilter.title"; //$NON-NLS-1$ - // Change System File Filter String dialog... - public static final String RESID_CHGFILEFILTERSTRING_TITLE = RESID_PREFIX+"ChgFileFilterString.title"; //$NON-NLS-1$ - - // Select Directory dialog... - public static final String RESID_SELECTDIRECTORY_TITLE = RESID_PREFIX+"SelectDirectory.title"; //$NON-NLS-1$ - public static final String RESID_SELECTDIRECTORY_VERBIAGE = RESID_PREFIX+"SelectDirectory.verbiage."; //$NON-NLS-1$ - public static final String RESID_SELECTDIRECTORY_SELECT = RESID_PREFIX+"SelectDirectory.select."; //$NON-NLS-1$ - // Select File dialog... - public static final String RESID_SELECTFILE_TITLE = RESID_PREFIX+"SelectFile.title"; //$NON-NLS-1$ - public static final String RESID_SELECTFILE_VERBIAGE = RESID_PREFIX+"SelectFile.verbiage."; //$NON-NLS-1$ - public static final String RESID_SELECTFILE_SELECT = RESID_PREFIX+"SelectFile.select."; //$NON-NLS-1$ - - // Prompt for home folder dialog... - public static final String RESID_HOMEPROMPT_TITLE = RESID_PREFIX+"HomePrompt.title"; //$NON-NLS-1$ - public static final String RESID_HOMEPROMPT_VERBIAGE = RESID_PREFIX+"HomePrompt.verbiage."; //$NON-NLS-1$ - public static final String RESID_HOMEPROMPT_PROMPT_ROOT = RESID_PREFIX+"HomePrompt.prompt."; //$NON-NLS-1$ - - // ------------------------- - // ACTIONS... - // ------------------------- - public static final String ACTION_ID = RESID_PREFIX + "action."; //$NON-NLS-1$ - - public static final String ACTION_NEWFILEFILTER = ACTION_ID + "NewFilter"; //$NON-NLS-1$ - public static final String ACTION_NEWNESTEDFILEFILTER= ACTION_ID + "NewNestedFilter"; //$NON-NLS-1$ - public static final String ACTION_UPDATEFILEFILTER = ACTION_ID + "UpdateFilter"; //$NON-NLS-1$ - - public static final String ACTION_NEWFILEFILTERSTRING = ACTION_ID + "NewFilterString"; //$NON-NLS-1$ - public static final String ACTION_ADDFILEFILTERSTRING = ACTION_ID + "AddFilterString"; //$NON-NLS-1$ - public static final String ACTION_UPDATEFILEFILTERSTRING = ACTION_ID + "UpdateFilterString"; //$NON-NLS-1$ - public static final String ACTION_SELECTFILETYPES = ACTION_ID + "SelectFileTypes"; //$NON-NLS-1$ - - // ------------------------- - // WIDGETS... - // ------------------------- - public static final String WIDGET_ID = RESID_PREFIX + "widget."; //$NON-NLS-1$ - - public static final String WIDGET_FOLDER_ROOT = WIDGET_ID + "directory."; //$NON-NLS-1$ - public static final String WIDGET_BROWSE_ROOT = WIDGET_ID + "browse."; //$NON-NLS-1$ + // -------------------------------- + // INFO-POPS FOR UNIVERSAL FILE + // ------------------------------- + public static final String NEW_FILE_WIZARD = "ufwf0000"; //$NON-NLS-1$ + public static final String NEW_FOLDER_WIZARD = "ufwr0000"; //$NON-NLS-1$ + public static final String NEW_FILE_ACTION = "ufaf0000"; //$NON-NLS-1$ + public static final String NEW_FOLDER_ACTION = "ufar0000"; //$NON-NLS-1$ - // ------------------------- - // PROPERTY PAGES... - // ------------------------- - public static final String RESID_PP_FILE_ROOT = RESID_PREFIX+"pp.file."; //$NON-NLS-1$ - public static final String RESID_PP_FILE_TITLE = RESID_PP_FILE_ROOT+"title"; //$NON-NLS-1$ - public static final String RESID_PP_FILE_TYPE_ROOT = RESID_PP_FILE_ROOT+"type."; //$NON-NLS-1$ - public static final String RESID_PP_FILE_TYPE_FILE_VALUE = RESID_PP_FILE_ROOT+"type.file.value"; //$NON-NLS-1$ - public static final String RESID_PP_FILE_TYPE_FOLDER_VALUE = RESID_PP_FILE_ROOT+"type.folder.value"; //$NON-NLS-1$ - public static final String RESID_PP_FILE_TYPE_ROOT_VALUE = RESID_PP_FILE_ROOT+"type.root.value"; //$NON-NLS-1$ - public static final String RESID_PP_FILE_NAME_ROOT = RESID_PP_FILE_ROOT+"name."; //$NON-NLS-1$ - public static final String RESID_PP_FILE_PATH_ROOT = RESID_PP_FILE_ROOT+"path."; //$NON-NLS-1$ - public static final String RESID_PP_FILE_SIZE_ROOT = RESID_PP_FILE_ROOT+"size."; //$NON-NLS-1$ - public static final String RESID_PP_FILE_SIZE_VALUE = RESID_PP_FILE_ROOT+"size.value"; //$NON-NLS-1$ - public static final String RESID_PP_FILE_MODIFIED_ROOT = RESID_PP_FILE_ROOT+"modified."; //$NON-NLS-1$ - public static final String RESID_PP_FILE_READONLY_ROOT = RESID_PP_FILE_ROOT+"readonly."; //$NON-NLS-1$ - public static final String RESID_PP_FILE_READABLE_ROOT = RESID_PP_FILE_ROOT+"readable."; //$NON-NLS-1$ - public static final String RESID_PP_FILE_WRITABLE_ROOT = RESID_PP_FILE_ROOT+"writable."; //$NON-NLS-1$ - public static final String RESID_PP_FILE_HIDDEN_ROOT = RESID_PP_FILE_ROOT+"hidden."; //$NON-NLS-1$ - - - // ------------------------------- - // Enter or select file form - // ------------------------------- - public static final String RESID_ENTER_OR_SELECT_FILE_PREFIX = RESID_PREFIX + "EnterOrSelectFile."; //$NON-NLS-1$ - public static final String RESID_ENTER_OR_SELECT_FILE_TITLE = RESID_ENTER_OR_SELECT_FILE_PREFIX + "title"; //$NON-NLS-1$ - public static final String RESID_ENTER_OR_SELECT_FILE_VERBIAGE_LABEL = RESID_ENTER_OR_SELECT_FILE_PREFIX + "verbiage.label"; //$NON-NLS-1$ - public static final String RESID_ENTER_OR_SELECT_FILE_ENTER_LABEL = RESID_ENTER_OR_SELECT_FILE_PREFIX + "enter.label"; //$NON-NLS-1$ - public static final String RESID_ENTER_OR_SELECT_FILE_ENTER_TOOLTIP = RESID_ENTER_OR_SELECT_FILE_PREFIX + "enter.tooltip"; //$NON-NLS-1$ - public static final String RESID_ENTER_OR_SELECT_FILE_SELECT_TOOLTIP = RESID_ENTER_OR_SELECT_FILE_PREFIX + "select.tooltip"; //$NON-NLS-1$ - public static final String RESID_ENTER_OR_SELECT_FILE_FILE_LABEL = RESID_ENTER_OR_SELECT_FILE_PREFIX + "file.label"; //$NON-NLS-1$ - public static final String RESID_ENTER_OR_SELECT_FILE_FILE_TOOLTIP = RESID_ENTER_OR_SELECT_FILE_PREFIX + "file.tooltip"; //$NON-NLS-1$ } diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/UniversalPreferencePage.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/UniversalPreferencePage.java index a4c16830ad8..d31c2bf8942 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/UniversalPreferencePage.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/propertypages/UniversalPreferencePage.java @@ -23,6 +23,7 @@ package org.eclipse.rse.internal.files.ui.propertypages; import java.util.ArrayList; import java.util.Iterator; +import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.preference.BooleanFieldEditor; @@ -44,12 +45,12 @@ import org.eclipse.rse.internal.files.ui.Activator; import org.eclipse.rse.internal.files.ui.FileResources; import org.eclipse.rse.internal.subsystems.files.core.ISystemFilePreferencesConstants; import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager; +import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageFile; import org.eclipse.rse.subsystems.files.core.model.ISystemFileTransferModeMapping; import org.eclipse.rse.subsystems.files.core.model.SystemFileTransferModeMapping; import org.eclipse.rse.subsystems.files.core.model.SystemFileTransferModeRegistry; -import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.Mnemonics; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemWidgetHelpers; @@ -726,7 +727,8 @@ public class UniversalPreferencePage // Note by DWD - this path is never taken because the dialog that gathers resource types checks for this condition. SystemMessageFile mf = RSEUIPlugin.getPluginMessageFile(); Shell shell = getControl().getShell(); - SystemMessage message = mf.getMessage(ISystemMessages.MSG_ERROR_FILENAME_INVALID); + String msgTxt = FileResources.MSG_ERROR_FILENAME_INVALID; + SystemMessage message = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt); SystemMessageDialog.displayErrorMessage(shell, message); return; } diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFileWizardMainPage.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFileWizardMainPage.java index e1f13e26809..91cab98dfe3 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFileWizardMainPage.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFileWizardMainPage.java @@ -13,17 +13,18 @@ * Contributors: * Kevin Doyle (IBM) - Changed name Validator to ValidatorFileUniqueName * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry + * David McKnight (IBM) - [216252] cleaning up system message ids and strings ********************************************************************************/ package org.eclipse.rse.internal.files.ui.wizards; import org.eclipse.jface.wizard.Wizard; import org.eclipse.rse.internal.files.ui.FileResources; +import org.eclipse.rse.internal.files.ui.ISystemFileConstants; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.rse.subsystems.files.core.util.ValidatorFileUniqueName; -import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.messages.ISystemMessageLine; @@ -103,7 +104,7 @@ public class SystemNewFileWizardMainPage } ); - SystemWidgetHelpers.setCompositeHelp(composite_prompts, RSEUIPlugin.HELPPREFIX+ISystemMessages.NEW_FILE_WIZARD); + SystemWidgetHelpers.setCompositeHelp(composite_prompts, RSEUIPlugin.HELPPREFIX+ISystemFileConstants.NEW_FILE_WIZARD); return composite_prompts; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFolderWizardMainPage.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFolderWizardMainPage.java index eeb37d478d5..2229811b148 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFolderWizardMainPage.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFolderWizardMainPage.java @@ -13,17 +13,18 @@ * Contributors: * Kevin Doyle (IBM) - Changed name Validator to ValidatorFileUniqueName * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry + * David McKnight (IBM) - [216252] cleaning up system message ids and strings ********************************************************************************/ package org.eclipse.rse.internal.files.ui.wizards; import org.eclipse.jface.wizard.Wizard; import org.eclipse.rse.internal.files.ui.FileResources; +import org.eclipse.rse.internal.files.ui.ISystemFileConstants; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.rse.subsystems.files.core.util.ValidatorFileUniqueName; -import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.messages.ISystemMessageLine; @@ -107,7 +108,7 @@ public class SystemNewFolderWizardMainPage } ); - SystemWidgetHelpers.setCompositeHelp(composite_prompts, RSEUIPlugin.HELPPREFIX+ISystemMessages.NEW_FOLDER_WIZARD); + SystemWidgetHelpers.setCompositeHelp(composite_prompts, RSEUIPlugin.HELPPREFIX+ISystemFileConstants.NEW_FOLDER_WIZARD); return composite_prompts; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemMessages.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemMessages.java index d9657b659f2..73e51572bc3 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemMessages.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemMessages.java @@ -19,6 +19,7 @@ * FILEMSG_RENAME_INTERRUPTED, FILEMSG_DELETE_INTERRUPTED * FILEMSG_COPY_INTERRUPTED * Xuan Chen (IBM) - [209828] Need to move the Create operation to a job. + * David McKnight (IBM) - [216252] removing unused messages and ids ********************************************************************************/ package org.eclipse.rse.ui; @@ -30,7 +31,7 @@ public interface ISystemMessages { /***************************************************/ - /* Unused messages (that may still be usable + /* Unused messages (that may still be usable) /***************************************************/ public static final String MSG_VALIDATE_RENAME_EMPTY = "RSEG1012"; //MSG_VALIDATE_PREFIX + "ReName.Required"; //$NON-NLS-1$ public static final String MSG_VALIDATE_RENAME_NOTVALID = "RSEG1011"; //MSG_VALIDATE_PREFIX + "ReName.NotValid"; //$NON-NLS-1$ @@ -159,6 +160,109 @@ public interface ISystemMessages public static final String FILEMSG_COPY_INTERRUPTED = "RSEG1248"; //$NON-NLS-1$ + // ------------------------- + // IMPORT/EXPORT MESSAGES... + // ------------------------- + public static final String FILEMSG_COPY_ROOT = "RSEF8050"; //$NON-NLS-1$ + public static final String FILEMSG_IMPORT_ERROR = "RSEF8052"; //$NON-NLS-1$ + public static final String FILEMSG_IMPORT_PROBLEMS = "RSEF8054"; //$NON-NLS-1$ + public static final String FILEMSG_IMPORT_SELF = "RSEF8056"; //$NON-NLS-1$ + public static final String FILEMSG_EXPORT_ERROR = "RSEF8057"; //$NON-NLS-1$ + public static final String FILEMSG_EXPORT_PROBLEMS = "RSEF8058"; //$NON-NLS-1$ + public static final String FILEMSG_NOT_WRITABLE = "RSEF8059"; //$NON-NLS-1$ + + public static final String FILEMSG_TARGET_EXISTS = "RSEF8060"; //$NON-NLS-1$ + public static final String FILEMSG_FOLDER_IS_FILE = "RSEF8061"; //$NON-NLS-1$ + public static final String FILEMSG_DESTINATION_CONFLICTING = "RSEF8062"; //$NON-NLS-1$ + public static final String FILEMSG_SOURCE_IS_FILE = "RSEF8063"; //$NON-NLS-1$ + public static final String FILEMSG_SOURCE_EMPTY = "RSEF8066"; //$NON-NLS-1$ + public static final String FILEMSG_EXPORT_FAILED = "RSEF8067"; //$NON-NLS-1$ + public static final String FILEMSG_EXPORT_NONE_SELECTED = "RSEF8068"; //$NON-NLS-1$ + public static final String FILEMSG_DESTINATION_EMPTY = "RSEF8069"; //$NON-NLS-1$ + public static final String FILEMSG_IMPORT_FAILED = "RSEF8070"; //$NON-NLS-1$ + public static final String FILEMSG_IMPORT_NONE_SELECTED = "RSEF8071"; //$NON-NLS-1$ + public static final String FILEMSG_IMPORT_FILTERING = "RSEF8072"; //$NON-NLS-1$ + + + // Remote File Exception Messages + public static final String FILEMSG_SECURITY_ERROR = "RSEF1001"; //$NON-NLS-1$ + public static final String FILEMSG_IO_ERROR = "RSEF1002"; //$NON-NLS-1$ + + public static final String FILEMSG_FOLDER_NOTEMPTY = "RSEF1003"; //$NON-NLS-1$ + public static final String FILEMSG_FOLDER_NOTFOUND = "RSEF1004"; //$NON-NLS-1$ + public static final String FILEMSG_FOLDER_NOTFOUND_WANTTOCREATE = "RSEF1005"; //$NON-NLS-1$ + public static final String FILEMSG_FILE_NOTFOUND = "RSEF1006"; //$NON-NLS-1$ + + + + public static final String MSG_ERROR_FOLDER_NOTFOUND = "RSEG1105"; //$NON-NLS-1$ + public static final String MSG_ERROR_FOLDERORFILE_NOTFOUND = "RSEG1107"; //$NON-NLS-1$ + public static final String MSG_ERROR_ARCHIVEMANAGEMENT_NOTSUPPORTED = "RSEG1304"; //$NON-NLS-1$ + + public static final String MSG_GENERIC_I_TWOPARMS_HELP = "RSEO1005"; //$NON-NLS-1$ + public static final String MSG_GENERIC_W_TWOPARMS_HELP = "RSEO1006"; //$NON-NLS-1$ + public static final String MSG_GENERIC_E_TWOPARMS_HELP = "RSEO1007"; //$NON-NLS-1$ + public static final String MSG_GENERIC_U_TWOPARMS_HELP = "RSEO1008"; //$NON-NLS-1$ + public static final String MSG_GENERIC_Q_TWOPARMS_HELP = "RSEO1009"; //$NON-NLS-1$ + + public static final String MSG_COMM_CONNECT_FAILED = "RSEC1001"; //$NON-NLS-1$ + public static final String MSG_COMM_AUTH_FAILED = "RSEC1002"; //$NON-NLS-1$ + + public static final String MSG_COMM_SERVER_NOTSTARTED = "RSEC2301"; //$NON-NLS-1$ + public static final String MSG_COMM_INVALID_LOGIN = "RSEC2302"; //$NON-NLS-1$ + + public static final String MSG_COMM_INCOMPATIBLE_PROTOCOL = "RSEC2303"; //$NON-NLS-1$ + public static final String MSG_COMM_INCOMPATIBLE_UPDATE = "RSEC2304"; //$NON-NLS-1$ + + public static final String MSG_COMM_REXEC_NOTSTARTED = "RSEC2305"; //$NON-NLS-1$ + + + public static final String MSG_COMM_SERVER_OLDER_WARNING = "RSEC2308"; //$NON-NLS-1$ + public static final String MSG_COMM_CLIENT_OLDER_WARNING = "RSEC2309"; //$NON-NLS-1$ + + public static final String MSG_COMM_USING_SSL = "RSEC2314"; //$NON-NLS-1$ + public static final String MSG_COMM_NOT_USING_SSL = "RSEC2315"; //$NON-NLS-1$ + + // Connection doesn't exist + public static final String MSG_CONNECTION_DELETED = "RSEF5011"; //$NON-NLS-1$ + + // Remote editing messages + public static final String MSG_DOWNLOAD_NO_WRITE = "RSEF5002"; //$NON-NLS-1$ + public static final String MSG_DOWNLOAD_ALREADY_OPEN_IN_EDITOR = "RSEF5009"; //$NON-NLS-1$ + public static final String MSG_UPLOAD_FILE_EXISTS = "RSEF5012"; //$NON-NLS-1$ + + public static final String MSG_FOLDER_UNREADABLE = "RSEF5020"; //$NON-NLS-1$ + + // General error message + public static final String MSG_ERROR_GENERAL = "RSEO1002"; //$NON-NLS-1$ + + + // remote error list title message + public static final String MSG_ERROR_LIST_TITLE = "RSEG1500"; //$NON-NLS-1$ + + // name validation + public static final String MSG_ERROR_EXTENSION_EMPTY = "RSEF6001"; //$NON-NLS-1$ + public static final String MSG_ERROR_FILENAME_INVALID = "RSEF6002"; //$NON-NLS-1$ + + + // cache preferences + public static final String MSG_CACHE_UPLOAD_BEFORE_DELETE = "RSEF6101"; //$NON-NLS-1$ + public static final String MSG_CACHE_UNABLE_TO_SYNCH = "RSEF6102"; //$NON-NLS-1$ + + // remote search messages + public static final String MSG_REMOTE_SEARCH_INVALID_REGEX = "RSEG1601"; //$NON-NLS-1$ + + + // yantzi: artemis 6.0, offline messages + public static final String MSG_OFFLINE_CANT_CONNECT = "RSEC3001"; //$NON-NLS-1$ + + // file import/export messages + public static final String MSG_IMPORT_EXPORT_UNABLE_TO_USE_CONNECTION = "RSEF5101"; //$NON-NLS-1$ + public static final String MSG_IMPORT_EXPORT_UNEXPECTED_EXCEPTION = "RSEF5102"; //$NON-NLS-1$ + + // jar export messages + public static final String MSG_REMOTE_JAR_EXPORT_OVERWRITE_FILE = "RSEF5103"; //$NON-NLS-1$ + /***************************************************/ /* End of Unused messages (that may still be usable @@ -296,52 +400,6 @@ public interface ISystemMessages public static final String FILEMSG_RENAME_INTERRUPTED = "RSEG1246"; //$NON-NLS-1$ public static final String FILEMSG_DELETE_INTERRUPTED = "RSEG1247"; //$NON-NLS-1$ - - - /******/ - - - // ------------------------- - // IMPORT/EXPORT MESSAGES... - // ------------------------- - public static final String FILEMSG_COPY_ROOT = "RSEF8050"; //$NON-NLS-1$ - public static final String FILEMSG_IMPORT_ERROR = "RSEF8052"; //$NON-NLS-1$ - public static final String FILEMSG_IMPORT_PROBLEMS = "RSEF8054"; //$NON-NLS-1$ - public static final String FILEMSG_IMPORT_SELF = "RSEF8056"; //$NON-NLS-1$ - public static final String FILEMSG_EXPORT_ERROR = "RSEF8057"; //$NON-NLS-1$ - public static final String FILEMSG_EXPORT_PROBLEMS = "RSEF8058"; //$NON-NLS-1$ - public static final String FILEMSG_NOT_WRITABLE = "RSEF8059"; //$NON-NLS-1$ - - public static final String FILEMSG_TARGET_EXISTS = "RSEF8060"; //$NON-NLS-1$ - public static final String FILEMSG_FOLDER_IS_FILE = "RSEF8061"; //$NON-NLS-1$ - public static final String FILEMSG_DESTINATION_CONFLICTING = "RSEF8062"; //$NON-NLS-1$ - public static final String FILEMSG_SOURCE_IS_FILE = "RSEF8063"; //$NON-NLS-1$ - public static final String FILEMSG_SOURCE_EMPTY = "RSEF8066"; //$NON-NLS-1$ - public static final String FILEMSG_EXPORT_FAILED = "RSEF8067"; //$NON-NLS-1$ - public static final String FILEMSG_EXPORT_NONE_SELECTED = "RSEF8068"; //$NON-NLS-1$ - public static final String FILEMSG_DESTINATION_EMPTY = "RSEF8069"; //$NON-NLS-1$ - public static final String FILEMSG_IMPORT_FAILED = "RSEF8070"; //$NON-NLS-1$ - public static final String FILEMSG_IMPORT_NONE_SELECTED = "RSEF8071"; //$NON-NLS-1$ - public static final String FILEMSG_IMPORT_FILTERING = "RSEF8072"; //$NON-NLS-1$ - - // -------------------------------- - // INFO-POPS FOR UNIVERSAL FILE - // ------------------------------- - - public static final String NEW_FILE_WIZARD = "ufwf0000"; //$NON-NLS-1$ - public static final String NEW_FOLDER_WIZARD = "ufwr0000"; //$NON-NLS-1$ - public static final String NEW_FILE_ACTION = "ufaf0000"; //$NON-NLS-1$ - public static final String NEW_FOLDER_ACTION = "ufar0000"; //$NON-NLS-1$ - - - // Remote File Exception Messages - public static final String FILEMSG_SECURITY_ERROR = "RSEF1001"; //$NON-NLS-1$ - public static final String FILEMSG_IO_ERROR = "RSEF1002"; //$NON-NLS-1$ - - public static final String FILEMSG_FOLDER_NOTEMPTY = "RSEF1003"; //$NON-NLS-1$ - public static final String FILEMSG_FOLDER_NOTFOUND = "RSEF1004"; //$NON-NLS-1$ - public static final String FILEMSG_FOLDER_NOTFOUND_WANTTOCREATE = "RSEF1005"; //$NON-NLS-1$ - public static final String FILEMSG_FILE_NOTFOUND = "RSEF1006"; //$NON-NLS-1$ // -------------------------- // SYSTEM VIEW MESSAGES... @@ -361,13 +419,12 @@ public interface ISystemMessages // ---------------------------------- // GENERIC ERROR CHECKING MESSAGES... // ---------------------------------- + public static final String MSG_ERROR_CONNECTION_NOTFOUND = "RSEG1103"; //$NON-NLS-1$ public static final String MSG_ERROR_PROFILE_NOTFOUND = "RSEG1104"; //$NON-NLS-1$ - public static final String MSG_ERROR_FOLDER_NOTFOUND = "RSEG1105"; //$NON-NLS-1$ public static final String MSG_ERROR_FILE_NOTFOUND = "RSEG1106"; //$NON-NLS-1$ - public static final String MSG_ERROR_FOLDERORFILE_NOTFOUND = "RSEG1107"; //$NON-NLS-1$ - public static final String MSG_ERROR_ARCHIVEMANAGEMENT_NOTSUPPORTED = "RSEG1304"; //$NON-NLS-1$ - + + // -------------------------- // Generic messages, must substitute in values... // -------------------------- @@ -381,19 +438,14 @@ public interface ISystemMessages public static final String MSG_GENERIC_E_HELP = "RSEO1002"; //$NON-NLS-1$ public static final String MSG_GENERIC_U_HELP = "RSEO1003"; //$NON-NLS-1$ public static final String MSG_GENERIC_Q_HELP = "RSEO1004"; //$NON-NLS-1$ - public static final String MSG_GENERIC_I_TWOPARMS_HELP = "RSEO1005"; //$NON-NLS-1$ - public static final String MSG_GENERIC_W_TWOPARMS_HELP = "RSEO1006"; //$NON-NLS-1$ - public static final String MSG_GENERIC_E_TWOPARMS_HELP = "RSEO1007"; //$NON-NLS-1$ - public static final String MSG_GENERIC_U_TWOPARMS_HELP = "RSEO1008"; //$NON-NLS-1$ - public static final String MSG_GENERIC_Q_TWOPARMS_HELP = "RSEO1009"; //$NON-NLS-1$ + // ---------------------------------- // COMMUNICATIONS ERROR CHECKING MESSAGES... // ---------------------------------- - public static final String MSG_COMM_CONNECT_FAILED = "RSEC1001"; //$NON-NLS-1$ - public static final String MSG_COMM_AUTH_FAILED = "RSEC1002"; //$NON-NLS-1$ + public static final String MSG_COMM_PWD_INVALID = "RSEC1004"; //$NON-NLS-1$ - + public static final String MSG_COMM_PWD_EXISTS = "RSEC2101"; //$NON-NLS-1$ public static final String MSG_COMM_PWD_MISMATCH = "RSEC2102"; //$NON-NLS-1$ public static final String MSG_COMM_PWD_BLANKFIELD = "RSEC2103"; //$NON-NLS-1$ @@ -402,64 +454,13 @@ public interface ISystemMessages public static final String MSG_COMM_ENVVAR_NONAME = "RSEC2002"; //$NON-NLS-1$ public static final String MSG_COMM_ENVVAR_INVALIDCHAR = "RSEC2004"; //$NON-NLS-1$ - public static final String MSG_COMM_SERVER_NOTSTARTED = "RSEC2301"; //$NON-NLS-1$ - public static final String MSG_COMM_INVALID_LOGIN = "RSEC2302"; //$NON-NLS-1$ - - public static final String MSG_COMM_INCOMPATIBLE_PROTOCOL = "RSEC2303"; //$NON-NLS-1$ - public static final String MSG_COMM_INCOMPATIBLE_UPDATE = "RSEC2304"; //$NON-NLS-1$ - - - public static final String MSG_COMM_REXEC_NOTSTARTED = "RSEC2305"; //$NON-NLS-1$ - public static final String MSG_COMM_PORT_WARNING = "RSEC2306"; //$NON-NLS-1$ - - public static final String MSG_COMM_SERVER_OLDER_WARNING = "RSEC2308"; //$NON-NLS-1$ - public static final String MSG_COMM_CLIENT_OLDER_WARNING = "RSEC2309"; //$NON-NLS-1$ - - public static final String MSG_COMM_USING_SSL = "RSEC2314"; //$NON-NLS-1$ - public static final String MSG_COMM_NOT_USING_SSL = "RSEC2315"; //$NON-NLS-1$ - + + // Unexpected error message public static final String MSG_ERROR_UNEXPECTED = "RSEF8002"; //$NON-NLS-1$ - // Connection doesn't exist - public static final String MSG_CONNECTION_DELETED = "RSEF5011"; //$NON-NLS-1$ - - // Remote editing messages - public static final String MSG_DOWNLOAD_NO_WRITE = "RSEF5002"; //$NON-NLS-1$ - public static final String MSG_DOWNLOAD_ALREADY_OPEN_IN_EDITOR = "RSEF5009"; //$NON-NLS-1$ - public static final String MSG_UPLOAD_FILE_EXISTS = "RSEF5012"; //$NON-NLS-1$ - - public static final String MSG_FOLDER_UNREADABLE = "RSEF5020"; //$NON-NLS-1$ - - // General error message - public static final String MSG_ERROR_GENERAL = "RSEO1002"; //$NON-NLS-1$ - // file transfer message public static final String MSG_TRANSFER_INVALID = "RSEG1270"; //$NON-NLS-1$ - - // remote error list title message - public static final String MSG_ERROR_LIST_TITLE = "RSEG1500"; //$NON-NLS-1$ - - // name validation - public static final String MSG_ERROR_EXTENSION_EMPTY = "RSEF6001"; //$NON-NLS-1$ - public static final String MSG_ERROR_FILENAME_INVALID = "RSEF6002"; //$NON-NLS-1$ - - // cache preferences - public static final String MSG_CACHE_UPLOAD_BEFORE_DELETE = "RSEF6101"; //$NON-NLS-1$ - public static final String MSG_CACHE_UNABLE_TO_SYNCH = "RSEF6102"; //$NON-NLS-1$ - - // remote search messages - public static final String MSG_REMOTE_SEARCH_INVALID_REGEX = "RSEG1601"; //$NON-NLS-1$ - - // yantzi: artemis 6.0, offline messages - public static final String MSG_OFFLINE_CANT_CONNECT = "RSEC3001"; //$NON-NLS-1$ - - // file import/export messages - public static final String MSG_IMPORT_EXPORT_UNABLE_TO_USE_CONNECTION = "RSEF5101"; //$NON-NLS-1$ - public static final String MSG_IMPORT_EXPORT_UNEXPECTED_EXCEPTION = "RSEF5102"; //$NON-NLS-1$ - - // jar export messages - public static final String MSG_REMOTE_JAR_EXPORT_OVERWRITE_FILE = "RSEF5103"; //$NON-NLS-1$ } \ No newline at end of file