Fix incorrect SubMonitor usage patterns

vogella · vogella · commit 0da857c02e1b · 2025-11-14T02:28:45.000+01:00
This commit addresses several SubMonitor anti-patterns identified throughout the codebase, based on best practices from the Eclipse article on Progress Monitors. Changes made: 1. Remove unnecessary null checks before SubMonitor.convert() - SubMonitor.convert() can handle null monitors - Fixed in team Policy.java files (core and ui) 2. Remove unnecessary SubMonitor.done() calls - SubMonitor.done() is a no-op and should not be called - Removed 27 instances across resources and team bundles: * org.eclipse.core.filesystem: LocalFile.java (2 calls) * org.eclipse.core.resources: File.java (6), Folder.java (1), Project.java (3), SaveManager.java (4), Workspace.java (7) * org.eclipse.compare.core: RangeComparatorLCS.java (1) * org.eclipse.compare: AddFromHistoryAction.java (1) * org.eclipse.team.core: BundleImporterDelegate.java (1), Subscriber.java (1) 3. Remove redundant cancellation checks before split() - SubMonitor.split() already checks for cancellation - Fixed in AutoBuildJob.java Reference: https://www.eclipse.org/articles/Article-Progress-Monitors/article.html
diff --git a/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFile.java b/resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFile.java
@@ -179,8 +179,6 @@ protected void copyFile(IFileInfo sourceInfo, IFileStore destination, int option
 				Policy.error(EFS.ERROR_EXISTS, NLS.bind(Messages.fileExists, target.filePath), e);
 			} catch (IOException e) {
 				Policy.error(EFS.ERROR_WRITE, NLS.bind(Messages.failedCopy, this.filePath, target.filePath), e);
-			} finally {
-				subMonitor.done();
 			}
 		} else {
 			super.copyFile(sourceInfo, destination, options, monitor);
@@ -503,8 +501,6 @@ public void move(IFileStore destFile, int options, IProgressMonitor monitor) thr
 			}
 			// fall back to default implementation
 			super.move(destFile, options, subMonitor.newChild(1));
-		} finally {
-			subMonitor.done();
 		}
 	}
 
diff --git a/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/events/AutoBuildJob.java b/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/events/AutoBuildJob.java
@@ -297,7 +297,7 @@ public void preferenceChange(PreferenceChangeEvent event) {
 	public IStatus run(IProgressMonitor monitor) {
 		SubMonitor subMonitor = SubMonitor.convert(monitor, 1);
 		synchronized (this) {
-			if (subMonitor.isCanceled() || isInterrupted()) {
+			if (isInterrupted()) {
 				return canceled();
 			}
 		}
diff --git a/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/File.java b/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/File.java
@@ -91,8 +91,6 @@ public void appendContents(InputStream content, int updateFlags, IProgressMonito
 			}
 		} catch (IOException streamCloseIgnored) {
 			// ignore;
-		} finally {
-			subMonitor.done();
 		}
 	}
 
@@ -163,8 +161,6 @@ public void create(InputStream content, int updateFlags, IProgressMonitor monito
 			}
 		} catch (IOException streamCloseIgnored) {
 			// ignore;
-		} finally {
-			subMonitor.done();
 		}
 	}
 
@@ -207,8 +203,6 @@ public void create(byte[] content, int updateFlags, IProgressMonitor monitor) th
 			} finally {
 				workspace.endOperation(rule, true);
 			}
-		} finally {
-			subMonitor.done();
 		}
 	}
 
@@ -244,7 +238,6 @@ IFileInfo create(int updateFlags, IProgressMonitor subMonitor, IFileStore store)
 				throw new ResourceException(IResourceStatus.FAILED_WRITE_LOCAL, getFullPath(), message, null);
 			}
 		}
-		subMonitor.done();
 
 		workspace.createResource(this, updateFlags);
 		return localInfo;
@@ -510,8 +503,6 @@ public void setContents(InputStream content, int updateFlags, IProgressMonitor m
 			}
 		} catch (IOException streamCloseIgnored) {
 			// ignore;
-		} finally {
-			subMonitor.done();
 		}
 	}
 	@Override
@@ -541,8 +532,6 @@ public void setContents(byte[] content, int updateFlags, IProgressMonitor monito
 			} finally {
 				workspace.endOperation(rule, true);
 			}
-		} finally {
-			subMonitor.done();
 		}
 	}
 
@@ -616,7 +605,6 @@ public void setCharset(String newCharset, IProgressMonitor monitor) throws CoreE
 			workspace.getWorkManager().operationCanceled();
 			throw e;
 		} finally {
-			subMonitor.done();
 			workspace.endOperation(rule, true);
 		}
 	}
diff --git a/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Folder.java b/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Folder.java
@@ -118,7 +118,6 @@ public void create(int updateFlags, boolean local, IProgressMonitor monitor) thr
 			workspace.getWorkManager().operationCanceled();
 			throw e;
 		} finally {
-			subMonitor.done();
 			workspace.endOperation(rule, true);
 		}
 	}
diff --git a/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Project.java b/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Project.java
@@ -252,7 +252,6 @@ public void close(IProgressMonitor monitor) throws CoreException {
 			workspace.getWorkManager().operationCanceled();
 			throw e;
 		} finally {
-			subMonitor.done();
 			workspace.endOperation(rule, true);
 		}
 	}
@@ -360,7 +359,6 @@ public void create(IProjectDescription description, int updateFlags, IProgressMo
 			workspace.getWorkManager().operationCanceled();
 			throw e;
 		} finally {
-			subMonitor.done();
 			workspace.endOperation(rule, true);
 		}
 	}
@@ -647,8 +645,6 @@ public void run(IProgressMonitor innerMonitor) throws CoreException {
 							workspace.endOperation(notificationsRule, false);
 						}
 					}
-				} finally {
-					subMonitor.done();
 				}
 			}
 
diff --git a/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/SaveManager.java b/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/SaveManager.java
@@ -274,8 +274,6 @@ public void run() throws Exception {
 				SafeRunner.run(code);
 				subMonitor.worked(1);
 			}
-		} finally {
-			subMonitor.done();
 		}
 	}
 
@@ -1603,8 +1601,6 @@ protected void snapTree(ElementTree tree, IProgressMonitor monitor) throws CoreE
 			if (Policy.DEBUG_SAVE_TREE) {
 				Policy.debug("Snapshot Workspace Tree: " + (System.currentTimeMillis() - start) + "ms"); //$NON-NLS-1$ //$NON-NLS-2$
 			}
-		} finally {
-			subMonitor.done();
 		}
 	}
 
@@ -2181,7 +2177,6 @@ protected void writeTree(Map<String, ElementTree> statesToSave, DataOutputStream
 				output.writeUTF(string);
 			}
 		} finally {
-			subMonitor.done();
 			if (!wasImmutable) {
 				workspace.newWorkingTree();
 			}
@@ -2257,7 +2252,6 @@ protected void writeTree(Project project, DataOutputStream output, IProgressMoni
 				output.writeUTF(string);
 			}
 		} finally {
-			subMonitor.done();
 			if (!wasImmutable) {
 				workspace.newWorkingTree();
 			}
diff --git a/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Workspace.java b/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Workspace.java
@@ -632,7 +632,6 @@ private void buildInternal(IBuildConfiguration[] requestedConfigs, int trigger,
 				throw new ResourceException(result);
 			}
 		} finally {
-			subMonitor.done();
 			// building may close the tree, but we are still inside an operation so open it
 			if (tree.isImmutable()) {
 				newWorkingTree();
@@ -1135,7 +1134,6 @@ public IStatus copy(IResource[] resources, IPath destination, int updateFlags, I
 			getWorkManager().operationCanceled();
 			throw e;
 		} finally {
-			subMonitor.done();
 			endOperation(getRoot(), true);
 		}
 		if (status.matches(IStatus.ERROR)) {
@@ -1529,7 +1527,6 @@ public IStatus delete(IResource[] resources, int updateFlags, IProgressMonitor m
 			getWorkManager().operationCanceled();
 			throw e;
 		} finally {
-			subMonitor.done();
 			endOperation(getRoot(), true);
 		}
 	}
@@ -2206,7 +2203,6 @@ public IStatus move(IResource[] resources, IPath destination, int updateFlags, I
 			getWorkManager().operationCanceled();
 			throw e;
 		} finally {
-			subMonitor.done();
 			endOperation(getRoot(), true);
 		}
 		if (status.matches(IStatus.ERROR)) {
@@ -2512,7 +2508,6 @@ public void run(ICoreRunnable action, ISchedulingRule rule, int options, IProgre
 			}
 			throw e;
 		} finally {
-			subMonitor.done();
 			if (avoidNotification) {
 				notificationManager.endAvoidNotify();
 			}
@@ -2641,7 +2636,6 @@ protected void shutdown(IProgressMonitor monitor) throws CoreException {
 				throw new CoreException(status);
 			}
 		} finally {
-			subMonitor.done();
 		}
 	}
 
@@ -2941,8 +2935,6 @@ private void createMultiple(ConcurrentMap<File, byte[]> filesToCreate, int updat
 			} finally {
 				endOperation(rule, true);
 			}
-		} finally {
-			subMonitor.done();
 		}
 	}
 }
diff --git a/team/bundles/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeComparatorLCS.java b/team/bundles/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeComparatorLCS.java
@@ -135,8 +135,6 @@ public RangeDifference[] getDifferences(SubMonitor subMonitor, AbstractRangeDiff
 
 			}
 			return differences.toArray(new RangeDifference[differences.size()]);
-		} finally {
-			subMonitor.done();
 		}
 	}
 
diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.java
@@ -130,11 +130,7 @@ public void execute(IProgressMonitor pm) throws InvocationTargetException {
 						IFileState fileState = s.fFileState;
 						createContainers(file);
 						SubMonitor subMonitor= SubMonitor.convert(pm, 1);
-						try {
-							file.create(fileState.getContents(), false, subMonitor);
-						} finally {
-							subMonitor.done();
-						}
+						file.create(fileState.getContents(), false, subMonitor);
 					}
 				} catch (CoreException e) {
 					throw new InvocationTargetException(e);
diff --git a/team/bundles/org.eclipse.team.core/src/org/eclipse/team/core/importing/provisional/BundleImporterDelegate.java b/team/bundles/org.eclipse.team.core/src/org/eclipse/team/core/importing/provisional/BundleImporterDelegate.java
@@ -103,7 +103,6 @@ public IProject[] performImport(ScmUrlImportDescription[] descriptions, IProgres
 			if (!references.isEmpty()) {
 				SubMonitor subMonitor = SubMonitor.convert(monitor, references.size());
 				result = psfCapability.addToWorkspace(references.toArray(new String[references.size()]), new ProjectSetSerializationContext(), subMonitor);
-				subMonitor.done();
 			}
 		}
 		return result;
diff --git a/team/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/Subscriber.java b/team/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/Subscriber.java
@@ -269,7 +269,6 @@ public void collectOutOfSync(IResource[] resources, int depth, SyncInfoSet set,
 				IProgressMonitor subMonitor = Policy.subMonitorFor(monitor, 100);
 				subMonitor.beginTask(null, IProgressMonitor.UNKNOWN);
 				collect(resource, depth, set, subMonitor);
-				subMonitor.done();
 			}
 		} finally {
 			monitor.done();
diff --git a/team/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/Policy.java b/team/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/Policy.java
@@ -54,9 +54,6 @@ public static IProgressMonitor monitorFor(IProgressMonitor monitor) {
 	}
 
 	public static IProgressMonitor subMonitorFor(IProgressMonitor monitor, int ticks) {
-		if (monitor == null) {
-			return new NullProgressMonitor();
-		}
 		if (monitor instanceof NullProgressMonitor) {
 			return monitor;
 		}
diff --git a/team/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Policy.java b/team/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Policy.java
@@ -69,9 +69,6 @@ public static void checkCanceled(IProgressMonitor monitor) {
 	}
 
 	public static IProgressMonitor subMonitorFor(IProgressMonitor monitor, int ticks) {
-		if (monitor == null) {
-			return new NullProgressMonitor();
-		}
 		if (monitor instanceof NullProgressMonitor) {
 			return monitor;
 		}

Original file line number	Diff line number	Diff line change
`@@ -179,8 +179,6 @@ protected void copyFile(IFileInfo sourceInfo, IFileStore destination, int option`
`179`	`179`	`Policy.error(EFS.ERROR_EXISTS, NLS.bind(Messages.fileExists, target.filePath), e);`
`180`	`180`	`} catch (IOException e) {`
`181`	`181`	`Policy.error(EFS.ERROR_WRITE, NLS.bind(Messages.failedCopy, this.filePath, target.filePath), e);`
`182`		`- } finally {`
`183`		`- subMonitor.done();`
`184`	`182`	`}`
`185`	`183`	`} else {`
`186`	`184`	`super.copyFile(sourceInfo, destination, options, monitor);`
`@@ -503,8 +501,6 @@ public void move(IFileStore destFile, int options, IProgressMonitor monitor) thr`
`503`	`501`	`}`
`504`	`502`	`// fall back to default implementation`
`505`	`503`	`super.move(destFile, options, subMonitor.newChild(1));`
`506`		`- } finally {`
`507`		`- subMonitor.done();`
`508`	`504`	`}`
`509`	`505`	`}`
`510`	`506`
Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ public void preferenceChange(PreferenceChangeEvent event) {`
`297`	`297`	`public IStatus run(IProgressMonitor monitor) {`
`298`	`298`	`SubMonitor subMonitor = SubMonitor.convert(monitor, 1);`
`299`	`299`	`synchronized (this) {`
`300`		`- if (subMonitor.isCanceled() \|\| isInterrupted()) {`
	`300`	`+ if (isInterrupted()) {`
`301`	`301`	`return canceled();`
`302`	`302`	`}`
`303`	`303`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,8 +91,6 @@ public void appendContents(InputStream content, int updateFlags, IProgressMonito`
`91`	`91`	`}`
`92`	`92`	`} catch (IOException streamCloseIgnored) {`
`93`	`93`	`// ignore;`
`94`		`- } finally {`
`95`		`- subMonitor.done();`
`96`	`94`	`}`
`97`	`95`	`}`
`98`	`96`
`@@ -163,8 +161,6 @@ public void create(InputStream content, int updateFlags, IProgressMonitor monito`
`163`	`161`	`}`
`164`	`162`	`} catch (IOException streamCloseIgnored) {`
`165`	`163`	`// ignore;`
`166`		`- } finally {`
`167`		`- subMonitor.done();`
`168`	`164`	`}`
`169`	`165`	`}`
`170`	`166`
`@@ -207,8 +203,6 @@ public void create(byte[] content, int updateFlags, IProgressMonitor monitor) th`
`207`	`203`	`} finally {`
`208`	`204`	`workspace.endOperation(rule, true);`
`209`	`205`	`}`
`210`		`- } finally {`
`211`		`- subMonitor.done();`
`212`	`206`	`}`
`213`	`207`	`}`
`214`	`208`
`@@ -244,7 +238,6 @@ IFileInfo create(int updateFlags, IProgressMonitor subMonitor, IFileStore store)`
`244`	`238`	`throw new ResourceException(IResourceStatus.FAILED_WRITE_LOCAL, getFullPath(), message, null);`
`245`	`239`	`}`
`246`	`240`	`}`
`247`		`- subMonitor.done();`
`248`	`241`
`249`	`242`	`workspace.createResource(this, updateFlags);`
`250`	`243`	`return localInfo;`
`@@ -510,8 +503,6 @@ public void setContents(InputStream content, int updateFlags, IProgressMonitor m`
`510`	`503`	`}`
`511`	`504`	`} catch (IOException streamCloseIgnored) {`
`512`	`505`	`// ignore;`
`513`		`- } finally {`
`514`		`- subMonitor.done();`
`515`	`506`	`}`
`516`	`507`	`}`
`517`	`508`	`@Override`
`@@ -541,8 +532,6 @@ public void setContents(byte[] content, int updateFlags, IProgressMonitor monito`
`541`	`532`	`} finally {`
`542`	`533`	`workspace.endOperation(rule, true);`
`543`	`534`	`}`
`544`		`- } finally {`
`545`		`- subMonitor.done();`
`546`	`535`	`}`
`547`	`536`	`}`
`548`	`537`
`@@ -616,7 +605,6 @@ public void setCharset(String newCharset, IProgressMonitor monitor) throws CoreE`
`616`	`605`	`workspace.getWorkManager().operationCanceled();`
`617`	`606`	`throw e;`
`618`	`607`	`} finally {`
`619`		`- subMonitor.done();`
`620`	`608`	`workspace.endOperation(rule, true);`
`621`	`609`	`}`
`622`	`610`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,6 @@ public void create(int updateFlags, boolean local, IProgressMonitor monitor) thr`
`118`	`118`	`workspace.getWorkManager().operationCanceled();`
`119`	`119`	`throw e;`
`120`	`120`	`} finally {`
`121`		`- subMonitor.done();`
`122`	`121`	`workspace.endOperation(rule, true);`
`123`	`122`	`}`
`124`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,6 @@ public void close(IProgressMonitor monitor) throws CoreException {`
`252`	`252`	`workspace.getWorkManager().operationCanceled();`
`253`	`253`	`throw e;`
`254`	`254`	`} finally {`
`255`		`- subMonitor.done();`
`256`	`255`	`workspace.endOperation(rule, true);`
`257`	`256`	`}`
`258`	`257`	`}`
`@@ -360,7 +359,6 @@ public void create(IProjectDescription description, int updateFlags, IProgressMo`
`360`	`359`	`workspace.getWorkManager().operationCanceled();`
`361`	`360`	`throw e;`
`362`	`361`	`} finally {`
`363`		`- subMonitor.done();`
`364`	`362`	`workspace.endOperation(rule, true);`
`365`	`363`	`}`
`366`	`364`	`}`
`@@ -647,8 +645,6 @@ public void run(IProgressMonitor innerMonitor) throws CoreException {`
`647`	`645`	`workspace.endOperation(notificationsRule, false);`
`648`	`646`	`}`
`649`	`647`	`}`
`650`		`- } finally {`
`651`		`- subMonitor.done();`
`652`	`648`	`}`
`653`	`649`	`}`
`654`	`650`
Original file line number	Diff line number	Diff line change
`@@ -274,8 +274,6 @@ public void run() throws Exception {`
`274`	`274`	`SafeRunner.run(code);`
`275`	`275`	`subMonitor.worked(1);`
`276`	`276`	`}`
`277`		`- } finally {`
`278`		`- subMonitor.done();`
`279`	`277`	`}`
`280`	`278`	`}`
`281`	`279`
`@@ -1603,8 +1601,6 @@ protected void snapTree(ElementTree tree, IProgressMonitor monitor) throws CoreE`
`1603`	`1601`	`if (Policy.DEBUG_SAVE_TREE) {`
`1604`	`1602`	`Policy.debug("Snapshot Workspace Tree: " + (System.currentTimeMillis() - start) + "ms"); //$NON-NLS-1$ //$NON-NLS-2$`
`1605`	`1603`	`}`
`1606`		`- } finally {`
`1607`		`- subMonitor.done();`
`1608`	`1604`	`}`
`1609`	`1605`	`}`
`1610`	`1606`
`@@ -2181,7 +2177,6 @@ protected void writeTree(Map<String, ElementTree> statesToSave, DataOutputStream`
`2181`	`2177`	`output.writeUTF(string);`
`2182`	`2178`	`}`
`2183`	`2179`	`} finally {`
`2184`		`- subMonitor.done();`
`2185`	`2180`	`if (!wasImmutable) {`
`2186`	`2181`	`workspace.newWorkingTree();`
`2187`	`2182`	`}`
`@@ -2257,7 +2252,6 @@ protected void writeTree(Project project, DataOutputStream output, IProgressMoni`
`2257`	`2252`	`output.writeUTF(string);`
`2258`	`2253`	`}`
`2259`	`2254`	`} finally {`
`2260`		`- subMonitor.done();`
`2261`	`2255`	`if (!wasImmutable) {`
`2262`	`2256`	`workspace.newWorkingTree();`
`2263`	`2257`	`}`
Original file line number	Diff line number	Diff line change
`@@ -632,7 +632,6 @@ private void buildInternal(IBuildConfiguration[] requestedConfigs, int trigger,`
`632`	`632`	`throw new ResourceException(result);`
`633`	`633`	`}`
`634`	`634`	`} finally {`
`635`		`- subMonitor.done();`
`636`	`635`	`// building may close the tree, but we are still inside an operation so open it`
`637`	`636`	`if (tree.isImmutable()) {`
`638`	`637`	`newWorkingTree();`
`@@ -1135,7 +1134,6 @@ public IStatus copy(IResource[] resources, IPath destination, int updateFlags, I`
`1135`	`1134`	`getWorkManager().operationCanceled();`
`1136`	`1135`	`throw e;`
`1137`	`1136`	`} finally {`
`1138`		`- subMonitor.done();`
`1139`	`1137`	`endOperation(getRoot(), true);`
`1140`	`1138`	`}`
`1141`	`1139`	`if (status.matches(IStatus.ERROR)) {`
`@@ -1529,7 +1527,6 @@ public IStatus delete(IResource[] resources, int updateFlags, IProgressMonitor m`
`1529`	`1527`	`getWorkManager().operationCanceled();`
`1530`	`1528`	`throw e;`
`1531`	`1529`	`} finally {`
`1532`		`- subMonitor.done();`
`1533`	`1530`	`endOperation(getRoot(), true);`
`1534`	`1531`	`}`
`1535`	`1532`	`}`
`@@ -2206,7 +2203,6 @@ public IStatus move(IResource[] resources, IPath destination, int updateFlags, I`
`2206`	`2203`	`getWorkManager().operationCanceled();`
`2207`	`2204`	`throw e;`
`2208`	`2205`	`} finally {`
`2209`		`- subMonitor.done();`
`2210`	`2206`	`endOperation(getRoot(), true);`
`2211`	`2207`	`}`
`2212`	`2208`	`if (status.matches(IStatus.ERROR)) {`
`@@ -2512,7 +2508,6 @@ public void run(ICoreRunnable action, ISchedulingRule rule, int options, IProgre`
`2512`	`2508`	`}`
`2513`	`2509`	`throw e;`
`2514`	`2510`	`} finally {`
`2515`		`- subMonitor.done();`
`2516`	`2511`	`if (avoidNotification) {`
`2517`	`2512`	`notificationManager.endAvoidNotify();`
`2518`	`2513`	`}`
`@@ -2641,7 +2636,6 @@ protected void shutdown(IProgressMonitor monitor) throws CoreException {`
`2641`	`2636`	`throw new CoreException(status);`
`2642`	`2637`	`}`
`2643`	`2638`	`} finally {`
`2644`		`- subMonitor.done();`
`2645`	`2639`	`}`
`2646`	`2640`	`}`
`2647`	`2641`
`@@ -2941,8 +2935,6 @@ private void createMultiple(ConcurrentMap<File, byte[]> filesToCreate, int updat`
`2941`	`2935`	`} finally {`
`2942`	`2936`	`endOperation(rule, true);`
`2943`	`2937`	`}`
`2944`		`- } finally {`
`2945`		`- subMonitor.done();`
`2946`	`2938`	`}`
`2947`	`2939`	`}`
`2948`	`2940`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,8 +135,6 @@ public RangeDifference[] getDifferences(SubMonitor subMonitor, AbstractRangeDiff`
`135`	`135`
`136`	`136`	`}`
`137`	`137`	`return differences.toArray(new RangeDifference[differences.size()]);`
`138`		`- } finally {`
`139`		`- subMonitor.done();`
`140`	`138`	`}`
`141`	`139`	`}`
`142`	`140`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,6 @@ public IProject[] performImport(ScmUrlImportDescription[] descriptions, IProgres`
`103`	`103`	`if (!references.isEmpty()) {`
`104`	`104`	`SubMonitor subMonitor = SubMonitor.convert(monitor, references.size());`
`105`	`105`	`result = psfCapability.addToWorkspace(references.toArray(new String[references.size()]), new ProjectSetSerializationContext(), subMonitor);`
`106`		`- subMonitor.done();`
`107`	`106`	`}`
`108`	`107`	`}`
`109`	`108`	`return result;`