Changeset 5984 in josm for trunk/src/org

Timestamp:

2013-06-02T00:07:54+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #7700 - fix all EDT violations observed while merging layers, most likely causing the internal Swing ClassCastException

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JosmAction.java (modified) (2 diffs)
• gui/dialogs/SelectionListDialog.java (modified) (5 diffs)
• gui/dialogs/properties/PropertiesDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/JosmAction.java

@@ -18 +18 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -223 +224 @@
      */
     private class LayerChangeAdapter implements MapView.LayerChangeListener {
+        private void updateEnabledStateInEDT() {
+            GuiHelper.runInEDT(new Runnable() {
+                @Override public void run() {
+                    updateEnabledState();
+                }
+            });
+        }
         public void activeLayerChange(Layer oldLayer, Layer newLayer) {
-            updateEnabledState();
+            updateEnabledStateInEDT();
         }
 
         public void layerAdded(Layer newLayer) {
-            updateEnabledState();
+            updateEnabledStateInEDT();
         }
 
         public void layerRemoved(Layer oldLayer) {
-            updateEnabledState();
+            updateEnabledStateInEDT();
         }
     }

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

@@ -66 +66 @@
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.ListPopupMenu;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
@@ -128 +129 @@
     }
 
+    /**
+     * Constructs a new {@code SelectionListDialog}.
+     */
     public SelectionListDialog() {
         super(tr("Selection"), "selectionlist", tr("Open a selection list window."),
@@ -219 +223 @@
     }
 
+    /**
+     * Replies the selected OSM primitives.
+     * @return The selected OSM primitives
+     */
     public Collection<OsmPrimitive> getSelectedPrimitives() {
         return model.getSelected();
@@ -484 +492 @@
 
         /**
-         * Replies the collection of OSM primitives in the view
-         * of this model
-         *
-         * @return complete content of the view
-         */
-        public Collection<OsmPrimitive> getAllElements() {
-            return selection;
-        }
-
-        /**
          * Sets the OSM primitives to be selected in the view of this model
          *
@@ -521 +519 @@
          * @param selection the collection of currently selected OSM objects
          */
-        public void setJOSMSelection(Collection<? extends OsmPrimitive> selection) {
+        public void setJOSMSelection(final Collection<? extends OsmPrimitive> selection) {
             this.selection.clear();
-            if (selection == null) {
-                fireContentsChanged(this, 0, getSize());
-                return;
-            }
-            this.selection.addAll(selection);
-            sort();
-            fireContentsChanged(this, 0, getSize());
-            remember(selection);
-            double dist = -1;
-            SubclassFilteredCollection<OsmPrimitive, Way> ways = new SubclassFilteredCollection<OsmPrimitive, Way>(selection, OsmPrimitive.wayPredicate);
-            // Compute total length of selected way(s) until an arbitrary limit set to 250 ways
-            // in order to prevent performance issue if a large number of ways are selected (old behaviour kept in that case, see #8403)
-            int maxWays = Math.max(1, Main.pref.getInteger("selection.max-ways-for-statusline", 250));
-            if (!ways.isEmpty() && ways.size() <= maxWays) {
-                dist = 0.0;
-                for (Way w : ways) {
-                    dist += w.getLength();
+            if (selection != null) {
+                this.selection.addAll(selection);
+                sort();
+            }
+            GuiHelper.runInEDTAndWait(new Runnable() {
+                @Override public void run() {
+                    fireContentsChanged(this, 0, getSize());
+                    if (selection != null) {
+                        remember(selection);
+                        double dist = -1;
+                        SubclassFilteredCollection<OsmPrimitive, Way> ways = new SubclassFilteredCollection<OsmPrimitive, Way>(selection, OsmPrimitive.wayPredicate);
+                        // Compute total length of selected way(s) until an arbitrary limit set to 250 ways
+                        // in order to prevent performance issue if a large number of ways are selected (old behaviour kept in that case, see #8403)
+                        int maxWays = Math.max(1, Main.pref.getInteger("selection.max-ways-for-statusline", 250));
+                        if (!ways.isEmpty() && ways.size() <= maxWays) {
+                            dist = 0.0;
+                            for (Way w : ways) {
+                                dist += w.getLength();
+                            }
+                        }
+                        Main.map.statusLine.setDist(dist);
+                    }
                 }
-            }
-            Main.map.statusLine.setDist(dist);
+            });
         }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -85 +85 @@
 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
 import org.openstreetmap.josm.gui.tagging.TaggingPreset.PresetType;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 import org.openstreetmap.josm.tools.GBC;
@@ -683 +684 @@
         if (newLayer == null) editHelper.saveTagsIfNeeded();
         // it is time to save history of tags
-            
-        updateSelection();
+        GuiHelper.runInEDT(new Runnable() {
+            @Override public void run() {
+                updateSelection();
+            }
+        });
     }