mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 18:26:01 +02:00
Code Issues Wiki Activity

Remove the monitor.setCancelled() call.

Browse source 
access Widget SWT libary.
This commit is contained in:
Alain Magloire 2003-09-04 15:39:20 +00:00
parent 962a76717e
commit 46c06a4a71
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeBuilder.java
View file

@ -92,7 +92,6 @@ public class MakeBuilder extends ACBuilder {
private boolean invokeMake(int kind, IMakeBuilderInfo info, IProgressMonitor monitor) { private boolean invokeMake(int kind, IMakeBuilderInfo info, IProgressMonitor monitor) {
boolean isClean = false; boolean isClean = false;
boolean isCanceled = false;
IProject currProject = getProject(); IProject currProject = getProject();
SubProgressMonitor subMonitor = null; SubProgressMonitor subMonitor = null;
@ -171,13 +170,14 @@ public class MakeBuilder extends ACBuilder {
if (launcher.waitAndRead(stdout, stderr, subMonitor) != CommandLauncher.OK) if (launcher.waitAndRead(stdout, stderr, subMonitor) != CommandLauncher.OK)
errMsg = launcher.getErrorMessage(); errMsg = launcher.getErrorMessage();
isCanceled = monitor.isCanceled();
monitor.setCanceled(false);
subMonitor = new SubProgressMonitor(monitor, IProgressMonitor.UNKNOWN); subMonitor = new SubProgressMonitor(monitor, IProgressMonitor.UNKNOWN);
subMonitor.subTask(MakeCorePlugin.getResourceString("MakeBuilder.Updating_project")); //$NON-NLS-1$ subMonitor.subTask(MakeCorePlugin.getResourceString("MakeBuilder.Updating_project")); //$NON-NLS-1$
try { try {
currProject.refreshLocal(IResource.DEPTH_INFINITE, subMonitor); // Do not allow the cancel of the refresh, since the builder is external
// to Eclipse, files may have been created/modified and we will be out-of-sync.
// The caveat is for hugue projects, it may take sometimes at every build.
currProject.refreshLocal(IResource.DEPTH_INFINITE, null);
} catch (CoreException e) { } catch (CoreException e) {
} }
} else { } else {
@ -205,7 +205,6 @@ public class MakeBuilder extends ACBuilder {
epm.reportProblems(); epm.reportProblems();
subMonitor.done(); subMonitor.done();
monitor.setCanceled(isCanceled);
} }
} catch (Exception e) { } catch (Exception e) {
CCorePlugin.log(e); CCorePlugin.log(e);