mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 06:02:11 +02:00
Code Issues Wiki Activity

Bug 484900: Replace LocalCDILaunchDelegate with LocalRunLaunchDelegate

Browse source 
The launch delegate id "org.eclipse.cdt.cdi.launch.localCLaunch" was
being used for both the Run launch and the CDI debug launch.  To keep
supporting the CDI debug launch, we still had to keep that delegate
pointing to the class LocalCDILaunchDelegate.

Now that we have remove the CDI debug launch, we no longer need to keep
pointing to LocalCDILaunchDelegate, and can use the
"org.eclipse.cdt.cdi.launch.localCLaunch" on for Run and pointing to
LocalRunLaunchDelegate.

Some more details can be found in Bug 464636.

Change-Id: I36c2adc043d29a5a11121059470505c6526c068b
This commit is contained in:
Marc Khouzam 2016-03-18 13:20:30 -04:00
parent 58081e64ef
commit 3b442e1f37
2 changed files with 1 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
launch/org.eclipse.cdt.launch/plugin.xml
View file

@ -8,7 +8,7 @@
<launchDelegate <launchDelegate
id="org.eclipse.cdt.cdi.launch.localCLaunch" id="org.eclipse.cdt.cdi.launch.localCLaunch"
type="org.eclipse.cdt.launch.applicationLaunchType" type="org.eclipse.cdt.launch.applicationLaunchType"
delegate="org.eclipse.cdt.launch.internal.LocalCDILaunchDelegate" delegate="org.eclipse.cdt.launch.internal.LocalRunLaunchDelegate"
modes="run" modes="run"
name="%LocalCDTLaunch.name" name="%LocalCDTLaunch.name"
delegateDescription="%LocalCDTLaunch.description" delegateDescription="%LocalCDTLaunch.description"

70
launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java
View file

@ -1,70 +0,0 @@
/*******************************************************************************
* Copyright (c) 2004, 2015 QNX Software Systems 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:
* QNX Software Systems - Initial API and implementation
* Anton Leherbauer (Wind River Systems) - bugs 205108, 212632, 224187
* Ken Ryall (Nokia) - bug 188116
* Marc Khouzam (Ericsson) - Modernize Run launch (bug 464636)
* Jonah Graham (Kichwa Coders) - Remove CDI - LocalCDILaunchDelegate now only support "run" mode
*******************************************************************************/
package org.eclipse.cdt.launch.internal;
import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
import org.eclipse.cdt.launch.AbstractCLaunchDelegate;
import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchManager;
/**
* The launch configuration delegate for the CDI debugger session types.
*/
public class LocalCDILaunchDelegate extends AbstractCLaunchDelegate {
@Override
public void launch(ILaunchConfiguration config, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
if (monitor == null) {
monitor = new NullProgressMonitor();
}
if (mode.equals(ILaunchManager.RUN_MODE)) {
// We plan on splitting the Run delegate from the Debug one.
// For now, to keep backwards-compatibility, we need to keep the same delegate (to keep its id)
// However, we can just call the new delegate class
new LocalRunLaunchDelegate().launch(config, mode, launch, monitor);
}
}
@Override
protected String getPluginID() {
return LaunchUIPlugin.getUniqueIdentifier();
}
@Override
public boolean preLaunchCheck(ILaunchConfiguration config, String mode, IProgressMonitor monitor) throws CoreException {
if (mode.equals(ILaunchManager.RUN_MODE)) {
// We plan on splitting the Run delegate from the Debug one.
// For now, to keep backwards-compatibility, we need to keep the same delegate (to keep its id)
// However, we can just call the new delegate class
new LocalRunLaunchDelegate().preLaunchCheck(config, mode, monitor);
}
return super.preLaunchCheck(config, mode, monitor);
}
@Override
public boolean buildForLaunch(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException {
// Never build for attach. Bug 188116
String debugMode = configuration.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE, ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN);
if (debugMode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH))
return false;
return super.buildForLaunch(configuration, mode, monitor);
}
}