Changeset 6355 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2013-11-02T16:52:15+01:00 (10 years ago)

Author:

Don-vip

Message:

code cleanup

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java

@@ -20 +20 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -445 +444 @@
                 // Deleting the highlighted node
 
-                //check to see if node has interesting keys
-                Iterator<String> keyIterator = candidateNode.getKeys().keySet().iterator();
-                boolean hasTags = false;
-                while (keyIterator.hasNext()) {
-                    String key = keyIterator.next();
-                    if (!OsmPrimitive.isUninterestingKey(key)) {
-                        hasTags = true;
-                        break;
-                    }
-                }
-
                 //check to see if node is in use by more than one object
                 List<OsmPrimitive> referrers = candidateNode.getReferrers();
@@ -463 +451 @@
                             tr("Cannot delete node that is referenced by multiple objects"),
                             tr("Error"), JOptionPane.ERROR_MESSAGE);
-                } else if (hasTags) {
+                } else if (candidateNode.isTagged()) {
                     JOptionPane.showMessageDialog(Main.parent,
                             tr("Cannot delete node that has tags"),