Index: applications/editors/josm/plugins/HouseNumberTaggingTool/build.xml
===================================================================
--- applications/editors/josm/plugins/HouseNumberTaggingTool/build.xml	(revision 33713)
+++ applications/editors/josm/plugins/HouseNumberTaggingTool/build.xml	(revision 33714)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Initial version."/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="10580"/>
+    <property name="plugin.main.version" value="12859"/>
     <!-- Configure these properties (replace "..." accordingly).
          See https://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
Index: applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/HouseNumberTaggingToolPlugin.java
===================================================================
--- applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/HouseNumberTaggingToolPlugin.java	(revision 33713)
+++ applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/HouseNumberTaggingToolPlugin.java	(revision 33714)
@@ -1,5 +1,5 @@
 package org.openstreetmap.josm.plugins.housenumbertool;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.plugins.Plugin;
@@ -19,5 +19,5 @@
         super(info);
         action = new LaunchAction(getPluginDir());
-        MainMenu.add(Main.main.menu.dataMenu, action, false,0);
+        MainMenu.add(MainApplication.getMenu().dataMenu, action, false,0);
     }
 }
Index: applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/LaunchAction.java
===================================================================
--- applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/LaunchAction.java	(revision 33713)
+++ applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/LaunchAction.java	(revision 33714)
@@ -16,5 +16,9 @@
 
     private String pluginDir;
-   
+
+    /**
+     * Constructs a new {@code LaunchAction}.
+     * @param pluginDir plugin directory
+     */
     public LaunchAction(String pluginDir) {
         super("HouseNumberTaggingTool", 
Index: applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/TagDialog.java
===================================================================
--- applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/TagDialog.java	(revision 33713)
+++ applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/TagDialog.java	(revision 33714)
@@ -39,7 +39,8 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.tagging.ac.AutoCompletionItem;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 
@@ -96,4 +97,9 @@
     private JRadioButton placeRadio;
 
+    /**
+     * Constructs a new {@code TagDialog}.
+     * @param pluginDir plugin directory
+     * @param selection selected primitive
+     */
     public TagDialog(String pluginDir, OsmPrimitive selection) {
         super(Main.parent, tr("House Number Editor"), new String[] { tr("OK"), tr("Cancel") }, true);
@@ -104,5 +110,5 @@
 
         setContent(editPanel);
-        setButtonIcons(new String[] { "ok.png", "cancel.png" });
+        setButtonIcons("ok", "cancel");
         setDefaultButton(1);
         setupDialog();
@@ -112,15 +118,12 @@
         setLocationRelativeTo(null);
 
-        SwingUtilities.invokeLater(new Runnable()  {
-            @Override
-            public void run() {
-                housnumber.requestFocus();
-                housnumber.selectAll();
-            }
+        SwingUtilities.invokeLater(() -> {
+            housnumber.requestFocus();
+            housnumber.selectAll();
         });
     }
 
     private JPanel createContentPane() {
-        acm = selection.getDataSet().getAutoCompletionManager();
+        acm = AutoCompletionManager.of(selection.getDataSet());
 
         Dto dto = loadDto();
@@ -164,5 +167,5 @@
 
         country = new AutoCompletingComboBox();
-        country.setPossibleACItems(acm.getValues(TAG_ADDR_COUNTRY));
+        country.setPossibleAcItems(acm.getTagValues(TAG_ADDR_COUNTRY));
         country.setPreferredSize(new Dimension(200, 24));
         country.setEditable(true);
@@ -189,5 +192,5 @@
 
         state = new AutoCompletingComboBox();
-        state.setPossibleACItems(acm.getValues(TAG_ADDR_STATE));
+        state.setPossibleAcItems(acm.getTagValues(TAG_ADDR_STATE));
         state.setPreferredSize(new Dimension(200, 24));
         state.setEditable(true);
@@ -213,5 +216,5 @@
 
         city = new AutoCompletingComboBox();
-        city.setPossibleACItems(acm.getValues(TAG_ADDR_CITY));
+        city.setPossibleAcItems(acm.getTagValues(TAG_ADDR_CITY));
         city.setPreferredSize(new Dimension(200, 24));
         city.setEditable(true);
@@ -237,5 +240,5 @@
 
         postcode = new AutoCompletingComboBox();
-        postcode.setPossibleACItems(acm.getValues(TAG_ADDR_POSTCODE));
+        postcode.setPossibleAcItems(acm.getTagValues(TAG_ADDR_POSTCODE));
         postcode.setPreferredSize(new Dimension(200, 24));
         postcode.setEditable(true);
@@ -290,5 +293,5 @@
             street.setPossibleItems(getPossibleStreets());
         } else {
-            street.setPossibleACItems(acm.getValues(TAG_ADDR_PLACE));
+            street.setPossibleAcItems(acm.getTagValues(TAG_ADDR_PLACE));
         }
         street.setPreferredSize(new Dimension(200, 24));
@@ -391,6 +394,6 @@
                 return (String) item;
             }
-            if (item instanceof AutoCompletionListItem) {
-                return ((AutoCompletionListItem) item).getValue();
+            if (item instanceof AutoCompletionItem) {
+                return ((AutoCompletionItem) item).getValue();
             }
             return item.toString();
@@ -512,5 +515,5 @@
          */
         Set<String> names = new TreeSet<>();
-        for (OsmPrimitive osm : Main.getLayerManager().getEditDataSet().allNonDeletedPrimitives()) {
+        for (OsmPrimitive osm : MainApplication.getLayerManager().getEditDataSet().allNonDeletedPrimitives()) {
             if (osm.getKeys() != null && osm.keySet().contains("highway") && osm.keySet().contains("name")) {
                 names.add(osm.get("name"));
@@ -554,5 +557,5 @@
                 street.setPossibleItems(getPossibleStreets());
             } else {
-                street.setPossibleACItems(acm.getValues(TAG_ADDR_PLACE));
+                street.setPossibleAcItems(acm.getTagValues(TAG_ADDR_PLACE));
             }
         }