Changeset 2256 in josm for trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.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/MergeNodesAction.java (modified) (1 diff)

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

@@ -263 +263 @@
     }
 
-    /**
-     * Enable the "Merge Nodes" menu option if more than one node is selected
-     */
     @Override
-    public void updateEnabledState() {
-        if (getCurrentDataSet() == null || getCurrentDataSet().getSelected().isEmpty()) {
+    protected void updateEnabledState() {
+        if (getCurrentDataSet() == null) {
             setEnabled(false);
+        } else {
+            updateEnabledState(getCurrentDataSet().getSelected());
+        }
+    }
+
+    @Override
+    protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
+        if (selection == null || selection.isEmpty()) {
+            setEnabled(false);
             return;
         }
         boolean ok = true;
-        if (getCurrentDataSet().getSelected().size() < 2) {
+        if (selection.size() < 2) {
             setEnabled(false);
             return;
         }
-        for (OsmPrimitive osm : getCurrentDataSet().getSelected()) {
+        for (OsmPrimitive osm : selection) {
             if (!(osm instanceof Node)) {
                 ok = false;