Bug 477790 - Change usage of SubProgressMonitor to SubMonitor inI20151014-1100

org.eclipse.jdt.core

Change-Id: Ie0954894d4ce9ea52b2346b0efe9814d9c52d364

9 files changed, 33 insertions, 33 deletions

diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/rewrite/ImportRewrite.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/rewrite/ImportRewrite.java
index 55023d2bca..812e16f091 100644
--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/rewrite/ImportRewrite.java
+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/rewrite/ImportRewrite.java
@@ -25,7 +25,7 @@ import java.util.Set;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.jdt.core.Flags;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.IImportDeclaration;
@@ -1149,7 +1149,7 @@ public final class ImportRewrite {
 				parser.setSource(this.compilationUnit);
 				parser.setFocalPosition(0); // reduced AST
 				parser.setResolveBindings(false);
-				usedAstRoot= (CompilationUnit) parser.createAST(new SubProgressMonitor(monitor, 1));
+				usedAstRoot= (CompilationUnit) parser.createAST(SubMonitor.convert(monitor, 1));
 			}
 
 			ImportRewriteConfiguration config= buildImportRewriteConfiguration();
@@ -1177,7 +1177,7 @@ public final class ImportRewrite {
 				computer.requireExplicitImport(true, staticExplicitSimpleName);
 			}
 
-			ImportRewriteAnalyzer.RewriteResult result= computer.analyzeRewrite(new SubProgressMonitor(monitor, 1));
+			ImportRewriteAnalyzer.RewriteResult result= computer.analyzeRewrite(SubMonitor.convert(monitor, 1));
 
 			this.createdImports= result.getCreatedImports();
 			this.createdStaticImports= result.getCreatedStaticImports();
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java
index fa4d46bc8a..aff762fed6 100644
--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java
+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java
@@ -124,7 +124,7 @@ import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.core.runtime.jobs.ISchedulingRule;
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
@@ -4061,10 +4061,10 @@ public final class JavaCore extends Plugin {
 
 			// initialize all containers and variables
 			JavaModelManager manager = JavaModelManager.getJavaModelManager();
-			SubProgressMonitor subMonitor = null;
+			SubMonitor subMonitor = null;
 			try {
 				if (monitor != null) {
-					subMonitor = new SubProgressMonitor(monitor, 50); // 50% of the time is spent in initializing containers and variables
+					subMonitor = SubMonitor.convert(monitor, 50); // 50% of the time is spent in initializing containers and variables
 					subMonitor.beginTask("", 100); //$NON-NLS-1$
 					subMonitor.worked(5); // give feedback to the user that something is happening
 					manager.batchContainerInitializationsProgress.initializeAfterLoadMonitor.set(subMonitor);
@@ -4143,7 +4143,7 @@ public final class JavaCore extends Plugin {
 					monitor.subTask(Messages.javamodel_refreshing_external_jars);
 				model.refreshExternalArchives(
 					null/*refresh all projects*/,
-					monitor == null ? null : new SubProgressMonitor(monitor, 1) // 1% of the time is spent in jar refresh
+					monitor == null ? null : SubMonitor.convert(monitor, 1) // 1% of the time is spent in jar refresh
 				);
 			} catch (JavaModelException e) {
 				// refreshing failed: ignore
@@ -4181,7 +4181,7 @@ public final class JavaCore extends Plugin {
 					// will not activate index query caches if indexes are not ready, since it would take to long
 					// to wait until indexes are fully rebuild
 					IJavaSearchConstants.CANCEL_IF_NOT_READY_TO_SEARCH,
-					monitor == null ? null : new SubProgressMonitor(monitor, 49) // 49% of the time is spent in the dummy search
+					monitor == null ? null : SubMonitor.convert(monitor, 49) // 49% of the time is spent in the dummy search
 				);
 			} catch (JavaModelException e) {
 				// /search failed: ignore
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java
index e03896ac5b..94e18210cf 100644
--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java
+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java
@@ -3069,7 +3069,7 @@ public class JavaModelManager implements ISaveParticipant, IContentTypeChangeLis
 						monitor.beginTask("", projectsToTouch.length); //$NON-NLS-1$
 					}
 					for (IProject iProject : projectsToTouch) {
-						IProgressMonitor subMonitor = monitor == null ? null: new SubProgressMonitor(monitor, 1);
+						IProgressMonitor subMonitor = monitor == null ? null: SubMonitor.convert(monitor, 1);
 						if (JavaBuilder.DEBUG) {
 							System.out.println("Touching project " + iProject.getName()); //$NON-NLS-1$
 						}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelOperation.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelOperation.java
index 176079ead5..8eff5263f6 100644
--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelOperation.java
+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelOperation.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -517,7 +517,7 @@ public abstract class JavaModelOperation implements IWorkspaceRunnable, IProgres
 	protected IProgressMonitor getSubProgressMonitor(int workAmount) {
 		IProgressMonitor sub = null;
 		if (this.progressMonitor != null) {
-			sub = new SubProgressMonitor(this.progressMonitor, workAmount, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK);
+			sub = SubMonitor.convert(this.progressMonitor, workAmount);
 		}
 		return sub;
 	}
@@ -578,7 +578,7 @@ public abstract class JavaModelOperation implements IWorkspaceRunnable, IProgres
 	protected void moveResources(IResource[] resources, IPath container) throws JavaModelException {
 		IProgressMonitor subProgressMonitor = null;
 		if (this.progressMonitor != null) {
-			subProgressMonitor = new SubProgressMonitor(this.progressMonitor, resources.length, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK);
+			subProgressMonitor = SubMonitor.convert(this.progressMonitor, resources.length);
 		}
 		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
 		try {
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/IndexBasedHierarchyBuilder.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/IndexBasedHierarchyBuilder.java
index 1b090d1354..f931e3f25d 100644
--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/IndexBasedHierarchyBuilder.java
+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/IndexBasedHierarchyBuilder.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,7 +17,7 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.jdt.core.*;
 import org.eclipse.jdt.core.compiler.CharOperation;
 import org.eclipse.jdt.core.search.*;
@@ -113,7 +113,7 @@ public void build(boolean computeSubtypes) {
 			IProgressMonitor possibleSubtypesMonitor =
 				this.hierarchy.progressMonitor == null ?
 					null :
-					new SubProgressMonitor(this.hierarchy.progressMonitor, amountOfWorkForSubtypes);
+					SubMonitor.convert(this.hierarchy.progressMonitor, amountOfWorkForSubtypes);
 			HashSet localTypes = new HashSet(10); // contains the paths that have potential subtypes that are local/anonymous types
 			String[] allPossibleSubtypes;
 			if (((Member)focusType).getOuterMostLocalContext() == null) {
@@ -127,7 +127,7 @@ public void build(boolean computeSubtypes) {
 				IProgressMonitor buildMonitor =
 					this.hierarchy.progressMonitor == null ?
 						null :
-						new SubProgressMonitor(this.hierarchy.progressMonitor, 100 - amountOfWorkForSubtypes);
+						SubMonitor.convert(this.hierarchy.progressMonitor, 100 - amountOfWorkForSubtypes);
 				this.hierarchy.initialize(allPossibleSubtypes.length);
 				buildFromPotentialSubtypes(allPossibleSubtypes, localTypes, buildMonitor);
 			}
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/RegionBasedHierarchyBuilder.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/RegionBasedHierarchyBuilder.java
index 70118f576b..3545ef7959 100644
--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/RegionBasedHierarchyBuilder.java
+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/RegionBasedHierarchyBuilder.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,7 +16,7 @@ import java.util.Iterator;
 import java.util.Map;
 
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.jdt.core.IClassFile;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.IJavaElement;
@@ -50,13 +50,13 @@ public void build(boolean computeSubtypes) {
 			IProgressMonitor typeInRegionMonitor =
 				this.hierarchy.progressMonitor == null ?
 					null :
-					new SubProgressMonitor(this.hierarchy.progressMonitor, 30);
+					SubMonitor.convert(this.hierarchy.progressMonitor, 30);
 			HashMap allOpenablesInRegion = determineOpenablesInRegion(typeInRegionMonitor);
 			this.hierarchy.initialize(allOpenablesInRegion.size());
 			IProgressMonitor buildMonitor =
 				this.hierarchy.progressMonitor == null ?
 					null :
-					new SubProgressMonitor(this.hierarchy.progressMonitor, 70);
+					SubMonitor.convert(this.hierarchy.progressMonitor, 70);
 			createTypeHierarchyBasedOnRegion(allOpenablesInRegion, buildMonitor);
 			((RegionBasedTypeHierarchy)this.hierarchy).pruneDeadBranches();
 		} else {
diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/BasicSearchEngine.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/BasicSearchEngine.java
index fa43a286f8..b8e8c23ba0 100644
--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/BasicSearchEngine.java
+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/BasicSearchEngine.java
@@ -215,7 +215,7 @@ public class BasicSearchEngine {
 					indexManager.performConcurrentJob(
 						new PatternSearchJob(pattern, participant, scope, pathCollector),
 						IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH,
-						monitor==null ? null : new SubProgressMonitor(monitor, 50));
+						monitor==null ? null : SubMonitor.convert(monitor, 50));
 					if (monitor != null && monitor.isCanceled()) throw new OperationCanceledException();
 
 					// locate index matches if any (note that all search matches could have been issued during index querying)
@@ -229,7 +229,7 @@ public class BasicSearchEngine {
 							indexMatches[j] = participant.getDocument(indexMatchPaths[j]);
 						}
 						SearchDocument[] matches = MatchLocator.addWorkingCopies(pattern, indexMatches, getWorkingCopies(), participant);
-						participant.locateMatches(matches, pattern, scope, requestor, monitor==null ? null : new SubProgressMonitor(monitor, 50));
+						participant.locateMatches(matches, pattern, scope, requestor, monitor==null ? null : SubMonitor.convert(monitor, 50));
 					}
 				} finally {
 					requestor.exitParticipant(participant);
@@ -646,7 +646,7 @@ public class BasicSearchEngine {
 					scope,
 					searchRequestor),
 				waitingPolicy,
-				progressMonitor == null ? null : new SubProgressMonitor(progressMonitor, 1000-copiesLength));
+				progressMonitor == null ? null : SubMonitor.convert(progressMonitor, 1000-copiesLength));
 
 			// add type names from working copies
 			if (copies != null) {
@@ -968,7 +968,7 @@ public class BasicSearchEngine {
 				waitForIndexes
 					? IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH
 					: IJavaSearchConstants.FORCE_IMMEDIATE_SEARCH,
-				progressMonitor == null ? null : new SubProgressMonitor(progressMonitor, 100));
+				progressMonitor == null ? null : SubMonitor.convert(progressMonitor, 100));
 		} catch (OperationCanceledException oce) {
 			// do nothing
 		} finally {
@@ -1140,7 +1140,7 @@ public class BasicSearchEngine {
 					scope,
 					searchRequestor),
 				waitingPolicy,
-				progressMonitor == null ? null : new SubProgressMonitor(progressMonitor, 1000-copiesLength));
+				progressMonitor == null ? null : SubMonitor.convert(progressMonitor, 1000-copiesLength));
 
 			// add type names from working copies
 			if (copies != null) {
@@ -1390,7 +1390,7 @@ public class BasicSearchEngine {
 					scope,
 					searchRequestor),
 				waitingPolicy,
-				progressMonitor == null ? null : new SubProgressMonitor(progressMonitor, 100));
+				progressMonitor == null ? null : SubMonitor.convert(progressMonitor, 100));
 
 			// add type names from working copies
 			if (copies != null) {
diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/SuperTypeNamesCollector.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/SuperTypeNamesCollector.java
index 3b450993a4..94f2505c7b 100644
--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/SuperTypeNamesCollector.java
+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/SuperTypeNamesCollector.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,7 @@
 package org.eclipse.jdt.internal.core.search.matching;
 
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.jdt.core.*;
 import org.eclipse.jdt.core.compiler.CharOperation;
 import org.eclipse.jdt.core.search.*;
@@ -274,7 +274,7 @@ protected String[] getPathsOfDeclaringType() {
 			scope,
 			searchRequestor),
 		IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH,
-		this.progressMonitor == null ? null : new SubProgressMonitor(this.progressMonitor, 100));
+		this.progressMonitor == null ? null : SubMonitor.convert(this.progressMonitor, 100));
 	return pathCollector.getPaths();
 }
 public char[][][] getSamePackageSuperTypeNames() {
diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/processing/JobManager.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/processing/JobManager.java
index e1774d9292..6a826e4754 100644
--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/processing/JobManager.java
+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/processing/JobManager.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -186,7 +186,7 @@ public abstract class JobManager implements Runnable {
 							Util.verbose("-> NOT READY - forcing immediate - " + searchJob);//$NON-NLS-1$
 						try {
 							disable(); // pause indexing
-							status = searchJob.execute(progress == null ? null : new SubProgressMonitor(progress, concurrentJobWork));
+							status = searchJob.execute(progress == null ? null : SubMonitor.convert(progress, concurrentJobWork));
 						} finally {
 							enable();
 						}
@@ -206,7 +206,7 @@ public abstract class JobManager implements Runnable {
 						try {
 							int totalWork = 1000;
 							if (progress != null) {
-								subProgress = new SubProgressMonitor(progress, concurrentJobWork * 8 / 10);
+								subProgress = SubMonitor.convert(progress, concurrentJobWork * 8 / 10);
 								subProgress.beginTask("", totalWork); //$NON-NLS-1$
 								concurrentJobWork = concurrentJobWork * 2 / 10;
 							}
@@ -274,7 +274,7 @@ public abstract class JobManager implements Runnable {
 						}
 				}
 			}
-			status = searchJob.execute(progress == null ? null : new SubProgressMonitor(progress, concurrentJobWork));
+			status = searchJob.execute(progress == null ? null : SubMonitor.convert(progress, concurrentJobWork));
 		} finally {
 			if (progress != null)
 				progress.done();