Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Khouzam2010-07-23 14:06:58 -0400
committerMarc Khouzam2010-07-23 14:06:58 -0400
commitabf3f627313516f6993454040bd7d3d157bdca15 (patch)
treecc4aa31d6432921b49a773ff59ec9694782d7ab2 /debug/org.eclipse.cdt.debug.ui
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 'debug/org.eclipse.cdt.debug.ui')
-rw-r--r--debug/org.eclipse.cdt.debug.ui/plugin.xml17
-rw-r--r--debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutablePageTwo.java3
2 files changed, 19 insertions, 1 deletions
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index 9e46217d06..63e9ffdfa5 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -24,6 +24,11 @@
configTypeID="org.eclipse.cdt.launch.postmortemLaunchType"
id="org.eclipse.cdt.launch.coreFileLaunchImage">
</launchConfigurationTypeImage>
+ <launchConfigurationTypeImage
+ icon="icons/obj16/c_app.gif"
+ configTypeID="org.eclipse.cdt.launch.remoteApplicationLaunchType"
+ id="org.eclipse.cdt.launch.remoteRunLaunchImage">
+ </launchConfigurationTypeImage>
</extension>
<extension
@@ -50,6 +55,18 @@
class="org.eclipse.cdt.debug.internal.ui.launch.PlaceHolderLaunchConfigurationTabGroup"
id="org.eclipse.cdt.launch.postmortemLaunchTabGroup">
</launchConfigurationTabGroup>
+ <launchConfigurationTabGroup
+ type="org.eclipse.cdt.launch.remoteApplicationLaunchType"
+ class="org.eclipse.cdt.debug.internal.ui.launch.PlaceHolderLaunchConfigurationTabGroup"
+ id="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup">
+ <launchMode mode="debug"/>
+ </launchConfigurationTabGroup>
+ <launchConfigurationTabGroup
+ type="org.eclipse.cdt.launch.remoteApplicationLaunchType"
+ class="org.eclipse.cdt.debug.internal.ui.launch.PlaceHolderLaunchConfigurationTabGroup"
+ id="org.eclipse.cdt.launch.remoteApplicationRunLaunchTabGroup">
+ <launchMode mode="run"/>
+ </launchConfigurationTabGroup>
</extension>
<extension
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutablePageTwo.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutablePageTwo.java
index dcac6735cb..c2187a2c21 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutablePageTwo.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutablePageTwo.java
@@ -17,6 +17,7 @@ import org.eclipse.cdt.core.ICDescriptor;
import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
import org.eclipse.cdt.debug.internal.ui.ICDebugHelpContextIds;
import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
import org.eclipse.cdt.ui.CElementLabelProvider;
@@ -94,7 +95,7 @@ public class ImportExecutablePageTwo extends WizardPage {
if (wizard.supportsConfigurationType(type)) {
configTypes.add(configTypeName);
- if (type.getIdentifier().equals("org.eclipse.cdt.launch.applicationLaunchType")) { //$NON-NLS-1$
+ if (type.getIdentifier().equals(ICDTLaunchConfigurationConstants.ID_LAUNCH_C_APP)) {
capp = j;
}
j++;

Back to the top