# HG changeset patch # User dadubrow # Date 1268251684 21600 # Node ID c18e25401dcfba0091d8e885c335cdb7d0bf65cb # Parent e1e93f4890677b6811cc5e55645cda3a9cd32b83 10843 - set in-use status for non-dynamic connections diff -r e1e93f489067 -r c18e25401dcf connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractConnectedService2.java --- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractConnectedService2.java Wed Mar 10 08:40:06 2010 -0600 +++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractConnectedService2.java Wed Mar 10 14:08:04 2010 -0600 @@ -31,6 +31,7 @@ import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus.EStatus; import com.nokia.carbide.remoteconnections.internal.ServiceTester; import com.nokia.carbide.remoteconnections.internal.api.IConnectedService2; +import com.nokia.carbide.remoteconnections.internal.api.IConnection2.IConnectionStatus; import com.nokia.cpp.internal.api.utils.core.Check; import com.nokia.cpp.internal.api.utils.core.ListenerList; import com.nokia.cpp.internal.api.utils.core.ObjectUtils; @@ -87,9 +88,20 @@ this.shortDescription = shortDescription; this.longDescription = longDescription; fireStatusChanged(); + if (!connection.isDynamic()) + connection.setStatus(getInUseConnectionStatus(estatus)); } } - + + private IConnectionStatus getInUseConnectionStatus(EStatus serviceStatus) { + String desc = ""; //$NON-NLS-1$ + if (serviceStatus.equals(EStatus.IN_USE)) { + desc = Messages.getString("AbstractConnectedService2.InUseDesc"); //$NON-NLS-1$ + return new AbstractConnection.ConnectionStatus(IConnectionStatus.EConnectionStatus.IN_USE, desc, desc); + } else + return new AbstractConnection.ConnectionStatus(IConnectionStatus.EConnectionStatus.NONE, desc, desc); + } + public static class TestResult { public TestResult(EStatus estatus, String shortDescription, String longDescription) { this.estatus = estatus; diff -r e1e93f489067 -r c18e25401dcf 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 Wed Mar 10 08:40:06 2010 -0600 +++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/messages.properties Wed Mar 10 14:08:04 2010 -0600 @@ -1,5 +1,6 @@ AbstractConnectedService.UserDisabledMessage=User disabled active status testing AbstractConnectedService.NoTestingLabel=Not testing service +AbstractConnectedService2.InUseDesc=In Use AbstractImportExportPage.BrowseButtonLabel=Browse... AbstractImportExportPage.ConnectionColumnLabel=Connection AbstractImportExportPage.TypeColumnLabel=Type