diff options
| author | Mathieu Cartaud | 2016-01-28 14:04:49 +0000 |
|---|---|---|
| committer | Laurent Delaigue | 2016-02-01 12:17:22 +0000 |
| commit | eee88a22481f8ba5d532a6ea3063c1fa0db478b4 (patch) | |
| tree | 287b9850bc7d1edca1c3451ee4ad99996978ebed /plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/AbstractResolution.java | |
| parent | 755f4bc6c59ebc762a6b92c53c6011243be344b4 (diff) | |
| download | org.eclipse.emf.compare-eee88a22481f8ba5d532a6ea3063c1fa0db478b4.tar.gz org.eclipse.emf.compare-eee88a22481f8ba5d532a6ea3063c1fa0db478b4.tar.xz org.eclipse.emf.compare-eee88a22481f8ba5d532a6ea3063c1fa0db478b4.zip | |
Improve progress monitor to allow cancelling3.2.0M5
Change-Id: I92cddf118a5ecc387b6256806192f2a8332aa30e
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
Diffstat (limited to 'plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/AbstractResolution.java')
| -rw-r--r-- | plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/AbstractResolution.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/AbstractResolution.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/AbstractResolution.java index e7d783836..c464d8858 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/AbstractResolution.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/AbstractResolution.java @@ -23,6 +23,7 @@ import org.apache.log4j.Logger; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IStorage; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.SubMonitor; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.URI; @@ -155,6 +156,9 @@ public abstract class AbstractResolution { && !knownURIs.contains(dep)) { filesToResolve.add(dependentFile); } + if (monitor.isCanceled()) { + throw new OperationCanceledException(); + } } } } |