diff options
author | Markus Keller | 2016-05-04 17:38:52 +0000 |
---|---|---|
committer | Stefan Xenos | 2016-05-04 18:42:38 +0000 |
commit | eec22e21e94943cfcfd2cac52f3ccf685f5f4711 (patch) | |
tree | 5da8471cf98db1f6db1c4ac14a8f81e438d697f9 | |
parent | 14630a0782941aaefbc0a36323231b99a7b4448d (diff) | |
download | rt.equinox.bundles-eec22e21e94943cfcfd2cac52f3ccf685f5f4711.tar.gz rt.equinox.bundles-eec22e21e94943cfcfd2cac52f3ccf685f5f4711.tar.xz rt.equinox.bundles-eec22e21e94943cfcfd2cac52f3ccf685f5f4711.zip |
Bug 493018: SubMonitor throws unspecified OperationCanceledExceptionsY20160505-1000I20160504-2000
Change-Id: I0c9ba0a7c1df8bbe4c79bbb53375d2ddbe31b5e1
-rw-r--r-- | bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/SubMonitor.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/SubMonitor.java b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/SubMonitor.java index 6008727de..0b513d024 100644 --- a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/SubMonitor.java +++ b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/SubMonitor.java @@ -873,9 +873,10 @@ public final class SubMonitor implements IProgressMonitorWithBlocking { * * @param totalWork number of ticks to consume from the receiver * @return a new SubMonitor instance + * @throws OperationCanceledException if the monitor has been cancelled * @since 3.8 */ - public SubMonitor split(int totalWork) { + public SubMonitor split(int totalWork) throws OperationCanceledException { return split(totalWork, SUPPRESS_BEGINTASK); } @@ -887,7 +888,7 @@ public final class SubMonitor implements IProgressMonitorWithBlocking { * or {@link #setWorkRemaining}</p> * * <p>This method is much like {@link #newChild}, but will additionally check for cancellation and - * will throw an OperationCanceledException if the monitor has been cancelled. Not every call to + * will throw an {@link OperationCanceledException} if the monitor has been cancelled. Not every call to * this method will trigger a cancellation check. The checks will be performed as often as possible * without degrading the performance of the caller. * @@ -942,10 +943,12 @@ public final class SubMonitor implements IProgressMonitorWithBlocking { * </pre></code> * * @param totalWork number of ticks to consume from the receiver + * @param suppressFlags TODO * @return new sub progress monitor that may be used in place of a new SubMonitor + * @throws OperationCanceledException if the monitor has been cancelled * @since 3.8 */ - public SubMonitor split(int totalWork, int suppressFlags) { + public SubMonitor split(int totalWork, int suppressFlags) throws OperationCanceledException { int oldUsedForParent = this.usedForParent; SubMonitor result = newChild(totalWork, suppressFlags); |