aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2018-06-15 08:21:05 -0400
committerThomas Watson2018-06-15 08:21:05 -0400
commit3cd187a9db700b43b3f785cbc4f5a90b51832509 (patch)
tree5504e8e6dca2b109b21c224595ad2281a22fefda
parentfed556917739ed2076b7e51f08ab2872224ff40a (diff)
downloadrt.equinox.bundles-3cd187a9db700b43b3f785cbc4f5a90b51832509.zip
rt.equinox.bundles-3cd187a9db700b43b3f785cbc4f5a90b51832509.tar.gz
rt.equinox.bundles-3cd187a9db700b43b3f785cbc4f5a90b51832509.tar.xz
Revert "Introduce checkCanceled on IProgressMonitor"
-rw-r--r--bundles/org.eclipse.equinox.common/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.common/pom.xml4
-rw-r--r--bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/IProgressMonitor.java21
-rw-r--r--bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/SubMonitor.java1
4 files changed, 3 insertions, 25 deletions
diff --git a/bundles/org.eclipse.equinox.common/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common/META-INF/MANIFEST.MF
index 03ecad8..09df9e6 100644
--- a/bundles/org.eclipse.equinox.common/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.common; singleton:=true
-Bundle-Version: 3.11.0.qualifier
+Bundle-Version: 3.10.100.qualifier
Bundle-Localization: plugin
Export-Package: org.eclipse.core.internal.boot;x-friends:="org.eclipse.core.resources,org.eclipse.core.runtime.compatibility,org.eclipse.pde.build",
org.eclipse.core.internal.runtime;common=split;mandatory:=common;
diff --git a/bundles/org.eclipse.equinox.common/pom.xml b/bundles/org.eclipse.equinox.common/pom.xml
index 438382b..a94af2d 100644
--- a/bundles/org.eclipse.equinox.common/pom.xml
+++ b/bundles/org.eclipse.equinox.common/pom.xml
@@ -5,7 +5,7 @@
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/org/documents/edl-v10.php
-
+
Contributors:
Igor Fedorenko - initial implementation
-->
@@ -19,6 +19,6 @@
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.common</artifactId>
- <version>3.11.0-SNAPSHOT</version>
+ <version>3.10.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/IProgressMonitor.java b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/IProgressMonitor.java
index 9a89607..89ade75 100644
--- a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/IProgressMonitor.java
+++ b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/IProgressMonitor.java
@@ -133,27 +133,6 @@ public interface IProgressMonitor {
public boolean isCanceled();
/**
- * Checks whether cancellation of this monitor has been requested and throws
- * an {@link OperationCanceledException} if it was the case.
- * <p>
- * This method is a shorthand for:
- * <pre>
- * if (monitor.isCanceled())
- * throw new OperationCanceledException();
- * </pre>
- * </p>
- *
- * @return this monitor instance for convenience (eg., chaining)
- * @throws OperationCanceledException if {@link #isCanceled()} returns <code>true</code>
- * @since 3.11
- */
- default IProgressMonitor checkCanceled() throws OperationCanceledException {
- if (isCanceled())
- throw new OperationCanceledException();
- return this;
- }
-
- /**
* Sets the cancel state to the given value.
*
* @param value <code>true</code> indicates that cancelation has
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 4dbd19d..5b72ed2 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
@@ -599,7 +599,6 @@ public final class SubMonitor implements IProgressMonitorWithBlocking {
* @see #isCanceled()
* @since 3.9
*/
- @Override
public SubMonitor checkCanceled() throws OperationCanceledException {
if (isCanceled()) {
throw new OperationCanceledException();