| commit | 2e38e0600c6c5f7149499bc8fa5f397567042a06 | [log] [tgz] |
|---|---|---|
| author | lgoubet <laurent.goubet@obeo.fr> | Wed Sep 18 09:07:16 2019 +0200 |
| committer | lgoubet <laurent.goubet@obeo.fr> | Wed Sep 18 09:07:16 2019 +0200 |
| tree | 5d3bce6a84997d5ea07dff8f6ec19050f3b814e0 | |
| parent | 45ef701770f7dca6e9c0c43d77d5c265afe7eb6c [diff] |
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
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 843d548..5aa8d87 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 @@ getCompareConfiguration().getAdapterFactory(), getViewer())); navigatable = new Navigatable(getViewer(), getContentProvider()); + getControl().setData(INavigatable.NAVIGATOR_PROPERTY, navigatable); toolBar = createToolBar(CompareViewerPane.getToolBarManager(parent)); getViewer().addSelectionChangedListener(getToolBar());