Changeset 18173 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

Timestamp:

2021-08-24T02:43:50+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #20690 - fix #21240 - Refactoring of UploadDialog, HistoryComboBox and AutoCompletingComboBox (patch by marcello)

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (modified) (13 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

@@ -88 +88 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
-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.GuiHelper;
@@ -400 +400 @@
 
     /**
+     * Returns the edited item with whitespaces removed
+     * @param cb the combobox
+     * @return the edited item with whitespaces removed
+     * @since 18173
+     */
+    public static String getEditItem(AutoCompComboBox<AutoCompletionItem> cb) {
+        return Utils.removeWhiteSpaces(cb.getEditor().getItem().toString());
+    }
+
+    /**
+     * Returns the selected item or the edited item as string
+     * @param cb the combobox
+     * @return the selected item or the edited item as string
+     * @since 18173
+     */
+    public static String getSelectedOrEditItem(AutoCompComboBox<AutoCompletionItem> cb) {
+        final Object selectedItem = cb.getSelectedItem();
+        if (selectedItem != null)
+            return selectedItem.toString();
+        return getEditItem(cb);
+    }
+
+    /**
      * Warns user about a key being overwritten.
      * @param action The action done by the user. Must state what key is changed
@@ -476 +499 @@
             List<AutoCompletionItem> keyList = autocomplete.getTagKeys(DEFAULT_AC_ITEM_COMPARATOR);
 
-            keys = new AutoCompletingComboBox(key);
-            keys.setPossibleAcItems(keyList);
+            keys = new AutoCompComboBox<>();
+            keys.getModel().setComparator(Comparator.naturalOrder()); // according to Comparable
+            keys.setPrototypeDisplayValue(new AutoCompletionItem(key));
             keys.setEditable(true);
+            keys.getModel().addAllElements(keyList);
             keys.setSelectedItem(key);
 
@@ -490 +515 @@
             final String selection = m.size() != 1 ? tr("<different>") : m.entrySet().iterator().next().getKey();
 
-            values = new AutoCompletingComboBox(selection);
+            values = new AutoCompComboBox<>();
+            values.getModel().setComparator(Comparator.naturalOrder());
+            values.setPrototypeDisplayValue(new AutoCompletionItem(selection));
             values.setRenderer(cellRenderer);
-
             values.setEditable(true);
-            values.setPossibleAcItems(valueList);
+            values.getModel().addAllElements(valueList);
             values.setSelectedItem(selection);
             values.getEditor().setItem(selection);
+
             p.add(Box.createVerticalStrut(5), GBC.eol());
             p.add(new JLabel(tr("Value")), GBC.std());
@@ -522 +549 @@
         @Override
         public void performTagEdit() {
-            String value = values.getEditItem();
+            String value = getEditItem(values);
             value = Normalizer.normalize(value, Normalizer.Form.NFC);
             if (value.isEmpty()) {
                 value = null; // delete the key
             }
-            String newkey = keys.getEditItem();
+            String newkey = getEditItem(keys);
             newkey = Normalizer.normalize(newkey, Normalizer.Form.NFC);
             if (newkey.isEmpty()) {
@@ -574 +601 @@
 
     protected abstract class AbstractTagsDialog extends ExtendedDialog {
-        protected AutoCompletingComboBox keys;
-        protected AutoCompletingComboBox values;
+        protected AutoCompComboBox<AutoCompletionItem> keys;
+        protected AutoCompComboBox<AutoCompletionItem> values;
 
         AbstractTagsDialog(Component parent, String title, String... buttonTexts) {
@@ -621 +648 @@
         }
 
-        private void selectACComboBoxSavingUnixBuffer(AutoCompletingComboBox cb) {
+        private void selectACComboBoxSavingUnixBuffer(AutoCompComboBox<AutoCompletionItem> cb) {
             // select combobox with saving unix system selection (middle mouse paste)
             Clipboard sysSel = ClipboardUtils.getSystemSelection();
@@ -667 +694 @@
                            && IntStream.range(0, size).allMatch(i -> Objects.equals(currentModel.getElementAt(i), correctItems.get(i)));
                    if (!valuesOK) {
-                       values.setPossibleAcItems(correctItems);
+                       values.getModel().removeAllElements();
+                       values.getModel().addAllElements(correctItems);
                    }
                    if (!Objects.equals(key, objKey)) {
@@ -688 +716 @@
                 return;
             }
-            buttons.get(0).setIcon(findIcon(keys.getSelectedOrEditItem(), values.getSelectedOrEditItem())
+            buttons.get(0).setIcon(findIcon(getSelectedOrEditItem(keys), getSelectedOrEditItem(values))
                     .orElse(ImageProvider.get("ok", ImageProvider.ImageSizes.LARGEICON)));
         }
@@ -732 +760 @@
 
             mainPanel = new JPanel(new GridBagLayout());
-            keys = new AutoCompletingComboBox();
-            values = new AutoCompletingComboBox();
+            keys = new AutoCompComboBox<>();
+            values = new AutoCompComboBox<>();
+            keys.getModel().setComparator(Comparator.naturalOrder()); // according to Comparable
+            values.getModel().setComparator(Comparator.naturalOrder());
+            keys.setPrototypeDisplayValue(new AutoCompletionItem("dummy"));
+            values.setPrototypeDisplayValue(new AutoCompletionItem("dummy"));
             keys.setAutocompleteEnabled(AUTOCOMPLETE_KEYS.get());
             values.setAutocompleteEnabled(AUTOCOMPLETE_VALUES.get());
@@ -748 +780 @@
             keyList.removeIf(item -> containsDataKey(item.getValue()));
 
-            keys.setPossibleAcItems(keyList);
+            keys.getModel().removeAllElements();
+            keys.getModel().addAllElements(keyList);
             keys.setEditable(true);
 
@@ -939 +972 @@
                     @Override
                     public void actionPerformed(ActionEvent e) {
-                        keys.setSelectedItem(t.getKey(), true);
+                        keys.setSelectedItem(t.getKey());
                         // fix #7951, #8298 - update list of values before setting value (?)
                         focus.focusGained(null);
-                        values.setSelectedItem(t.getValue(), true);
+                        values.setSelectedItem(t.getValue());
                         selectValuesCombobox();
                     }
@@ -1094 +1127 @@
          */
         public final void performTagAdding() {
-            String key = keys.getEditItem();
-            String value = values.getEditItem();
+            String key = getEditItem(keys);
+            String value = getEditItem(values);
             if (key.isEmpty() || value.isEmpty())
                 return;