diff options
| author | Axel Richard | 2013-07-18 10:52:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2013-07-18 11:23:57 +0000 |
| commit | 2b51e0b0cc8a0c6c708145d907504dfb90aedc64 (patch) | |
| tree | 22a5451b0b9b5e709e24c8b8e3f111b245bd0789 /plugins/org.eclipse.emf.compare.ide.ui/src | |
| parent | deca68b5b8e812a92e4f0c655e9f3816a759ac06 (diff) | |
| download | org.eclipse.emf.compare-2b51e0b0cc8a0c6c708145d907504dfb90aedc64.tar.gz org.eclipse.emf.compare-2b51e0b0cc8a0c6c708145d907504dfb90aedc64.tar.xz org.eclipse.emf.compare-2b51e0b0cc8a0c6c708145d907504dfb90aedc64.zip | |
[413232] Display "Compute Differences" in SMV when compute model
Bug: 413232
Change-Id: I3c0580988d07c31a926e0e164aff27fec2cc3d1d
Diffstat (limited to 'plugins/org.eclipse.emf.compare.ide.ui/src')
| -rw-r--r-- | plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.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/structuremergeviewer/EMFCompareStructureMergeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java index b167e3d3a..03c0fb446 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java @@ -138,6 +138,7 @@ public class EMFCompareStructureMergeViewer extends AbstractViewerWrapper implem */ public EMFCompareStructureMergeViewer(Composite parent, CompareConfiguration config) { super(parent, config); + inputChangedTask.setPriority(Job.LONG); } /** @@ -220,8 +221,6 @@ public class EMFCompareStructureMergeViewer extends AbstractViewerWrapper implem fHandlerService = CompareHandlerService.createFor(getCompareConfiguration().getContainer(), diffTreeViewer.getControl().getShell()); - // inputChangedTask.setPriority(Job.LONG); - return control; } @@ -258,7 +257,6 @@ public class EMFCompareStructureMergeViewer extends AbstractViewerWrapper implem compareInputChanged(ci); } - getViewer().setInput(input); } /** |