Changeset 35310 in osm for applications/editors/josm

Timestamp:

2020-01-27T08:05:05+01:00 (5 years ago)

Author:

gerdp

Message:

fix #10020: Revert selection to new layer broken
Selected elements where searched in the wrong DataSet.

Location:

applications/editors/josm/plugins/reverter/src/reverter

Files:

• ChangesetReverter.java (modified) (3 diffs)
• RevertChangesetTask.java (modified) (4 diffs)

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

@@ -74 +74 @@
     private final DataSet ds; // DataSet associated with reverter
     private final ChangesetDataSet cds; // Current changeset data
+    /** original DataSet, used if a new layer is requested */
+    private final DataSet ods;
     private DataSet nds; // Dataset that contains new objects downloaded by reverter
 
@@ -118 +120 @@
             return true;
         }
-        OsmPrimitive p = ds.getPrimitiveById(entry.getPrimitive().getPrimitiveId());
+        if (ods == null)
+            return false; // should not happen
+        OsmPrimitive p = ods.getPrimitiveById(entry.getPrimitive().getPrimitiveId());
         if (p == null) return false;
         return p.isSelected();
@@ -128 +132 @@
      * @param revertType type of revert
      * @param newLayer set to true if a new layer should be created
+     * @param ods original dataset to search for selected primitives, can be null
      * @param monitor progress monitor
      * @throws OsmTransferException if data transfer errors occur
      * @throws RevertRedactedChangesetException if a redacted changeset is requested
      */
-    public ChangesetReverter(int changesetId, RevertType revertType, boolean newLayer, ProgressMonitor monitor)
+    public ChangesetReverter(int changesetId, RevertType revertType, boolean newLayer, DataSet ods, ProgressMonitor monitor)
             throws OsmTransferException, RevertRedactedChangesetException {
         this.changesetId = changesetId;
+        OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
         if (newLayer) {
             this.ds = new DataSet();
             this.layer = new OsmDataLayer(this.ds, tr("Reverted changeset") + tr(" [id: {0}]", String.valueOf(changesetId)), null);
+            this.ods = ods;
         } else {
-            this.layer = MainApplication.getLayerManager().getEditLayer();
-            this.ds = layer.data;
+            this.layer = editLayer;
+            this.ds = editLayer.data;
+            this.ods = ods;
         }
         this.revertType = revertType;
+        if ((revertType == RevertType.SELECTION || revertType == RevertType.SELECTION_WITH_UNDELETE)
+                && (ods == null || ods.getAllSelected().isEmpty())) {
+            throw new IllegalArgumentException("No selected elements with revert type " + revertType);
+        }
 
         OsmServerChangesetReader csr = new OsmServerChangesetReader(true);

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

@@ -18 +18 @@
 import org.openstreetmap.josm.command.conflict.ConflictAddCommand;
 import org.openstreetmap.josm.data.UndoRedoHandler;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -33 +35 @@
     private final RevertType revertType;
     private boolean newLayer;
+    private final DataSet oldDataSet;
 
     private ChangesetReverter rev;
@@ -56 +59 @@
         this.downloadConfirmed = autoConfirmDownload;
         this.newLayer = newLayer;
+        OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
+        this.oldDataSet = editLayer == null ? null : editLayer.data;
     }
 
@@ -116 +121 @@
         progressMonitor.indeterminateSubTask(tr("Reverting changeset {0}", Long.toString(changesetId)));
         try {
-            rev = new ChangesetReverter(changesetId, revertType, newLayer, progressMonitor.createSubTaskMonitor(0, true));
+            rev = new ChangesetReverter(changesetId, revertType, newLayer, oldDataSet, progressMonitor.createSubTaskMonitor(0, true));
         } catch (final RevertRedactedChangesetException e) {
             GuiHelper.runInEDT(() -> new Notification(