Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlgoubet2019-09-17 09:07:00 -0400
committerlgoubet2019-09-17 09:07:00 -0400
commit45ef701770f7dca6e9c0c43d77d5c265afe7eb6c (patch)
tree33712aa373937e4fcc5874598858df1c58b8438b
parent89b43a837714f3b6315e07dd93a57617a9ce848c (diff)
downloadorg.eclipse.emf.compare-45ef701770f7dca6e9c0c43d77d5c265afe7eb6c.tar.gz
org.eclipse.emf.compare-45ef701770f7dca6e9c0c43d77d5c265afe7eb6c.tar.xz
org.eclipse.emf.compare-45ef701770f7dca6e9c0c43d77d5c265afe7eb6c.zip
The navigatable's cache needs to be cleared when we refresh the viewer
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java10
1 files changed, 10 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 611bb84b2..843d54898 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
@@ -1088,6 +1088,16 @@ public class EMFCompareStructureMergeViewer extends AbstractStructuredViewerWrap
}
}
+ @Override
+ public void refresh() {
+ super.refresh();
+ // Make sure we clear the navigatable's caches
+ getNavigatable().refresh();
+ if (getViewer().getSelection().isEmpty()) {
+ selectFirstDiffOrDisplayLabelViewer(getCompareConfiguration().getComparison());
+ }
+ }
+
/**
* Set the state of the cascading filter.
*

Back to the top