From cb914b0d8f8e8f3ffb0b7ad2b52a64b86799aa16 Mon Sep 17 00:00:00 2001 From: David Dykstal Date: Tue, 13 May 2008 23:15:17 +0000 Subject: [PATCH] [231841] TVT34:TCT187: TVT - FR - Apostrophe issue in Details message https://bugs.eclipse.org/bugs/show_bug.cgi?id=231841 --- .../rse/internal/files/ui/FileResources.java | 3 +++ .../internal/files/ui/FileResources.properties | 4 ++++ .../files/ui/wizards/SystemNewFolderWizard.java | 15 ++++++++------- 3 files changed, 15 insertions(+), 7 deletions(-) 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 13c2d2ff79b..beccb5eb98b 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 @@ -21,6 +21,7 @@ * David McKnight (IBM) - [223204] [cleanup] fix broken nls strings in files.ui and others * David McKnight (IBM) - [224377] "open with" menu does not have "other" option * Rupen Mardirossian (IBM) - [227213] Added RESID_CONFLICT_COPY_PATTERN to be used for copying resources to parent folder. + * David Dykstal (IBM) [231841] Correcting messages for folder creation *******************************************************************************/ package org.eclipse.rse.internal.files.ui; @@ -351,6 +352,7 @@ public class FileResources extends NLS public static String FILEMSG_DELETE_FILE_FAILED; public static String FILEMSG_CREATE_FILE_FAILED; public static String FILEMSG_CREATE_FILE_FAILED_EXIST; + public static String FILEMSG_CREATE_FOLDER_FAILED; public static String FILEMSG_CREATE_FOLDER_FAILED_EXIST; public static String FILEMSG_CREATE_RESOURCE_NOTVISIBLE; public static String FILEMSG_ERROR_NOFILETYPES; @@ -364,6 +366,7 @@ public class FileResources extends NLS public static String FILEMSG_DELETE_FILE_FAILED_DETAILS; public static String FILEMSG_CREATE_FILE_FAILED_DETAILS; public static String FILEMSG_CREATE_FILE_FAILED_EXIST_DETAILS; + public static String FILEMSG_CREATE_FOLDER_FAILED_DETAILS; public static String FILEMSG_CREATE_FOLDER_FAILED_EXIST_DETAILS; public static String FILEMSG_CREATE_RESOURCE_NOTVISIBLE_DETAILS; public static String FILEMSG_ERROR_NOFILETYPES_DETAILS; 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 e7ac3f62f6f..0b3d5f5dc99 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 @@ -22,6 +22,7 @@ # David McKnight (IBM) - [224377] "open with" menu does not have "other" option # Martin Oberhuber (Wind River) - [226784] [nls] Standardize on Cancelled in PII # Rupen Mardirossian (IBM) - [227213] Added RESID_CONFLICT_COPY_PATTERN to be used for copying resources to parent folder. +# David Dykstal (IBM) [231841] Correcting messages for folder creation ############################################################################### # NLS_MESSAGEFORMAT_VAR @@ -347,6 +348,9 @@ FILEMSG_DELETE_FILE_FAILED_DETAILS=Either the object does not exist or you do no FILEMSG_CREATE_FILE_FAILED=No authority or file name not valid FILEMSG_CREATE_FILE_FAILED_DETAILS=The file could not be created because of one of the following reasons:\n- the user does not have enough authority to create the file \n- the file name is not valid +FILEMSG_CREATE_FOLDER_FAILED=No authority or folder name not valid +FILEMSG_CREATE_FOLDER_FAILED_DETAILS=The folder could not be created because of one of the following reasons:\n- the user does not have enough authority to create the folder \n- the folder name is not valid + FILEMSG_CREATE_FILE_FAILED_EXIST=File already exists FILEMSG_CREATE_FILE_FAILED_EXIST_DETAILS=The new file {0} already exists diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFolderWizard.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFolderWizard.java index a8615b86a0f..0ea253e8065 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFolderWizard.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/wizards/SystemNewFolderWizard.java @@ -17,6 +17,7 @@ * Xuan Chen (IBM) - [209828] Need to move the Create operation to a job. * David McKnight (IBM) - [216252] [api][nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible * David McKnight (IBM) - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared + * David Dykstal (IBM) [231841] Correcting messages for folder creation *******************************************************************************/ package org.eclipse.rse.internal.files.ui.wizards; @@ -93,21 +94,21 @@ public class SystemNewFolderWizard catch (RemoteFileIOException exc ) { ok = false; - SystemBasePlugin.logDebugMessage(CLASSNAME+ ":", " Creating remote file "+ absName + " failed with RemoteFileIOException " ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - String msgTxt = FileResources.FILEMSG_CREATE_FILE_FAILED_EXIST; - String msgDetails = NLS.bind(FileResources.FILEMSG_CREATE_FILE_FAILED_EXIST_DETAILS, absName); + SystemBasePlugin.logDebugMessage(CLASSNAME+ ":", " Creating remote folder "+ absName + " failed with RemoteFileIOException " ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + String msgTxt = FileResources.FILEMSG_CREATE_FOLDER_FAILED_EXIST; + String msgDetails = NLS.bind(FileResources.FILEMSG_CREATE_FOLDER_FAILED_EXIST_DETAILS, absName); msg = new SimpleSystemMessage(Activator.PLUGIN_ID, - ISystemFileConstants.FILEMSG_CREATE_FILE_FAILED_EXIST, + ISystemFileConstants.FILEMSG_CREATE_FOLDER_FAILED_EXIST, IStatus.ERROR, msgTxt, msgDetails); SystemMessageDialog.displayErrorMessage(null, msg); } catch (RemoteFileSecurityException e) { ok = false; - String msgTxt = FileResources.FILEMSG_CREATE_FOLDER_FAILED_EXIST; - String msgDetails = NLS.bind(FileResources.FILEMSG_CREATE_FOLDER_FAILED_EXIST_DETAILS, absName); + String msgTxt = FileResources.FILEMSG_CREATE_FOLDER_FAILED; + String msgDetails = FileResources.FILEMSG_CREATE_FOLDER_FAILED_DETAILS; msg = new SimpleSystemMessage(Activator.PLUGIN_ID, - ISystemFileConstants.FILEMSG_CREATE_FOLDER_FAILED_EXIST, + ISystemFileConstants.FILEMSG_CREATE_FOLDER_FAILED, IStatus.ERROR, msgTxt, msgDetails); SystemBasePlugin.logDebugMessage(CLASSNAME+ ":", " Creating remote folder "+ absName + " failed with RemoteFileSecurityException "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ SystemMessageDialog.displayErrorMessage(null, msg);