mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-08 11:03:28 +02:00
Code Issues Wiki Activity

Adjust to removal of special launch config delegate for remote.

Browse source 
Change-Id: I767ca01a8a233b2b6ab197991a696b4deef52b8c
This commit is contained in:
Doug Schaefer 2015-05-19 13:34:59 -04:00
parent 56032058d2
commit 809f470514
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/Messages.java
View file

@ -16,6 +16,7 @@ public class Messages extends NLS {
private static final String BUNDLE_NAME = "org.eclipse.cdt.arduino.core.internal.messages"; //$NON-NLS-1$ private static final String BUNDLE_NAME = "org.eclipse.cdt.arduino.core.internal.messages"; //$NON-NLS-1$
public static String ArduinoLaunchConfigurationDelegate_0; public static String ArduinoLaunchConfigurationDelegate_0;
public static String ArduinoLaunchConfigurationDelegate_1; public static String ArduinoLaunchConfigurationDelegate_1;
public static String ArduinoLaunchConfigurationDelegate_2;
public static String ArduinoProjectGenerator_0; public static String ArduinoProjectGenerator_0;
static { static {

17
toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/launch/ArduinoLaunchConfigurationDelegate.java
View file

@ -38,16 +38,18 @@ import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.launchbar.core.launch.RemoteLaunchConfigurationDelegate; import org.eclipse.debug.core.model.LaunchConfigurationDelegate;
import org.eclipse.launchbar.core.PerTargetLaunchConfigProvider;
import org.eclipse.remote.core.IRemoteConnection; import org.eclipse.remote.core.IRemoteConnection;
public class ArduinoLaunchConfigurationDelegate extends RemoteLaunchConfigurationDelegate { public class ArduinoLaunchConfigurationDelegate extends LaunchConfigurationDelegate {
public static final String TYPE_ID = "org.eclipse.cdt.arduino.core.launchConfigurationType"; //$NON-NLS-1$ public static final String TYPE_ID = "org.eclipse.cdt.arduino.core.launchConfigurationType"; //$NON-NLS-1$
@Override @Override
public boolean buildForLaunch(ILaunchConfiguration configuration, String mode, IRemoteConnection target, public boolean buildForLaunch(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException {
IProgressMonitor monitor) throws CoreException { IRemoteConnection target = PerTargetLaunchConfigProvider.getTarget(configuration);
// 1. make sure proper build config is set active // 1. make sure proper build config is set active
IProject project = configuration.getMappedResources()[0].getProject(); IProject project = configuration.getMappedResources()[0].getProject();
ICProjectDescription projDesc = CCorePlugin.getDefault().getProjectDescription(project); ICProjectDescription projDesc = CCorePlugin.getDefault().getProjectDescription(project);
@ -75,12 +77,15 @@ public class ArduinoLaunchConfigurationDelegate extends RemoteLaunchConfiguratio
} }
@Override @Override
public void launch(final ILaunchConfiguration configuration, String mode, final IRemoteConnection target, public void launch(final ILaunchConfiguration configuration, String mode, final ILaunch launch, IProgressMonitor monitor) throws CoreException {
final ILaunch launch, IProgressMonitor monitor) throws CoreException {
new Job(Messages.ArduinoLaunchConfigurationDelegate_0) { new Job(Messages.ArduinoLaunchConfigurationDelegate_0) {
protected IStatus run(IProgressMonitor monitor) { protected IStatus run(IProgressMonitor monitor) {
try { try {
ArduinoLaunchConsoleService consoleService = getConsoleService(); ArduinoLaunchConsoleService consoleService = getConsoleService();
IRemoteConnection target = PerTargetLaunchConfigProvider.getTarget(configuration);
if (target == null) {
return new Status(IStatus.ERROR, Activator.getId(), Messages.ArduinoLaunchConfigurationDelegate_2);
}
// The project // The project
IProject project = (IProject) configuration.getMappedResources()[0]; IProject project = (IProject) configuration.getMappedResources()[0];

1
toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/messages.properties
View file

@ -10,4 +10,5 @@ ArduinoLaunchConfigurationDelegate_1=No active Arduino remote connection.
# QNX Software Systems - Initial API and implementation # QNX Software Systems - Initial API and implementation
################################################################################ ################################################################################
ArduinoLaunchConfigurationDelegate_0=Arduino Launch ArduinoLaunchConfigurationDelegate_0=Arduino Launch
ArduinoLaunchConfigurationDelegate_2=Target has not been selected for Launch Configuration
ArduinoProjectGenerator_0=Write Arduino project file ArduinoProjectGenerator_0=Write Arduino project file