diff options
| author | Arthur Daussy | 2014-08-22 15:24:42 +0000 |
|---|---|---|
| committer | Mikael Barbero | 2014-08-27 09:29:39 +0000 |
| commit | 2cdba74ce47e8333c01058bdfa5a6fde14cd8a62 (patch) | |
| tree | 7ff081af3a7bf9404450375b8094134104c02785 | |
| parent | c32f79b74c61a488ef1c9f74f197375a3f0b3a7a (diff) | |
| download | org.eclipse.emf.compare-2cdba74ce47e8333c01058bdfa5a6fde14cd8a62.tar.gz org.eclipse.emf.compare-2cdba74ce47e8333c01058bdfa5a6fde14cd8a62.tar.xz org.eclipse.emf.compare-2cdba74ce47e8333c01058bdfa5a6fde14cd8a62.zip | |
[442355] Corrects label on "ReplaceWith" dialog.
The computation of the label needs to be aware of the visible elements.
Previously it was done using the content provider. However now it's not
possible anymore since the content provider is deferred. To compute the
list of visible items the implementation now rely on the swt tree
content that is to say on the TreeItem inside of it. The
updateTreeItemMappings forces the tree to be filled.
Change-Id: I0b0616dc6bac894dcda53d02c2ba971bb69ed34e
Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr>
| -rw-r--r-- | plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java | 3 |
1 files changed, 3 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 a7e7d644a..d29b276e9 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 @@ -759,6 +759,9 @@ public class EMFCompareStructureMergeViewer extends AbstractStructuredViewerWrap getContentProvider().runWhenReady(IN_UI_ASYNC, new Runnable() { public void run() { if (!getControl().isDisposed()) { + // Needs all to build all treeItem to compute the label + dependencyData.updateTreeItemMappings(); + // title is not initialized as the comparison was set in the configuration after the // refresh caused by the initialization of the viewer filters and the group providers. refreshTitle(); |