Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Richard2013-10-03 11:36:28 -0400
committerGerrit Code Review @ Eclipse.org2013-10-04 05:20:32 -0400
commit2dca8403508513ee9d4f5f6d69379d948a83820c (patch)
tree5ade23fc6a32906ad6d1035199dde96cf41407c7 /plugins/org.eclipse.emf.compare.ide.ui/src
parent261b06af0e353528dbbc0e916b1d021ce27bd2f0 (diff)
downloadorg.eclipse.emf.compare-2dca8403508513ee9d4f5f6d69379d948a83820c.tar.gz
org.eclipse.emf.compare-2dca8403508513ee9d4f5f6d69379d948a83820c.tar.xz
org.eclipse.emf.compare-2dca8403508513ee9d4f5f6d69379d948a83820c.zip
[418601] - Fix invalid thread access when editing text value
Diffstat (limited to 'plugins/org.eclipse.emf.compare.ide.ui/src')
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java1
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerLabelProvider.java1
2 files changed, 1 insertions, 1 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 7a7361857..83f60964b 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
@@ -331,6 +331,7 @@ public class EMFCompareStructureMergeViewer extends AbstractViewerWrapper implem
ICompareInput.class);
SWTUtil.safeAsyncExec(new Runnable() {
public void run() {
+ refresh();
setSelection(new StructuredSelection(adaptedAffectedObject), true);
}
});
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerLabelProvider.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerLabelProvider.java
index 26e987785..b0e7b474a 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerLabelProvider.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerLabelProvider.java
@@ -42,7 +42,6 @@ class EMFCompareStructureMergeViewerLabelProvider extends AdapterFactoryLabelPro
*/
public EMFCompareStructureMergeViewerLabelProvider(AdapterFactory adapterFactory, Viewer viewer) {
super(adapterFactory, viewer);
- isFireLabelUpdateNotifications = true;
}
/**

Back to the top