Changeset 5297 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

Timestamp:

2012-06-24T19:14:38+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #4493, fix #7750: conflict dialog, nodes and members tab: allow selection via double-click, allow zoom via contexual menu, plus various fix in EDT violations

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -46 +46 @@
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -156 +157 @@
     public final void refreshView() {
         OsmDataLayer editLayer =  Main.main.getEditLayer();
-        conflicts = editLayer == null?new ConflictCollection():editLayer.getConflicts();
-        model.fireContentChanged();
-        updateTitle(conflicts.size());
+        conflicts = (editLayer == null ? new ConflictCollection() : editLayer.getConflicts());
+        GuiHelper.runInEDT(new Runnable() {
+            @Override
+            public void run() {
+                model.fireContentChanged();
+                updateTitle(conflicts.size());
+            }
+        });
     }