diff options
| author | Laurent Delaigue | 2015-05-29 07:51:46 +0000 |
|---|---|---|
| committer | Axel RICHARD | 2015-06-01 12:33:14 +0000 |
| commit | e6f3fe86cdf7d0283c4f60444299c2b233ab05aa (patch) | |
| tree | fc345a51047e958b565df63e3134592c4fce1611 /plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/AbstractResolution.java | |
| parent | bb6a1d32312acc2be28a10cb132b22ae2fbc56d4 (diff) | |
| download | org.eclipse.emf.compare-e6f3fe86cdf7d0283c4f60444299c2b233ab05aa.tar.gz org.eclipse.emf.compare-e6f3fe86cdf7d0283c4f60444299c2b233ab05aa.tar.xz org.eclipse.emf.compare-e6f3fe86cdf7d0283c4f60444299c2b233ab05aa.zip | |
[468741] Cancel of comparisons caused a pop-up.
Bug: 468741
Change-Id: I2bad5d846eb5045b1a0a3015997de8a117c24530
Signed-off-by: Laurent Delaigue <laurent.delaigue@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, 1 insertions, 3 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 63357cfc7..e7d783836 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 @@ -81,10 +81,8 @@ public abstract class AbstractResolution { * @param callable * Treatment to run * @return The result of the treatment - * @throws InterruptedException - * If the treatment is interrupted */ - protected <T> T call(Callable<T> callable) throws InterruptedException { + protected <T> T call(Callable<T> callable) { this.diagnostic = new DiagnosticSupport(); return context.getScheduler().call(callable, getFinalizeResolvingRunnable()); } |