Changeset 6258 in josm for trunk/src/org/openstreetmap/josm/gui

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

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• NavigatableComponent.java (modified) (4 diffs)
• conflict/tags/PasteTagsConflictResolverDialog.java (modified) (2 diffs)
• dialogs/relation/sort/RelationSorter.java (modified) (3 diffs)
• io/UploadDialog.java (modified) (2 diffs)
• tagging/TagEditorModel.java (modified) (2 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()) {

trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java

@@ -20 +20 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import javax.swing.AbstractAction;
@@ -451 +452 @@
             }
             String text = "";
-            for (OsmPrimitiveType type: stat.keySet()) {
-                int numPrimitives = stat.get(type) == null ? 0 : stat.get(type);
+            for (Entry<OsmPrimitiveType, Integer> entry: stat.entrySet()) {
+                OsmPrimitiveType type = entry.getKey();
+                int numPrimitives = entry.getValue() == null ? 0 : entry.getValue();
                 if (numPrimitives == 0) {
                     continue;

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java

@@ -10 +10 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -65 +66 @@
     }
 
-    /*
+    /**
      * Sort a collection of relation members by the way they are linked.
      *
@@ -93 +94 @@
 
         // Sort members and add them to result
-        for (AdditionalSorter s : customMap.keySet()) {
-            newMembers.addAll(s.sortMembers(customMap.get(s)));
+        for (Entry<AdditionalSorter, List<RelationMember>> entry : customMap.entrySet()) {
+            newMembers.addAll(entry.getKey().sortMembers(entry.getValue()));
         }
 

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -22 +22 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import javax.swing.AbstractAction;
@@ -312 +313 @@
     public void setDefaultChangesetTags(Map<String, String> tags) {
         pnlTagSettings.setDefaultTags(tags);
-         for (String key: tags.keySet()) {
-            if (key.equals("comment")) {
-                changesetCommentModel.setComment(tags.get(key));
+         for (Entry<String, String> entry: tags.entrySet()) {
+            if ("comment".equals(entry.getKey())) {
+                changesetCommentModel.setComment(entry.getValue());
             }
         }

trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java

@@ -13 +13 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import javax.swing.DefaultListSelectionModel;
@@ -369 +370 @@
     public void initFromTags(Map<String,String> tags) {
         this.tags.clear();
-        for (String key : tags.keySet()) {
-            String value = tags.get(key);
-            this.tags.add(new TagModel(key,value));
+        for (Entry<String, String> entry : tags.entrySet()) {
+            this.tags.add(new TagModel(entry.getKey(), entry.getValue()));
         }
         sort();