connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/view/ConnectionsView.java
equal
deleted
inserted
replaced
85 import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus.EStatus; |
85 import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus.EStatus; |
86 import com.nokia.carbide.remoteconnections.interfaces.IConnectionsManager.IConnectionListener; |
86 import com.nokia.carbide.remoteconnections.interfaces.IConnectionsManager.IConnectionListener; |
87 import com.nokia.carbide.remoteconnections.interfaces.IConnectionsManager.IConnectionsManagerListener; |
87 import com.nokia.carbide.remoteconnections.interfaces.IConnectionsManager.IConnectionsManagerListener; |
88 import com.nokia.carbide.remoteconnections.internal.api.IConnection2; |
88 import com.nokia.carbide.remoteconnections.internal.api.IConnection2; |
89 import com.nokia.carbide.remoteconnections.internal.api.IConnection2.IConnectionStatus; |
89 import com.nokia.carbide.remoteconnections.internal.api.IConnection2.IConnectionStatus; |
|
90 import com.nokia.carbide.remoteconnections.internal.api.IConnection2.IConnectionStatus.EConnectionStatus; |
90 import com.nokia.carbide.remoteconnections.internal.registry.Registry; |
91 import com.nokia.carbide.remoteconnections.internal.registry.Registry; |
91 import com.nokia.carbide.remoteconnections.internal.ui.ConnectionUIUtils; |
92 import com.nokia.carbide.remoteconnections.internal.ui.ConnectionUIUtils; |
92 import com.nokia.carbide.remoteconnections.settings.ui.SettingsWizard; |
93 import com.nokia.carbide.remoteconnections.settings.ui.SettingsWizard; |
93 import com.nokia.cpp.internal.api.utils.core.ObjectUtils; |
94 import com.nokia.cpp.internal.api.utils.core.ObjectUtils; |
94 import com.nokia.cpp.internal.api.utils.core.TextUtils; |
95 import com.nokia.cpp.internal.api.utils.core.TextUtils; |
259 status = ((IConnectedService) value).getStatus(); |
260 status = ((IConnectedService) value).getStatus(); |
260 return status.getShortDescription(); |
261 return status.getShortDescription(); |
261 } |
262 } |
262 } |
263 } |
263 else if (value instanceof IConnection) { |
264 else if (value instanceof IConnection) { |
264 if (isDynamicConnection(value)) { |
265 IConnectionStatus connectionStatus = getConnectionStatus((IConnection) value); |
265 IConnectionStatus status = ((IConnection2) value).getStatus(); |
266 if (connectionStatus != null) { |
266 if (status != null) |
267 return connectionStatus.getShortDescription(); |
267 return status.getShortDescription(); |
|
268 } |
268 } |
269 else { |
269 else { |
270 IStatus status = ConnectionUIUtils.getFirstInUseServiceStatus((IConnection) value); |
270 IStatus status = ConnectionUIUtils.getFirstInUseServiceStatus((IConnection) value); |
271 if (status != null) |
271 if (status != null) |
272 return status.getShortDescription(); |
272 return status.getShortDescription(); |
323 longDescription = TextUtils.canonicalizeNewlines(longDescription, " "); //$NON-NLS-1$ |
323 longDescription = TextUtils.canonicalizeNewlines(longDescription, " "); //$NON-NLS-1$ |
324 return longDescription; |
324 return longDescription; |
325 } |
325 } |
326 } |
326 } |
327 else if (value instanceof IConnection) { |
327 else if (value instanceof IConnection) { |
328 if (isDynamicConnection(value)) { |
328 IConnectionStatus status = getConnectionStatus((IConnection) value); |
329 IConnectionStatus status = ((IConnection2) value).getStatus(); |
329 if (status != null) { |
330 if (status != null) |
330 return status.getLongDescription(); |
331 return status.getLongDescription(); |
|
332 } |
331 } |
333 else if (ConnectionUIUtils.isSomeServiceInUse((IConnection) value)) { |
332 else if (ConnectionUIUtils.isSomeServiceInUse((IConnection) value)) { |
334 return Messages.getString("ConnectionsView.InUseDesc"); //$NON-NLS-1$ |
333 return Messages.getString("ConnectionsView.InUseDesc"); //$NON-NLS-1$ |
335 } |
334 } |
336 } |
335 } |
558 Registry.instance().addConnectionListener(connectionListener); |
557 Registry.instance().addConnectionListener(connectionListener); |
559 |
558 |
560 RemoteConnectionsActivator.setHelp(parent, ".connections_view"); //$NON-NLS-1$ |
559 RemoteConnectionsActivator.setHelp(parent, ".connections_view"); //$NON-NLS-1$ |
561 } |
560 } |
562 |
561 |
|
562 // returns non-null status when status is not EConnectionStatus.NONE |
|
563 private IConnectionStatus getConnectionStatus(IConnection connection) { |
|
564 if (connection instanceof IConnection2) { |
|
565 IConnectionStatus status = ((IConnection2) connection).getStatus(); |
|
566 if (status != null && status.getEConnectionStatus() != EConnectionStatus.NONE) |
|
567 return status; |
|
568 } |
|
569 return null; |
|
570 } |
|
571 |
563 private void packColumns() { |
572 private void packColumns() { |
564 TreeColumn[] columns = viewer.getTree().getColumns(); |
573 TreeColumn[] columns = viewer.getTree().getColumns(); |
565 for (TreeColumn column : columns) { |
574 for (TreeColumn column : columns) { |
566 column.pack(); |
575 column.pack(); |
567 } |
576 } |