FCL/sftools/dev/ide/carbidecpp: comparison debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/TRKLaunchDelegate.java

equal deleted inserted replaced

-:2a211a55b277
+:f3b387a17eb7
 *
 */
 package com.nokia.cdt.internal.debug.launch;
 import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;
 import org.eclipse.cdt.core.model.ICProject;
 import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.debug.core.ICDebugConfiguration;
-import org.eclipse.cdt.debug.core.cdi.CDIException;
 import org.eclipse.cdt.debug.core.cdi.ICDISession;
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import com.nokia.carbide.remoteconnections.interfaces.IConnection;
 import com.nokia.carbide.remoteconnections.internal.api.IConnection2;
 import com.nokia.carbide.remoteconnections.internal.api.IConnection2.IConnectionStatus;
 import com.nokia.carbide.remoteconnections.internal.api.IConnection2.IConnectionStatusChangedListener;
 import com.nokia.carbide.remoteconnections.internal.api.IConnection2.IConnectionStatus.EConnectionStatus;
+import com.nokia.cdt.debug.common.internal.api.ILaunchDelegateConnectionExtension;
 import com.nokia.cdt.debug.cw.symbian.SettingsData;
 import com.nokia.cdt.debug.cw.symbian.SymbianPlugin;
 import com.nokia.cdt.internal.debug.launch.ui.PartialUpgradeAlertDialog;
 import cwdbg.PreferenceConstants;
 	private static final String DONT_ASK_ABOUT_PARTIAL_UPGRADE_OPTION = "DONT_ASK_ABOUT_PARTIAL_UPGRADE_OPTION"; //$NON-NLS-1$
 	private static final int LARGE_SIS_THRESHOLD = 250 * 1024; // 250K
 	protected Session cwDebugSession;
-	private IConnection connection;
+	protected IConnection connection;
 	private IConnectionStatusChangedListener connectionStatusChangedListener;
+	private List<ILaunchDelegateConnectionExtension> connectionExtensions;
 	public void launch(
 			ILaunchConfiguration 	config,
-			String 					mode,
+			final String 					mode,
-			ILaunch 				launch,
+			final ILaunch 				launch,
 			IProgressMonitor monitor) throws CoreException
 	{
 	// See comment at definition of the "mutex" for why this "synchronized".
 	synchronized(Session.sessionStartStopMutex()) {
 		if (monitor == null) {
 monitor = new NullProgressMonitor();
 }
-monitor.beginTask(LaunchMessages.getString("LocalRunLaunchDelegate.Launching_Local_C_Application"), 10); //$NON-NLS-1$
+monitor.beginTask(LaunchMessages.getString("LocalRunLaunchDelegate.Launching_Local_C_Application"), 30); //$NON-NLS-1$
 // check for cancellation
 if (monitor.isCanceled()) {
 return;
 }
 		if (connection == null) {
 			IStatus status = new Status(Status.ERROR, LaunchPlugin.PLUGIN_ID,
 				LaunchMessages.getString("TRKLaunchDelegate.NoConnectionErrorMsg")); //$NON-NLS-1$
 			throw new DebugException(status);
 		}
+		invokeConnectionSpecificSetup(launch, new SubProgressMonitor(monitor, 5));
 		connection.useConnection(true);
 try {
 	addBeingLaunched(config); // indicating the LC is being launched
 monitor.worked(1);
 IPath exePath = verifyProgramPath(config);
 					assert(dsession instanceof Session);
 					cwDebugSession = (Session)dsession;
 					doAdditionalSessionSetup(cwDebugSession);
-					IPath[] otherExecutables = getOtherExecutables(project, exePath, config, monitor);
+					IPath[] otherExecutables = getOtherExecutables(project, exePath, config, new SubProgressMonitor(monitor, 1));
 					{
 						try {
 							monitor.worked(1);
 							// if enabled in the prefs, show the console view(s)
 							session.debuggingStopped(null);
 							this.abort(e.getLocalizedMessage(), null, 0);
 						}
 					}
 }
-hookSessionEnded();
+hookSessionEnded(launch);
 }
 else if (mode.equals(ILaunchManager.RUN_MODE)) {
 // Run the program.
 	// Connect to DE, download and launch the program, close debug session.
 ICDebugConfiguration debugConfig = getDebugConfig(config);
 										exeFile,
 										new IPath[0],
 										arguments,
 										null,
 										getEnvironmentAsProperty(config),
-										monitor,
+										new SubProgressMonitor(monitor, 8),
 										project,
 										"",  //$NON-NLS-1$
 										false  /* run instead of debug */);
 				// The above call would throw exception on error. So it must have succeeded
 					display = Display.getDefault();
 				}
 				display.syncExec(new Runnable() {
 					public void run() {
-						connection.useConnection(false);
+						shutdownConnection(launch);
 						MessageDialog.openInformation(
 							CUIPlugin.getActiveWorkbenchShell(),
 							LaunchMessages.getString("CarbideCPPLaunchDelegate.DebuggerName"),  //$NON-NLS-1$
 							LaunchMessages.getString("TRKLaunchDelegate.runSucceed") + //$NON-NLS-1$
 						           "\n\t\"" + exeLaunched + "\""); //$NON-NLS-1$ //$NON-NLS-2$
 					}
 				});
 }
+invokeConnectionSpecificPostLaunch(launch, new SubProgressMonitor(monitor, 5));
 } catch (CWException e) {
-		connection.useConnection(false);
+	shutdownConnection(launch);
 		unhookConnectionStatus();
 	if (! monitor.isCanceled()) // don't throw on user cancellation
 		e.printStackTrace();
 		} catch (CoreException e) {
-			connection.useConnection(false);
+			shutdownConnection(launch);
 			unhookConnectionStatus();
 	if (! monitor.isCanceled()) // don't throw on user cancellation
 		throw e;
 		} finally {
 monitor.done();
 removeBeingLaunched(config);
 }
 	} // end of synchronized.
 	}
-	protected void hookSessionEnded() {
+	protected void shutdownConnection(ILaunch launch) {
+		try {
+			invokeConnectionSpecificShutdown(launch, new NullProgressMonitor());
+		} catch (CoreException e) {
+			LaunchPlugin.log(e);
+		} finally {
+			connection.useConnection(false);
+		}
+	}
+	/** Create the extensions every session, in case they hold state. */
+	protected List<ILaunchDelegateConnectionExtension> getLaunchDelegateConnectionExtensions() {
+		if (connectionExtensions == null) {
+			connectionExtensions = new ArrayList<ILaunchDelegateConnectionExtension>();
+			IConfigurationElement[] elements =
+				Platform.getExtensionRegistry().getConfigurationElementsFor(ILaunchDelegateConnectionExtension.ID);
+			for (IConfigurationElement element : elements) {
+				try {
+					connectionExtensions.add((ILaunchDelegateConnectionExtension) element.createExecutableExtension("class"));
+				} catch (CoreException e) {
+					LaunchPlugin.log(e);
+				}
+			}
+		}
+		return connectionExtensions;
+	}
+	protected void invokeConnectionSpecificSetup(ILaunch launch,
+			IProgressMonitor monitor) throws CoreException {
+		List<ILaunchDelegateConnectionExtension> extensions = getLaunchDelegateConnectionExtensions();
+		monitor.beginTask("", extensions.size());
+		for (ILaunchDelegateConnectionExtension extension : extensions) {
+			extension.initializeConnection(launch, connection, new SubProgressMonitor(monitor, 1));
+		}
+		monitor.done();
+	}
+	protected void invokeConnectionSpecificPostLaunch(ILaunch launch,
+			IProgressMonitor monitor) throws CoreException {
+		List<ILaunchDelegateConnectionExtension> extensions = getLaunchDelegateConnectionExtensions();
+		monitor.beginTask("", extensions.size());
+		for (ILaunchDelegateConnectionExtension extension : extensions) {
+			extension.launchStarted(launch, connection, new SubProgressMonitor(monitor, 1));
+		}
+		monitor.done();
+	}
+	protected void invokeConnectionSpecificShutdown(
+			ILaunch launch, IProgressMonitor monitor) throws CoreException {
+		List<ILaunchDelegateConnectionExtension> extensions = getLaunchDelegateConnectionExtensions();
+		monitor.beginTask("", extensions.size());
+		for (ILaunchDelegateConnectionExtension extension : extensions) {
+			extension.terminateConnection(launch, connection, new SubProgressMonitor(monitor, 1));
+		}
+		monitor.done();
+	}
+	protected void hookSessionEnded(final ILaunch launch) {
 		if (cwDebugSession != null) {
 			cwDebugSession.addListener(new ISessionListener() {
 				public void sessionEnded() {
-					connection.useConnection(false);
+					try {
-					unhookConnectionStatus();
+						invokeConnectionSpecificShutdown(launch, new NullProgressMonitor());
+					} catch (CoreException e) {
+						LaunchPlugin.log(e);
+					} finally {
+						connection.useConnection(false);
+						unhookConnectionStatus();
+					}
 				}
 			});
 		}
 	}

changeset 1260	f3b387a17eb7
parent 772	c3301e21f173