Changeset 36319 in osm for applications

Timestamp:

2024-08-21T22:49:24+02:00 (4 months ago)

Author:

taylor.smock

Message:

Fix #23701: Support for revert multiple changesets in Remote Control (patch by TrickyFoxy, modified)

Modifications are as follows:

• Lint cleanups
• Add remote control checkbox for reverter to preferences

Location:

applications/editors/josm/plugins/reverter

Files:

• build.xml (modified) (1 diff)
• pom.xml (modified) (1 diff)
• src/reverter/RevertChangesetHandler.java (modified) (3 diffs)
• src/reverter/ReverterPlugin.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="18723"/>
+    <property name="plugin.main.version" value="19044"/>
 
     <!-- Configure these properties (replace "..." accordingly).

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

@@ -17 +17 @@
     <properties>
         <plugin.src.dir>src</plugin.src.dir>
-        <plugin.main.version>18723</plugin.main.version>
+        <plugin.main.version>19044</plugin.main.version>
         <plugin.author>Upliner</plugin.author>
         <plugin.class>reverter.ReverterPlugin</plugin.class>

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

@@ -7 +7 @@
 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
 import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler;
+import org.openstreetmap.josm.tools.Logging;
 
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * The handler for {@link org.openstreetmap.josm.io.remotecontrol.RemoteControl} revert commands
+ */
 public class RevertChangesetHandler extends RequestHandler {
-    public static final String command = "revert_changeset";
-    public static final String permissionKey = "remotecontrol.permission.revert_changeset";
-    public static final boolean permissionDefault = true;
+    public static final String COMMAND = "revert_changeset";
+    private static final String PERMISSION_KEY = "remotecontrol.permission.revert_changeset";
+    private static final boolean PERMISSION_DEFAULT = true;
 
-    private int changesetId;
+    private final List<Integer> changesetIds = new ArrayList<>();
 
     @Override
-    protected void handleRequest() throws RequestHandlerErrorException,
-            RequestHandlerBadRequestException {
+    protected void handleRequest() throws RequestHandlerErrorException {
         try {
-            MainApplication.worker.submit(new RevertChangesetTask(changesetId, ChangesetReverter.RevertType.FULL, true));
+            MainApplication.worker.submit(new RevertChangesetTask(changesetIds, ChangesetReverter.RevertType.FULL, true, false));
         } catch (Exception ex) {
-            System.out.println("RemoteControl: Error parsing revert_changeset remote control request:");
-            ex.printStackTrace();
+            Logging.debug("RemoteControl: Error parsing revert_changeset remote control request:");
+            Logging.debug(ex);
             throw new RequestHandlerErrorException(ex);
         }
@@ -34 +40 @@
     @Override
     public PermissionPrefWithDefault getPermissionPref() {
-        return null;
+        return new PermissionPrefWithDefault(PERMISSION_KEY, PERMISSION_DEFAULT, tr("Revert changeset(s)"));
     }
 
@@ -44 +50 @@
     @Override
     protected void validateRequest() throws RequestHandlerBadRequestException {
-        try {
-            changesetId = Integer.parseInt(args.get("id"));
-        } catch (NumberFormatException e) {
-            throw new RequestHandlerBadRequestException("NumberFormatException: "+e.getMessage());
+        if (args.get("id") != null) {
+            try {
+                for (String id : args.get("id").split(",", -1)) {
+                    changesetIds.add(Integer.parseInt(id));
+                }
+            } catch (NumberFormatException e) {
+                throw new RequestHandlerBadRequestException("NumberFormatException: " + e.getMessage());
+            }
+        } else {
+            throw new RequestHandlerBadRequestException("The required id argument must be specified");
         }
     }

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

@@ -28 +28 @@
         MainMenu.add(historyMenu, new RevertChangesetAction());
         UploadAction.registerUploadHook(new ReverterUploadHook(info));
-        new RemoteControl().addRequestHandler(RevertChangesetHandler.command, RevertChangesetHandler.class);
+        new RemoteControl().addRequestHandler(RevertChangesetHandler.COMMAND, RevertChangesetHandler.class);
     }
 }