Changeset 35858 in osm for applications/editors/josm/plugins/DirectUpload

Timestamp:

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

Author:

GerdP

Message:

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

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

Location:

applications/editors/josm/plugins/DirectUpload

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java (modified) (6 diffs)

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

@@ -5 +5 @@
     <property name="commit.message" value="applied JOSM Ticket 4498 (patch by ax) - oauth support for gpx upload (I accidentally committed parts of the path in [24236])"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="15502"/>
+    <property name="plugin.main.version" value="18173"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java

@@ -13 +13 @@
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
-import java.util.Collections;
 import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
 
 import javax.swing.JComboBox;
@@ -24 +21 @@
 import org.openstreetmap.josm.data.gpx.GpxConstants;
 import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.data.gpx.GpxTrack;
 import org.openstreetmap.josm.data.gpx.IGpxTrack;
 import org.openstreetmap.josm.gui.ExtendedDialog;
@@ -140 +136 @@
         descriptionField.setToolTipText(tr("Please enter Description about your trace."));
 
-        List<String> descHistory = new LinkedList<>(Config.getPref().getList("directupload.description.history", new LinkedList<String>()));
-        // we have to reverse the history, because ComboBoxHistory will reverse it again in addElement()
-        // XXX this should be handled in HistoryComboBox
-        Collections.reverse(descHistory);
-        descriptionField.setPossibleItems(descHistory);
+        descriptionField.getModel().prefs().load("directupload.description.history");
 
         // tags
@@ -151 +143 @@
         tagsField.setToolTipText(tr("Please enter tags about your trace."));
 
-        List<String> tagsHistory = new LinkedList<>(Config.getPref().getList("directupload.tags.history", new LinkedList<String>()));
-        // we have to reverse the history, because ComboBoxHistory will reverse it againin addElement()
-        // XXX this should be handled in HistoryComboBox
-        Collections.reverse(tagsHistory);
-        tagsField.setPossibleItems(tagsHistory);
+        tagsField.getModel().prefs().load("directupload.tags.history");
 
         JPanel p = new JPanel(new GridBagLayout());
@@ -240 +228 @@
 
             if (canceled) {
-                response.disconnect();
+                response.disconnect();
                 GuiHelper.runInEDT(new Runnable() {
                     @Override public void run() {
@@ -429 +417 @@
 
         descriptionField.addCurrentItemToHistory();
-        Config.getPref().putList("directupload.description.history", descriptionField.getHistory());
+        descriptionField.getModel().prefs().save("directupload.description.history");
 
         tagsField.addCurrentItemToHistory();
-        Config.getPref().putList("directupload.tags.history", tagsField.getHistory());
+        tagsField.getModel().prefs().save("directupload.tags.history");
 
         PleaseWaitRunnable uploadTask = new PleaseWaitRunnable(tr("Uploading GPX Track")){