Skip to main content
summaryrefslogtreecommitdiffstats
path: root/cross
diff options
context:
space:
mode:
authorMarc Khouzam2010-07-23 14:06:58 -0400
committerMarc Khouzam2010-07-23 14:06:58 -0400
commitabf3f627313516f6993454040bd7d3d157bdca15 (patch)
treecc4aa31d6432921b49a773ff59ec9694782d7ab2 /cross
parente01304986c74853c786363ab1431bf918593c601 (diff)
downloadorg.eclipse.cdt-abf3f627313516f6993454040bd7d3d157bdca15.tar.gz
org.eclipse.cdt-abf3f627313516f6993454040bd7d3d157bdca15.tar.xz
org.eclipse.cdt-abf3f627313516f6993454040bd7d3d157bdca15.zip
Bug 318214: Unify Basic remote launch with Advanced remote launch
Diffstat (limited to 'cross')
-rw-r--r--cross/org.eclipse.cdt.launch.remote/plugin.properties9
-rw-r--r--cross/org.eclipse.cdt.launch.remote/plugin.xml70
-rw-r--r--cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/internal/launch/remote/Activator.java38
-rw-r--r--cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteLaunchConfigurationTabGroup.java31
4 files changed, 19 insertions, 129 deletions
diff --git a/cross/org.eclipse.cdt.launch.remote/plugin.properties b/cross/org.eclipse.cdt.launch.remote/plugin.properties
index 4fcb15e224..a6eea12660 100644
--- a/cross/org.eclipse.cdt.launch.remote/plugin.properties
+++ b/cross/org.eclipse.cdt.launch.remote/plugin.properties
@@ -13,8 +13,7 @@
pluginName=C/C++ Remote Debug Launcher
providerName=Eclipse CDT
-launchConfigurationType.name = C/C++ Remote Application
-cdiLaunchDelegate.name = Standard C/C++ Remote Application
-cdiLaunchDelegate.description = Standard remote application launching/debugging using the standard debugger Framework (CDI).
-dsfLaunchDelegate.name = GDB (DSF) Remote Debugging
-dsfLaunchDelegate.description = Start new application on a remote system under control of GDB debugger integrated using the Debugger Services Framework (DSF). \ No newline at end of file
+cdiLaunchDelegate.name = Standard Remote Create Process
+cdiLaunchDelegate.description = Automatically start and optionally debug a new application on a remote system under control of the standard debugger.
+dsfLaunchDelegate.name = GDB (DSF) Automatic Remote Debugging
+dsfLaunchDelegate.description = Automatically start and debug a new application on a remote system under control of GDB debugger integrated using the Debugger Services Framework (DSF). \ No newline at end of file
diff --git a/cross/org.eclipse.cdt.launch.remote/plugin.xml b/cross/org.eclipse.cdt.launch.remote/plugin.xml
index 9cf37cdd1c..21bf234109 100644
--- a/cross/org.eclipse.cdt.launch.remote/plugin.xml
+++ b/cross/org.eclipse.cdt.launch.remote/plugin.xml
@@ -14,19 +14,10 @@ Anna Dushistova (Mentor Graphics) - code restructuring
-->
<?eclipse version="3.0"?>
<plugin>
- <extension
- point="org.eclipse.debug.core.launchConfigurationTypes">
- <launchConfigurationType
- public="true"
- name="%launchConfigurationType.name"
- id="org.eclipse.rse.remotecdt.RemoteApplicationLaunch"
- >
- </launchConfigurationType>
- </extension>
<extension point="org.eclipse.debug.core.launchDelegates">
<launchDelegate
id="org.eclipse.rse.remotecdt.launch"
- type="org.eclipse.rse.remotecdt.RemoteApplicationLaunch"
+ type="org.eclipse.cdt.launch.remoteApplicationLaunchType"
modes="run,debug"
delegate="org.eclipse.cdt.launch.remote.launching.RemoteRunLaunchDelegate"
name="%cdiLaunchDelegate.name"
@@ -36,7 +27,7 @@ Anna Dushistova (Mentor Graphics) - code restructuring
</launchDelegate>
<launchDelegate
id="org.eclipse.rse.remotecdt.dsf.debug"
- type="org.eclipse.rse.remotecdt.RemoteApplicationLaunch"
+ type="org.eclipse.cdt.launch.remoteApplicationLaunchType"
modes="debug"
delegate="org.eclipse.cdt.launch.remote.launching.RemoteGdbLaunchDelegate"
name="%dsfLaunchDelegate.name"
@@ -46,63 +37,32 @@ Anna Dushistova (Mentor Graphics) - code restructuring
</launchDelegate>
</extension>
-
- <extension
- point="org.eclipse.debug.ui.launchConfigurationTypeImages">
- <launchConfigurationTypeImage
- icon="icons/full/obj16/c_app.gif"
- configTypeID="org.eclipse.rse.remotecdt.RemoteApplicationLaunch"
- id="org.eclipse.cdt.launch.localRunLaunchImagefff">
- </launchConfigurationTypeImage>
- </extension>
- <extension
- point="org.eclipse.debug.ui.launchConfigurationTabGroups">
- <launchConfigurationTabGroup
- class="org.eclipse.cdt.launch.remote.tabs.RemoteLaunchConfigurationTabGroup"
- helpContextId="org.eclipse.rse.remotecdt.launchgroup"
- id="org.eclipse.rse.remotecdt.RemoteLaunchTabGroup"
- type="org.eclipse.rse.remotecdt.RemoteApplicationLaunch">
- <launchMode
- mode="run">
- </launchMode>
- </launchConfigurationTabGroup>
- <launchConfigurationTabGroup
- class="org.eclipse.cdt.launch.remote.tabs.RemoteLaunchConfigurationTabGroup"
- helpContextId="org.eclipse.rse.remotecdt.launchgroup"
- id="org.eclipse.rse.remotecdt.RemoteDebugTabGroup"
- type="org.eclipse.rse.remotecdt.RemoteApplicationLaunch">
- <launchMode
- mode="debug">
- </launchMode>
- </launchConfigurationTabGroup>
- </extension>
-
<extension
point="org.eclipse.debug.ui.launchConfigurationTabs">
<tab
id="org.eclipse.rse.remotecdt.launch.RemoteCMainTab"
- group="org.eclipse.rse.remotecdt.RemoteLaunchTabGroup"
+ group="org.eclipse.cdt.launch.remoteApplicationRunLaunchTabGroup"
name="Main"
class="org.eclipse.cdt.launch.remote.tabs.RemoteCMainTab">
<associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
</tab>
<tab
id="org.eclipse.rse.remotecdt.debug.RemoteCMainTab"
- group="org.eclipse.rse.remotecdt.RemoteDebugTabGroup"
+ group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
name="Main"
class="org.eclipse.cdt.launch.remote.tabs.RemoteCMainTab">
<associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
</tab>
<tab
id="org.eclipse.rse.remotecdt.dsf.gdb.mainTab"
- group="org.eclipse.rse.remotecdt.RemoteDebugTabGroup"
+ group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
name="Main"
class="org.eclipse.cdt.launch.remote.tabs.RemoteCDSFMainTab">
<associatedDelegate delegate="org.eclipse.rse.remotecdt.dsf.debug"/>
</tab>
<tab
id="org.eclipse.rse.remotecdt.launch.CAgrumentsTab"
- group="org.eclipse.rse.remotecdt.RemoteLaunchTabGroup"
+ group="org.eclipse.cdt.launch.remoteApplicationRunLaunchTabGroup"
name="Arguments"
class="org.eclipse.cdt.launch.ui.CArgumentsTab">
<associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
@@ -110,14 +70,14 @@ Anna Dushistova (Mentor Graphics) - code restructuring
</tab>
<tab
id="org.eclipse.rse.remotecdt.debug.CArgumentsTab"
- group="org.eclipse.rse.remotecdt.RemoteDebugTabGroup"
+ group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
name="Arguments"
class="org.eclipse.cdt.launch.ui.CArgumentsTab">
<associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
<placement after="org.eclipse.rse.remotecdt.launch.RemoteCMainTab"/>
</tab>
<tab id="org.eclipse.rse.remotecdt.dsf.debug.CArgumentsTab"
- group="org.eclipse.rse.remotecdt.RemoteDebugTabGroup"
+ group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
name="Arguments"
class="org.eclipse.cdt.dsf.gdb.internal.ui.launching.CArgumentsTab">
<associatedDelegate delegate="org.eclipse.rse.remotecdt.dsf.debug"/>
@@ -125,14 +85,14 @@ Anna Dushistova (Mentor Graphics) - code restructuring
</tab>
<tab
id="org.eclipse.rse.remotecdt.launch.RemoteCDebuggerTab"
- group="org.eclipse.rse.remotecdt.RemoteDebugTabGroup"
+ group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
name="Debugger"
class="org.eclipse.cdt.launch.remote.tabs.RemoteCDebuggerTab">
<associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
<placement after="org.eclipse.cdt.cdi.launch.argumentsTab"/>
</tab>
<tab id="org.eclipse.rse.remotecdt.dsf.debug.RemoteCDSFDebuggerTab"
- group="org.eclipse.rse.remotecdt.RemoteDebugTabGroup"
+ group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
name="Debugger"
class="org.eclipse.cdt.launch.remote.tabs.RemoteCDSFDebuggerTab">
<associatedDelegate delegate="org.eclipse.rse.remotecdt.dsf.debug"/>
@@ -140,7 +100,7 @@ Anna Dushistova (Mentor Graphics) - code restructuring
</tab>
<tab
id="org.eclipse.rse.remotecdt.launch.SourceLookupTab"
- group="org.eclipse.rse.remotecdt.RemoteDebugTabGroup"
+ group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
name="Source"
class="org.eclipse.debug.ui.sourcelookup.SourceLookupTab">
<associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
@@ -148,7 +108,7 @@ Anna Dushistova (Mentor Graphics) - code restructuring
</tab>
<tab
id="org.eclipse.rse.remotecdt.debug.dsf.SourceLookupTab"
- group="org.eclipse.rse.remotecdt.RemoteDebugTabGroup"
+ group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
name="Source"
class="org.eclipse.debug.ui.sourcelookup.SourceLookupTab">
<associatedDelegate delegate="org.eclipse.rse.remotecdt.dsf.debug"/>
@@ -156,7 +116,7 @@ Anna Dushistova (Mentor Graphics) - code restructuring
</tab>
<tab
id="org.eclipse.rse.remotecdt.launch.CommonTab"
- group="org.eclipse.rse.remotecdt.RemoteLaunchTabGroup"
+ group="org.eclipse.cdt.launch.remoteApplicationRunLaunchTabGroup"
name="Common"
class="org.eclipse.debug.ui.CommonTab">
<associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
@@ -164,7 +124,7 @@ Anna Dushistova (Mentor Graphics) - code restructuring
</tab>
<tab
id="org.eclipse.rse.remotecdt.debug.CommonTab"
- group="org.eclipse.rse.remotecdt.RemoteDebugTabGroup"
+ group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
name="Common"
class="org.eclipse.debug.ui.CommonTab">
<associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
@@ -172,7 +132,7 @@ Anna Dushistova (Mentor Graphics) - code restructuring
</tab>
<tab
id="org.eclipse.rse.remotecdt.debug.dsf.CommonTab"
- group="org.eclipse.rse.remotecdt.RemoteDebugTabGroup"
+ group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
name="Common"
class="org.eclipse.debug.ui.CommonTab">
<associatedDelegate delegate="org.eclipse.rse.remotecdt.dsf.debug"/>
diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/internal/launch/remote/Activator.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/internal/launch/remote/Activator.java
index c8ed4252d0..ef325ebbcf 100644
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/internal/launch/remote/Activator.java
+++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/internal/launch/remote/Activator.java
@@ -12,14 +12,7 @@
package org.eclipse.cdt.internal.launch.remote;
-import java.util.HashSet;
-
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Plugin;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchDelegate;
-import org.eclipse.debug.core.ILaunchManager;
import org.osgi.framework.BundleContext;
/**
@@ -30,13 +23,6 @@ public class Activator extends Plugin {
// The plug-in ID
public static final String PLUGIN_ID = "org.eclipse.cdt.launch.remote"; //$NON-NLS-1$
-
- private static final String REMOTE_LAUNCH_TYPE = "org.eclipse.rse.remotecdt.RemoteApplicationLaunch"; //$NON-NLS-1$
-
-
- private static final String PREFERRED_DEBUG_REMOTE_LAUNCH_DELEGATE = "org.eclipse.rse.remotecdt.dsf.debug"; //$NON-NLS-1$
-
-
/* The shared instance */
private static Activator plugin;
@@ -53,7 +39,6 @@ public class Activator extends Plugin {
*/
public void start(BundleContext context) throws Exception {
super.start(context);
- setDefaultLaunchDelegates();
}
/*
@@ -77,27 +62,4 @@ public class Activator extends Plugin {
public static BundleContext getBundleContext() {
return getDefault().getBundle().getBundleContext();
}
-
- private void setDefaultLaunchDelegates() {
- // Set the default launch delegates as early as possible, and do it only once (Bug 312997)
- ILaunchManager launchMgr = DebugPlugin.getDefault().getLaunchManager();
-
- HashSet<String> debugSet = new HashSet<String>();
- debugSet.add(ILaunchManager.DEBUG_MODE);
-
- ILaunchConfigurationType remoteCfg = launchMgr.getLaunchConfigurationType(REMOTE_LAUNCH_TYPE);
- try {
- if (remoteCfg.getPreferredDelegate(debugSet) == null) {
- ILaunchDelegate[] delegates = remoteCfg.getDelegates(debugSet);
- for (ILaunchDelegate delegate : delegates) {
- if (PREFERRED_DEBUG_REMOTE_LAUNCH_DELEGATE.equals(delegate.getId())) {
- remoteCfg.setPreferredDelegate(debugSet, delegate);
- break;
- }
- }
- }
- } catch (CoreException e) {}
- }
-
-
}
diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteLaunchConfigurationTabGroup.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteLaunchConfigurationTabGroup.java
deleted file mode 100644
index 996f9b68a8..0000000000
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteLaunchConfigurationTabGroup.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2010 PalmSource, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Ewa Matejska (PalmSource) - Adapted from LocalRunLaunchConfigurationTabGroup
- * Anna Dushistova (Mentor Graphics) - [314659] move remote launch/debug to DSF
- * Anna Dushistova (Mentor Graphics) - moved to org.eclipse.cdt.launch.remote.tabs
- *******************************************************************************/
-
-package org.eclipse.cdt.launch.remote.tabs;
-
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-
-/**
- * This class defines the tab group for the Remote C++ Launch Configuration. It
- * returns an empty set of tabs because all the tabs are contributed via
- * launchConfigurationTabs extension point
- */
-public class RemoteLaunchConfigurationTabGroup extends
- AbstractLaunchConfigurationTabGroup {
- public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
- ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {};
- setTabs(tabs);
- }
-} \ No newline at end of file

Back to the top