Bug 506217 - Delete SubMonitor.step

Change-Id: Id35cbd2cab92a7b3216d990dd1a93560c15b374b
Signed-off-by: Stefan Xenos <sxenos@gmail.com>

4 files changed, 13 insertions, 13 deletions

diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/FileSystemResourceManager.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/FileSystemResourceManager.java
index d9abdd0ea..efbf1c2b2 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/FileSystemResourceManager.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/FileSystemResourceManager.java
@@ -1146,7 +1146,7 @@ public class FileSystemResourceManager implements ICoreConstants, IManager, Pref
 				store.putInfo(fileInfo, EFS.SET_ATTRIBUTES, subMonitor.split(1));
 				restoreHiddenAttribute = true;
 			} else {
-				subMonitor.step(1);
+				subMonitor.split(1);
 			}
 			int options = append ? EFS.APPEND : EFS.NONE;
 			OutputStream out = store.openOutputStream(options, subMonitor.split(1));
@@ -1154,7 +1154,7 @@ public class FileSystemResourceManager implements ICoreConstants, IManager, Pref
 				fileInfo.setAttribute(EFS.ATTRIBUTE_HIDDEN, true);
 				store.putInfo(fileInfo, EFS.SET_ATTRIBUTES, subMonitor.split(1));
 			} else {
-				subMonitor.step(1);
+				subMonitor.split(1);
 			}
 			FileUtil.transferStreams(content, out, store.toString(), subMonitor.split(1));
 			// get the new last modified time and stash in the info
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/refresh/MonitorManager.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/refresh/MonitorManager.java
index bcd0954a4..651e39e41 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/refresh/MonitorManager.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/refresh/MonitorManager.java
@@ -294,7 +294,7 @@ class MonitorManager implements ILifecycleListener, IPathVariableChangeListener,
 		if (refreshNeeded) {
 			new PollingMonitor(refreshManager).runOnce();
 		}
-		subMonitor.step(1);
+		subMonitor.split(1);
 	}
 
 	/**
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Resource.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Resource.java
index 5145aa3ba..1ae2dd544 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Resource.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Resource.java
@@ -589,7 +589,7 @@ public abstract class Resource extends PlatformObject implements IResource, ICor
 
 			// Copy over the properties.
 			getPropertyManager().copy(this, destProject, DEPTH_ZERO);
-			progress.step(18);
+			progress.split(18);
 		} catch (OperationCanceledException e) {
 			workspace.getWorkManager().operationCanceled();
 			throw e;
@@ -652,7 +652,7 @@ public abstract class Resource extends PlatformObject implements IResource, ICor
 			if (linkDescription.isGroup())
 				info.set(M_VIRTUAL);
 			getLocalManager().link(this, localLocation, fileInfo);
-			progress.step(5);
+			progress.split(5);
 			// Save the location in the project description.
 			Project project = (Project) getProject();
 			boolean changed = project.internalGetDescription().setLinkLocation(getProjectRelativePath(), linkDescription);
@@ -665,19 +665,19 @@ public abstract class Resource extends PlatformObject implements IResource, ICor
 					throw e; // Rethrow.
 				}
 			}
-			progress.step(4);
+			progress.split(4);
 
 			// Refresh to discover any new resources below this linked location.
 			if (getType() != IResource.FILE) {
 				// Refresh either in background or foreground.
 				if ((updateFlags & IResource.BACKGROUND_REFRESH) != 0) {
 					workspace.refreshManager.refresh(this);
-					progress.step(90);
+					progress.split(90);
 				} else {
 					refreshLocal(DEPTH_INFINITE, progress.split(90));
 				}
 			} else {
-				progress.step(90);
+				progress.split(90);
 			}
 		} catch (OperationCanceledException e) {
 			workspace.getWorkManager().operationCanceled();
@@ -1624,7 +1624,7 @@ public abstract class Resource extends PlatformObject implements IResource, ICor
 			} else {
 				info.clear(ICoreConstants.M_DERIVED);
 			}
-			progress.step(98);
+			progress.split(98);
 		} catch (OperationCanceledException e) {
 			workspace.getWorkManager().operationCanceled();
 			throw e;
@@ -1657,7 +1657,7 @@ public abstract class Resource extends PlatformObject implements IResource, ICor
 			workspace.prepareOperation(null, progress.split(1));
 			workspace.beginOperation(true);
 			internalSetLocal(flag, depth);
-			progress.step(98);
+			progress.split(98);
 		} finally {
 			workspace.endOperation(null, true);
 		}
@@ -1755,7 +1755,7 @@ public abstract class Resource extends PlatformObject implements IResource, ICor
 			// Forget content-related caching flags.
 			info.clear(M_CONTENT_CACHE);
 			workspace.updateModificationStamp(info);
-			progress.step(98);
+			progress.split(98);
 		} catch (OperationCanceledException e) {
 			workspace.getWorkManager().operationCanceled();
 			throw e;
@@ -2007,7 +2007,7 @@ public abstract class Resource extends PlatformObject implements IResource, ICor
 			// Refresh either in background or foreground.
 			if ((updateFlags & IResource.BACKGROUND_REFRESH) != 0) {
 				workspace.refreshManager.refresh(this);
-				progress.step(99);
+				progress.split(99);
 			} else {
 				refreshLocal(DEPTH_INFINITE, progress.split(98));
 			}
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/FileUtil.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/FileUtil.java
index 10a43ede5..450bec6f3 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/FileUtil.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/FileUtil.java
@@ -419,7 +419,7 @@ public class FileUtil {
 					String msg = NLS.bind(Messages.localstore_couldNotWrite, path);
 					throw new ResourceException(IResourceStatus.FAILED_WRITE_LOCAL, new Path(path), msg, e);
 				}
-				subMonitor.step(1);
+				subMonitor.split(1);
 			}
 		} finally {
 			safeClose(source);