Changeset 5297 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.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/LayerListDialog.java (modified) (5 diffs)

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

@@ -63 +63 @@
 import org.openstreetmap.josm.gui.layer.Layer.LayerAction;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -704 +705 @@
         @Override
         public void updateEnabledState() {
-            if (layer == null) {
-                if (getModel().getSelectedLayers().size() != 1) {
-                    setEnabled(false);
-                    return;
-                }
-                Layer selectedLayer = getModel().getSelectedLayers().get(0);
-                setEnabled(!isActiveLayer(selectedLayer));
-            } else {
-                setEnabled(!isActiveLayer(layer));
-            }
+            GuiHelper.runInEDT(new Runnable() {
+                @Override
+                public void run() {
+                    if (layer == null) {
+                        if (getModel().getSelectedLayers().size() != 1) {
+                            setEnabled(false);
+                            return;
+                        }
+                        Layer selectedLayer = getModel().getSelectedLayers().get(0);
+                        setEnabled(!isActiveLayer(selectedLayer));
+                    } else {
+                        setEnabled(!isActiveLayer(layer));
+                    }
+                }
+            });
         }
 
@@ -1255 +1261 @@
                 return;
             layer.removePropertyChangeListener(this);
-            int size = getRowCount();
-            List<Integer> rows = getSelectedRows();
-            if (rows.isEmpty() && size > 0) {
-                selectionModel.setSelectionInterval(size-1, size-1);
-            }
-            fireTableDataChanged();
-            fireRefresh();
-            ensureActiveSelected();
+            final int size = getRowCount();
+            final List<Integer> rows = getSelectedRows();
+            GuiHelper.runInEDTAndWait(new Runnable() {
+                @Override
+                public void run() {
+                    if (rows.isEmpty() && size > 0) {
+                        selectionModel.setSelectionInterval(size-1, size-1);
+                    }
+                    fireTableDataChanged();
+                    fireRefresh();
+                    ensureActiveSelected();
+                }
+            });
         }
 
@@ -1426 +1437 @@
             if (getLayers().isEmpty())
                 return;
-            if (getActiveLayer() != null) {
+            final Layer activeLayer = getActiveLayer();
+            if (activeLayer != null) {
                 // there's an active layer - select it and make it
                 // visible
-                int idx = getLayers().indexOf(getActiveLayer());
+                int idx = getLayers().indexOf(activeLayer);
                 selectionModel.setSelectionInterval(idx, idx);
                 ensureSelectedIsVisible();
@@ -1506 +1518 @@
         /* ------------------------------------------------------------------------------ */
         @Override
-        public void activeLayerChange(Layer oldLayer, Layer newLayer) {
-            if (oldLayer != null) {
-                int idx = getLayers().indexOf(oldLayer);
-                if (idx >= 0) {
-                    fireTableRowsUpdated(idx,idx);
-                }
-            }
-
-            if (newLayer != null) {
-                int idx = getLayers().indexOf(newLayer);
-                if (idx >= 0) {
-                    fireTableRowsUpdated(idx,idx);
-                }
-            }
-            ensureActiveSelected();
+        public void activeLayerChange(final Layer oldLayer, final Layer newLayer) {
+            GuiHelper.runInEDTAndWait(new Runnable() {
+                @Override
+                public void run() {
+                    if (oldLayer != null) {
+                        int idx = getLayers().indexOf(oldLayer);
+                        if (idx >= 0) {
+                            fireTableRowsUpdated(idx,idx);
+                        }
+                    }
+
+                    if (newLayer != null) {
+                        int idx = getLayers().indexOf(newLayer);
+                        if (idx >= 0) {
+                            fireTableRowsUpdated(idx,idx);
+                        }
+                    }
+                    ensureActiveSelected();
+                }
+            });
         }