Changeset 18173 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.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/preferences/projection/CustomProjectionChoice.java (modified) (5 diffs)

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

@@ -23 +23 @@
 import org.openstreetmap.josm.data.projection.ProjectionConfigurationException;
 import org.openstreetmap.josm.data.projection.Projections;
-import org.openstreetmap.josm.data.tagging.ac.AutoCompletionItem;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
@@ -29 +28 @@
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
-import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -64 +62 @@
             input = new JosmTextField(30);
             cbInput = new HistoryComboBox();
-            cbInput.setPrototypeDisplayValue(new AutoCompletionItem("xxxx"));
             cbInput.setEditor(new BasicComboBoxEditor() {
                 @Override
@@ -74 +71 @@
                     "+proj=lonlat +ellps=WGS84 +datum=WGS84 +bounds=-180,-90,180,90",
                     "+proj=tmerc +lat_0=0 +lon_0=9 +k_0=1 +x_0=3500000 +y_0=0 +ellps=bessel +nadgrids=BETA2007.gsb");
-            cbInput.setPossibleItemsTopDown(Config.getPref().getList("projection.custom.value.history", samples));
+            cbInput.getModel().prefs().load("projection.custom.value.history", samples);
             cbInput.setText(initialText == null ? "" : initialText);
 
@@ -146 +143 @@
         public void rememberHistory() {
             cbInput.addCurrentItemToHistory();
-            Config.getPref().putList("projection.custom.value.history", cbInput.getHistory());
+            cbInput.getModel().prefs().save("projection.custom.value.history");
         }
     }