Changeset 30031 in osm for applications/editors/josm/plugins/reverter

Timestamp:

2013-10-27T15:19:50+01:00 (11 years ago)

Author:

donvip

Message:

[josm_reverter] fix #josm9197 - Forbid revert of redaction changesets

Location:

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

Files:

• ChangesetReverter.java (modified) (3 diffs)
• RevertChangesetTask.java (modified) (2 diffs)
• RevertRedactedChangesetException.java (added)

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

@@ -55 +55 @@
         SELECTION_WITH_UNDELETE
     }
+    
+    public static final Collection<Long> MODERATOR_REDACTION_ACCOUNTS = Collections.unmodifiableCollection(Arrays.asList(
+            722137L, // OSMF Redaction Account
+            760215L  // pnorman redaction revert
+            ));
 
     public final int changesetId;
@@ -122 +127 @@
      * @param monitor
      * @throws OsmTransferException
+     * @throws RevertRedactedChangesetException 
      */
     public ChangesetReverter(int changesetId, RevertType revertType, boolean newLayer, ProgressMonitor monitor)
-            throws OsmTransferException {
+            throws OsmTransferException, RevertRedactedChangesetException {
         this.changesetId = changesetId;
         if (newLayer) {
@@ -137 +143 @@
         OsmServerChangesetReader csr = new OsmServerChangesetReader();
         monitor.beginTask("", 2);
+        changeset = csr.readChangeset(changesetId, monitor.createSubTaskMonitor(1, false));
+        if (MODERATOR_REDACTION_ACCOUNTS.contains(changeset.getUser().getId())) {
+            throw new RevertRedactedChangesetException(tr("It is not allowed to revert changeset from {0}", changeset.getUser().getName()));
+        }
         try {
-            changeset = csr.readChangeset(changesetId, monitor.createSubTaskMonitor(1, false));
             cds = csr.downloadChangeset(changesetId, monitor.createSubTaskMonitor(1, false));
         } finally {

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

@@ -10 +10 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.ConflictAddCommand;
+import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
@@ -64 +65 @@
     protected void realRun() throws OsmTransferException {
         progressMonitor.indeterminateSubTask(tr("Downloading changeset"));
-        rev = new ChangesetReverter(changesetId, revertType, newLayer,
-                progressMonitor.createSubTaskMonitor(0, true));
+        try {
+            rev = new ChangesetReverter(changesetId, revertType, newLayer,
+                    progressMonitor.createSubTaskMonitor(0, true));
+        } catch (final RevertRedactedChangesetException e) {
+            GuiHelper.runInEDT(new Runnable() {
+                @Override
+                public void run() {
+                    new Notification(
+                            e.getMessage()+"<br>"+
+                            tr("See {0}", "<a href=\"http://www.openstreetmap.org/redactions\">http://www.openstreetmap.org/redactions</a>"))
+                    .setIcon(JOptionPane.ERROR_MESSAGE)
+                    .setDuration(Notification.TIME_LONG)
+                    .show();
+                }
+            });
+            progressMonitor.cancel();
+        }
         if (progressMonitor.isCanceled()) return;