From 566add7ee3d8eb233c2caaee30972a295a125946 Mon Sep 17 00:00:00 2001 From: Alena Laskavaia Date: Mon, 23 Feb 2015 16:35:28 -0500 Subject: [PATCH] adjusted some messages in the new connection wizard - replace Launch Type with Connection type - message "Enter name for connection" is not relevant and confusing when user actually entered it already (and it is set by default too), replaced with generic message (only visible in the begging and when no errors) Change-Id: I4deb8b2a0e878084eaf59030c9bd5d09610d2d78 Signed-off-by: Alena Laskavaia --- .../eclipse/remote/internal/jsch/ui/messages/Messages.java | 2 +- .../remote/internal/jsch/ui/messages/messages.properties | 2 +- .../remote/internal/jsch/ui/wizards/JSchConnectionPage.java | 2 +- .../src/org/eclipse/remote/internal/ui/messages.properties | 6 +++--- .../remote/internal/ui/views/NewRemoteConnectionWizard.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/messages/Messages.java b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/messages/Messages.java index 1667f5b6c6f..2b3420d7365 100755 --- a/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/messages/Messages.java +++ b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/messages/Messages.java @@ -24,7 +24,7 @@ public class Messages extends NLS { public static String JSchConnectionPage_A_connection_with_that_name_already_exists; public static String JSchConnectionPage_Edit_Connection; public static String JSchConnectionPage_Edit_properties_of_an_existing_connection; - public static String JSchConnectionPage_Please_enter_name_for_connection; + public static String JSchConnectionPage_Initial_Message; public static String JSchConnectionPage_Proxy; public static String JSchConnectionPage_Help; public static String JSchConnectionPage_KeysAtSSH2; diff --git a/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/messages/messages.properties b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/messages/messages.properties index 250aa5e5ddc..9f64c2e5f2f 100755 --- a/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/messages/messages.properties +++ b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/messages/messages.properties @@ -11,7 +11,7 @@ JSchConnectionPage_A_connection_with_that_name_already_exists=A connection with that name already exists JSchConnectionPage_Edit_Connection=Edit Connection JSchConnectionPage_Edit_properties_of_an_existing_connection=Edit properties of an existing connection -JSchConnectionPage_Please_enter_name_for_connection=Please enter a name for the connection +JSchConnectionPage_Initial_Message=Specify properties of a new connection JSchConnectionPage_Proxy=SSH Proxy Settings JSchConnectionPage_Help=If 'Local' is selected and proxy command is empty, no proxy is used.\nSee Network Connections for SOCKS and HTTP proxy options. JSchConnectionPage_KeysAtSSH2=Keys are set at Network Connections, SSH2 diff --git a/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/wizards/JSchConnectionPage.java b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/wizards/JSchConnectionPage.java index 89ff0e951e8..a7f415cd9c2 100755 --- a/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/wizards/JSchConnectionPage.java +++ b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/wizards/JSchConnectionPage.java @@ -232,7 +232,7 @@ public class JSchConnectionPage extends WizardPage { if (fConnection == null) { setDescription(Messages.JSchNewConnectionPage_New_connection_properties); setTitle(Messages.JSchNewConnectionPage_New_Connection); - setMessage(Messages.JSchConnectionPage_Please_enter_name_for_connection); + setMessage(Messages.JSchConnectionPage_Initial_Message); } else { setDescription(Messages.JSchConnectionPage_Edit_properties_of_an_existing_connection); setTitle(Messages.JSchConnectionPage_Edit_Connection); diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/messages.properties b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/messages.properties index 26212f3755b..b9b7ca6feb5 100644 --- a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/messages.properties +++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/messages.properties @@ -1,6 +1,6 @@ -NewRemoteConnectionTypePage_LaunchTargetType=Launch Target Type -NewRemoteConnectionTypePage_SelectTargetType=Select type of launch target to create. -NewRemoteConnectionWizard_0=Launch Target Type +NewRemoteConnectionTypePage_LaunchTargetType=Connection Type +NewRemoteConnectionTypePage_SelectTargetType=Select type of connection to create. +NewRemoteConnectionWizard_0=Connection Type OpenTerminalHandler_OpenTerminalDesc=A real terminal would open now OpenTerminalHandler_OpenTerminalTitle=Open Terminal RemoteConnectionPropertyPage_ConnectionName=Connection Name: diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/views/NewRemoteConnectionWizard.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/views/NewRemoteConnectionWizard.java index 79b4f498799..2d5d8c87bca 100644 --- a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/views/NewRemoteConnectionWizard.java +++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/views/NewRemoteConnectionWizard.java @@ -55,7 +55,7 @@ public class NewRemoteConnectionWizard extends Wizard { @Override public boolean canFinish() { - // Need to move onto the new target wizard + // don't allow to finish since we need to activate actual connection wizard page return false; }