--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/InstallPackages.java Wed Sep 08 18:06:14 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/InstallPackages.java Wed Sep 08 18:06:51 2010 -0500
@@ -182,6 +182,11 @@
if (o1.equals(o2))
return 0;
+ // EJS HACK: I tried using the ';' separator in the sdkFamily but it
+ // sorted to the bottom and also showed up in the UI...?
+ if (o1.equals("Symbian"))
+ return -1;
+
for (String orderString : orderList) {
if (o1.equals(orderString))
return -1;
@@ -216,8 +221,19 @@
return packages;
}
- private PackagesType getAvailablePackagesFromServer() throws Exception {
- GetMethod getMethod = new GetMethod(getMasterFilePath());
+
+ private URL getAvailablePackagesURL() throws Exception {
+ URL url = null;
+
+ // see if the file is local (Ed's hack for testing...)
+ String masterFilePathStr = getMasterFilePath();
+ url = new URL(masterFilePathStr);
+ if (url.getProtocol().equals("file")) {
+ return url;
+ }
+
+ // else, read the file to a local temporary location
+ GetMethod getMethod = new GetMethod(masterFilePathStr);
HttpClient client = new HttpClient();
setProxyData(client, getMethod);
client.getHttpConnectionManager().getParams()
@@ -255,12 +271,21 @@
}
out.close();
in.close();
- URL url = masterFile.toURI().toURL();
- return loadPackages(url);
+ url = masterFile.toURI().toURL();
+
+ return url;
}
-
return null;
}
+
+ private PackagesType getAvailablePackagesFromServer() throws Exception {
+ URL url = getAvailablePackagesURL();
+
+ if (url == null)
+ return null;
+
+ return loadPackages(url);
+ }
private static java.net.URI getURI(GetMethod getMethod) {
try {
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractPackageInstallerProvider.java Wed Sep 08 18:06:14 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractPackageInstallerProvider.java Wed Sep 08 18:06:51 2010 -0500
@@ -19,6 +19,7 @@
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;
+import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -117,7 +118,7 @@
installFileUrl = getInstallFileUrl(runnableContext);
inputStream = getInstallFile(installFileUrl, runnableContext);
} catch (Exception e) {
- RemoteConnectionsActivator.logError(e);
+ RemoteConnectionsActivator.log("Failed to find package URL " + installFileUrl, e);
}
String defaultFileName = null;
if (installFileUrl != null)
@@ -125,7 +126,16 @@
return new PackageContents(defaultFileName, inputStream);
}
- private ByteArrayInputStream getInstallFile(String installFileUrl, IRunnableContext runnableContext) throws Exception {
+ private InputStream getInstallFile(String installFileUrl, IRunnableContext runnableContext) throws Exception {
+
+ URL url = null;
+
+ // see if the file is local (Ed's hack for testing...)
+ url = new URL(installFileUrl);
+ if (url.getProtocol().equals("file")) {
+ return url.openStream();
+ }
+
GetMethod getMethod = new GetMethod(installFileUrl);
HttpClient client = new HttpClient();
InstallPackages.setProxyData(client, getMethod);
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java Wed Sep 08 18:06:14 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java Wed Sep 08 18:06:51 2010 -0500
@@ -211,8 +211,10 @@
public Collection<String> getCompatibleConnectionTypeIds(IService service) {
Collection<String> compatibleConnectionTypeIds = new HashSet<String>();
- for (IConnectedServiceFactory factory : connectedServiceFactories) {
- compatibleConnectionTypeIds.addAll(factory.getCompatibleConnectionTypeIds(service));
+ if (service != null) {
+ for (IConnectedServiceFactory factory : connectedServiceFactories) {
+ compatibleConnectionTypeIds.addAll(factory.getCompatibleConnectionTypeIds(service));
+ }
}
return compatibleConnectionTypeIds;
}
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/ui/ClientServiceSiteUI2.java Wed Sep 08 18:06:14 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/ui/ClientServiceSiteUI2.java Wed Sep 08 18:06:51 2010 -0500
@@ -387,8 +387,8 @@
for (int i = 0; i < connectionTypes.length; i++) {
IConnectionType type = connectionTypes[i];
if (requiredConnectionTypes.length() > 0)
- requiredConnectionTypes.append(", "); //$NON-NLS-1$
- if (i == connectionTypes.length - 1)
+ requiredConnectionTypes.append(connectionTypes.length > 2 ? ", " : " "); //$NON-NLS-1$ //$NON-NLS-2$
+ if (i == connectionTypes.length - 1 && connectionTypes.length > 1)
requiredConnectionTypes.append(Messages.getString("ClientServiceSiteUI2.Or")); //$NON-NLS-1$
requiredConnectionTypes.append(type.getDisplayName());
}
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/settings/ui/ConnectionSettingsPage.java Wed Sep 08 18:06:14 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/settings/ui/ConnectionSettingsPage.java Wed Sep 08 18:06:51 2010 -0500
@@ -35,6 +35,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -861,6 +862,9 @@
FileUtils.copyFile(is, file);
}
}
+ else
+ MessageDialog.openError(getShell(), "Package Error", MessageFormat.format("Cannot locate package file ({0})\n\n(server configuration problem?)",
+ packageContents.getDefaultNameFileName()));
}
private void attemptInstall(IPackageContents packageContents) throws Exception {
@@ -875,6 +879,10 @@
FileUtils.copyFile(is, tempFile);
Program.launch(tempFile.getAbsolutePath());
}
+ else
+ MessageDialog.openError(getShell(), "Package Error", MessageFormat.format(
+ "Failed to download package ({0})\n\n(server configuration problem?)",
+ packageContents.getDefaultNameFileName()));
}
--- a/core/carbide_releases/configuration/server.properties Wed Sep 08 18:06:14 2010 -0500
+++ b/core/carbide_releases/configuration/server.properties Wed Sep 08 18:06:51 2010 -0500
@@ -8,7 +8,9 @@
#
###############################################################################
com.nokia.carbide.cpp.news.reader.feed.listing.file=http://tools.ext.nokia.com/carbide_news_reader/feedListing.xml
-com.nokia.carbide.trk.support.service.TRKService=http://tools.ext.nokia.com/trk/TRKPackages.xml
+# C3TCF: no TRK support in C3
+#com.nokia.carbide.trk.support.service.TRKService=http://tools.ext.nokia.com/trk/TRKPackages.xml
+com.nokia.carbide.cpp.edc.connection.services.TCFTRKService=http://tools.ext.nokia.com/trk/tcf/TCFTRKPackages.xml
com.nokia.carbide.internal.discovery.ui.view.InstallExtensionsPortalExtension=http://cdn.symbian.org/carbide/updates/3.0/discovery/directory.xml
com.nokia.carbide.internal.discovery.ui.view.BugzillaPage=https://xdabug001.ext.nokia.com/bugzilla
com.nokia.carbide.internal.discovery.ui.view.HomePage=http://www.forum.nokia.com/Library/Tools_and_downloads/Other/Carbide.c++/
@@ -16,3 +18,4 @@
com.nokia.carbide.internal.discovery.ui.view.CreatingCarbidePage=http://creatingcarbide.blogspot.com/feeds/posts/default?alt=rss
com.nokia.carbide.internal.discovery.ui.view.PulsarPageLayer=http://tools.ext.nokia.com/pulsar/directory.xml
com.nokia.carbide.internal.discovery.ui.view.SupportPage=http://www.yahoo.com
+com.nokia.carbide.internal.discovery.ui.view.InstallPlatSimPage=
--- a/core/com.nokia.carbide.discovery.ui/plugin.xml Wed Sep 08 18:06:14 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/plugin.xml Wed Sep 08 18:06:51 2010 -0500
@@ -80,7 +80,7 @@
class="com.nokia.carbide.internal.discovery.ui.view.HomePage"
order="1"
pageId="com.nokia.carbide.discovery.ui.homePage"
- title="Forum Nokia">
+ title="Carbide (S60 Wiki)">
</portalPageLayer>
<portalPageLayer
class="com.nokia.carbide.internal.discovery.ui.view.SupportPage"
@@ -117,6 +117,12 @@
pageId="com.nokia.carbide.discovery.ui.kitsPage"
title="Install SDKs">
</portalPageLayer>
+ <portalPageLayer
+ class="com.nokia.carbide.internal.discovery.ui.view.InstallPlatSimPage"
+ order="10"
+ pageId="com.nokia.carbide.discovery.ui.homePage"
+ title="Install PlatSim">
+ </portalPageLayer>
</extension>
<extension
point="org.eclipse.equinox.p2.engine.actions">
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/InstallPlatSimPage.java Wed Sep 08 18:06:51 2010 -0500
@@ -0,0 +1,22 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+package com.nokia.carbide.internal.discovery.ui.view;
+
+import com.nokia.carbide.internal.discovery.ui.extension.AbstractBrowserPortalPageLayer;
+
+public class InstallPlatSimPage extends AbstractBrowserPortalPageLayer {
+}
--- a/debuggercdi/com.nokia.carbide.trk.support/plugin.xml Wed Sep 08 18:06:14 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/plugin.xml Wed Sep 08 18:06:51 2010 -0500
@@ -2,6 +2,7 @@
<?eclipse version="3.0"?>
<plugin>
+<!-- C3TCF: removing TRK support, which is the service, and any connections that only support TRK, from C3
<extension
point="com.nokia.carbide.remoteConnections.service">
<service
@@ -20,18 +21,22 @@
class="com.nokia.carbide.trk.support.connection.SerialBTConnectionType">
</connectionType>
</extension>
+-->
+
<extension
point="com.nokia.carbide.remoteConnections.connectionType">
<connectionType
class="com.nokia.carbide.trk.support.connection.USBConnectionType">
</connectionType>
</extension>
+
<extension
point="com.nokia.carbide.remoteConnections.service">
<service
class="com.nokia.carbide.trk.support.service.TracingService">
</service>
</extension>
+
<extension
point="com.nokia.carbide.remoteConnections.connectedServiceFactory">
<connectedServiceFactory
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/messages.properties Wed Sep 08 18:06:14 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/messages.properties Wed Sep 08 18:06:51 2010 -0500
@@ -4,28 +4,9 @@
ConnectionStatusReconciler_inUseLabel_lower=in use
ConnectionStatusReconciler_NotReadyLabel=Not Ready
ConnectionStatusReconciler_ReadyLabel=Ready
-ConnectionStatusReconciler_TracingServicePrefix=, Tracing service
-ConnectionStatusReconciler_TRKServicePrefix=Debugging services
+ConnectionStatusReconciler_TracingServicePrefix=, Trace service
+ConnectionStatusReconciler_TRKServicePrefix=Debug services
ConnectionStatusReconciler_unavailableLabel=unavailable
-TRKConnectedService.AppTRKName=Application TRK
-TRKConnectedService.DownLabel=Not Accessible
-TRKConnectedService.ErrorStatus=Error:
-TRKConnectedService.InUseLabel=In Use
-TRKConnectedService.IsLatestStatus=Installed TRK is latest available version: version = {0}
-TRKConnectedService.NeedsInstallStatus1=There is a newer version of TRK available. Please use the install tab to install it:\n
-TRKConnectedService.NeedsInstallStatus2=Installed TRK version = {0}, latest TRK version = {1}
-TRKConnectedService.OKStatus=Connection to TRK OK, TRK version = {0}
-TRKConnectedService.PortInUseStatus=Port {0} is in use
-TRKConnectedService.TaskLabel=Testing TRK Service
-TRKConnectedService.TCPIPInUseStatus=Address {0}, port {1} is in use
-TRKConnectedService.NoPingError=TRK did not respond
-TRKConnectedService.BadVersionResponseError=TRK version response was corrupted
-TRKConnectedService.NoPingErrorNoVersionError=Attempt to get TRK version timed out
-TRKConnectedService.RunningLabel=Available
-TRKConnectedService.SysTRKName=System TRK
-TRKConnectedService.UnknownLabel=Unknown
-TRKService.Label=TRK
-TRKService.ServiceInfo=Ensure TRK is running on the device
SerialConnectionFactory.BaudLabel=Baud rate:
SerialConnectionFactory.DataBitsLabel=Data bits:
SerialConnectionFactory.FlowControlLabel=Flow control:
@@ -52,12 +33,31 @@
TracingConnectedService.OKStatus=Connection to TraceCore OK
TracingConnectedService.PortInUseStatus=Port {0} is in use
TracingConnectedService.RunningLabel=Available
-TracingConnectedService.TaskLabel=Testing Tracing Service
+TracingConnectedService.TaskLabel=Testing Trace Service
TracingConnectedService.TCPIPInUseStatus=Address {0}, port {1} is in use
TracingConnectedService.TimedOutError=Attempt to get response from TraceCore timed out
TracingConnectedService.UnknownLabel=Unknown
TracingService.AdditionalInfoString=For USB, ensure TraceSwitch is running on the device.
-TracingService.Label=Tracing
+TracingService.Label=Trace
USBConnectionType.Desc=USB serial port connection settings
USBConnectionType.Label=USB
-
+# the below TRK strings should be no longer used
+TRKConnectedService.AppTRKName=Application TRK
+TRKConnectedService.DownLabel=Not Accessible
+TRKConnectedService.ErrorStatus=Error:
+TRKConnectedService.InUseLabel=In Use
+TRKConnectedService.IsLatestStatus=Installed TRK is latest available version: version = {0}
+TRKConnectedService.NeedsInstallStatus1=There is a newer version of TRK available. Please use the install tab to install it:\n
+TRKConnectedService.NeedsInstallStatus2=Installed TRK version = {0}, latest TRK version = {1}
+TRKConnectedService.OKStatus=Connection to TRK OK, TRK version = {0}
+TRKConnectedService.PortInUseStatus=Port {0} is in use
+TRKConnectedService.TaskLabel=Testing TRK Service
+TRKConnectedService.TCPIPInUseStatus=Address {0}, port {1} is in use
+TRKConnectedService.NoPingError=TRK did not respond
+TRKConnectedService.BadVersionResponseError=TRK version response was corrupted
+TRKConnectedService.NoPingErrorNoVersionError=Attempt to get TRK version timed out
+TRKConnectedService.RunningLabel=Available
+TRKConnectedService.SysTRKName=System TRK
+TRKConnectedService.UnknownLabel=Unknown
+TRKService.Label=TRK
+TRKService.ServiceInfo=Ensure TRK is running on the device
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/ConnectedServiceFactory.java Wed Sep 08 18:06:14 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/ConnectedServiceFactory.java Wed Sep 08 18:06:51 2010 -0500
@@ -27,8 +27,6 @@
import com.nokia.carbide.remoteconnections.interfaces.IConnectedServiceFactory;
import com.nokia.carbide.remoteconnections.interfaces.IConnection;
import com.nokia.carbide.remoteconnections.interfaces.IService;
-import com.nokia.carbide.trk.support.connection.SerialBTConnectionType;
-import com.nokia.carbide.trk.support.connection.SerialConnectionType;
import com.nokia.carbide.trk.support.connection.USBConnectionType;
import com.nokia.cpp.internal.api.utils.core.HostOS;
@@ -47,12 +45,14 @@
return new RemoteConnectedService(service); // TODO: not ported
return new TracingConnectedService(service, (AbstractSynchronizedConnection) connection);
}
+ /* C3TCF: removing TRK
else if (service instanceof TRKService &&
isCompatibleConnection(getCompatibleTRKConnectionTypeIds(), connection)) {
if (HostOS.IS_UNIX)
return new RemoteConnectedService(service); // TODO: not ported
return new TRKConnectedService(service, (AbstractSynchronizedConnection) connection);
}
+ */
return null;
}
@@ -72,6 +72,7 @@
});
}
+ /*
private Collection<String> getCompatibleTRKConnectionTypeIds() {
return Arrays.asList(new String[] {
SerialConnectionType.ID,
@@ -79,14 +80,18 @@
USBConnectionType.ID,
});
}
+ */
/* (non-Javadoc)
* @see com.nokia.carbide.remoteconnections.interfaces.IConnectedServiceFactory#getCompatibleConnectionTypeIds(com.nokia.carbide.remoteconnections.interfaces.IService)
*/
public Collection<String> getCompatibleConnectionTypeIds(IService service) {
+ /* C3TCF: removing TRK
if (service instanceof TRKService)
return getCompatibleTRKConnectionTypeIds();
- else if (service instanceof TracingService)
+ else
+ */
+ if (service instanceof TracingService)
return getCompatibleTracingConnectionTypeIds();
return Collections.emptyList();
}
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TRKConnectedService.java Wed Sep 08 18:06:14 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TRKConnectedService.java Wed Sep 08 18:06:51 2010 -0500
@@ -49,7 +49,7 @@
import com.nokia.tcf.api.TCFClassFactory;
/**
- *
+ * @deprecated C3TCF: TRK not visible or supported in C3
*/
public class TRKConnectedService extends AbstractConnectedService2 {
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TRKInstallerProvider.java Wed Sep 08 18:06:14 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TRKInstallerProvider.java Wed Sep 08 18:06:51 2010 -0500
@@ -22,7 +22,7 @@
import com.nokia.carbide.remoteconnections.interfaces.*;
/**
- *
+ * @deprecated C3TCF: TRKService and installer are not provided in C3
*/
public class TRKInstallerProvider extends AbstractPackageInstallerProvider {
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TRKService.java Wed Sep 08 18:06:14 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TRKService.java Wed Sep 08 18:06:51 2010 -0500
@@ -28,6 +28,8 @@
/**
* Implementation of IService for TRK
+ *
+ * @deprecated C3TCF: TRK service not provided in C3
*/
public class TRKService implements IService {
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/status/ConnectionStatusReconciler.java Wed Sep 08 18:06:14 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/status/ConnectionStatusReconciler.java Wed Sep 08 18:06:51 2010 -0500
@@ -38,7 +38,6 @@
import com.nokia.carbide.remoteconnections.internal.api.IConnection2.IConnectionStatus.EConnectionStatus;
import com.nokia.carbide.trk.support.Messages;
import com.nokia.carbide.trk.support.connection.USBConnectionType;
-import com.nokia.carbide.trk.support.service.TRKConnectedService;
import com.nokia.cpp.internal.api.utils.ui.RunRunnableWhenWorkbenchVisibleJob;
import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
@@ -112,15 +111,16 @@
return connection instanceof IConnection2 && ((IConnection2) connection).isDynamic();
}
+ /* C3TCF
private boolean isSysTRK(TRKConnectedService service) {
String value = service.getProperties().get(TRKConnectedService.PROP_SYS_TRK);
return Boolean.parseBoolean(value);
}
-
+ */
private void addConnection(IConnection connection) {
handledConnections.add(connection);
for (IConnectedService service : manager.getConnectedServices(connection)) {
- if (service instanceof TRKConnectedService || isTCFTRKService(service)) {
+ if (/* C3TCF service instanceof TRKConnectedService ||*/ isTCFTRKService(service)) {
service.addStatusChangedListener(serviceStatusListener);
}
}
@@ -213,10 +213,12 @@
EStatus trkStatus = EStatus.UNKNOWN;
EStatus tcfTRKStatus = EStatus.UNKNOWN;
for (IConnectedService service : manager.getConnectedServices(connection)) {
+ /* C3TCF
if (service instanceof TRKConnectedService) {
isSysTRK = isSysTRK((TRKConnectedService) service);
trkStatus = service.getStatus().getEStatus();
}
+ */
if (isTCFTRKService(service)) { //$NON-NLS-1$
tcfTRKStatus = service.getStatus().getEStatus();
}
--- a/debuggercdi/com.nokia.cdt.debug.launch/plugin.xml Wed Sep 08 18:06:14 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/plugin.xml Wed Sep 08 18:06:51 2010 -0500
@@ -28,13 +28,13 @@
</launchConfigurationType>
<launchConfigurationType
- name="Symbian OS Application TRK"
+ name="Symbian OS Application TCF TRK"
public="true"
id="com.nokia.cdt.debug.launch.appTRKLaunch">
</launchConfigurationType>
<launchConfigurationType
- name="Symbian OS System TRK"
+ name="Symbian OS System TCF TRK"
public="true"
id="com.nokia.cdt.debug.launch.systemTRKLaunch">
</launchConfigurationType>
@@ -181,11 +181,11 @@
</contextLabel>
</contextualLaunch>
<description
- description="Debugs on a phone or simulator using System TRK or Application TRK"
+ description="Debugs on a phone or simulator using System or Application TCF TRK"
mode="debug">
</description>
<description
- description="Runs on a phone or simulator using System TRK or Application TRK"
+ description="Runs on a phone or simulator using System or Application TCF TRK"
mode="run">
</description>
</shortcut>
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/LaunchPlugin.java Wed Sep 08 18:06:14 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/LaunchPlugin.java Wed Sep 08 18:06:51 2010 -0500
@@ -74,7 +74,9 @@
public static final String EMULATION_LAUNCH_TYPE = "com.nokia.cdt.debug.launch.emulationLaunch"; //$NON-NLS-1$
+ /** @deprecated */
public static final String REMOTE_CONNECTIONS_TRK_SERVICE = "com.nokia.carbide.trk.support.service.TRKService"; //$NON-NLS-1$
+ public static final String REMOTE_CONNECTIONS_TCFTRK_SERVICE = "com.nokia.carbide.cpp.edc.TCFTRKService"; //$NON-NLS-1$
public static final String REMOTE_CONNECTIONS_TRACING_SERVICE = "com.nokia.carbide.trk.support.service.TracingService"; //$NON-NLS-1$
@@ -384,11 +386,24 @@
return CarbideBuilderPlugin.getProjectInContext();
}
+ /** @deprecated */
public static IService getTRKService() {
return RemoteConnectionsActivator.getConnectionTypeProvider().
findServiceByID(REMOTE_CONNECTIONS_TRK_SERVICE);
}
-
+ /** Get the TCF TRK service, specifically */
+ public static IService getTCFTRKService() {
+ return RemoteConnectionsActivator.getConnectionTypeProvider().
+ findServiceByID(REMOTE_CONNECTIONS_TCFTRK_SERVICE);
+ }
+ /** Get the run-mode debug service, generically */
+ public static IService getRunModeDebugService() {
+ return getTCFTRKService();
+ }
+ /** Get the run-mode debug service ID, generically */
+ public static String getDebugServiceId() {
+ return REMOTE_CONNECTIONS_TCFTRK_SERVICE;
+ }
/**
* Returns the currently active workbench window or <code>null</code>
* if none.
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/PhoneLaunchShortcut.java Wed Sep 08 18:06:14 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/PhoneLaunchShortcut.java Wed Sep 08 18:06:51 2010 -0500
@@ -45,7 +45,7 @@
LaunchPlugin.getDefault().launchProject(project, executable, defaultMMP, mode,
new ILaunchCreationWizardFactory() {
public ILaunchCreationWizard createLaunchCreationWizard(LaunchOptions launchOptions) throws Exception {
- IService trkService = LaunchPlugin.getTRKService();
+ IService trkService = LaunchPlugin.getRunModeDebugService();
LaunchWizard launchWizard = new LaunchWizard(launchOptions, trkService);
return launchWizard;
};
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/messages.properties Wed Sep 08 18:06:14 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/messages.properties Wed Sep 08 18:06:51 2010 -0500
@@ -1,7 +1,7 @@
AbstractSymbianLaunchShortcut.ChooseConfigLabel=Select the launch configuration:
AbstractSymbianLaunchShortcut.ChooseConfigTitle=Choose configuration
LaunchPlugin.0=Carbide_Sys_TRK
-LaunchPlugin.1=System TRK Debugging
+LaunchPlugin.1=System TCF TRK Debugging
LaunchPlugin.17=No binaries found for project. Unable to launch.
LaunchPlugin.ErrorTitle=Launch Error
LaunchPlugin.noTCPIPConnectionType=Unable to locate a TCP/IP connection type.
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/CommandRunLaunchWizard2.java Wed Sep 08 18:06:14 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/CommandRunLaunchWizard2.java Wed Sep 08 18:06:51 2010 -0500
@@ -17,8 +17,8 @@
import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin;
import com.nokia.carbide.cdt.builder.EpocEngineHelper;
import com.nokia.carbide.cdt.builder.project.ICarbideProjectInfo;
-import com.nokia.carbide.remoteconnections.RemoteConnectionsActivator;
import com.nokia.carbide.remoteconnections.interfaces.IService;
+import com.nokia.cdt.internal.debug.launch.LaunchPlugin;
/**
* Our sample handler extends AbstractHandler, an IHandler base class.
@@ -56,8 +56,7 @@
if (info == null)
throw new ExecutionException("Not a Carbide project");
List<IPath> mmpFiles = EpocEngineHelper.getMMPFilesForProject(info);
- IService trkService = RemoteConnectionsActivator.getConnectionTypeProvider().
- findServiceByID("com.nokia.carbide.trk.support.service.TRKService"); //$NON-NLS-1$
+ IService debugService = LaunchPlugin.getRunModeDebugService();
List<IPath> allExePaths = new ArrayList<IPath>();
List<IPath> currBuiltExePaths = new ArrayList<IPath>();
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/LaunchWizardData.java Wed Sep 08 18:06:14 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/LaunchWizardData.java Wed Sep 08 18:06:51 2010 -0500
@@ -403,7 +403,7 @@
Collection<IConnectedService> connectedServices =
RemoteConnectionsActivator.getConnectionsManager().getConnectedServices(connection);
for (IConnectedService connectedService : connectedServices) {
- if (connectedService.getService().getIdentifier().equals(service.getIdentifier()))
+ if (service != null && connectedService.getService().getIdentifier().equals(service.getIdentifier()))
return connectedService;
}
}
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/AttachMainTab.java Wed Sep 08 18:06:14 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/AttachMainTab.java Wed Sep 08 18:06:51 2010 -0500
@@ -59,10 +59,8 @@
fProjText.setToolTipText(Messages.getString("RunModeMainTab.8")); //$NON-NLS-1$
createVerticalSpacer(comp, 1);
- /* TODO: do not filter by service: we need to match either TRK or TCF TRK and the API does not support this yet;
- * this isn't a problem, though, since all stock connections support TRK anyway */
- //clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(LaunchPlugin.getTRKService());
- clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(null);
+ clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(
+ LaunchPlugin.getRunModeDebugService());
clientSiteUI.createComposite(comp);
clientSiteUI.addListener(new IListener() {
public void connectionSelected() {
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/RunModeMainTab.java Wed Sep 08 18:06:14 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/RunModeMainTab.java Wed Sep 08 18:06:51 2010 -0500
@@ -80,10 +80,8 @@
if (wantsConnectionUI)
{
createVerticalSpacer(comp, 1);
- /* TODO: do not filter by service: we need to match either TRK or TCF TRK and the API does not support this yet;
- * this isn't a problem, though, since all stock connections support TRK anyway */
- //clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(LaunchPlugin.getTRKService());
- clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(null);
+ clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(
+ LaunchPlugin.getRunModeDebugService());
clientSiteUI.createComposite(comp);
clientSiteUI.addListener(new IListener() {
public void connectionSelected() {
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/AppTRKLaunchWizard.java Wed Sep 08 18:06:14 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/AppTRKLaunchWizard.java Wed Sep 08 18:06:51 2010 -0500
@@ -17,6 +17,7 @@
package com.nokia.cdt.internal.debug.launch.wizard;
import com.nokia.cdt.debug.cw.symbian.SettingsData;
+import com.nokia.cdt.internal.debug.launch.LaunchPlugin;
import com.nokia.cdt.internal.debug.launch.ui.RunModeMainTab;
import com.nokia.cdt.internal.debug.launch.wizard.MainExecutableSelectionWizardPage.IPathValidator;
@@ -57,7 +58,8 @@
public void addPages() {
super.addPages();
fBuildOptionsSelectionPage = new BuildOptionsSelectionPage();
- fMainPage = new TRKConnectionWizardPage(this);
+ fMainPage = new TRKConnectionWizardPage(this,
+ LaunchPlugin.getDebugServiceId());
fSISSelectionPage = new TRKSISSelectionWizardPage(this);
addPage(fBuildOptionsSelectionPage);
addPage(fMainPage);
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/AttachTRKLaunchWizard.java Wed Sep 08 18:06:14 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/AttachTRKLaunchWizard.java Wed Sep 08 18:06:51 2010 -0500
@@ -25,6 +25,7 @@
import java.util.List;
import com.nokia.cdt.debug.cw.symbian.SettingsData;
+import com.nokia.cdt.internal.debug.launch.LaunchPlugin;
public class AttachTRKLaunchWizard extends AbstractLaunchWizard {
private BuildOptionsSelectionPage fBuildOptionsSelectionPage;
@@ -54,7 +55,8 @@
public void addPages() {
super.addPages();
fBuildOptionsSelectionPage = new BuildOptionsSelectionPage();
- fMainPage = new TRKConnectionWizardPage(this);
+ fMainPage = new TRKConnectionWizardPage(this,
+ LaunchPlugin.getDebugServiceId());
addPage(fBuildOptionsSelectionPage);
addPage(fMainPage);
addPage(getSummaryPage());
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/SystemTRKLaunchWizard.java Wed Sep 08 18:06:14 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/SystemTRKLaunchWizard.java Wed Sep 08 18:06:51 2010 -0500
@@ -17,6 +17,7 @@
package com.nokia.cdt.internal.debug.launch.wizard;
import com.nokia.cdt.debug.cw.symbian.SettingsData;
+import com.nokia.cdt.internal.debug.launch.LaunchPlugin;
import com.nokia.cdt.internal.debug.launch.ui.RunModeMainTab;
import com.nokia.cdt.internal.debug.launch.wizard.MainExecutableSelectionWizardPage.IPathValidator;
@@ -56,7 +57,8 @@
public void addPages() {
super.addPages();
fBuildOptionsSelectionPage = new BuildOptionsSelectionPage();
- fMainPage = new TRKConnectionWizardPage(this);
+ fMainPage = new TRKConnectionWizardPage(this,
+ LaunchPlugin.getDebugServiceId());
addPage(fBuildOptionsSelectionPage);
addPage(fMainPage);
addPage(getSummaryPage());
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/TRKConnectionWizardPage.java Wed Sep 08 18:06:14 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/TRKConnectionWizardPage.java Wed Sep 08 18:06:51 2010 -0500
@@ -21,7 +21,6 @@
import com.nokia.carbide.remoteconnections.interfaces.IClientServiceSiteUI2;
import com.nokia.carbide.remoteconnections.interfaces.IConnection;
import com.nokia.carbide.remoteconnections.interfaces.IClientServiceSiteUI2.IListener;
-import com.nokia.cdt.internal.debug.launch.LaunchPlugin;
import com.nokia.cpp.internal.api.utils.core.Check;
import org.eclipse.core.runtime.IStatus;
@@ -40,10 +39,13 @@
private final ISummaryTextItemContainer summaryTextItemContainer;
private IClientServiceSiteUI2 clientSiteUI;
private String connectionId;
+ private final String debugServiceId;
- public TRKConnectionWizardPage(ISummaryTextItemContainer summaryTextItemContainer) {
+ public TRKConnectionWizardPage(ISummaryTextItemContainer summaryTextItemContainer,
+ String debugServiceId) {
super(Messages.getString("TRKConnectionWizardPage.0")); //$NON-NLS-1$
+ this.debugServiceId = debugServiceId;
Check.checkArg(summaryTextItemContainer);
this.summaryTextItemContainer = summaryTextItemContainer;
setPageComplete(false);
@@ -59,7 +61,9 @@
GridLayout layout = new GridLayout();
composite.setLayout(layout);
- clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(LaunchPlugin.getTRKService());
+ clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(
+ RemoteConnectionsActivator.getConnectionTypeProvider().
+ findServiceByID(debugServiceId));
clientSiteUI.createComposite(composite);
clientSiteUI.addListener(new IListener() {
public void connectionSelected() {
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/messages.properties Wed Sep 08 18:06:14 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/messages.properties Wed Sep 08 18:06:51 2010 -0500
@@ -1,6 +1,6 @@
-AppTRKLaunchWizard.1=New Application TRK Launch Configuration
-AppTRKLaunchWizard.2=Application TRK Launch Configuration
-AppTRKLaunchWizard.3=Application TRK is a debug agent that runs on released phones and allows you to debug your executables. The debugger downloads the Symbian OS installation file to the phone and installs it prior to launching.
+AppTRKLaunchWizard.1=New Application TCF Debugger Launch Configuration
+AppTRKLaunchWizard.2=Application TCF Debugger Launch Configuration
+AppTRKLaunchWizard.3=Application TCF Debugger is a debug agent that runs on released phones and allows you to debug your executables. The debugger downloads the Symbian OS installation file to the phone and installs it prior to launching.
AttachTRKLaunchWizard.1=New Attach to Process Launch Configuration
AttachTRKLaunchWizard.2=Attach to Process Launch Configuration
AttachTRKLaunchWizard.3=The debugger attempts to debug a process already running on the phone.
@@ -19,7 +19,7 @@
LaunchCategorySelectionPage.title=Launch Categories
LaunchCategorySelectionPage.description=Select a launch category.
LaunchCategorySelectionPage.phone=Phone
-LaunchCategorySelectionPage.phoneDesc=Launches on a phone using System TRK or Application TRK.
+LaunchCategorySelectionPage.phoneDesc=Launches on a phone using System or Application TCF TRK.
LaunchCategorySelectionPage.categoryLabel=Select where you want to launch
LaunchWizardSelectionPage.0=Launch Wizard
LaunchWizardSelectionPage.1=Launch Types
@@ -46,9 +46,9 @@
MainExecutableSelectionWizardPage.SelectExectuableTitle=Select Exectuable To Launch
MainExecutableSelectionWizardPage.UsePathLabel.device=Specify device path of remote process to launch
MainExecutableSelectionWizardPage.UsePathLabel.device.ToolTip=The specified process will be launched on the phone
-SystemTRKLaunchWizard.1=New System TRK Launch Configuration
-SystemTRKLaunchWizard.2=System TRK Launch Configuration
-SystemTRKLaunchWizard.3=System TRK is a debug agent that runs on reference boards and prototype phones and allows you to debug your executables. The debugger downloads the executable files to the phone prior to launching. With System TRK, you can also debug the binaries included in the ROM image.
+SystemTRKLaunchWizard.1=New System TCF TRK Launch Configuration
+SystemTRKLaunchWizard.2=System TCF TRK Launch Configuration
+SystemTRKLaunchWizard.3=System TCF TRK is a debug agent that runs on reference boards and prototype phones and allows you to debug your executables. The debugger downloads the executable files to the phone prior to launching. With the System TCF TRK, you can also debug the binaries included in the ROM image.
TRKConnectionWizardPage.0=Connection Settings
TRKConnectionWizardPage.1=Select the remote connection to use to connect for debugging
TRKConnectionWizardPage.2=Serial Port\: