# HG changeset patch # User Ed Swartz # Date 1260395035 21600 # Node ID 4817219999f081d512b556d786f22fc9deb050f7 # Parent 12ea338ad1f66c37cd067a9b177ceed38a54a0c8 Avoid loading TRK/TCF related connected services outside Win32 since there are no native libraries to support these yet. diff -r 12ea338ad1f6 -r 4817219999f0 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 Wed Dec 09 15:40:36 2009 -0600 +++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java Wed Dec 09 15:43:55 2009 -0600 @@ -131,6 +131,7 @@ return true; } + @SuppressWarnings("unchecked") private void loadExtensions(String extensionId, String loadError, Collection extensionObjects, IFilter filter) { IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry(); IExtensionPoint extensionPoint = extensionRegistry.getExtensionPoint(extensionId); @@ -235,7 +236,8 @@ List connectedServices = new ArrayList(); for (IService service : getCompatibleServices(connection.getConnectionType())) { IConnectedService connectedService = createConnectedService(service, connection); - connectedServices.add(connectedService); + if (connectedService != null) + connectedServices.add(connectedService); } return connectedServices; } @@ -305,7 +307,7 @@ Collection services = connectionTypeToServices.get(connectionType); if (services != null) return new ArrayList(services); - return Collections.EMPTY_LIST; + return Collections.emptyList(); } /* (non-Javadoc) diff -r 12ea338ad1f6 -r 4817219999f0 debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/ConnectedServiceFactory.java --- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/ConnectedServiceFactory.java Wed Dec 09 15:40:36 2009 -0600 +++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/ConnectedServiceFactory.java Wed Dec 09 15:43:55 2009 -0600 @@ -20,6 +20,7 @@ import com.nokia.carbide.remoteconnections.interfaces.*; import com.nokia.carbide.trk.support.connection.*; +import com.nokia.cpp.internal.api.utils.core.HostOS; import java.util.*; @@ -34,10 +35,14 @@ public IConnectedService createConnectedService(IService service, IConnection connection) { if (service instanceof TracingService && isCompatibleConnection(getCompatibleTracingConnectionTypeIds(), connection)) { + if (HostOS.IS_UNIX) + return null; // TODO: not ported return new TracingConnectedService(service, (AbstractSynchronizedConnection) connection); } else if (service instanceof TRKService && isCompatibleConnection(getCompatibleTRKConnectionTypeIds(), connection)) { + if (HostOS.IS_UNIX) + return null; // TODO: not ported return new TRKConnectedService(service, (AbstractSynchronizedConnection) connection); } @@ -75,7 +80,7 @@ return getCompatibleTRKConnectionTypeIds(); else if (service instanceof TracingService) return getCompatibleTracingConnectionTypeIds(); - return Collections.EMPTY_LIST; + return Collections.emptyList(); } }