Changeset 35669 in osm for applications

Timestamp:

2020-12-07T18:28:49+01:00 (3 years ago)

Author:

GerdP

Message:

fix some errorprone warnings: Entry -> Map.Entry

Location:

applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools

Files:

• AdvancedSettingsDialog.java (modified) (2 diffs)
• DrawBuildingAction.java (modified) (2 diffs)
• MergeAddrPointsAction.java (modified) (2 diffs)
• ToolSettings.java (modified) (2 diffs)

applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/AdvancedSettingsDialog.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.util.Map.Entry;
+import java.util.Map;
 
 import javax.swing.JCheckBox;
@@ -26 +26 @@
         panel.add(new JLabel(tr("Buildings tags:")), GBC.eol().fill(GBC.HORIZONTAL));
 
-        for (Entry<String, String> entry : ToolSettings.getTags().entrySet()) {
+        for (Map.Entry<String, String> entry : ToolSettings.getTags().entrySet()) {
             tagsModel.add(entry.getKey(), entry.getValue());
         }

applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/DrawBuildingAction.java

@@ -20 +20 @@
 import java.util.Collection;
 import java.util.LinkedList;
-import java.util.Map.Entry;
+import java.util.Map;
 
 import org.openstreetmap.josm.actions.mapmode.MapMode;
@@ -327 +327 @@
             if (w != null) {
                 if (!alt || ToolSettings.isUsingAddr())
-                    for (Entry<String, String> kv : ToolSettings.getTags().entrySet()) {
+                    for (Map.Entry<String, String> kv : ToolSettings.getTags().entrySet()) {
                         w.put(kv.getKey(), kv.getValue());
                     }

applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/MergeAddrPointsAction.java

@@ -15 +15 @@
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -134 +133 @@
                 boolean hasConflicts = false;
                 Map<String, String> tags = new HashMap<>();
-                for (Entry<String, String> entry : mergeNode.getKeys().entrySet()) {
+                for (Map.Entry<String, String> entry : mergeNode.getKeys().entrySet()) {
                     String newValue = entry.getValue();
                     if (newValue == null)

applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/ToolSettings.java

@@ -8 +8 @@
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.NoSuchElementException;
 
@@ -69 +68 @@
         TAGS.putAll(tags);
         ArrayList<String> values = new ArrayList<>(TAGS.size() * 2);
-        for (Entry<String, String> entry : TAGS.entrySet()) {
+        for (Map.Entry<String, String> entry : TAGS.entrySet()) {
             values.add(entry.getKey());
             values.add(entry.getValue());