Changeset 30000 in osm for applications

Timestamp:

2013-10-06T19:08:22+02:00 (11 years ago)

Author:

donvip

Message:

[josm_reverter] fix #josm9151 - unable to revert a changeset when a way has been deleted with all its nodes

Location:

applications/editors/josm/plugins/reverter

Files:

• .classpath (modified) (1 diff)
• src/reverter/ChangesetReverter.java (modified) (3 diffs)
• src/reverter/DataSetCommandMerger.java (modified) (4 diffs)

applications/editors/josm/plugins/reverter/.classpath

@@ -2 +2 @@
 <classpath>
         <classpathentry kind="src" path="src"/>
-        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
         <classpathentry kind="output" path="build"/>

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

@@ -9 +9 @@
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 
@@ -204 +203 @@
      * @throws OsmTransferException
      */
+    @SuppressWarnings("unchecked")
     public void downloadObjectsHistory(ProgressMonitor progressMonitor) throws OsmTransferException {
         final OsmServerMultiObjectReader rdr = new OsmServerMultiObjectReader();
@@ -334 +334 @@
         // Create commands to restore/update all affected objects
         DataSetCommandMerger merger = new DataSetCommandMerger(nds,ds);
-        LinkedList<Command> cmds = merger.getCommandList();
+        List<Command> cmds = merger.getCommandList();
 
         //////////////////////////////////////////////////////////////////////////

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

@@ -31 +31 @@
     private final DataSet targetDataSet;
 
-    private final LinkedList<Command> cmds = new LinkedList<Command>();
+    private final List<Command> cmds = new LinkedList<Command>();
+    private final List<OsmPrimitive> undeletedPrimitives = new LinkedList<OsmPrimitive>();
 
     /**
@@ -45 +46 @@
         if (!target.hasEqualSemanticAttributes(newTarget)) {
             cmds.add(new ChangeCommand(target,newTarget));
+            undeletedPrimitives.add(target);
         }
     }
@@ -94 +96 @@
         for (Node sourceNode : source.getNodes()) {
             Node targetNode = (Node)getMergeTarget(sourceNode);
-            if (!targetNode.isDeleted()) {
+            if (!targetNode.isDeleted() || undeletedPrimitives.contains(targetNode)) {
                 newNodes.add(targetNode);
             } else if (sourceNode.isIncomplete()
@@ -157 +159 @@
     }
 
-    public LinkedList<Command> getCommandList() {
+    public List<Command> getCommandList() {
         return cmds;
     }