diff --git a/bundles/org.eclipse.ltk.core.refactoring/META-INF/MANIFEST.MF b/bundles/org.eclipse.ltk.core.refactoring/META-INF/MANIFEST.MF index a4fdac38f26..9f0f659919b 100644 --- a/bundles/org.eclipse.ltk.core.refactoring/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.ltk.core.refactoring/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.ltk.core.refactoring Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.ltk.core.refactoring; singleton:=true -Bundle-Version: 3.15.100.qualifier +Bundle-Version: 3.15.200.qualifier Bundle-Activator: org.eclipse.ltk.internal.core.refactoring.RefactoringCorePlugin Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName diff --git a/bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/MultiStateTextFileChange.java b/bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/MultiStateTextFileChange.java index df6a4ff778f..56737d5ddb2 100644 --- a/bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/MultiStateTextFileChange.java +++ b/bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/MultiStateTextFileChange.java @@ -435,7 +435,6 @@ public final IDocument getCurrentDocument(IProgressMonitor monitor) throws CoreE releaseDocument(result, subMon.newChild(1)); } } - subMon.done(); if (result == null) { result= new Document(); } diff --git a/bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/PerformChangeOperation.java b/bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/PerformChangeOperation.java index 6f6ac708d91..aed0be42e14 100644 --- a/bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/PerformChangeOperation.java +++ b/bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/PerformChangeOperation.java @@ -199,22 +199,18 @@ public void setSchedulingRule(ISchedulingRule rule) { @Override public void run(IProgressMonitor pm) throws CoreException { SubMonitor subMon= SubMonitor.convert(pm, 4); - try { - fChangeExecuted= false; - if (createChange()) { - // Check for cancellation before executing the change, since canceling - // during change execution is not supported - // (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=187265 ): - fCreateChangeOperation.run(subMon.split(3)); - fChange= fCreateChangeOperation.getChange(); - if (fChange != null) { - executeChange(subMon.newChild(1)); - } - } else { - executeChange(subMon.newChild(4)); + fChangeExecuted= false; + if (createChange()) { + // Check for cancellation before executing the change, since canceling + // during change execution is not supported + // (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=187265 ): + fCreateChangeOperation.run(subMon.split(3)); + fChange= fCreateChangeOperation.getChange(); + if (fChange != null) { + executeChange(subMon.newChild(1)); } - } finally { - subMon.done(); + } else { + executeChange(subMon.newChild(4)); } } diff --git a/bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/PerformRefactoringOperation.java b/bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/PerformRefactoringOperation.java index 9da22f17a29..13d537d3f84 100644 --- a/bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/PerformRefactoringOperation.java +++ b/bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/PerformRefactoringOperation.java @@ -135,7 +135,6 @@ public void run(IProgressMonitor monitor) throws CoreException { fUndo= perform.getUndoChange(); } } finally { - subMon.done(); if (fRefactoringContext != null) { fRefactoringContext.dispose(); } diff --git a/bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/Refactoring.java b/bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/Refactoring.java index 86a4dac5cc7..2f8f854ad95 100644 --- a/bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/Refactoring.java +++ b/bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/Refactoring.java @@ -162,7 +162,6 @@ public RefactoringStatus checkAllConditions(IProgressMonitor pm) throws CoreExce if (!result.hasFatalError()) { result.merge(checkFinalConditions(subMon.split(refactoringTickProvider.getCheckFinalConditionsTicks()))); } - subMon.done(); return result; } diff --git a/bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/TextChange.java b/bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/TextChange.java index aa8022c9f4d..7585514281c 100644 --- a/bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/TextChange.java +++ b/bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/TextChange.java @@ -247,7 +247,6 @@ public Change perform(IProgressMonitor pm) throws CoreException { throw Changes.asCoreException(e); } finally { releaseDocument(document, subMon.newChild(1)); - subMon.done(); } } diff --git a/bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/CheckConditionsContext.java b/bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/CheckConditionsContext.java index 82ca63804a6..14e44465e4e 100644 --- a/bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/CheckConditionsContext.java +++ b/bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/CheckConditionsContext.java @@ -23,7 +23,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubMonitor; @@ -123,11 +122,7 @@ public RefactoringStatus check(IProgressMonitor pm) throws CoreException { SubMonitor sm= SubMonitor.convert(pm, "", values.size()); //$NON-NLS-1$ for (IConditionChecker checker : values) { result.merge(checker.check(sm.split(1))); - if (pm.isCanceled()) { - throw new OperationCanceledException(); - } } - pm.done(); return result; } diff --git a/bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/ProcessorBasedRefactoring.java b/bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/ProcessorBasedRefactoring.java index 6bfc08b3fe8..bbdfd9e600f 100644 --- a/bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/ProcessorBasedRefactoring.java +++ b/bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/core/refactoring/participants/ProcessorBasedRefactoring.java @@ -232,9 +232,6 @@ public RefactoringStatus checkFinalConditions(IProgressMonitor pm) throws CoreEx if (result.hasFatalError()) { return result; } - if (sm.isCanceled()) { - throw new OperationCanceledException(); - } SharableParticipants sharableParticipants= new SharableParticipants(); // must not be shared when checkFinalConditions is called again RefactoringParticipant[] loadedParticipants= getProcessor().loadParticipants(result, sharableParticipants); @@ -270,9 +267,6 @@ public RefactoringStatus checkFinalConditions(IProgressMonitor pm) throws CoreEx stats.endRun(); - if (sm2.isCanceled()) { - throw new OperationCanceledException(); - } } if (result.hasFatalError()) { return result; @@ -292,9 +286,6 @@ public Change createChange(IProgressMonitor pm) throws CoreException { try { SubMonitor sm= SubMonitor.convert(pm, RefactoringCoreMessages.ProcessorBasedRefactoring_create_change, fParticipants.size() * 2 + 1); Change processorChange= getProcessor().createChange(sm.split(1)); - if (sm.isCanceled()) { - throw new OperationCanceledException(); - } fTextChangeMap= new HashMap<>(); addToTextChangeMap(processorChange); @@ -334,9 +325,6 @@ public Change createChange(IProgressMonitor pm) throws CoreException { disableParticipant(participant, e); throw e; } - if (sm.isCanceled()) { - throw new OperationCanceledException(); - } } fTextChangeMap= null; diff --git a/bundles/org.eclipse.ui.ide/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.ide/META-INF/MANIFEST.MF index c115a47b5f6..0d2916a41cb 100644 --- a/bundles/org.eclipse.ui.ide/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.ui.ide/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Plugin.name Bundle-SymbolicName: org.eclipse.ui.ide; singleton:=true -Bundle-Version: 3.22.800.qualifier +Bundle-Version: 3.22.900.qualifier Bundle-Activator: org.eclipse.ui.internal.ide.IDEWorkbenchPlugin Bundle-ActivationPolicy: lazy Bundle-Vendor: %Plugin.providerName diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/SmartImportJob.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/SmartImportJob.java index 8fd1ba72da3..ebe95a0234b 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/SmartImportJob.java +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/SmartImportJob.java @@ -383,7 +383,6 @@ private Set searchAndImportChildrenProjectsRecursively(final IContaine for (CrawlFolderJob job : jobs) { job.join(0, subMonitor.split(1)); } - subMonitor.done(); return res; } @@ -512,7 +511,6 @@ private Set importProjectAndChildrenRecursively(final IContainer conta // make sure this folder isn't going to be processed again excludedPaths.add(project.getLocation()); } - subMonitor.done(); return projectFromCurrentContainer; } diff --git a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/SaveableHelper.java b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/SaveableHelper.java index 582e336be34..c287f2c649f 100644 --- a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/SaveableHelper.java +++ b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/SaveableHelper.java @@ -184,21 +184,14 @@ private static boolean saveModels(ISaveablesSource modelSource, final IWorkbench IRunnableWithProgress progressOp = monitor -> { IProgressMonitor monitorWrap = new EventLoopProgressMonitor(monitor); SubMonitor subMonitor = SubMonitor.convert(monitorWrap, WorkbenchMessages.Save, dirtyModels.size()); - try { - for (Saveable model : dirtyModels) { - // handle case where this model got saved as a result of - // saving another - if (!model.isDirty()) { - subMonitor.worked(1); - continue; - } - doSaveModel(model, subMonitor.split(1), window, confirm); - if (subMonitor.isCanceled()) { - break; - } + for (Saveable model : dirtyModels) { + // handle case where this model got saved as a result of + // saving another + if (!model.isDirty()) { + subMonitor.worked(1); + continue; } - } finally { - monitorWrap.done(); + doSaveModel(model, subMonitor.split(1), window, confirm); } }; diff --git a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/SaveablesList.java b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/SaveablesList.java index 7b58f101b41..70bb621dbf0 100644 --- a/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/SaveablesList.java +++ b/bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/SaveablesList.java @@ -796,11 +796,7 @@ public boolean saveModels(final List finalModels, final IShellProvider continue; } SaveableHelper.doSaveModel(model, subMonitor.split(1), shellProvider, blockUntilSaved); - if (subMonitor.isCanceled()) { - break; - } } - monitorWrap.done(); }; // Do the save.