Changeset 6258 in josm for trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

Timestamp:

2013-09-25T02:56:42+02:00 (11 years ago)

Author:

Don-vip

Message:

Sonar/Findbugs - Performance - Inefficient use of keySet iterator instead of entrySet iterator

File:

• trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -21 +21 @@
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.Stack;
@@ -665 +666 @@
         if (!nlists.isEmpty()) {
             Double minDistSq = null;
-            List<Node> nlist;
-            for (Double distSq : nlists.keySet()) {
-                nlist = nlists.get(distSq);
+            for (Entry<Double, List<Node>> entry : nlists.entrySet()) {
+                Double distSq = entry.getKey();
+                List<Node> nlist = entry.getValue();
 
                 // filter nodes to be ignored before determining minDistSq..
@@ -754 +755 @@
      */
     public final Node getNearestNode(Point p, Predicate<OsmPrimitive> predicate,
-            boolean use_selected, Collection<OsmPrimitive> preferredRefs) {
+            boolean useSelected, Collection<OsmPrimitive> preferredRefs) {
 
         Map<Double, List<Node>> nlists = getNearestNodesImpl(p, predicate);
@@ -761 +762 @@
         if (preferredRefs != null && preferredRefs.isEmpty()) preferredRefs = null;
         Node ntsel = null, ntnew = null, ntref = null;
-        boolean useNtsel = use_selected;
+        boolean useNtsel = useSelected;
         double minDistSq = nlists.keySet().iterator().next();
 
-        for (Double distSq : nlists.keySet()) {
-            for (Node nd : nlists.get(distSq)) {
+        for (Entry<Double, List<Node>> entry : nlists.entrySet()) {
+            Double distSq = entry.getKey();
+            for (Node nd : entry.getValue()) {
                 // find the nearest selected node
                 if (ntsel == null && nd.isSelected()) {