# HG changeset patch
# User dadubrow
# Date 1271879894 18000
# Node ID 2a211a55b277ee40ec128dc892ab85036df7b037
# Parent  7adc53ca384404a5ad365458b03fa745189aa521
support for connection status for static connections

diff -r 7adc53ca3844 -r 2a211a55b277 connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/view/ConnectionsView.java
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/view/ConnectionsView.java	Wed Apr 21 14:14:01 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/view/ConnectionsView.java	Wed Apr 21 14:58:14 2010 -0500
@@ -87,6 +87,7 @@
 import com.nokia.carbide.remoteconnections.interfaces.IConnectionsManager.IConnectionsManagerListener;
 import com.nokia.carbide.remoteconnections.internal.api.IConnection2;
 import com.nokia.carbide.remoteconnections.internal.api.IConnection2.IConnectionStatus;
+import com.nokia.carbide.remoteconnections.internal.api.IConnection2.IConnectionStatus.EConnectionStatus;
 import com.nokia.carbide.remoteconnections.internal.registry.Registry;
 import com.nokia.carbide.remoteconnections.internal.ui.ConnectionUIUtils;
 import com.nokia.carbide.remoteconnections.settings.ui.SettingsWizard;
@@ -261,10 +262,9 @@
 				}
 			}
 			else if (value instanceof IConnection) {
-				if (isDynamicConnection(value)) {
-					IConnectionStatus status = ((IConnection2) value).getStatus();
-					if (status != null)
-						return status.getShortDescription();
+				IConnectionStatus connectionStatus = getConnectionStatus((IConnection) value);
+				if (connectionStatus != null) {
+					return connectionStatus.getShortDescription();
 				}
 				else {	
 					IStatus status = ConnectionUIUtils.getFirstInUseServiceStatus((IConnection) value);
@@ -325,10 +325,9 @@
 				}
 			}
 			else if (value instanceof IConnection) {
-				if (isDynamicConnection(value)) {
-					IConnectionStatus status = ((IConnection2) value).getStatus();
-					if (status != null)
-						return status.getLongDescription();
+				IConnectionStatus status = getConnectionStatus((IConnection) value);
+				if (status != null) {
+					return status.getLongDescription();
 				}
 				else if (ConnectionUIUtils.isSomeServiceInUse((IConnection) value)) {
 					return Messages.getString("ConnectionsView.InUseDesc"); //$NON-NLS-1$
@@ -560,6 +559,16 @@
 		RemoteConnectionsActivator.setHelp(parent, ".connections_view"); //$NON-NLS-1$
 	}
 
+	// returns non-null status when status is not EConnectionStatus.NONE
+	private IConnectionStatus getConnectionStatus(IConnection connection) {
+		if (connection instanceof IConnection2) {
+			IConnectionStatus status = ((IConnection2) connection).getStatus();
+			if (status != null && status.getEConnectionStatus() != EConnectionStatus.NONE)
+				return status;
+		}
+		return null;
+	}
+
 	private void packColumns() {
 		TreeColumn[] columns = viewer.getTree().getColumns();
 		for (TreeColumn column : columns) {