# HG changeset patch # User wpaul # Date 1282094550 18000 # Node ID 2a6d912d3065858a8371c5cb4eb78efc2d5b7f15 # Parent 02332f8022247a83b3ffd3b20a0e42b2b5665771 removed obsolete extensions and code from the launch plugin. diff -r 02332f802224 -r 2a6d912d3065 debuggercdi/com.nokia.cdt.debug.launch/plugin.xml --- a/debuggercdi/com.nokia.cdt.debug.launch/plugin.xml Tue Aug 17 15:04:12 2010 -0500 +++ b/debuggercdi/com.nokia.cdt.debug.launch/plugin.xml Tue Aug 17 20:22:30 2010 -0500 @@ -299,25 +299,6 @@ - - - - - - - - - - - -

diff -r 02332f802224 -r 2a6d912d3065 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/LaunchPlugin.java --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/LaunchPlugin.java Tue Aug 17 15:04:12 2010 -0500 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/LaunchPlugin.java Tue Aug 17 20:22:30 2010 -0500 @@ -18,8 +18,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.MissingResourceException; -import java.util.ResourceBundle; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CoreModel; @@ -31,42 +29,23 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.DebugPlugin; -import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.ILaunchConfiguration; -import org.eclipse.debug.core.ILaunchConfigurationListener; import org.eclipse.debug.core.ILaunchConfigurationType; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; -import org.eclipse.debug.core.ILaunchListener; import org.eclipse.debug.core.ILaunchManager; -import org.eclipse.debug.ui.AbstractDebugView; import org.eclipse.debug.ui.DebugUITools; import org.eclipse.debug.ui.IDebugUIConstants; -import org.eclipse.debug.ui.IDebugView; -import org.eclipse.debug.ui.contexts.DebugContextEvent; -import org.eclipse.debug.ui.contexts.IDebugContextListener; -import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.IActionBars; -import org.eclipse.ui.IPartListener2; -import org.eclipse.ui.IStartup; -import org.eclipse.ui.IWindowListener; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchPartReference; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.eclipse.ui.progress.UIJob; import org.osgi.framework.BundleContext; -import com.freescale.cdt.debug.cw.core.CWPlugin; -import com.freescale.cdt.debug.cw.core.ui.ShowAllVariablesToggleAction; import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin; import com.nokia.carbide.cdt.builder.EpocEngineHelper; import com.nokia.carbide.cdt.builder.project.ICarbideBuildConfiguration; @@ -82,7 +61,7 @@ /** * The main plugin class to be used in the desktop. */ -public class LaunchPlugin extends AbstractUIPlugin implements ILaunchListener, ILaunchConfigurationListener, IStartup { +public class LaunchPlugin extends AbstractUIPlugin { public interface ILaunchCreationWizardFactory { ILaunchCreationWizard createLaunchCreationWizard(LaunchOptions launchOptions) throws Exception; @@ -90,24 +69,14 @@ //The shared instance. private static LaunchPlugin plugin; - //Resource bundle. - private ResourceBundle resourceBundle; - - private ArrayList recentlyLaunchedConfigs = new ArrayList(); public static final String PLUGIN_ID = "com.nokia.cdt.debug.launch"; //$NON-NLS-1$ public static final String EMULATION_LAUNCH_TYPE = "com.nokia.cdt.debug.launch.emulationLaunch"; //$NON-NLS-1$ - public static final String PROXY_LAUNCH_TYPE = "com.nokia.cdt.debug.launch.proxyLaunch"; //$NON-NLS-1$ public static final String REMOTE_CONNECTIONS_TRK_SERVICE = "com.nokia.carbide.trk.support.service.TRKService"; //$NON-NLS-1$ public static final String REMOTE_CONNECTIONS_TRACING_SERVICE = "com.nokia.carbide.trk.support.service.TracingService"; //$NON-NLS-1$ - // Preference constants - public static final String Use_New_Project_Assist = "com.nokia.cdt.debug.launch.Use_New_Project_Assist"; //$NON-NLS-1$ - - - /** * The constructor. @@ -122,9 +91,6 @@ */ public void start(BundleContext context) throws Exception { super.start(context); - - DebugPlugin.getDefault().getLaunchManager().addLaunchListener(this); - DebugPlugin.getDefault().getLaunchManager().addLaunchConfigurationListener(this); } /** @@ -133,10 +99,6 @@ public void stop(BundleContext context) throws Exception { super.stop(context); plugin = null; - resourceBundle = null; - - DebugPlugin.getDefault().getLaunchManager().removeLaunchListener(this); - DebugPlugin.getDefault().getLaunchManager().removeLaunchConfigurationListener(this); } /** @@ -147,32 +109,6 @@ } /** - * Returns the string from the plugin's resource bundle, - * or 'key' if not found. - */ - public static String getResourceString(String key) { - ResourceBundle bundle = LaunchPlugin.getDefault().getResourceBundle(); - try { - return (bundle != null) ? bundle.getString(key) : key; - } catch (MissingResourceException e) { - return key; - } - } - - /** - * Returns the plugin's resource bundle, - */ - public ResourceBundle getResourceBundle() { - try { - if (resourceBundle == null) - resourceBundle = ResourceBundle.getBundle("com.nokia.cdt.debug.launch.LaunchPluginResources"); //$NON-NLS-1$ - } catch (MissingResourceException x) { - resourceBundle = null; - } - return resourceBundle; - } - - /** * Convenience method which returns the unique identifier of this plugin. */ public static String getUniqueIdentifier() { @@ -204,11 +140,7 @@ return getLaunchManager().getLaunchConfigurationType(LaunchPlugin.EMULATION_LAUNCH_TYPE); } - public ILaunchConfigurationType getProxyLaunchConfigType() { - return getLaunchManager().getLaunchConfigurationType(LaunchPlugin.PROXY_LAUNCH_TYPE); - } - - protected ILaunchManager getLaunchManager() { + private ILaunchManager getLaunchManager() { return DebugPlugin.getDefault().getLaunchManager(); } @@ -448,155 +380,10 @@ return AbstractUIPlugin.imageDescriptorFromPlugin("com.nokia.cdt.debug.launch", path); //$NON-NLS-1$ } - public void launchRemoved(ILaunch launch) { - // don't care about this - } - - public void launchAdded(ILaunch launch) { - // keep a list of recent launches. we're really just interested in the - // order so we can launch the most recently used config if more than one - // exists for a particular project/build config combo. - ILaunchConfiguration config = launch.getLaunchConfiguration(); - if (recentlyLaunchedConfigs.contains(config)) { - recentlyLaunchedConfigs.remove(config); - } - - // insert at the front of the list - recentlyLaunchedConfigs.add(0, config); - } - - public void launchChanged(ILaunch launch) { - // don't care about this - } - - public void launchConfigurationAdded(ILaunchConfiguration configuration) { - // don't care about this - } - - public void launchConfigurationChanged(ILaunchConfiguration configuration) { - // don't care about this - } - - public void launchConfigurationRemoved(ILaunchConfiguration configuration) { - // remove this launch config from our list of recent launches if necessary - if (recentlyLaunchedConfigs.contains(configuration)) { - recentlyLaunchedConfigs.remove(configuration); - } - } - - public void earlyStartup() { - UIJob earlyJob = new UIJob("Startup"){//$NON-NLS-1$ - - @Override - public IStatus runInUIThread(IProgressMonitor monitor) { - listenForVariablesView(); - return Status.OK_STATUS; - }}; - // earlyJob.schedule(); - } - public static IProject getSelectedProject() { return CarbideBuilderPlugin.getProjectInContext(); } - public void addShowAllVariablesAction(final IDebugView variablesView) - { - UIJob installSAVJob = new UIJob("Show All Variables Action"){//$NON-NLS-1$ - - @Override - public IStatus runInUIThread(IProgressMonitor monitor) { - ShowAllVariablesToggleAction showAllVarsAction = new ShowAllVariablesToggleAction(); - variablesView.setAction("com.freescale.cdt.debug.cw.core.ui.showAllVariablesToggle", showAllVarsAction); //$NON-NLS-1$ - - IActionBars actionBars = variablesView.getViewSite().getActionBars(); - IMenuManager viewMenu = actionBars.getMenuManager(); - viewMenu.add(showAllVarsAction); - return Status.OK_STATUS; - }}; - - installSAVJob.schedule(); - - } - - private void addVariablesViewListener(IWorkbenchWindow window) - { - window.getPartService().addPartListener(new IPartListener2() { - - public void partActivated(IWorkbenchPartReference partRef) {} - - public void partBroughtToTop(IWorkbenchPartReference partRef) {} - - public void partClosed(IWorkbenchPartReference partRef) {} - - public void partDeactivated(IWorkbenchPartReference partRef) {} - - public void partHidden(IWorkbenchPartReference partRef) {} - - public void partInputChanged(IWorkbenchPartReference partRef) {} - - public void partOpened(IWorkbenchPartReference partRef) { - if (partRef.getId().equals(IDebugUIConstants.ID_VARIABLE_VIEW)) - { - IDebugView variablesView = (IDebugView) partRef.getPart(true); - addShowAllVariablesAction(variablesView); - } - } - - public void partVisible(IWorkbenchPartReference partRef) {}}); - } - - private void setupShowAllVariablesAction(IWorkbenchWindow window) - { - IWorkbenchPage page = window.getActivePage(); - AbstractDebugView variablesView = (AbstractDebugView) page.findView(IDebugUIConstants.ID_VARIABLE_VIEW); - if (variablesView == null) - addVariablesViewListener(window); - else - addShowAllVariablesAction(variablesView); - - DebugUITools.getDebugContextManager().getContextService(window).addDebugContextListener(new IDebugContextListener() { - - public void debugContextChanged(DebugContextEvent event) { - if ((event.getFlags() & DebugContextEvent.ACTIVATED) > 0) { - contextActivated(event.getContext()); - } - } - - private void contextActivated(ISelection context) { - CWPlugin.setDebugContext(((IStructuredSelection) context).getFirstElement()); - }}); - - } - - public void listenForVariablesView() - { - - Display.getDefault().asyncExec(new Runnable() { - public void run() { - - IWorkbenchWindow[] windows = getDefault().getWorkbench().getWorkbenchWindows(); - - for (int i = 0; i < windows.length; i++) { - setupShowAllVariablesAction(windows[i]); - } - - getDefault().getWorkbench().addWindowListener(new IWindowListener() { - - public void windowActivated(IWorkbenchWindow window) {} - - public void windowClosed(IWorkbenchWindow window) {} - - public void windowDeactivated(IWorkbenchWindow window) {} - - public void windowOpened(IWorkbenchWindow window) { - setupShowAllVariablesAction(window); - }}); - - } - }); - - } - public static IService getTRKService() { return RemoteConnectionsActivator.getConnectionTypeProvider(). findServiceByID(REMOTE_CONNECTIONS_TRK_SERVICE);