Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlgoubet2019-09-18 03:07:16 -0400
committerlgoubet2019-09-18 03:07:16 -0400
commit2e38e0600c6c5f7149499bc8fa5f397567042a06 (patch)
tree5d3bce6a84997d5ea07dff8f6ec19050f3b814e0
parent45ef701770f7dca6e9c0c43d77d5c265afe7eb6c (diff)
downloadorg.eclipse.emf.compare-2e38e0600c6c5f7149499bc8fa5f397567042a06.tar.gz
org.eclipse.emf.compare-2e38e0600c6c5f7149499bc8fa5f397567042a06.tar.xz
org.eclipse.emf.compare-2e38e0600c6c5f7149499bc8fa5f397567042a06.zip
Register the navigatable so that the toolbar actions work
Navigation actions from the toolbar to go to the next/previous differences were not working without this. Change-Id: I3747597c32044868bcbebf524306a1e06f7dd494
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java1
1 files changed, 1 insertions, 0 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 843d54898..5aa8d8799 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
@@ -419,6 +419,7 @@ public class EMFCompareStructureMergeViewer extends AbstractStructuredViewerWrap
getCompareConfiguration().getAdapterFactory(), getViewer()));
navigatable = new Navigatable(getViewer(), getContentProvider());
+ getControl().setData(INavigatable.NAVIGATOR_PROPERTY, navigatable);
toolBar = createToolBar(CompareViewerPane.getToolBarManager(parent));
getViewer().addSelectionChangedListener(getToolBar());

Back to the top