# HG changeset patch
# User dadubrow
# Date 1263997727 21600
# Node ID 43d328ced5343d9943b105f73b16030e59c0c051
# Parent  6c8eba9e19ea64d8ce143edd80d2704ee412eeee
tweak dialog for ensureConnection

diff -r 6c8eba9e19ea -r 43d328ced534 connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java	Tue Jan 19 13:14:32 2010 -0600
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java	Wed Jan 20 08:28:47 2010 -0600
@@ -40,7 +40,6 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.IMessageProvider;
@@ -543,8 +542,7 @@
 							ui.createComposite(c);
 							ui.addListener(new IListener() {
 								public void connectionSelected() {
-									IStatus selectionStatus = ui.getSelectionStatus();
-									updateStatus(selectionStatus);
+									updateStatus(ui.getSelectionStatus());
 								}
 
 							});
@@ -554,6 +552,7 @@
 
 						private void updateStatus(IStatus selectionStatus) {
 							setTitle(Messages.getString("Registry.EnsureConnection.TitleLabel")); //$NON-NLS-1$
+							setMessage(Messages.getString("Registry.EnsureConnection.Description")); //$NON-NLS-1$
 							switch (selectionStatus.getSeverity()) {
 							case IStatus.ERROR:
 								setMessage(selectionStatus.getMessage(), IMessageProvider.ERROR);
@@ -568,7 +567,6 @@
 								getButton(IDialogConstants.OK_ID).setEnabled(true);
 								break;
 							default:
-								setMessage(null, IMessageProvider.NONE);
 								getButton(IDialogConstants.OK_ID).setEnabled(true);
 							}
 						}
@@ -576,8 +574,7 @@
 						@Override
 						public void create() {
 							super.create();
-							updateStatus(new Status(IStatus.ERROR, RemoteConnectionsActivator.PLUGIN_ID, 
-									Messages.getString("Registry.EnsureConnection.InitialStatusMessage"))); //$NON-NLS-1$
+							updateStatus(ui.getSelectionStatus());
 						}
 						
 						@Override
diff -r 6c8eba9e19ea -r 43d328ced534 connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/messages.properties
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/messages.properties	Tue Jan 19 13:14:32 2010 -0600
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/messages.properties	Wed Jan 20 08:28:47 2010 -0600
@@ -112,9 +112,9 @@
 Registry.ConnectionStoreError=Could not store connections
 Registry.FilterExtensionLoadError=Could not load filter extensions
 Registry.ConnectionTypeExtensionLoadError=Could not load connection type extensions
-Registry.EnsureConnection.DialogTitle=No Valid Connection
-Registry.EnsureConnection.InitialStatusMessage=No valid connection found. Select a valid connection, create a new one or attach a device.
-Registry.EnsureConnection.TitleLabel=Select Connection
+Registry.EnsureConnection.DialogTitle=Invalid Connection Stored
+Registry.EnsureConnection.TitleLabel=Select a connection to use
+Registry.EnsureConnection.Description=Select a connection, create a new one or attach a device
 Registry.NoCompatibleConnectionMsg=No compatible connection found for this id
 Registry.ServiceExtensionLoadError=Could not load service extensions
 Registry.ServiceListUnknownConnectionTypeError=Service ''{0}'' lists unknown connection type ''{1}'' as compatible