Index: /applications/editors/josm/plugins/terracer/build.xml
===================================================================
--- /applications/editors/josm/plugins/terracer/build.xml	(revision 35826)
+++ /applications/editors/josm/plugins/terracer/build.xml	(revision 35827)
@@ -2,5 +2,5 @@
 <project name="terracer" default="dist" basedir=".">
     <property name="commit.message" value="applied #j5760 (patch by robome) - Order of housenumbers not correct"/>
-    <property name="plugin.main.version" value="14153"/>
+    <property name="plugin.main.version" value="18207"/>
     <property name="plugin.author" value="Matt Amos"/>
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.terracer.TerracerPlugin"/>
Index: /applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/HouseNumberInputDialog.java
===================================================================
--- /applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/HouseNumberInputDialog.java	(revision 35826)
+++ /applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/HouseNumberInputDialog.java	(revision 35827)
@@ -26,7 +26,8 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
+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.AutoCompComboBox;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 import org.openstreetmap.josm.gui.util.WindowGeometry;
@@ -69,7 +70,7 @@
     JTextField numbers;
     private JLabel streetLabel;
-    AutoCompletingComboBox streetComboBox;
+    AutoCompComboBox<String> streetComboBox;
     private JLabel buildingLabel;
-    AutoCompletingComboBox buildingComboBox;
+    AutoCompComboBox<AutoCompletionItem> buildingComboBox;
     private JLabel segmentsLabel;
     JTextField segments;
@@ -115,5 +116,6 @@
         getRootPane().setDefaultButton(defaultButton);
         pack();
-        setRememberWindowGeometry(getClass().getName() + ".geometry", WindowGeometry.centerInWindow(MainApplication.getMainFrame(), getPreferredSize()));
+        setRememberWindowGeometry(getClass().getName() + ".geometry",
+                WindowGeometry.centerInWindow(MainApplication.getMainFrame(), getPreferredSize()));
         lo.requestFocusInWindow();
     }
@@ -290,11 +292,8 @@
      * @return AutoCompletingComboBox
      */
-    private AutoCompletingComboBox getStreet() {
-
+    private AutoCompComboBox<String> getStreet() {
         if (streetComboBox == null) {
-            final TreeSet<String> names = createAutoCompletionInfo();
-
-            streetComboBox = new AutoCompletingComboBox();
-            streetComboBox.setPossibleItems(names);
+            streetComboBox = new AutoCompComboBox<>();
+            streetComboBox.getModel().addAllElements(createAutoCompletionInfo());
             streetComboBox.setEditable(true);
             streetComboBox.setSelectedItem(null);
@@ -308,9 +307,9 @@
      * @return AutoCompletingComboBox
      */
-    private AutoCompletingComboBox getBuilding() {
-
+    private AutoCompComboBox<AutoCompletionItem> getBuilding() {
         if (buildingComboBox == null) {
-            buildingComboBox = new AutoCompletingComboBox();
-            buildingComboBox.setPossibleAcItems(AutoCompletionManager.of(OsmDataManager.getInstance().getEditDataSet()).getTagValues("building"));
+            buildingComboBox = new AutoCompComboBox<>();
+            buildingComboBox.getModel().addAllElements(
+                    AutoCompletionManager.of(OsmDataManager.getInstance().getEditDataSet()).getTagValues("building"));
             buildingComboBox.setEditable(true);
             if (buildingType != null && !buildingType.isEmpty()) {
Index: /applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/HouseNumberInputHandler.java
===================================================================
--- /applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/HouseNumberInputHandler.java	(revision 35826)
+++ /applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/HouseNumberInputHandler.java	(revision 35827)
@@ -24,8 +24,9 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.tagging.ac.AutoCompletionItem;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompComboBox;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.UserCancelException;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -385,5 +386,5 @@
     }
 
-    private static String getItemText(AutoCompletingComboBox box) {
+    private static String getItemText(AutoCompComboBox<?> box) {
         Object selected = box.getSelectedItem();
         if (selected == null) {
@@ -397,9 +398,5 @@
             }
 
-            if (name.length() == 0) {
-                return null;
-            } else {
-                return name;
-            }
+            return Utils.isEmpty(name) ? null : name;
         }
     }