From da6ba5fc6230fe2d1493e8f95395731e1eec4682 Mon Sep 17 00:00:00 2001 From: Greg Watson Date: Mon, 7 Oct 2013 16:09:48 -0400 Subject: [PATCH] Improve progress monitor message. Signed-off-by: Greg Watson --- .../remote/internal/jsch/core/commands/ExecCommand.java | 3 ++- .../remote/internal/jsch/core/messages/Messages.java | 7 ------- .../remote/internal/jsch/core/messages/messages.properties | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/ExecCommand.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/ExecCommand.java index 4f14aaa2f53..0dffebc5217 100644 --- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/ExecCommand.java +++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/ExecCommand.java @@ -4,6 +4,7 @@ import java.io.ByteArrayOutputStream; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; +import org.eclipse.osgi.util.NLS; import org.eclipse.remote.core.exception.RemoteConnectionException; import org.eclipse.remote.internal.jsch.core.JSchConnection; import org.eclipse.remote.internal.jsch.core.messages.Messages; @@ -48,7 +49,7 @@ public class ExecCommand extends AbstractRemoteCommand { return stream.toString(); } }; - subMon.subTask(Messages.ExecCommand_Exec_command); + subMon.subTask(NLS.bind(Messages.ExecCommand_Exec_command, fCommand)); return c.getResult(subMon.newChild(10)); } } diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/messages/Messages.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/messages/Messages.java index 46971bfbc4d..3e231697018 100755 --- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/messages/Messages.java +++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/messages/Messages.java @@ -22,7 +22,6 @@ public class Messages extends NLS { public static String AuthInfo_Authentication_message; public static String ChildInfosCommand_Get_file_attributes; public static String DeleteCommand_Remove_file; - public static String ExecCommand_Exec_command; public static String FetchInfoCommand_Fetch_info; public static String GetInputStreamCommand_Get_input_stream; @@ -31,23 +30,17 @@ public class Messages extends NLS { public static String JSchConnection_remotePort; public static String RemoteToolsConnection_open; public static String JSchConnection_forwarding; - public static String JSchConnection_Remote_host_does_not_support_sftp; - public static String JSchConnection_Unable_to_open_sftp_channel; public static String JSchConnection_username_must_be_set; public static String JSchConnectionManager_connection_with_name_exists; public static String JSchConnectionManager_cannotRemoveOpenConnection; public static String JSchConnectionManager_invalidConnectionType; - public static String JSchProcessBuilder_Connection_is_not_open; public static String JschFileStore_Connection_is_not_open; - public static String JschFileStore_File_doesnt_exist; public static String JschFileStore_Invalid_connection_for_URI; - public static String JschFileStore_Is_a_directory; - public static String JschFileStore_No_remote_services_found_for_URI; public static String JschFileStore_The_file_of_name_already_exists; public static String JschFileStore_The_parent_of_directory_does_not_exist; diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/messages/messages.properties b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/messages/messages.properties index d5e9eb4e0b9..7abf22b2960 100755 --- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/messages/messages.properties +++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/messages/messages.properties @@ -14,7 +14,7 @@ AbstractRemoteCommand_Execution_exception=Execution exception AuthInfo_Authentication_message=Authentication Message ChildInfosCommand_Get_file_attributes=Get file attributes DeleteCommand_Remove_file=Remove file -ExecCommand_Exec_command=Exec command +ExecCommand_Exec_command=Executing command "{0}" FetchInfoCommand_Fetch_info=Fetch info GetInputStreamCommand_Get_input_stream=Get input stream JSchConnection_connectionNotOpen=Connection is not open