Changeset 2256 in josm for trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java

Timestamp:

2009-10-09T17:16:54+02:00 (15 years ago)

Author:

Gubaer

Message:

Removed inefficient DataSet:getSelected() when responding to fireSelectionChanged() in JOSM actions, see ​thread on dev
Still uses DataSet:getSelected() when responding to layer change events, this is less critical.

File:

• trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java (modified) (2 diffs)

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

@@ -6 +6 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.util.Collection;
 import java.util.List;
 
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.MergeSourceBuildingVisitor;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
@@ -45 +47 @@
     @Override
     protected void updateEnabledState() {
-        if (getEditLayer() == null) {
+        if (getCurrentDataSet() == null) {
             setEnabled(false);
-            return;
+        } else {
+            updateEnabledState(getCurrentDataSet().getSelected());
         }
-        setEnabled(!getEditLayer().data.getSelected().isEmpty());
+    }
+
+    @Override
+    protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
+        setEnabled(selection != null && !selection.isEmpty());
     }
 }