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

Get LaunchBar builds off of the UI thread.

Browse source
This commit is contained in:
Doug Schaefer 2014-09-18 11:55:27 -04:00
parent ae1b12338a
commit ddd0df6db8
1 changed files with 47 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
launch/org.eclipse.cdt.launchbar.ui/src/org/eclipse/cdt/launchbar/ui/internal/commands/BuildActiveCommandHandler.java
View file

@ -15,8 +15,6 @@ import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import org.eclipse.cdt.launchbar.core.ILaunchDescriptor;
import org.eclipse.cdt.launchbar.core.ILaunchTarget;
import org.eclipse.cdt.launchbar.core.internal.LaunchBarManager; import org.eclipse.cdt.launchbar.core.internal.LaunchBarManager;
import org.eclipse.cdt.launchbar.ui.internal.Activator; import org.eclipse.cdt.launchbar.ui.internal.Activator;
import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.AbstractHandler;
@ -32,6 +30,7 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchDelegate; import org.eclipse.debug.core.ILaunchDelegate;
import org.eclipse.debug.core.ILaunchMode; import org.eclipse.debug.core.ILaunchMode;
@ -61,49 +60,57 @@ public class BuildActiveCommandHandler extends AbstractHandler {
public IStatus runInUIThread(IProgressMonitor monitor) { public IStatus runInUIThread(IProgressMonitor monitor) {
try { try {
LaunchBarManager launchBarManager = Activator.getDefault().getLaunchBarUIManager().getManager(); final LaunchBarManager launchBarManager = Activator.getDefault().getLaunchBarUIManager().getManager();
ILaunchDescriptor desc = launchBarManager.getActiveLaunchDescriptor(); final ILaunchConfiguration config = launchBarManager.getActiveLaunchConfiguration();
ILaunchTarget target = launchBarManager.getActiveLaunchTarget();
ILaunchConfiguration config = launchBarManager.getLaunchConfiguration(desc, target);
Collection<IProject> projects = getProjects(config); final Collection<IProject> projects = getProjects(config);
if (BuildAction.isSaveAllSet()) { if (BuildAction.isSaveAllSet()) {
saveEditors(projects); saveEditors(projects);
} }
if (config == null) { new Job("Building Active Configuration") {
// Default, build the workspace @Override
ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, monitor); protected IStatus run(IProgressMonitor monitor) {
return Status.OK_STATUS; try {
} if (config == null) {
// Default, build the workspace
ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, monitor);
return Status.OK_STATUS;
}
ILaunchMode launchMode = launchBarManager.getActiveLaunchMode(); ILaunchMode launchMode = launchBarManager.getActiveLaunchMode();
String mode = launchMode.getIdentifier(); String mode = launchMode.getIdentifier();
Set<String> modes = new HashSet<>(); Set<String> modes = new HashSet<>();
modes.add(mode); modes.add(mode);
ILaunchDelegate delegate = config.getType().getPreferredDelegate(modes); ILaunchDelegate delegate = config.getType().getPreferredDelegate(modes);
if (delegate == null) if (delegate == null)
delegate = config.getType().getDelegates(modes)[0]; delegate = config.getType().getDelegates(modes)[0];
ILaunchConfigurationDelegate configDel = delegate.getDelegate(); ILaunchConfigurationDelegate configDel = delegate.getDelegate();
if (configDel instanceof ILaunchConfigurationDelegate2) { if (configDel instanceof ILaunchConfigurationDelegate2) {
ILaunchConfigurationDelegate2 configDel2 = (ILaunchConfigurationDelegate2)configDel; ILaunchConfigurationDelegate2 configDel2 = (ILaunchConfigurationDelegate2)configDel;
boolean ret; boolean ret;
ret = configDel2.preLaunchCheck(config, mode, monitor); ret = configDel2.preLaunchCheck(config, mode, monitor);
if (!ret) if (!ret)
return Status.CANCEL_STATUS; return Status.CANCEL_STATUS;
if (!configDel2.buildForLaunch(config, mode, monitor)) if (!configDel2.buildForLaunch(config, mode, monitor))
return Status.OK_STATUS; return Status.OK_STATUS;
} }
// Fall through, do a normal build // Fall through, do a normal build
if (projects.isEmpty()) { if (projects.isEmpty()) {
ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, monitor); ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, monitor);
} else { } else {
Collection<IBuildConfiguration> buildConfigs = getBuildConfigs(projects); Collection<IBuildConfiguration> buildConfigs = getBuildConfigs(projects);
ResourcesPlugin.getWorkspace().build(buildConfigs.toArray(new IBuildConfiguration[buildConfigs.size()]), ResourcesPlugin.getWorkspace().build(buildConfigs.toArray(new IBuildConfiguration[buildConfigs.size()]),
IncrementalProjectBuilder.INCREMENTAL_BUILD, true, monitor); IncrementalProjectBuilder.INCREMENTAL_BUILD, true, monitor);
// TODO, may need to get the buildReferences argument from the descriptor // TODO, may need to get the buildReferences argument from the descriptor
} }
return Status.OK_STATUS;
} catch (CoreException e) {
return e.getStatus();
}
}
}.schedule();
} catch (CoreException e) { } catch (CoreException e) {
return e.getStatus(); return e.getStatus();
} }