Changeset 18438 in josm for trunk/src

Timestamp:

2022-05-04T20:34:54+02:00 (3 years ago)

Author:

taylor.smock

Message:

Fix #21619: CCE where JosmTextField cannot be cast to AutoCompTextField (patch by marcello, modified)

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java

@@ -17 +17 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.plaf.basic.BasicComboBoxEditor;
 
 import org.openstreetmap.josm.data.projection.CustomProjection;
@@ -24 +23 @@
 import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompTextField;
 import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
 import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
-import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -54 +51 @@
     private static class PreferencePanel extends JPanel {
 
-        public AutoCompTextField<String> input;
         private HistoryComboBox cbInput;
 
@@ -62 +58 @@
 
         private void build(String initialText, final ActionListener listener) {
-            input = new AutoCompTextField<>(30);
             cbInput = new HistoryComboBox();
-            cbInput.setEditor(new BasicComboBoxEditor() {
-                @Override
-                protected JosmTextField createEditorComponent() {
-                    return input;
-                }
-            });
+            cbInput.getEditorComponent().setColumns(30);
             List<String> samples = Arrays.asList(
                     "+proj=lonlat +ellps=WGS84 +datum=WGS84 +bounds=-180,-90,180,90",
@@ -81 +71 @@
             valStatus.setVisible(false);
 
-            final AbstractTextComponentValidator val = new AbstractTextComponentValidator(input, false, false, false) {
+            final AbstractTextComponentValidator val = new AbstractTextComponentValidator(cbInput.getEditorComponent(), false, false, false) {
 
                 private String error;
@@ -99 +89 @@
                     try {
                         CustomProjection test = new CustomProjection();
-                        test.update(input.getText());
+                        test.update(cbInput.getEditorComponent().getText());
                     } catch (ProjectionConfigurationException ex) {
                         Logging.warn(ex);
@@ -222 +212 @@
         }
         PreferencePanel prefPanel = (PreferencePanel) panel;
-        String pref = prefPanel.input.getText();
+        String pref = prefPanel.cbInput.getEditorComponent().getText();
         prefPanel.rememberHistory();
         return Collections.singleton(pref);