Ticket #21240: 21240.housenumber.patch

src/org/openstreetmap/josm/plugins/housenumbertool/TagDialog.java

@@ -9 +9 @@
 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 javax.swing.*;
@@ -62 +62 @@
 
     private static final String TEMPLATE_DATA = "/template.data";
 
-    private AutoCompletingComboBox source;
-    private AutoCompletingComboBox country;
-    private AutoCompletingComboBox state;
-    private AutoCompletingComboBox suburb;
-    private AutoCompletingComboBox city;
-    private AutoCompletingComboBox postcode;
-    private AutoCompletingComboBox street;
+    private AutoCompComboBox<AutoCompletionItem> source;
+    private AutoCompComboBox<AutoCompletionItem> country;
+    private AutoCompComboBox<AutoCompletionItem> state;
+    private AutoCompComboBox<AutoCompletionItem> suburb;
+    private AutoCompComboBox<AutoCompletionItem> city;
+    private AutoCompComboBox<AutoCompletionItem> postcode;
+    private AutoCompComboBox<AutoCompletionItem> street;
     private JTextField housnumber;
     private JCheckBox buildingEnabled;
     private JCheckBox sourceEnabled;
@@ -220 +220 @@
         c.insets = new Insets(5, 5, 0, 5);
         editPanel.add(sourceEnabled, c);
 
-        source = new AutoCompletingComboBox();
-        source.setPossibleAcItems(acm.getTagValues(TAG_SOURCE));
+        source = new AutoCompComboBox<>();
+        source.getModel().addAllElements(acm.getTagValues(TAG_SOURCE));
         source.setPreferredSize(new Dimension(200, 24));
         source.setEditable(true);
         source.setSelectedItem(dto.getSource());
@@ -270 +270 @@
         c.insets = new Insets(5, 5, 0, 5);
         editPanel.add(countryEnabled, c);
 
-        country = new AutoCompletingComboBox();
-        country.setPossibleAcItems(acm.getTagValues(TAG_ADDR_COUNTRY));
+        country = new AutoCompComboBox<>();
+        country.getModel().addAllElements(acm.getTagValues(TAG_ADDR_COUNTRY));
         country.setPreferredSize(new Dimension(200, 24));
         country.setEditable(true);
         country.setSelectedItem(dto.getCountry());
@@ -320 +320 @@
         c.insets = new Insets(5, 5, 0, 5);
         editPanel.add(stateEnabled, c);
 
-        state = new AutoCompletingComboBox();
-        state.setPossibleAcItems(acm.getTagValues(TAG_ADDR_STATE));
+        state = new AutoCompComboBox<>();
+        state.getModel().addAllElements(acm.getTagValues(TAG_ADDR_STATE));
         state.setPreferredSize(new Dimension(200, 24));
         state.setEditable(true);
         state.setSelectedItem(dto.getState());
@@ -370 +370 @@
         c.insets = new Insets(5, 5, 0, 5);
         editPanel.add(suburbEnabled, c);
 
-        suburb = new AutoCompletingComboBox();
-        suburb.setPossibleAcItems(acm.getTagValues(TAG_ADDR_SUBURB));
+        suburb = new AutoCompComboBox<>();
+        suburb.getModel().addAllElements(acm.getTagValues(TAG_ADDR_SUBURB));
         suburb.setPreferredSize(new Dimension(200, 24));
         suburb.setEditable(true);
         suburb.setSelectedItem(dto.getSuburb());
@@ -420 +420 @@
         c.insets = new Insets(5, 5, 0, 5);
         editPanel.add(cityEnabled, c);
 
-        city = new AutoCompletingComboBox();
-        city.setPossibleAcItems(acm.getTagValues(TAG_ADDR_CITY));
+        city = new AutoCompComboBox<>();
+        city.getModel().addAllElements(acm.getTagValues(TAG_ADDR_CITY));
         city.setPreferredSize(new Dimension(200, 24));
         city.setEditable(true);
         city.setSelectedItem(dto.getCity());
@@ -470 +470 @@
         c.insets = new Insets(5, 5, 0, 5);
         editPanel.add(zipEnabled, c);
 
-        postcode = new AutoCompletingComboBox();
-        postcode.setPossibleAcItems(acm.getTagValues(TAG_ADDR_POSTCODE));
+        postcode = new AutoCompComboBox<>();
+        postcode.getModel().addAllElements(acm.getTagValues(TAG_ADDR_POSTCODE));
         postcode.setPreferredSize(new Dimension(200, 24));
         postcode.setEditable(true);
         postcode.setSelectedItem(dto.getPostcode());
@@ -548 +548 @@
         g.add(streetRadio);
         g.add(placeRadio);
 
-        street = new AutoCompletingComboBox();
+        street = new AutoCompComboBox<>();
         if (dto.isTagStreet()) {
-            street.setPossibleItems(getPossibleStreets());
+            street.getModel().addAllElements(getPossibleStreets());
         } else {
-            street.setPossibleAcItems(acm.getTagValues(TAG_ADDR_PLACE));
+            street.getModel().addAllElements(acm.getTagValues(TAG_ADDR_PLACE));
         }
         street.setPreferredSize(new Dimension(200, 24));
         street.setEditable(true);
@@ -739 +739 @@
             dto.setSaveSuburb(suburbEnabled.isSelected());
 
             dto.setBuilding((String) building.getSelectedItem());
-            dto.setSource(getAutoCompletingComboBoxValue(source));
-            dto.setCity(getAutoCompletingComboBoxValue(city));
-            dto.setCountry(getAutoCompletingComboBoxValue(country));
+            dto.setSource(getAutoCompComboBoxValue(source));
+            dto.setCity(getAutoCompComboBoxValue(city));
+            dto.setCountry(getAutoCompComboBoxValue(country));
             dto.setHousenumber(housnumber.getText());
-            dto.setPostcode(getAutoCompletingComboBoxValue(postcode));
-            dto.setStreet(getAutoCompletingComboBoxValue(street));
-            dto.setState(getAutoCompletingComboBoxValue(state));
-            dto.setSuburb(getAutoCompletingComboBoxValue(suburb));
+            dto.setPostcode(getAutoCompComboBoxValue(postcode));
+            dto.setStreet(getAutoCompComboBoxValue(street));
+            dto.setState(getAutoCompComboBoxValue(state));
+            dto.setSuburb(getAutoCompComboBoxValue(suburb));
             dto.setHousenumberChangeValue(housenumberChangeSequence.getValue());
 
             updateJOSMSelection(selection, dto);
@@ -755 +755 @@
         setVisible(false);
     }
 
-    private String getAutoCompletingComboBoxValue(AutoCompletingComboBox box) {
+    private String getAutoCompComboBoxValue(AutoCompComboBox<AutoCompletionItem> box) {
         Object item = box.getSelectedItem();
         if (item != null) {
             if (item instanceof String) {
@@ -885 +885 @@
 
         if (!commands.isEmpty()) {
             SequenceCommand sequenceCommand = new SequenceCommand(
-                 trn("Updating properties of up to {0} object",
+                 trn("Updating properties of up to {0} object",
                      "Updating properties of up to {0} objects", commands.size(), commands.size()), commands);
 
             // executes the commands and adds them to the undo/redo chains
@@ -893 +893 @@
         }
     }
 
-    private Collection<String> getPossibleStreets() {
+    private Collection<AutoCompletionItem> getPossibleStreets() {
         /**
          * Generates a list of all visible names of highways in order to do autocompletion on the road name.
          */
-        Set<String> names = new TreeSet<>();
+        Set<AutoCompletionItem> names = new TreeSet<>();
         for (OsmPrimitive osm : MainApplication.getLayerManager().getEditDataSet().allNonDeletedPrimitives()) {
             if (osm.getKeys() != null && osm.keySet().contains("highway") && osm.keySet().contains("name")) {
-                names.add(osm.get("name"));
+                names.add(new AutoCompletionItem (osm.get("name")));
             }
         }
         return names;
@@ -945 +945 @@
         @Override
         public void itemStateChanged(ItemEvent e) {
             if (streetRadio.isSelected()) {
-                street.setPossibleItems(getPossibleStreets());
+                street.getModel().addAllElements(getPossibleStreets());
             } else {
-                street.setPossibleAcItems(acm.getTagValues(TAG_ADDR_PLACE));
+                street.getModel().addAllElements(acm.getTagValues(TAG_ADDR_PLACE));
             }
         }
     }