Bug 531433 - Replace usage of SubProgressMonitor by SubMonitorI20180311-2000I20180310-1500I20180309-2000

Change-Id: I68e635f60614b9a923c8c848c17115b6e9275a30
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>

4 files changed, 9 insertions, 9 deletions

diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Policy.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Policy.java
index 28c30b8f4..8a189a8b0 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Policy.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Policy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 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
@@ -66,7 +66,7 @@ public class Policy {
 			return new NullProgressMonitor();
 		if (monitor instanceof NullProgressMonitor)
 			return monitor;
-		return new SubProgressMonitor(monitor, ticks);
+		return SubMonitor.convert(monitor, ticks);
 	}
 
 	public static IProgressMonitor monitorFor(IProgressMonitor monitor) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveSynchronizeParticipantAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveSynchronizeParticipantAction.java
index 1bfc684c4..4dae74987 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveSynchronizeParticipantAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveSynchronizeParticipantAction.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 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
@@ -176,7 +176,7 @@ public class RemoveSynchronizeParticipantAction extends Action {
 				Saveable model = (Saveable) i.next();
 				if (model.isDirty()) {
 					try {
-						model.doSave(new SubProgressMonitor(monitor, 1));
+						model.doSave(SubMonitor.convert(monitor, 1));
 					} catch (CoreException e) {
 						ErrorDialog.openError(view.getSite().getShell(), null, e.getMessage(), e.getStatus());
 					}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationWizard.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationWizard.java
index 509fd2b11..4cf400ef2 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationWizard.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationWizard.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
+ * Copyright (c) 2009, 2018 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
@@ -163,7 +163,7 @@ public class ApplyPatchSynchronizationWizard extends PatchWizard implements
 				for (int i = 0; i < projects.length; i++) {
 					IProject project = projects[i];
 					try {
-						project.open(new SubProgressMonitor(monitor, 1));
+						project.open(SubMonitor.convert(monitor, 1));
 					} catch (CoreException e) {
 						errorStatus.add(e.getStatus());
 					}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ProjectSetExportWizard.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ProjectSetExportWizard.java
index 3a972d55c..8c62beb40 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ProjectSetExportWizard.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ProjectSetExportWizard.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 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
@@ -131,7 +131,7 @@ public class ProjectSetExportWizard extends Wizard implements IExportWizard {
 							ProjectSetCapability serializer = providerType.getProjectSetCapability();
 							ProjectSetCapability.ensureBackwardsCompatible(providerType, serializer);
 							if (serializer != null) {
-								String[] references = serializer.asReference(projectArray, context, new SubProgressMonitor(monitor, 990));
+								String[] references = serializer.asReference(projectArray, context, SubMonitor.convert(monitor, 990));
 								for (int i = 0; i < references.length; i++) {
 									IMemento proj = memento.createChild("project"); //$NON-NLS-1$
 									proj.putString("reference", references[i]); //$NON-NLS-1$
@@ -175,7 +175,7 @@ public class ProjectSetExportWizard extends Wizard implements IExportWizard {
 						if (type != null) {
 							ProjectSetCapability capability = type.getProjectSetCapability();
 							if (capability != null) {
-								capability.projectSetCreated(file, context, new SubProgressMonitor(monitor, 10));
+								capability.projectSetCreated(file, context, SubMonitor.convert(monitor, 10));
 							}
 						}
 					}