Changeset 18126 in josm for trunk

Timestamp:

2021-08-06T01:22:18+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #21203 - CCE in HistoryComboBox#addCurrentItemToHistory (patch by taylor.smock)

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/widgets/HistoryComboBox.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/widgets/HistoryComboBoxTest.java (added)

trunk/src/org/openstreetmap/josm/gui/widgets/HistoryComboBox.java

@@ -6 +6 @@
 import javax.swing.text.JTextComponent;
 
+import org.openstreetmap.josm.data.tagging.ac.AutoCompletionItem;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -55 +56 @@
      */
     public void addCurrentItemToHistory() {
-        model.addElement((String) getEditor().getItem());
+        Object item = getEditor().getItem();
+        if (item instanceof String) {
+            model.addElement((String) item);
+        } else if (item instanceof AutoCompletionItem) {
+            model.addElement((AutoCompletionItem) item);
+        } else {
+            throw new IllegalArgumentException(item.getClass().getSimpleName() + " is not supported in addCurrentItemToHistory");
+        }
     }