Changeset 35856 in osm for applications/editors/josm

Timestamp:

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

Author:

GerdP

Message:

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

• update code to recent changes in core, bump version
• also seems to fix #18897

Location:

applications/editors/josm/plugins/utilsplugin2

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTagDialog.java (modified) (4 diffs)

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

@@ -5 +5 @@
     <property name="commit.message" value="[josm_utilsplugin2]: select boundary by double-click; multitagger table highlights"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="17199"/>
+    <property name="plugin.main.version" value="18173"/>
 
     <property name="plugin.author" value="Kalle Lampila, Upliner, Zverik, akks, joshdoe and others"/>

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTagDialog.java

@@ -19 +19 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 
@@ -143 +142 @@
 
     private void loadHistory() {
-        List<String> cmtHistory = new LinkedList<>(
-                Config.getPref().getList(HISTORY_KEY, Arrays.asList(defaultHistory)));
-        Collections.reverse(cmtHistory);
-        cbTagSet.setPossibleItems(cmtHistory);
-        String s = cmtHistory.get(cmtHistory.size()-1);
+        cbTagSet.getModel().prefs().load(HISTORY_KEY, Arrays.asList(defaultHistory));
+        String s = cbTagSet.getModel().getElementAt(0);
         cbTagSet.setText(s);
         specifyTagSet(s);
@@ -283 +279 @@
             String txt = cbTagSet.getText();
             Logging.debug(txt);
-            List<String> history = cbTagSet.getHistory();
+            List<String> history = cbTagSet.getModel().asStringList();
             history.remove(txt);
             if (history.isEmpty()) {
@@ -321 +317 @@
             oldTags = s;
             cbTagSet.addCurrentItemToHistory();
-            Config.getPref().putList(HISTORY_KEY, cbTagSet.getHistory());
+            cbTagSet.getModel().prefs().save(HISTORY_KEY);
             specifyTagSet(s);
         }