Index: applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/AdvancedSettingsDialog.java
===================================================================
--- applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/AdvancedSettingsDialog.java	(revision 35668)
+++ applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/AdvancedSettingsDialog.java	(revision 35669)
@@ -4,5 +4,5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.util.Map.Entry;
+import java.util.Map;
 
 import javax.swing.JCheckBox;
@@ -26,5 +26,5 @@
         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());
         }
Index: applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/DrawBuildingAction.java
===================================================================
--- applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/DrawBuildingAction.java	(revision 35668)
+++ applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/DrawBuildingAction.java	(revision 35669)
@@ -20,5 +20,5 @@
 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,5 +327,5 @@
             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());
                     }
Index: applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/MergeAddrPointsAction.java
===================================================================
--- applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/MergeAddrPointsAction.java	(revision 35668)
+++ applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/MergeAddrPointsAction.java	(revision 35669)
@@ -15,5 +15,4 @@
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -134,5 +133,5 @@
                 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)
Index: applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/ToolSettings.java
===================================================================
--- applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/ToolSettings.java	(revision 35668)
+++ applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/ToolSettings.java	(revision 35669)
@@ -8,5 +8,4 @@
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.NoSuchElementException;
 
@@ -69,5 +68,5 @@
         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());