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

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/actions

Files:

• CreateMultipolygonAction.java (modified) (5 diffs)
• PasteTagsAction.java (modified) (3 diffs)

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

@@ -12 +12 @@
 import java.util.List;
 import java.util.Map;
-
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TreeSet;
+
 import javax.swing.JOptionPane;
-
 import javax.swing.SwingUtilities;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.AddCommand;
@@ -51 +52 @@
 public class CreateMultipolygonAction extends JosmAction {
 
+    /**
+     * Constructs a new {@code CreateMultipolygonAction}.
+     */
     public CreateMultipolygonAction() {
         super(tr("Create multipolygon"), "multipoly_create", tr("Create multipolygon."),
@@ -258 +262 @@
         boolean moveTags = Main.pref.getBoolean("multipoly.movetags", true);
 
-        for( String key : values.keySet() ) {
+        for (Entry<String, String> entry : values.entrySet()) {
             List<OsmPrimitive> affectedWays = new ArrayList<OsmPrimitive>();
-            String value = values.get(key);
-
-            for( Way way : innerWays ) {
-                if( way.hasKey(key) && (value.equals(way.get(key))) ) {
+            String key = entry.getKey();
+            String value = entry.getValue();
+
+            for (Way way : innerWays) {
+                if (way.hasKey(key) && (value.equals(way.get(key)))) {
                     affectedWays.add(way);
                 }
             }
 
-            if( moveTags ) {
+            if (moveTags) {
                 // remove duplicated tags from outer ways
                 for( Way way : outerWays ) {
@@ -277 +282 @@
             }
 
-            if(!affectedWays.isEmpty()) {
+            if (!affectedWays.isEmpty()) {
                 // reset key tag on affected ways
                 commands.add(new ChangePropertyCommand(affectedWays, key, null));
@@ -283 +288 @@
         }
 
-        if( moveTags ) {
+        if (moveTags) {
             // add those tag values to the relation
 
             boolean fixed = false;
             Relation r2 = new Relation(relation);
-            for( String key : values.keySet() ) {
-                if( !r2.hasKey(key) && !key.equals("area") ) {
-                    if( relation.isNew() )
-                        relation.put(key, values.get(key));
+            for (Entry<String, String> entry : values.entrySet()) {
+                String key = entry.getKey();
+                if (!r2.hasKey(key) && !key.equals("area") ) {
+                    if (relation.isNew())
+                        relation.put(key, entry.getValue());
                     else
-                        r2.put(key, values.get(key));
+                        r2.put(key, entry.getValue());
                     fixed = true;
                 }
             }
-            if( fixed && !relation.isNew() )
+            if (fixed && !relation.isNew())
                 commands.add(new ChangeCommand(relation, r2));
         }

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

@@ -13 +13 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import org.openstreetmap.josm.Main;
@@ -40 +41 @@
     private static final String help = ht("/Action/PasteTags");
 
+    /**
+     * Constructs a new {@code PasteTagsAction}.
+     */
     public PasteTagsAction() {
         super(tr("Paste Tags"), "pastetags",
@@ -270 +274 @@
 
         List<Command> commands = new ArrayList<Command>(tags.size());
-        String v;
-        for (String key: tags.keySet()) {
-            v = tags.get(key);
-            commands.add(new ChangePropertyCommand(selection, key, "".equals(v)?null:v));
+        for (Entry<String, String> entry: tags.entrySet()) {
+            String v = entry.getValue();
+            commands.add(new ChangePropertyCommand(selection, entry.getKey(), "".equals(v)?null:v));
         }
         commitCommands(selection, commands);