tmf remote: rename messages constants

Change-Id: Ib0c9ebbc3378c9a1e8466270cf6179b4f5453988
Signed-off-by: Bernd Hufmann <Bernd.Hufmann@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/44400
Reviewed-by: Hudson CI
Reviewed-by: Patrick Tasse <patrick.tasse@gmail.com>
Tested-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>

diff --git a/org.eclipse.tracecompass.tmf.remote.core/src/org/eclipse/tracecompass/internal/tmf/remote/core/messages/Messages.java b/org.eclipse.tracecompass.tmf.remote.core/src/org/eclipse/tracecompass/internal/tmf/remote/core/messages/Messages.java
index 55136adb914412b6bc9c0a7b7d0226190b01b8c7..c9f501cd6236fc2e7e9bc36e0b795ac6053b97d3 100644 (file)
--- a/org.eclipse.tracecompass.tmf.remote.core/src/org/eclipse/tracecompass/internal/tmf/remote/core/messages/Messages.java
+++ b/org.eclipse.tracecompass.tmf.remote.core/src/org/eclipse/tracecompass/internal/tmf/remote/core/messages/Messages.java
@@ -24,11 +24,11 @@ public final class Messages extends NLS {
     private static final String BUNDLE_NAME = "org.eclipse.tracecompass.internal.tmf.remote.core.messages.messages"; //$NON-NLS-1$
 
     // Failures
-    public static String TraceControl_ExecutionCancelled;
-    public static String TraceControl_ExecutionFailure;
-    public static String TraceControl_ExecutionTimeout;
-    public static String TraceControl_ShellNotConnected;
-    public static String TraceControl_CommandShellError;
+    public static String RemoteConnection_ExecutionCancelled;
+    public static String RemoteConnection_ExecutionFailure;
+    public static String RemoteConnection_ExecutionTimeout;
+    public static String RemoteConnection_ShellNotConnected;
+    public static String RemoteConnection_CommandShellError;
 
     static {
         // initialize resource bundle

diff --git a/org.eclipse.tracecompass.tmf.remote.core/src/org/eclipse/tracecompass/internal/tmf/remote/core/messages/messages.properties b/org.eclipse.tracecompass.tmf.remote.core/src/org/eclipse/tracecompass/internal/tmf/remote/core/messages/messages.properties
index 2c31e56cad4c375096c5aba14c99584fa5bcbb3b..0c36a23af8077a420b928ea1a25c9c0bd6f412af 100644 (file)
--- a/org.eclipse.tracecompass.tmf.remote.core/src/org/eclipse/tracecompass/internal/tmf/remote/core/messages/messages.properties
+++ b/org.eclipse.tracecompass.tmf.remote.core/src/org/eclipse/tracecompass/internal/tmf/remote/core/messages/messages.properties
@@ -10,8 +10,8 @@
 # Bernd Hufmann - initial API and implementation
 ###############################################################################
 
-TraceControl_ExecutionCancelled=Command Execution cancelled
-TraceControl_ExecutionFailure=Command Execution failed
-TraceControl_ExecutionTimeout=Command Execution timed-out
-TraceControl_ShellNotConnected=Command shell not connected
-TraceControl_CommandShellError=Could not create HostShellProcessAdapter
+RemoteConnection_ExecutionCancelled=Command Execution cancelled
+RemoteConnection_ExecutionFailure=Command Execution failed
+RemoteConnection_ExecutionTimeout=Command Execution timed-out
+RemoteConnection_ShellNotConnected=Command shell not connected
+RemoteConnection_CommandShellError=Could not create HostShellProcessAdapter

diff --git a/org.eclipse.tracecompass.tmf.remote.core/src/org/eclipse/tracecompass/internal/tmf/remote/core/shell/CommandShell.java b/org.eclipse.tracecompass.tmf.remote.core/src/org/eclipse/tracecompass/internal/tmf/remote/core/shell/CommandShell.java
index eb94060979b3b7343876d8d45ca33a0f00d08769..a22913f76eb817c75f0755251787a60b5c575811 100644 (file)
--- a/org.eclipse.tracecompass.tmf.remote.core/src/org/eclipse/tracecompass/internal/tmf/remote/core/shell/CommandShell.java
+++ b/org.eclipse.tracecompass.tmf.remote.core/src/org/eclipse/tracecompass/internal/tmf/remote/core/shell/CommandShell.java
@@ -120,17 +120,17 @@ public class CommandShell implements ICommandShell {
             try {
                 return checkNotNull(future.get(TmfRemotePreferences.getCommandTimeout(), TimeUnit.SECONDS));
             } catch (InterruptedException ex) {
-                throw new ExecutionException(Messages.TraceControl_ExecutionCancelled, ex);
+                throw new ExecutionException(Messages.RemoteConnection_ExecutionCancelled, ex);
             } catch (TimeoutException ex) {
-                throw new ExecutionException(Messages.TraceControl_ExecutionTimeout, ex);
+                throw new ExecutionException(Messages.RemoteConnection_ExecutionTimeout, ex);
             } catch (Exception ex) {
-                throw new ExecutionException(Messages.TraceControl_ExecutionFailure, ex);
+                throw new ExecutionException(Messages.RemoteConnection_ExecutionFailure, ex);
             }
             finally {
                 future.cancel(true);
             }
         }
-        throw new ExecutionException(Messages.TraceControl_ShellNotConnected, null);
+        throw new ExecutionException(Messages.RemoteConnection_ShellNotConnected, null);
     }
 
     // ------------------------------------------------------------------------