Changeset 35860 in osm for applications/editors/josm

Timestamp:

2021-11-06T11:56:28+01:00 (3 years ago)

Author:

GerdP

Message:

see #21515: NoSuchMethodError: 'void org.openstreetmap.josm.gui.widgets.HistoryComboBox.setPossibleItems(java.util.Collection)'

• update FastDraw code to recent changes in core, bump version

Location:

applications/editors/josm/plugins/FastDraw

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java (modified) (4 diffs)

applications/editors/josm/plugins/FastDraw/build.xml

@@ -4 +4 @@
     <property name="commit.message" value="[josm_fastdraw] Fix incorrect settings saving-2"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="14960"/>
+    <property name="plugin.main.version" value="18173"/>
     
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java

@@ -8 +8 @@
 import java.text.NumberFormat;
 import java.text.ParseException;
-import java.util.ArrayList;
 
 import javax.swing.AbstractAction;
@@ -24 +23 @@
 import org.openstreetmap.josm.gui.datatransfer.importers.TextTagPaster;
 import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
-import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -69 +67 @@
         pasteButton.setToolTipText(tr("Try copying tags from properties table"));
 
-        ArrayList<String> history = new ArrayList<>(Config.getPref().getList("fastdraw.tags-history"));
-        while (history.remove("")) { };
-        addTags.setPossibleItems(history);
+        addTags.getModel().prefs().load("fastdraw.tags-history");
+        while (addTags.getModel().find("") != null)
+            addTags.getModel().removeElement("");
 
         all.add(label1, GBC.std().insets(10, 0, 0, 0));
@@ -134 +132 @@
                     addTags.addCurrentItemToHistory();
                 }
-                Config.getPref().putList("fastdraw.tags-history", addTags.getHistory());
+                addTags.getModel().prefs().save("fastdraw.tags-history");
                 settings.savePrefs();
             } catch (ParseException e) {