From 2e38e0600c6c5f7149499bc8fa5f397567042a06 Mon Sep 17 00:00:00 2001 From: lgoubet Date: Wed, 18 Sep 2019 09:07:16 +0200 Subject: 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 --- .../ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java | 1 + 1 file changed, 1 insertion(+) 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()); -- cgit v1.2.3