| commit | c89396fe5936af419997f9d7c5ac90d963b3d153 | [log] [tgz] |
|---|---|---|
| author | Camille Letavernier <cletavernier@eclipsesource.com> | Thu Nov 30 03:29:25 2017 -0500 |
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | Thu Nov 30 03:29:25 2017 -0500 |
| tree | 43b54f8ccbc3851ed4d8521e2bae143639f4ea41 | |
| parent | 857b21c9455d2e7919aa541d798a10cc0b26204f [diff] | |
| parent | a005c9ceb130489f03ef59c70401e4db4e2a7b67 [diff] |
Merge "PapyrusTreeContentMergeViewer.updateContent should refresh"
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewer.java b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewer.java index 597e7a1..5c15245 100644 --- a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewer.java +++ b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/PapyrusTreeContentMergeViewer.java
@@ -195,6 +195,9 @@ leftContentComputations = null; rightContentComputations = null; cachedMapForSelection = null; + } else { + getLeftMergeViewer().refresh(); + getRightMergeViewer().refresh(); } IMergeViewerItem leftInitialItem = null;