Changeset 33865 in osm for applications/editors/josm/plugins

Timestamp:

2017-11-22T00:20:39+01:00 (8 years ago)

Author:

donvip

Message:

update to JOSM 12840

Location:

applications/editors/josm/plugins/reverter

Files:

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

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

@@ -4 +4 @@
     <property name="commit.message" value="Reverter: Update MultiOsmReader to support null data after redaction"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12675"/>
+    <property name="plugin.main.version" value="12840"/>
 
     <!-- Configure these properties (replace "..." accordingly).

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

@@ -157 +157 @@
     protected void restoreChangesetsHistory(HistoryComboBox cbHistory) {
         List<String> cmtHistory = new LinkedList<>(
-                Main.pref.getCollection(getClass().getName() + ".changesetsHistory", new LinkedList<String>()));
+                Main.pref.getList(getClass().getName() + ".changesetsHistory", new LinkedList<String>()));
         // we have to reverse the history, because ComboBoxHistory will reverse it again in addElement()
         Collections.reverse(cmtHistory);
@@ -169 +169 @@
     protected void remindChangesetsHistory(HistoryComboBox cbHistory) {
         cbHistory.addCurrentItemToHistory();
-        Main.pref.putCollection(getClass().getName() + ".changesetsHistory", cbHistory.getHistory());
+        Main.pref.putList(getClass().getName() + ".changesetsHistory", cbHistory.getHistory());
     }
 

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

@@ -370 +370 @@
 
         for (Conflict<? extends OsmPrimitive> conflict : merger.getConflicts()) {
-            cmds.add(new ConflictAddCommand(layer, conflict));
+            cmds.add(new ConflictAddCommand(layer.data, conflict));
         }
 
@@ -390 +390 @@
                     /* Don't create conflict if the object has to be deleted but has already been deleted */
                     && !(toDelete.contains(dp) && dp.isDeleted())) {
-                cmds.add(new ConflictAddCommand(layer, CreateConflict(dp,
+                cmds.add(new ConflictAddCommand(layer.data, CreateConflict(dp,
                         entry.getModificationType() == ChangesetModificationType.CREATED)));
                 conflicted.add(dp);
@@ -412 +412 @@
                                */
                 if (!conflicted.contains(p)) {
-                    cmds.add(new ConflictAddCommand(layer, CreateConflict(p, true)));
+                    cmds.add(new ConflictAddCommand(layer.data, CreateConflict(p, true)));
                     conflicted.add(p);
                 }