Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 318214
Collapse All | Expand All

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
Lines 2-8 Link Here
2
Bundle-ManifestVersion: 2
2
Bundle-ManifestVersion: 2
3
Bundle-Name: %pluginName
3
Bundle-Name: %pluginName
4
Bundle-SymbolicName: org.eclipse.cdt.debug.core; singleton:=true
4
Bundle-SymbolicName: org.eclipse.cdt.debug.core; singleton:=true
5
Bundle-Version: 7.0.0.qualifier
5
Bundle-Version: 7.1.0.qualifier
6
Bundle-Activator: org.eclipse.cdt.debug.core.CDebugCorePlugin
6
Bundle-Activator: org.eclipse.cdt.debug.core.CDebugCorePlugin
7
Bundle-Vendor: %providerName
7
Bundle-Vendor: %providerName
8
Bundle-Localization: plugin
8
Bundle-Localization: plugin
(-)plugin.properties (+1 lines)
Lines 20-25 Link Here
20
ApplicationLaunch.name=C/C++ Application
20
ApplicationLaunch.name=C/C++ Application
21
AttachLaunch.name=C/C++ Attach to Application
21
AttachLaunch.name=C/C++ Attach to Application
22
PostMortemLaunch.name=C/C++ Postmortem Debugger
22
PostMortemLaunch.name=C/C++ Postmortem Debugger
23
RemoteApplicationLaunch.name=C/C++ Remote Application
23
24
24
CDebugger.name=C/C++ Development Tools Core Debugger Extension
25
CDebugger.name=C/C++ Development Tools Core Debugger Extension
25
BreakpointAction.name=Breakpoint Action Extension
26
BreakpointAction.name=Breakpoint Action Extension
(-)plugin.xml (+5 lines)
Lines 28-33 Link Here
28
            name="%PostMortemLaunch.name"
28
            name="%PostMortemLaunch.name"
29
            public="true">
29
            public="true">
30
      </launchConfigurationType>
30
      </launchConfigurationType>
31
      <launchConfigurationType
32
            id="org.eclipse.cdt.launch.remoteApplicationLaunchType"
33
            name="%RemoteApplicationLaunch.name"
34
            public="true">
35
      </launchConfigurationType>
31
   </extension>
36
   </extension>
32
37
33
   <extension
38
   <extension
(-)src/org/eclipse/cdt/debug/core/CDebugCorePlugin.java (+13 lines)
Lines 455-460 Link Here
455
			}
455
			}
456
		} catch (CoreException e) {}
456
		} catch (CoreException e) {}
457
457
458
		ILaunchConfigurationType remoteCfg = launchMgr.getLaunchConfigurationType(ICDTLaunchConfigurationConstants.ID_LAUNCH_C_REMOTE_APP);
459
		try {
460
			if (remoteCfg.getPreferredDelegate(debugSet) == null) {
461
				ILaunchDelegate[] delegates = remoteCfg.getDelegates(debugSet);
462
				for (ILaunchDelegate delegate : delegates) {
463
					if (ICDTLaunchConfigurationConstants.PREFERRED_DEBUG_REMOTE_LAUNCH_DELEGATE.equals(delegate.getId())) {
464
						remoteCfg.setPreferredDelegate(debugSet, delegate);
465
						break;
466
					}
467
				}
468
			}
469
		} catch (CoreException e) {}
470
		
458
		ILaunchConfigurationType attachCfg = launchMgr.getLaunchConfigurationType(ICDTLaunchConfigurationConstants.ID_LAUNCH_C_ATTACH);
471
		ILaunchConfigurationType attachCfg = launchMgr.getLaunchConfigurationType(ICDTLaunchConfigurationConstants.ID_LAUNCH_C_ATTACH);
459
		try {
472
		try {
460
			if (attachCfg.getPreferredDelegate(debugSet) == null) {
473
			if (attachCfg.getPreferredDelegate(debugSet) == null) {
(-)src/org/eclipse/cdt/debug/core/ICDTLaunchConfigurationConstants.java (+17 lines)
Lines 28-33 Link Here
28
	public static final String ID_LAUNCH_C_APP = "org.eclipse.cdt.launch.applicationLaunchType"; //$NON-NLS-1$
28
	public static final String ID_LAUNCH_C_APP = "org.eclipse.cdt.launch.applicationLaunchType"; //$NON-NLS-1$
29
29
30
	/**
30
	/**
31
	 * This is the remote application launch type id.
32
	 *
33
	 * @since 7.1
34
	 */
35
	public static final String ID_LAUNCH_C_REMOTE_APP = "org.eclipse.cdt.launch.remoteApplicationLaunchType"; //$NON-NLS-1$
36
	
37
	/**
31
     * This is the attach launch type id.
38
     * This is the attach launch type id.
32
     *
39
     *
33
     * @since 6.0
40
     * @since 6.0
Lines 48-53 Link Here
48
    public static final String PREFERRED_DEBUG_LOCAL_LAUNCH_DELEGATE = "org.eclipse.cdt.dsf.gdb.launch.localCLaunch"; //$NON-NLS-1$
55
    public static final String PREFERRED_DEBUG_LOCAL_LAUNCH_DELEGATE = "org.eclipse.cdt.dsf.gdb.launch.localCLaunch"; //$NON-NLS-1$
49
56
50
    /**
57
    /**
58
	 * Specifies the default launch delegate for a Remote Debug session.
59
	 * This default is part of the optional plugin org.eclipse.cdt.launch.remote.  If that plugin is not installed
60
	 * then we won't set a default, which is ok since we only have one other delegate 
61
	 * (which is org.eclipse.cdt.dsf.gdb.launch.remoteCLaunch).
62
	 * @since 7.1
63
	 */
64
    public static final String PREFERRED_DEBUG_REMOTE_LAUNCH_DELEGATE = "org.eclipse.rse.remotecdt.dsf.debug"; //$NON-NLS-1$
65
66
67
    /**
51
	 * Specifies the default launch delegate for an Attach Debug session
68
	 * Specifies the default launch delegate for an Attach Debug session
52
	 * @since 7.0
69
	 * @since 7.0
53
	 */
70
	 */
(-)plugin.xml (+17 lines)
Lines 24-29 Link Here
24
            configTypeID="org.eclipse.cdt.launch.postmortemLaunchType"
24
            configTypeID="org.eclipse.cdt.launch.postmortemLaunchType"
25
            id="org.eclipse.cdt.launch.coreFileLaunchImage">
25
            id="org.eclipse.cdt.launch.coreFileLaunchImage">
26
      </launchConfigurationTypeImage>
26
      </launchConfigurationTypeImage>
27
      <launchConfigurationTypeImage
28
            icon="icons/obj16/c_app.gif"
29
            configTypeID="org.eclipse.cdt.launch.remoteApplicationLaunchType"
30
            id="org.eclipse.cdt.launch.remoteRunLaunchImage">
31
      </launchConfigurationTypeImage>
27
   </extension>
32
   </extension>
28
33
29
   <extension
34
   <extension
Lines 50-55 Link Here
50
            class="org.eclipse.cdt.debug.internal.ui.launch.PlaceHolderLaunchConfigurationTabGroup"
55
            class="org.eclipse.cdt.debug.internal.ui.launch.PlaceHolderLaunchConfigurationTabGroup"
51
            id="org.eclipse.cdt.launch.postmortemLaunchTabGroup">
56
            id="org.eclipse.cdt.launch.postmortemLaunchTabGroup">
52
      </launchConfigurationTabGroup>
57
      </launchConfigurationTabGroup>
58
      <launchConfigurationTabGroup
59
            type="org.eclipse.cdt.launch.remoteApplicationLaunchType"
60
            class="org.eclipse.cdt.debug.internal.ui.launch.PlaceHolderLaunchConfigurationTabGroup"
61
            id="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup">
62
         <launchMode mode="debug"/>
63
      </launchConfigurationTabGroup>
64
      <launchConfigurationTabGroup
65
            type="org.eclipse.cdt.launch.remoteApplicationLaunchType"
66
            class="org.eclipse.cdt.debug.internal.ui.launch.PlaceHolderLaunchConfigurationTabGroup"
67
            id="org.eclipse.cdt.launch.remoteApplicationRunLaunchTabGroup">
68
         <launchMode mode="run"/>
69
      </launchConfigurationTabGroup>
53
   </extension>
70
   </extension>
54
71
55
   <extension
72
   <extension
(-)src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutablePageTwo.java (-1 / +2 lines)
Lines 17-22 Link Here
17
import org.eclipse.cdt.core.model.CModelException;
17
import org.eclipse.cdt.core.model.CModelException;
18
import org.eclipse.cdt.core.model.CoreModel;
18
import org.eclipse.cdt.core.model.CoreModel;
19
import org.eclipse.cdt.core.model.ICProject;
19
import org.eclipse.cdt.core.model.ICProject;
20
import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
20
import org.eclipse.cdt.debug.internal.ui.ICDebugHelpContextIds;
21
import org.eclipse.cdt.debug.internal.ui.ICDebugHelpContextIds;
21
import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
22
import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
22
import org.eclipse.cdt.ui.CElementLabelProvider;
23
import org.eclipse.cdt.ui.CElementLabelProvider;
Lines 94-100 Link Here
94
				if (wizard.supportsConfigurationType(type)) {
95
				if (wizard.supportsConfigurationType(type)) {
95
					configTypes.add(configTypeName);
96
					configTypes.add(configTypeName);
96
					
97
					
97
					if (type.getIdentifier().equals("org.eclipse.cdt.launch.applicationLaunchType")) { //$NON-NLS-1$
98
					if (type.getIdentifier().equals(ICDTLaunchConfigurationConstants.ID_LAUNCH_C_APP)) {
98
						capp = j;
99
						capp = j;
99
					}
100
					}
100
					j++;
101
					j++;
(-)plugin.properties (-4 / +4 lines)
Lines 14-22 Link Here
14
14
15
launchDelegate.localApplication.name=GDB (DSF) Create Process
15
launchDelegate.localApplication.name=GDB (DSF) Create Process
16
launchDelegate.localApplication.description=Start new application under control of GDB debugger integrated using the Debugger Services Framework (DSF).
16
launchDelegate.localApplication.description=Start new application under control of GDB debugger integrated using the Debugger Services Framework (DSF).
17
launchDelegate.remoteApplication.name=GDB (DSF) Remote System Process
17
launchDelegate.remoteApplication.name=GDB (DSF) Manual Remote Debugging
18
launchDelegate.remoteApplication.description=Start new application on a remote system under control of GDB debugger integrated using the Debugger Services Framework (DSF).
18
launchDelegate.remoteApplication.description=Debug a new application that was manually started on a remote system under control of GDB debugger integrated using the Debugger Services Framework (DSF).
19
launchDelegate.attach.name=GDB (DSF) Attach to Process
19
launchDelegate.attach.name=GDB (DSF) Attach to Process
20
launchDelegate.attach.description=Attach the GDB debugger, integrated using the Debugger Services Framework (DSF), to a running program.
20
launchDelegate.attach.description=Attach the GDB debugger, integrated using the Debugger Services Framework (DSF), to a running program locally or remotely.
21
launchDelegate.postmortem.name=GDB (DSF) Postmortem Debugger
21
launchDelegate.postmortem.name=GDB (DSF) Postmortem Debugger
22
launchDelegate.postmortem.description=Load an application dump under into the GDB debugger integrated using the Debugger Services Framework (DSF).
22
launchDelegate.postmortem.description=Load an application dump using the GDB debugger integrated using the Debugger Services Framework (DSF).
(-)plugin.xml (-1 / +1 lines)
Lines 15-21 Link Here
15
      </launchDelegate>
15
      </launchDelegate>
16
      <launchDelegate
16
      <launchDelegate
17
            id="org.eclipse.cdt.dsf.gdb.launch.remoteCLaunch"
17
            id="org.eclipse.cdt.dsf.gdb.launch.remoteCLaunch"
18
            type="org.eclipse.cdt.launch.applicationLaunchType"
18
            type="org.eclipse.cdt.launch.remoteApplicationLaunchType"
19
            modes="debug"
19
            modes="debug"
20
            delegate="org.eclipse.cdt.dsf.gdb.launching.GdbLaunchDelegate"
20
            delegate="org.eclipse.cdt.dsf.gdb.launching.GdbLaunchDelegate"
21
            name="%launchDelegate.remoteApplication.name"
21
            name="%launchDelegate.remoteApplication.name"
(-)plugin.xml (-4 / +4 lines)
Lines 55-68 Link Here
55
      <!-- Remote application launch tabs-->
55
      <!-- Remote application launch tabs-->
56
      <tab
56
      <tab
57
            id="org.eclipse.cdt.dsf.gdb.launch.remoteApplicationLaunch.mainTab"
57
            id="org.eclipse.cdt.dsf.gdb.launch.remoteApplicationLaunch.mainTab"
58
            group="org.eclipse.cdt.launch.applicationLaunchTabGroup"
58
            group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
59
            name="%launchTab.main.name"
59
            name="%launchTab.main.name"
60
            class="org.eclipse.cdt.dsf.gdb.internal.ui.launching.CMainTab">
60
            class="org.eclipse.cdt.dsf.gdb.internal.ui.launching.CMainTab">
61
        <associatedDelegate delegate="org.eclipse.cdt.dsf.gdb.launch.remoteCLaunch"/>
61
        <associatedDelegate delegate="org.eclipse.cdt.dsf.gdb.launch.remoteCLaunch"/>
62
      </tab>
62
      </tab>
63
      <tab
63
      <tab
64
            id="org.eclipse.cdt.dsf.gdb.launch.remoteApplicationLaunch.debuggerTab"
64
            id="org.eclipse.cdt.dsf.gdb.launch.remoteApplicationLaunch.debuggerTab"
65
            group="org.eclipse.cdt.launch.applicationLaunchTabGroup"
65
            group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
66
            name="%launchTab.debugger.name"
66
            name="%launchTab.debugger.name"
67
            class="org.eclipse.cdt.dsf.gdb.internal.ui.launching.RemoteApplicationCDebuggerTab">
67
            class="org.eclipse.cdt.dsf.gdb.internal.ui.launching.RemoteApplicationCDebuggerTab">
68
        <associatedDelegate delegate="org.eclipse.cdt.dsf.gdb.launch.remoteCLaunch"/>
68
        <associatedDelegate delegate="org.eclipse.cdt.dsf.gdb.launch.remoteCLaunch"/>
Lines 70-76 Link Here
70
      </tab>
70
      </tab>
71
      <tab
71
      <tab
72
            id="org.eclipse.cdt.dsf.gdb.launch.remoteApplicationLaunch.sourceLookupTab"
72
            id="org.eclipse.cdt.dsf.gdb.launch.remoteApplicationLaunch.sourceLookupTab"
73
            group="org.eclipse.cdt.launch.applicationLaunchTabGroup"
73
            group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
74
            name="%launchTab.sourceLookup.name"
74
            name="%launchTab.sourceLookup.name"
75
            class="org.eclipse.debug.ui.sourcelookup.SourceLookupTab">
75
            class="org.eclipse.debug.ui.sourcelookup.SourceLookupTab">
76
        <associatedDelegate delegate="org.eclipse.cdt.dsf.gdb.launch.remoteCLaunch"/>
76
        <associatedDelegate delegate="org.eclipse.cdt.dsf.gdb.launch.remoteCLaunch"/>
Lines 78-84 Link Here
78
      </tab>
78
      </tab>
79
      <tab
79
      <tab
80
            id="org.eclipse.cdt.dsf.gdb.launch.remoteApplicationLaunch.commonTab"
80
            id="org.eclipse.cdt.dsf.gdb.launch.remoteApplicationLaunch.commonTab"
81
            group="org.eclipse.cdt.launch.applicationLaunchTabGroup"
81
            group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
82
            name="%launchTab.common.name"
82
            name="%launchTab.common.name"
83
            class="org.eclipse.debug.ui.CommonTab">
83
            class="org.eclipse.debug.ui.CommonTab">
84
        <associatedDelegate delegate="org.eclipse.cdt.dsf.gdb.launch.remoteCLaunch"/>
84
        <associatedDelegate delegate="org.eclipse.cdt.dsf.gdb.launch.remoteCLaunch"/>
(-)plugin.properties (-5 / +4 lines)
Lines 13-20 Link Here
13
pluginName=C/C++ Remote Debug Launcher
13
pluginName=C/C++ Remote Debug Launcher
14
providerName=Eclipse CDT
14
providerName=Eclipse CDT
15
15
16
launchConfigurationType.name = C/C++ Remote Application
16
cdiLaunchDelegate.name = Standard Remote Create Process
17
cdiLaunchDelegate.name = Standard C/C++ Remote Application
17
cdiLaunchDelegate.description = Automatically start and optionally debug a new application on a remote system under control of the standard debugger.
18
cdiLaunchDelegate.description = Standard remote application launching/debugging using the standard debugger Framework (CDI).
18
dsfLaunchDelegate.name = GDB (DSF) Automatic Remote Debugging
19
dsfLaunchDelegate.name = GDB (DSF) Remote Debugging
19
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).
20
dsfLaunchDelegate.description = Start new application on a remote system under control of GDB debugger integrated using the Debugger Services Framework (DSF).
(-)plugin.xml (-55 / +15 lines)
Lines 14-32 Link Here
14
-->
14
-->
15
<?eclipse version="3.0"?>
15
<?eclipse version="3.0"?>
16
<plugin>
16
<plugin>
17
   <extension
18
         point="org.eclipse.debug.core.launchConfigurationTypes">
19
      <launchConfigurationType
20
            public="true"
21
            name="%launchConfigurationType.name"
22
            id="org.eclipse.rse.remotecdt.RemoteApplicationLaunch"
23
       >
24
      </launchConfigurationType>
25
   </extension>
26
       <extension point="org.eclipse.debug.core.launchDelegates">
17
       <extension point="org.eclipse.debug.core.launchDelegates">
27
      <launchDelegate
18
      <launchDelegate
28
            id="org.eclipse.rse.remotecdt.launch"
19
            id="org.eclipse.rse.remotecdt.launch"
29
            type="org.eclipse.rse.remotecdt.RemoteApplicationLaunch"
20
            type="org.eclipse.cdt.launch.remoteApplicationLaunchType"
30
            modes="run,debug"
21
            modes="run,debug"
31
            delegate="org.eclipse.cdt.launch.remote.launching.RemoteRunLaunchDelegate"
22
            delegate="org.eclipse.cdt.launch.remote.launching.RemoteRunLaunchDelegate"
32
            name="%cdiLaunchDelegate.name"
23
            name="%cdiLaunchDelegate.name"
Lines 36-42 Link Here
36
      </launchDelegate>
27
      </launchDelegate>
37
      <launchDelegate
28
      <launchDelegate
38
            id="org.eclipse.rse.remotecdt.dsf.debug"
29
            id="org.eclipse.rse.remotecdt.dsf.debug"
39
            type="org.eclipse.rse.remotecdt.RemoteApplicationLaunch"
30
            type="org.eclipse.cdt.launch.remoteApplicationLaunchType"
40
            modes="debug"
31
            modes="debug"
41
            delegate="org.eclipse.cdt.launch.remote.launching.RemoteGdbLaunchDelegate"
32
            delegate="org.eclipse.cdt.launch.remote.launching.RemoteGdbLaunchDelegate"
42
            name="%dsfLaunchDelegate.name"
33
            name="%dsfLaunchDelegate.name"
Lines 46-108 Link Here
46
      </launchDelegate>
37
      </launchDelegate>
47
   </extension>
38
   </extension>
48
   
39
   
49
   
50
   <extension
51
         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
52
      <launchConfigurationTypeImage
53
            icon="icons/full/obj16/c_app.gif"
54
            configTypeID="org.eclipse.rse.remotecdt.RemoteApplicationLaunch"
55
            id="org.eclipse.cdt.launch.localRunLaunchImagefff">
56
      </launchConfigurationTypeImage>
57
   </extension>    
58
   <extension
59
         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
60
      <launchConfigurationTabGroup
61
            class="org.eclipse.cdt.launch.remote.tabs.RemoteLaunchConfigurationTabGroup"
62
            helpContextId="org.eclipse.rse.remotecdt.launchgroup"
63
            id="org.eclipse.rse.remotecdt.RemoteLaunchTabGroup"
64
            type="org.eclipse.rse.remotecdt.RemoteApplicationLaunch">
65
         <launchMode
66
               mode="run">
67
         </launchMode>
68
      </launchConfigurationTabGroup>
69
      <launchConfigurationTabGroup
70
            class="org.eclipse.cdt.launch.remote.tabs.RemoteLaunchConfigurationTabGroup"
71
            helpContextId="org.eclipse.rse.remotecdt.launchgroup"
72
            id="org.eclipse.rse.remotecdt.RemoteDebugTabGroup"
73
            type="org.eclipse.rse.remotecdt.RemoteApplicationLaunch">
74
         <launchMode
75
               mode="debug">
76
         </launchMode>
77
      </launchConfigurationTabGroup>
78
   </extension>
79
   
80
   <extension
40
   <extension
81
         point="org.eclipse.debug.ui.launchConfigurationTabs">
41
         point="org.eclipse.debug.ui.launchConfigurationTabs">
82
     <tab
42
     <tab
83
            id="org.eclipse.rse.remotecdt.launch.RemoteCMainTab"
43
            id="org.eclipse.rse.remotecdt.launch.RemoteCMainTab"
84
            group="org.eclipse.rse.remotecdt.RemoteLaunchTabGroup"
44
            group="org.eclipse.cdt.launch.remoteApplicationRunLaunchTabGroup"
85
            name="Main"
45
            name="Main"
86
            class="org.eclipse.cdt.launch.remote.tabs.RemoteCMainTab">
46
            class="org.eclipse.cdt.launch.remote.tabs.RemoteCMainTab">
87
        <associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
47
        <associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
88
     </tab>         
48
     </tab>         
89
     <tab
49
     <tab
90
            id="org.eclipse.rse.remotecdt.debug.RemoteCMainTab"
50
            id="org.eclipse.rse.remotecdt.debug.RemoteCMainTab"
91
            group="org.eclipse.rse.remotecdt.RemoteDebugTabGroup"
51
            group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
92
            name="Main"
52
            name="Main"
93
            class="org.eclipse.cdt.launch.remote.tabs.RemoteCMainTab">
53
            class="org.eclipse.cdt.launch.remote.tabs.RemoteCMainTab">
94
        <associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
54
        <associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
95
     </tab>         
55
     </tab>         
96
     <tab
56
     <tab
97
            id="org.eclipse.rse.remotecdt.dsf.gdb.mainTab"
57
            id="org.eclipse.rse.remotecdt.dsf.gdb.mainTab"
98
            group="org.eclipse.rse.remotecdt.RemoteDebugTabGroup"
58
            group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
99
            name="Main"
59
            name="Main"
100
            class="org.eclipse.cdt.launch.remote.tabs.RemoteCDSFMainTab">
60
            class="org.eclipse.cdt.launch.remote.tabs.RemoteCDSFMainTab">
101
        <associatedDelegate delegate="org.eclipse.rse.remotecdt.dsf.debug"/>
61
        <associatedDelegate delegate="org.eclipse.rse.remotecdt.dsf.debug"/>
102
     </tab>         
62
     </tab>         
103
     <tab
63
     <tab
104
            id="org.eclipse.rse.remotecdt.launch.CAgrumentsTab"
64
            id="org.eclipse.rse.remotecdt.launch.CAgrumentsTab"
105
            group="org.eclipse.rse.remotecdt.RemoteLaunchTabGroup"
65
            group="org.eclipse.cdt.launch.remoteApplicationRunLaunchTabGroup"
106
            name="Arguments"
66
            name="Arguments"
107
            class="org.eclipse.cdt.launch.ui.CArgumentsTab">
67
            class="org.eclipse.cdt.launch.ui.CArgumentsTab">
108
        <associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
68
        <associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
Lines 110-123 Link Here
110
      </tab>         
70
      </tab>         
111
      <tab
71
      <tab
112
            id="org.eclipse.rse.remotecdt.debug.CArgumentsTab"
72
            id="org.eclipse.rse.remotecdt.debug.CArgumentsTab"
113
            group="org.eclipse.rse.remotecdt.RemoteDebugTabGroup"
73
            group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
114
            name="Arguments"
74
            name="Arguments"
115
            class="org.eclipse.cdt.launch.ui.CArgumentsTab">
75
            class="org.eclipse.cdt.launch.ui.CArgumentsTab">
116
        <associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
76
        <associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
117
        <placement after="org.eclipse.rse.remotecdt.launch.RemoteCMainTab"/>                
77
        <placement after="org.eclipse.rse.remotecdt.launch.RemoteCMainTab"/>                
118
      </tab> 
78
      </tab> 
119
      <tab id="org.eclipse.rse.remotecdt.dsf.debug.CArgumentsTab"
79
      <tab id="org.eclipse.rse.remotecdt.dsf.debug.CArgumentsTab"
120
            group="org.eclipse.rse.remotecdt.RemoteDebugTabGroup"
80
            group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
121
            name="Arguments"
81
            name="Arguments"
122
            class="org.eclipse.cdt.dsf.gdb.internal.ui.launching.CArgumentsTab">
82
            class="org.eclipse.cdt.dsf.gdb.internal.ui.launching.CArgumentsTab">
123
        <associatedDelegate delegate="org.eclipse.rse.remotecdt.dsf.debug"/>
83
        <associatedDelegate delegate="org.eclipse.rse.remotecdt.dsf.debug"/>
Lines 125-138 Link Here
125
      </tab>
85
      </tab>
126
      <tab
86
      <tab
127
            id="org.eclipse.rse.remotecdt.launch.RemoteCDebuggerTab"
87
            id="org.eclipse.rse.remotecdt.launch.RemoteCDebuggerTab"
128
            group="org.eclipse.rse.remotecdt.RemoteDebugTabGroup"
88
            group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
129
            name="Debugger"
89
            name="Debugger"
130
            class="org.eclipse.cdt.launch.remote.tabs.RemoteCDebuggerTab">
90
            class="org.eclipse.cdt.launch.remote.tabs.RemoteCDebuggerTab">
131
        <associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
91
        <associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
132
        <placement after="org.eclipse.cdt.cdi.launch.argumentsTab"/>        
92
        <placement after="org.eclipse.cdt.cdi.launch.argumentsTab"/>        
133
      </tab>
93
      </tab>
134
      <tab id="org.eclipse.rse.remotecdt.dsf.debug.RemoteCDSFDebuggerTab"
94
      <tab id="org.eclipse.rse.remotecdt.dsf.debug.RemoteCDSFDebuggerTab"
135
            group="org.eclipse.rse.remotecdt.RemoteDebugTabGroup"
95
            group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
136
            name="Debugger"
96
            name="Debugger"
137
            class="org.eclipse.cdt.launch.remote.tabs.RemoteCDSFDebuggerTab">
97
            class="org.eclipse.cdt.launch.remote.tabs.RemoteCDSFDebuggerTab">
138
        <associatedDelegate delegate="org.eclipse.rse.remotecdt.dsf.debug"/>
98
        <associatedDelegate delegate="org.eclipse.rse.remotecdt.dsf.debug"/>
Lines 140-146 Link Here
140
      </tab>
100
      </tab>
141
      <tab
101
      <tab
142
            id="org.eclipse.rse.remotecdt.launch.SourceLookupTab"
102
            id="org.eclipse.rse.remotecdt.launch.SourceLookupTab"
143
            group="org.eclipse.rse.remotecdt.RemoteDebugTabGroup"
103
            group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
144
            name="Source"
104
            name="Source"
145
            class="org.eclipse.debug.ui.sourcelookup.SourceLookupTab">
105
            class="org.eclipse.debug.ui.sourcelookup.SourceLookupTab">
146
        <associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
106
        <associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
Lines 148-154 Link Here
148
      </tab>         
108
      </tab>         
149
      <tab
109
      <tab
150
            id="org.eclipse.rse.remotecdt.debug.dsf.SourceLookupTab"
110
            id="org.eclipse.rse.remotecdt.debug.dsf.SourceLookupTab"
151
            group="org.eclipse.rse.remotecdt.RemoteDebugTabGroup"
111
            group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
152
            name="Source"
112
            name="Source"
153
            class="org.eclipse.debug.ui.sourcelookup.SourceLookupTab">
113
            class="org.eclipse.debug.ui.sourcelookup.SourceLookupTab">
154
        <associatedDelegate delegate="org.eclipse.rse.remotecdt.dsf.debug"/>
114
        <associatedDelegate delegate="org.eclipse.rse.remotecdt.dsf.debug"/>
Lines 156-162 Link Here
156
      </tab>         
116
      </tab>         
157
      <tab
117
      <tab
158
            id="org.eclipse.rse.remotecdt.launch.CommonTab"
118
            id="org.eclipse.rse.remotecdt.launch.CommonTab"
159
            group="org.eclipse.rse.remotecdt.RemoteLaunchTabGroup"
119
            group="org.eclipse.cdt.launch.remoteApplicationRunLaunchTabGroup"
160
            name="Common"
120
            name="Common"
161
            class="org.eclipse.debug.ui.CommonTab">
121
            class="org.eclipse.debug.ui.CommonTab">
162
        <associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
122
        <associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
Lines 164-170 Link Here
164
      </tab>         
124
      </tab>         
165
      <tab
125
      <tab
166
            id="org.eclipse.rse.remotecdt.debug.CommonTab"
126
            id="org.eclipse.rse.remotecdt.debug.CommonTab"
167
            group="org.eclipse.rse.remotecdt.RemoteDebugTabGroup"
127
            group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
168
            name="Common"
128
            name="Common"
169
            class="org.eclipse.debug.ui.CommonTab">
129
            class="org.eclipse.debug.ui.CommonTab">
170
        <associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
130
        <associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
Lines 172-178 Link Here
172
      </tab>         
132
      </tab>         
173
      <tab
133
      <tab
174
            id="org.eclipse.rse.remotecdt.debug.dsf.CommonTab"
134
            id="org.eclipse.rse.remotecdt.debug.dsf.CommonTab"
175
            group="org.eclipse.rse.remotecdt.RemoteDebugTabGroup"
135
            group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
176
            name="Common"
136
            name="Common"
177
            class="org.eclipse.debug.ui.CommonTab">
137
            class="org.eclipse.debug.ui.CommonTab">
178
        <associatedDelegate delegate="org.eclipse.rse.remotecdt.dsf.debug"/>
138
        <associatedDelegate delegate="org.eclipse.rse.remotecdt.dsf.debug"/>
(-)src/org/eclipse/cdt/internal/launch/remote/Activator.java (-38 lines)
Lines 12-25 Link Here
12
12
13
package org.eclipse.cdt.internal.launch.remote;
13
package org.eclipse.cdt.internal.launch.remote;
14
14
15
import java.util.HashSet;
16
17
import org.eclipse.core.runtime.CoreException;
18
import org.eclipse.core.runtime.Plugin;
15
import org.eclipse.core.runtime.Plugin;
19
import org.eclipse.debug.core.DebugPlugin;
20
import org.eclipse.debug.core.ILaunchConfigurationType;
21
import org.eclipse.debug.core.ILaunchDelegate;
22
import org.eclipse.debug.core.ILaunchManager;
23
import org.osgi.framework.BundleContext;
16
import org.osgi.framework.BundleContext;
24
17
25
/**
18
/**
Lines 30-42 Link Here
30
	// The plug-in ID
23
	// The plug-in ID
31
	public static final String PLUGIN_ID = "org.eclipse.cdt.launch.remote"; //$NON-NLS-1$
24
	public static final String PLUGIN_ID = "org.eclipse.cdt.launch.remote"; //$NON-NLS-1$
32
25
33
34
	private static final String REMOTE_LAUNCH_TYPE = "org.eclipse.rse.remotecdt.RemoteApplicationLaunch"; //$NON-NLS-1$
35
36
37
	private static final String PREFERRED_DEBUG_REMOTE_LAUNCH_DELEGATE = "org.eclipse.rse.remotecdt.dsf.debug"; //$NON-NLS-1$
38
39
	
40
	/* The shared instance */
26
	/* The shared instance */
41
	private static Activator plugin;
27
	private static Activator plugin;
42
	
28
	
Lines 53-59 Link Here
53
	 */
39
	 */
54
	public void start(BundleContext context) throws Exception {
40
	public void start(BundleContext context) throws Exception {
55
		super.start(context);
41
		super.start(context);
56
		setDefaultLaunchDelegates();
57
	}
42
	}
58
43
59
	/*
44
	/*
Lines 77-103 Link Here
77
	public static BundleContext getBundleContext() {
62
	public static BundleContext getBundleContext() {
78
		return getDefault().getBundle().getBundleContext();
63
		return getDefault().getBundle().getBundleContext();
79
	}
64
	}
80
81
	private void setDefaultLaunchDelegates() {
82
		// Set the default launch delegates as early as possible, and do it only once (Bug 312997) 
83
		ILaunchManager launchMgr = DebugPlugin.getDefault().getLaunchManager();
84
85
		HashSet<String> debugSet = new HashSet<String>();
86
		debugSet.add(ILaunchManager.DEBUG_MODE);
87
88
		ILaunchConfigurationType remoteCfg = launchMgr.getLaunchConfigurationType(REMOTE_LAUNCH_TYPE);
89
		try {
90
			if (remoteCfg.getPreferredDelegate(debugSet) == null) {
91
				ILaunchDelegate[] delegates = remoteCfg.getDelegates(debugSet);
92
				for (ILaunchDelegate delegate : delegates) {
93
					if (PREFERRED_DEBUG_REMOTE_LAUNCH_DELEGATE.equals(delegate.getId())) {
94
						remoteCfg.setPreferredDelegate(debugSet, delegate);
95
						break;
96
					}
97
				}
98
			}
99
		} catch (CoreException e) {}
100
	}
101
	
102
103
}
65
}
(-)src/org/eclipse/cdt/launch/remote/tabs/RemoteLaunchConfigurationTabGroup.java (-31 lines)
Removed Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2006, 2010 PalmSource, Inc. and others.
3
 * All rights reserved. This program and the accompanying materials 
4
 * are made available under the terms of the Eclipse Public License v1.0 
5
 * which accompanies this distribution, and is available at 
6
 * http://www.eclipse.org/legal/epl-v10.html 
7
 * 
8
 * Contributors: 
9
 * Ewa Matejska    (PalmSource)      - Adapted from LocalRunLaunchConfigurationTabGroup
10
 * Anna Dushistova (Mentor Graphics) - [314659] move remote launch/debug to DSF 
11
 * Anna Dushistova (Mentor Graphics) - moved to org.eclipse.cdt.launch.remote.tabs
12
 *******************************************************************************/
13
14
package org.eclipse.cdt.launch.remote.tabs;
15
16
import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
17
import org.eclipse.debug.ui.ILaunchConfigurationDialog;
18
import org.eclipse.debug.ui.ILaunchConfigurationTab;
19
20
/**
21
 * This class defines the tab group for the Remote C++ Launch Configuration. It
22
 * returns an empty set of tabs because all the tabs are contributed via
23
 * launchConfigurationTabs extension point
24
 */
25
public class RemoteLaunchConfigurationTabGroup extends
26
		AbstractLaunchConfigurationTabGroup {
27
	public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
28
		ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {};
29
		setTabs(tabs);
30
	}
31
}

Return to bug 318214