Changeset 18313 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/presets

Timestamp:

2021-11-06T23:09:06+01:00 (3 years ago)

Author:

Don-vip

Message:

fix #21509 - fix potential NPEs related to comboboxes

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.util.ArrayList;
 import java.awt.Color;
 import java.awt.Component;
@@ -11 +10 @@
 import java.text.NumberFormat;
 import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -223 +223 @@
     private static String getValue(Component comp) {
         if (comp instanceof JosmComboBox) {
-            return ((JosmComboBox<?>) comp).getEditor().getItem().toString();
+            return ((JosmComboBox<?>) comp).getEditorItemAsString();
         } else if (comp instanceof JosmTextField) {
             return ((JosmTextField) comp).getText();