diff --git a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/Activator.java b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/Activator.java index becf2d918fa..08e25bd9257 100644 --- a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/Activator.java +++ b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/Activator.java @@ -45,7 +45,7 @@ public class Activator extends Plugin { //The shared instance. private static Activator plugin; - + public static final String PLUGIN_ID="org.eclipse.rse.services"; //$NON-NLS-1$ /** * The constructor. diff --git a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/RSEServicesMessages.java b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/RSEServicesMessages.java index f33f6523431..855c18dca5c 100644 --- a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/RSEServicesMessages.java +++ b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/RSEServicesMessages.java @@ -15,12 +15,25 @@ import org.eclipse.osgi.util.NLS; public class RSEServicesMessages extends NLS { private static final String BUNDLE_NAME = "org.eclipse.rse.internal.services.messages"; //$NON-NLS-1$ - static { - NLS.initializeMessages(BUNDLE_NAME, RSEServicesMessages.class); - } + private RSEServicesMessages() { } public static String Socket_timeout; + public static String FILEMSG_OPERATION_FAILED; + public static String FILEMSG_OPERATION_FAILED_DETAILS; + + public static String FILEMSG_SECURITY_VIOLATION; + public static String FILEMSG_SECURITY_VIOLATION_DETAILS; + + public static String MSG_OPERATION_CANCELED; + + public static String FILEMSG_FOLDER_NOT_EMPTY; + public static String FILEMSG_FOLDER_NOT_EMPTY_DETAILS; + + + static { + NLS.initializeMessages(BUNDLE_NAME, RSEServicesMessages.class); + } } diff --git a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/messages.properties b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/messages.properties index 57b1e72e1b2..f47ac116153 100644 --- a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/messages.properties +++ b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/messages.properties @@ -15,3 +15,17 @@ #From org.eclipse.team.internal.ccvs.core/messages.properties Socket_timeout=A timeout occurred connecting to host {0} + + +FILEMSG_OPERATION_FAILED=Operation failed. File system input or output error +FILEMSG_OPERATION_FAILED_DETAILS=Message reported from file system: {0} + +FILEMSG_SECURITY_VIOLATION=Operation failed. Security violation +FILEMSG_SECURITY_VIOLATION_DETAILS=Message reported from file system: {0} + +MSG_OPERATION_CANCELED=Operation canceled. + +FILEMSG_FOLDER_NOT_EMPTY = Folder is not empty. Cannot delete +FILEMSG_FOLDER_NOT_EMPTY_DETAILS = The operation failed. One possible reason is that the folder is not empty + + diff --git a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileCancelledException.java b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileCanceledException.java similarity index 71% rename from rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileCancelledException.java rename to rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileCanceledException.java index 09175c68685..b95ef3db57a 100644 --- a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileCancelledException.java +++ b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileCanceledException.java @@ -18,13 +18,18 @@ package org.eclipse.rse.services.files; +import org.eclipse.core.runtime.IStatus; + +import org.eclipse.rse.internal.services.Activator; +import org.eclipse.rse.internal.services.RSEServicesMessages; +import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage; /** * Exception thrown when attempting a file operation and the user * canceled it before it could be completed. */ -public class RemoteFileCancelledException extends RemoteFileException { +public class RemoteFileCanceledException extends RemoteFileException { /** * A serialVersionUID is recommended for all serializable classes. @@ -37,23 +42,14 @@ public class RemoteFileCancelledException extends RemoteFileException { /** * Constructor */ - public RemoteFileCancelledException() { + public RemoteFileCanceledException() { super(getMyMessage()); } - /* - * TODO dwd update this to retrieve the new messages when those are created - * myMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_CANCELED); - * public static final String MSG_OPERATION_CANCELED = "RSEG1067"; - * - * Operation cancelled. - * - * - */ private static SystemMessage getMyMessage() { - String l1 = "Operation cancelled."; //$NON-NLS-1$ - String l2 = ""; //$NON-NLS-1$ - myMessage = new SystemMessage("RSE", "G", "1067", SystemMessage.ERROR, l1, l2); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + String msgTxt = RSEServicesMessages.MSG_OPERATION_CANCELED; + + myMessage = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt); return myMessage; } diff --git a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileIOException.java b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileIOException.java index e52f8701b0b..0c94208c82e 100644 --- a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileIOException.java +++ b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileIOException.java @@ -17,6 +17,12 @@ package org.eclipse.rse.services.files; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.osgi.util.NLS; + +import org.eclipse.rse.internal.services.Activator; +import org.eclipse.rse.internal.services.RSEServicesMessages; +import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage; /** @@ -41,27 +47,21 @@ public class RemoteFileIOException extends RemoteFileException { * @param remoteException the initial cause of this exception */ public RemoteFileIOException(Exception remoteException) { - super(getMyMessage(), remoteException); + super(getMyMessage(remoteException), remoteException); + + } + + private static SystemMessage getMyMessage(Exception remoteException) { + String secondLevel = remoteException.getMessage(); if (secondLevel == null) { secondLevel = remoteException.getClass().getName(); } - getSystemMessage().makeSubstitution(secondLevel); - } - - /* - * TODO dwd update this to retrieve the new messages when those are created - * myMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_IO_ERROR); - * public static final String FILEMSG_IO_ERROR = "RSEF1002"; - * - * Operation failed. File system input or output error - * Message reported from file system: %1 - * - */ - private static SystemMessage getMyMessage() { - String l1 = "Operation failed. File system input or output error"; //$NON-NLS-1$ - String l2 = "Message reported from file system: %1"; //$NON-NLS-1$ - myMessage = new SystemMessage("RSE", "F", "1002", SystemMessage.ERROR, l1, l2); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + String msgTxt = RSEServicesMessages.FILEMSG_OPERATION_FAILED; + String msgDetails = NLS.bind(RSEServicesMessages.FILEMSG_OPERATION_FAILED_DETAILS, secondLevel); + + myMessage = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails); return myMessage; } diff --git a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileSecurityException.java b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileSecurityException.java index 793bee67920..4da19617ff4 100644 --- a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileSecurityException.java +++ b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileSecurityException.java @@ -17,6 +17,12 @@ package org.eclipse.rse.services.files; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.osgi.util.NLS; + +import org.eclipse.rse.internal.services.Activator; +import org.eclipse.rse.internal.services.RSEServicesMessages; +import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage; /** @@ -39,29 +45,21 @@ public class RemoteFileSecurityException extends RemoteFileException { * @param remoteException the original cause of this exception. */ public RemoteFileSecurityException(Exception remoteException) { - super(getMyMessage(), remoteException); - String secondLevel = remoteException.getMessage(); - if (secondLevel == null) { - secondLevel = remoteException.getClass().getName(); - } - getSystemMessage().makeSubstitution(secondLevel); + super(getMyMessage(remoteException), remoteException); + } - /* - * TODO dwd update this to retrieve the new messages when those are created - * super(RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_SECURITY_ERROR), remoteException); - * public static final String FILEMSG_SECURITY_ERROR = "RSEF1001"; - * - * Operation failed. Security violation - * Message reported from file system: %1 - * - */ - private static SystemMessage getMyMessage() { + private static SystemMessage getMyMessage(Exception remoteException) { if (myMessage == null) { - String l1 = "Operation failed. Security violation"; //$NON-NLS-1$ - String l2 = "Message reported from file system: %1"; //$NON-NLS-1$ - myMessage = new SystemMessage("RSE", "F", "1001", SystemMessage.ERROR, l1, l2); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - + String secondLevel = remoteException.getMessage(); + if (secondLevel == null) { + secondLevel = remoteException.getClass().getName(); + } + + String msgTxt = RSEServicesMessages.FILEMSG_SECURITY_VIOLATION; + String msgDetails = NLS.bind(RSEServicesMessages.FILEMSG_SECURITY_VIOLATION_DETAILS, secondLevel); + + myMessage = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails); } return myMessage; } diff --git a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFolderNotEmptyException.java b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFolderNotEmptyException.java index 9d0b81c9836..60fc9dc7a7a 100644 --- a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFolderNotEmptyException.java +++ b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFolderNotEmptyException.java @@ -17,6 +17,11 @@ package org.eclipse.rse.services.files; +import org.eclipse.core.runtime.IStatus; + +import org.eclipse.rse.internal.services.Activator; +import org.eclipse.rse.internal.services.RSEServicesMessages; +import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage; /** @@ -47,21 +52,12 @@ public class RemoteFolderNotEmptyException extends RemoteFileException { super(getMyMessage(), remoteException); } - /* - * TODO dwd update this to retrieve the new messages when those are created - * super(RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_FOLDER_NOTEMPTY), remoteException); - * public static final String FILEMSG_FOLDER_NOTEMPTY = "RSEF1003"; - * - * Folder is not empty. Cannot delete - * The operation failed. One possible reason is that the folder is not empty - * - */ + private static SystemMessage getMyMessage() { if (myMessage == null) { - String l1 = "Folder is not empty. Cannot delete"; //$NON-NLS-1$ - String l2 = "The operation failed. One possible reason is that the folder is not empty"; //$NON-NLS-1$ - myMessage = new SystemMessage("RSE", "F", "1003", SystemMessage.ERROR, l1, l2); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - + String msgTxt = RSEServicesMessages.FILEMSG_FOLDER_NOT_EMPTY; + String msgDetails = RSEServicesMessages.FILEMSG_FOLDER_NOT_EMPTY_DETAILS; + myMessage = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails); } return myMessage; }