diff -r 47bb893ba749 -r d97b8b6bce37 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 Fri Dec 18 10:19:18 2009 -0600 +++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/view/ConnectionsView.java Fri Dec 18 10:44:27 2009 -0600 @@ -211,7 +211,7 @@ else if (value instanceof IConnectedService) { EStatus status = ((IConnectedService) value).getStatus().getEStatus(); IConnection connection = findConnection((IConnectedService) value); - if (connection != null && isConnectionInUse(connection)) + if (connection != null && ConnectionUIUtils.isSomeServiceInUse(connection)) status = EStatus.IN_USE; return ConnectionUIUtils.getConnectedServiceStatusImage(status); } @@ -227,14 +227,14 @@ IStatus status = null; IConnection connection = findConnection((IConnectedService) value); if (connection != null) - status = getFirstInUseStatus(connection); + status = ConnectionUIUtils.getFirstInUseServiceStatus(connection); if (status == null) { status = ((IConnectedService) value).getStatus(); return status.getShortDescription(); } } else if (value instanceof IConnection) { - IStatus status = getFirstInUseStatus((IConnection) value); + IStatus status = ConnectionUIUtils.getFirstInUseServiceStatus((IConnection) value); if (status != null) return status.getShortDescription(); } @@ -274,7 +274,7 @@ IStatus status = ((IConnectedService) value).getStatus(); IConnection connection = findConnection((IConnectedService) value); if (!status.getEStatus().equals(EStatus.IN_USE) || - !(connection != null && isConnectionInUse(connection))) { // if in-use, we show it in the connection row + !(connection != null && ConnectionUIUtils.isSomeServiceInUse(connection))) { // if in-use, we show it in the connection row String longDescription = status.getLongDescription(); if (longDescription != null) longDescription = TextUtils.canonicalizeNewlines(longDescription, " "); //$NON-NLS-1$ @@ -282,7 +282,7 @@ } } else if (value instanceof IConnection) { - if (isConnectionInUse((IConnection) value)) { + if (ConnectionUIUtils.isSomeServiceInUse((IConnection) value)) { return Messages.getString("ConnectionsView.InUseDesc"); } } @@ -758,23 +758,6 @@ return null; } - private static IStatus getFirstInUseStatus(IConnection connection) { - Collection connectedServices = - Registry.instance().getConnectedServices(connection); - // if any service is in-use, then connection is in-use - for (IConnectedService connectedService : connectedServices) { - IStatus status = connectedService.getStatus(); - if (status.getEStatus().equals(EStatus.IN_USE)) - return status; - } - - return null; - } - - private boolean isConnectionInUse(IConnection connection) { - return getFirstInUseStatus(connection) != null; - } - private boolean isDynamicConnection(Object object) { return object instanceof IConnection2 && ((IConnection2) object).isDynamic(); }