Changeset 17585 in josm for trunk/src

Timestamp:

2021-03-18T00:57:09+01:00 (4 years ago)

Author:

simon04

Message:

see #20613 - Use Tagged.visitKeys()

Avoids creating a temporary HashMap just for iteration purposes

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/CreateMultipolygonAction.java (modified) (1 diff)
• actions/JoinAreasAction.java (modified) (1 diff)
• actions/upload/ApiPreconditionCheckerHook.java (modified) (2 diffs)
• data/osm/TagCollection.java (modified) (1 diff)
• data/osm/search/SearchCompiler.java (modified) (1 diff)
• data/validation/tests/ConditionalKeys.java (modified) (4 diffs)
• data/validation/tests/InternetTags.java (modified) (2 diffs)
• gui/MapStatus.java (modified) (1 diff)
• gui/dialogs/InspectPrimitiveDataText.java (modified) (1 diff)
• gui/dialogs/properties/PropertiesDialog.java (modified) (2 diffs)
• gui/tagging/TagEditorModel.java (modified) (2 diffs)
• gui/tagging/ac/AutoCompletionManager.java (modified) (1 diff)

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

@@ -423 +423 @@
                 outerWays.add(way);
 
-                for (String key : way.keySet()) {
+                way.visitKeys((p, key, value) -> {
                     if (!values.containsKey(key)) { //relation values take precedence
-                        values.put(key, way.get(key));
-                    } else if (!values.get(key).equals(way.get(key))) {
+                        values.put(key, value);
+                    } else if (!values.get(key).equals(value)) {
                         conflictingKeys.add(key);
                     }
-                }
+                });
             }
         }

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

@@ -1698 +1698 @@
                 }
                 // Add tags
-                for (String key : r.rel.keySet()) {
-                    newRel.put(key, r.rel.get(key));
-                }
+                r.rel.visitKeys((p, key, value) -> newRel.put(key, value));
                 // Delete old relation
                 relationsToDelete.add(r.rel);

trunk/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java

@@ -6 +6 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Map;
 
 import javax.swing.JOptionPane;
@@ -60 +61 @@
     private static boolean checkMaxNodes(Collection<OsmPrimitive> primitives, long maxNodes) {
         for (OsmPrimitive osmPrimitive : primitives) {
-            for (String key: osmPrimitive.keySet()) {
-                String value = osmPrimitive.get(key);
+            for (Map.Entry<String, String> entry: osmPrimitive.getKeys().entrySet()) {
+                String key = entry.getKey();
+                String value = entry.getValue();
                 if (key.length() > Tagged.MAX_TAG_LENGTH) {
                     if (osmPrimitive.isDeleted()) {

trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java

@@ -64 +64 @@
         TagCollection tags = new TagCollection();
         if (primitive != null) {
-            for (String key: primitive.keySet()) {
-                tags.add(new Tag(key, primitive.get(key)));
-            }
+            primitive.visitKeys((p, key, value) -> tags.add(new Tag(key, value)));
         }
         return tags;

trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java

@@ -1063 +1063 @@
                 return search.isEmpty();
 
-            for (String key: osm.keySet()) {
-                String value = osm.get(key);
+            for (Map.Entry<String, String> entry: osm.getKeys().entrySet()) {
+                String key = entry.getKey();
+                String value = entry.getValue();
                 if (searchRegex != null) {
 

trunk/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java

@@ -18 +18 @@
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 
 /**
@@ -224 +223 @@
     public List<TestError> validatePrimitive(OsmPrimitive p) {
         final List<TestError> errors = new ArrayList<>();
-        for (final String key : SubclassFilteredCollection.filter(p.keySet(),
-                Pattern.compile(":conditional(:.*)?$").asPredicate())) {
+        final Pattern pattern = Pattern.compile(":conditional(:.*)?$");
+        p.visitKeys((primitive, key, value) -> {
+            if (!pattern.matcher(key).find()) {
+                return;
+            }
             if (!isKeyValid(key)) {
                 errors.add(TestError.builder(this, Severity.WARNING, 3201)
@@ -231 +233 @@
                         .primitives(p)
                         .build());
-                continue;
-            }
-            final String value = p.get(key);
+                return;
+            }
             final String error = validateValue(key, value);
             if (error != null) {
@@ -241 +242 @@
                         .build());
             }
-        }
+        });
         return errors;
     }

trunk/src/org/openstreetmap/josm/data/validation/tests/InternetTags.java

@@ -122 +122 @@
     @Override
     public void check(OsmPrimitive p) {
-        for (String k : p.keySet()) {
+        p.visitKeys((primitive, k, value) -> {
             // Test key against URL validator
             if (!doTest(p, k, URL_KEYS, UrlValidator.getInstance(), INVALID_URL)) {
@@ -128 +128 @@
                 doTest(p, k, EMAIL_KEYS, EmailValidator.getInstance(), INVALID_EMAIL);
             }
-        }
+        });
     }
 }

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

@@ -643 +643 @@
             }
 
-            for (String key : osm.keySet()) {
-                text.append("<br>").append(key).append('=').append(osm.get(key));
-            }
+            osm.visitKeys((primitive, key, value) -> text.append("<br>").append(key).append('=').append(value));
 
             final JLabel l = new JLabel(

trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDataText.java

@@ -164 +164 @@
         if (o.hasKeys()) {
             add(tr("Tags: "));
-            for (String key : o.keySet()) {
-                s.append(INDENT).append(INDENT);
-                s.append(String.format("\"%s\"=\"%s\"%n", key, o.get(key)));
-            }
+            o.visitKeys((primitive, key, value) -> s.append(INDENT).append(INDENT).append(String.format("\"%s\"=\"%s\"%n", key, value)));
         }
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -659 +659 @@
         for (IPrimitive osm : newSel) {
             types.add(TaggingPresetType.forPrimitive(osm));
-            for (String key : osm.keySet()) {
+            osm.visitKeys((p, key, value) -> {
                 if (displayDiscardableKeys || !AbstractPrimitive.getDiscardableKeys().contains(key)) {
-                    String value = osm.get(key);
                     keyCount.put(key, keyCount.containsKey(key) ? keyCount.get(key) + 1 : 1);
                     if (valueCount.containsKey(key)) {
@@ -672 +671 @@
                     }
                 }
-            }
+            });
         }
         for (Entry<String, Map<String, Integer>> e : valueCount.entrySet()) {

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

@@ -368 +368 @@
         commitPendingEdit();
         this.tags.clear();
-        for (String key : primitive.keySet()) {
-            String value = primitive.get(key);
-            this.tags.add(new TagModel(key, value));
-        }
+        primitive.visitKeys((p, key, value) -> this.tags.add(new TagModel(key, value)));
         sort();
         TagModel tag = new TagModel();
@@ -512 +509 @@
 
         for (OsmPrimitive prim : primitives) {
-            for (String oldkey : prim.keySet()) {
+            prim.visitKeys((p, oldkey, value) -> {
                 if (!currentkeys.contains(oldkey)) {
                     commands.add(new ChangePropertyCommand(prim, oldkey, null));
                 }
-            }
+            });
         }
 

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java

@@ -193 +193 @@
      */
     protected void cachePrimitiveTags(OsmPrimitive primitive) {
-        for (String key: primitive.keySet()) {
-            String value = primitive.get(key);
-            tagCache.put(key, value);
-        }
+        primitive.visitKeys((p, key, value) -> tagCache.put(key, value));
     }