Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Rennie2009-04-20 15:38:03 +0000
committerMichael Rennie2009-04-20 15:38:03 +0000
commit6de458401084d0d8414f1c924e091ff463125ab7 (patch)
tree9a1fb2173e37d4b04f471232fd63cbdaa29db05f /org.eclipse.debug.core
parent72b5e0d6939e96b60c14c4e2c87e5f9e8abee0ad (diff)
downloadeclipse.platform.debug-6de458401084d0d8414f1c924e091ff463125ab7.tar.gz
eclipse.platform.debug-6de458401084d0d8414f1c924e091ff463125ab7.tar.xz
eclipse.platform.debug-6de458401084d0d8414f1c924e091ff463125ab7.zip
Bug 268978 Build before launch should use one top level workspace runnable
Diffstat (limited to 'org.eclipse.debug.core')
-rw-r--r--org.eclipse.debug.core/core/org/eclipse/debug/core/model/LaunchConfigurationDelegate.java13
-rw-r--r--org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.java2
-rw-r--r--org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.properties1
3 files changed, 8 insertions, 8 deletions
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/model/LaunchConfigurationDelegate.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/LaunchConfigurationDelegate.java
index 5731a9c78..449a2efc2 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/model/LaunchConfigurationDelegate.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/LaunchConfigurationDelegate.java
@@ -30,6 +30,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.IBreakpointManager;
@@ -412,20 +413,16 @@ public abstract class LaunchConfigurationDelegate implements ILaunchConfiguratio
protected void buildProjects(final IProject[] projects, IProgressMonitor monitor) throws CoreException {
IWorkspaceRunnable build = new IWorkspaceRunnable(){
public void run(IProgressMonitor pm) throws CoreException {
+ SubMonitor localmonitor = SubMonitor.convert(pm, DebugCoreMessages.LaunchConfigurationDelegate_scoped_incremental_build, projects.length);
try {
- if (pm != null) {
- pm.beginTask("", projects.length); //$NON-NLS-1$
- }
for (int i = 0; i < projects.length; i++ ) {
- if (pm != null && pm.isCanceled()) {
+ if (localmonitor.isCanceled()) {
throw new OperationCanceledException();
}
- projects[i].build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new SubProgressMonitor(pm, 1));
+ projects[i].build(IncrementalProjectBuilder.INCREMENTAL_BUILD, localmonitor.newChild(1));
}
} finally {
- if (pm != null) {
- pm.done();
- }
+ localmonitor.done();
}
}
};
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.java
index 65b8f9740..23dca1e58 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.java
@@ -81,6 +81,8 @@ public class DebugCoreMessages extends NLS {
public static String LaunchConfiguration_Failed_to_delete_launch_configuration__1;
public static String LaunchConfigurationDelegate_6;
public static String LaunchConfigurationDelegate_7;
+
+ public static String LaunchConfigurationDelegate_scoped_incremental_build;
public static String LaunchConfigurationInfo_Attribute__0__is_not_of_type_boolean__3;
public static String LaunchConfigurationInfo_Attribute__0__is_not_of_type_int__2;
public static String LaunchConfigurationInfo_Attribute__0__is_not_of_type_java_lang_String__1;
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.properties b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.properties
index a7e3aa31b..a9f99dcbc 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.properties
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.properties
@@ -47,6 +47,7 @@ LaunchConfiguration_18=Invalid launch configuration memento: missing path attrib
LaunchConfiguration_19=Invalid launch configuration memento: missing local attribute
LaunchConfigurationDelegate_6=Searching for errors
LaunchConfigurationDelegate_7=Searching for errors in {0}
+LaunchConfigurationDelegate_scoped_incremental_build=Scoped incremental build before launch...
LaunchConfigurationInfo_Attribute__0__is_not_of_type_boolean__3=Attribute {0} is not of type boolean.
LaunchConfigurationInfo_Attribute__0__is_not_of_type_int__2=Attribute {0} is not of type int.
LaunchConfigurationInfo_Attribute__0__is_not_of_type_java_lang_String__1=Attribute {0} is not of type java.lang.String.

Back to the top