Changeset 35846 in osm for applications/editors

Timestamp:

2021-11-04T16:15:18+01:00 (3 years ago)

Author:

GerdP

Message:

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

• update code to recent changes in core
• fix javadoc

Location:

applications/editors/josm/plugins/reverter

Files:

• build.xml (modified) (1 diff)
• src/reverter/ChangesetIdQuery.java (modified) (3 diffs)
• src/reverter/ChangesetIdsTextField.java (modified) (1 diff)
• src/reverter/ChangesetReverter.java (modified) (1 diff)

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

@@ -4 +4 @@
     <property name="commit.message" value="Reverter: fix deleted/redacted relation members"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="17717"/>
+    <property name="plugin.main.version" value="18173"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/reverter/src/reverter/ChangesetIdQuery.java

@@ -10 +10 @@
 import java.awt.event.WindowEvent;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
 
 import javax.swing.ButtonGroup;
@@ -158 +155 @@
      */
     protected void restoreChangesetsHistory(HistoryComboBox cbHistory) {
-        List<String> cmtHistory = new LinkedList<>(
-                Config.getPref().getList(getClass().getName() + ".changesetsHistory", new LinkedList<String>()));
-        // we have to reverse the history, because ComboBoxHistory will reverse it again in addElement()
-        Collections.reverse(cmtHistory);
-        cbHistory.setPossibleItems(cmtHistory);
+        cbHistory.getModel().prefs().load(getClass().getName() + ".changesetsHistory");
     }
 
@@ -171 +164 @@
     protected void remindChangesetsHistory(HistoryComboBox cbHistory) {
         cbHistory.addCurrentItemToHistory();
-        Config.getPref().putList(getClass().getName() + ".changesetsHistory", cbHistory.getHistory());
+        cbHistory.getModel().prefs().save(getClass().getName() + ".changesetsHistory");
     }
 

applications/editors/josm/plugins/reverter/src/reverter/ChangesetIdsTextField.java

@@ -36 +36 @@
 
     /**
+     * Return sorted changeset IDs (highest ID first).
      * @return sorted changeset IDs (highest ID first)
      */

applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java

@@ -512 +512 @@
                             if (!history.isEmpty()) {
                                 Node historyNode = (Node) history.allPrimitives().iterator().next();
-                                if (historyNode.isLatLonKnown() && changeset.getClosedAt().toEpochMilli() > historyNode.getTimestamp().getTime()) {
+                                if (historyNode.isLatLonKnown() && changeset.getClosedAt().isAfter(historyNode.getInstant())) {
                                     n.load(historyNode.save());
                                     break;