From 99b9b7d5d9e8a6419dff4acac02baac6ab632459 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Thu, 21 Feb 2008 18:07:17 +0000 Subject: [PATCH] [216252] [api][nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible --- .../internal/subsystems/files/core/SystemFileResources.java | 4 +++- .../subsystems/files/core/SystemFileResources.properties | 4 +--- .../files/core/util/ValidatorFileFilterString.java | 3 ++- .../subsystems/files/core/util/ValidatorFileUniqueName.java | 6 ++++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.java index b6a30a20165..f6409b008e4 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.java @@ -181,8 +181,10 @@ public class SystemFileResources extends NLS public static String FILEMSG_VALIDATE_FILEFILTERSTRING_NOTVALID; public static String FILEMSG_VALIDATE_FILEFILTERSTRING_NOINCLUDES; public static String MSG_VALIDATE_NAME_EMPTY; + public static String MSG_VALIDATE_NAME_EMPTY_DETAILS; public static String MSG_VALIDATE_NAME_NOTUNIQUE; - public static String MSG_VALIDATE_NAME_NOTVALID; + public static String MSG_VALIDATE_NAME_NOTUNIQUE_DETAILS; + public static String MSG_CONNECT_FAILED; public static String MSG_OPERATION_CANCELED; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.properties b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.properties index dd5c67e80b0..2e8dc484ec9 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.properties +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.properties @@ -226,9 +226,7 @@ MSG_VALIDATE_NAME_EMPTY_DETAILS = You must enter a name in the field where the c MSG_VALIDATE_NAME_NOTUNIQUE= Name in use MSG_VALIDATE_NAME_NOTUNIQUE_DETAILS = This name is already used by another resource. Enter a unique name. -MSG_VALIDATE_NAME_NOTVALID = Name not valid -MSG_VALIDATE_NAME_NOTVALID_DETAILS =The name entered does not have valid syntax - + MSG_CONNECT_FAILED = Connect to {0} failed with an unexpected exception MSG_OPERATION_CANCELED = Operation canceled. diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/util/ValidatorFileFilterString.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/util/ValidatorFileFilterString.java index 4a8dcfc54e8..ea8af0049ab 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/util/ValidatorFileFilterString.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/util/ValidatorFileFilterString.java @@ -101,7 +101,8 @@ public class ValidatorFileFilterString private void init() { //setErrorMessages(RSEUIPlugin.getPluginMessage(FILEMSG_VALIDATE_FILEFILTERSTRING_EMPTY), - setErrorMessages(new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, SystemFileResources.MSG_VALIDATE_NAME_EMPTY), + setErrorMessages(new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, + SystemFileResources.MSG_VALIDATE_NAME_EMPTY, SystemFileResources.MSG_VALIDATE_NAME_EMPTY_DETAILS), new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, SystemFileResources.FILEMSG_VALIDATE_FILEFILTERSTRING_NOTUNIQUE), new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, SystemFileResources.FILEMSG_VALIDATE_FILEFILTERSTRING_NOTVALID)); isFileName = isFolderName = true; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/util/ValidatorFileUniqueName.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/util/ValidatorFileUniqueName.java index 0e25fb86899..36602c222cf 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/util/ValidatorFileUniqueName.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/util/ValidatorFileUniqueName.java @@ -78,8 +78,10 @@ public class ValidatorFileUniqueName //shell.setCursor(busyCursor); org.eclipse.rse.ui.dialogs.SystemPromptDialog.setDisplayCursor(shell, busyCursor); - setErrorMessages(new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, SystemFileResources.MSG_VALIDATE_NAME_EMPTY), - new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, SystemFileResources.MSG_VALIDATE_NAME_NOTUNIQUE), + setErrorMessages(new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, + SystemFileResources.MSG_VALIDATE_NAME_EMPTY, SystemFileResources.MSG_VALIDATE_NAME_EMPTY_DETAILS), + new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, + SystemFileResources.MSG_VALIDATE_NAME_NOTUNIQUE, SystemFileResources.MSG_VALIDATE_NAME_NOTUNIQUE_DETAILS), isFolder ? new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, SystemFileResources.FILEMSG_VALIDATE_FILEFILTERSTRING_NOTUNIQUE) : new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, SystemFileResources.FILEMSG_VALIDATE_FILEFILTERSTRING_NOTVALID));