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

Timestamp:

2018-01-28T20:57:36+01:00 (7 years ago)

Author:

donvip

Message:

fix #josm15843, #josm15844 - problem with changesets already reverted

File:

• applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetTask.java (modified) (3 diffs)

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

@@ -10 +10 @@
 import java.util.List;
 import java.util.concurrent.Callable;
+import java.util.stream.Collectors;
 
 import javax.swing.JOptionPane;
@@ -87 +88 @@
         numberOfConflicts = 0;
         final List<Command> allcmds = new ArrayList<>();
-        Logging.info("Reverting {0} changeset(s): {1}", changesetIds.size(), changesetIds);
+        Logging.info("Reverting {0} changeset(s): {1}",
+                changesetIds.size(), changesetIds.stream().map(Long::toString).collect(Collectors.toList()));
         for (int changesetId : changesetIds) {
             try {
-                Logging.info("Reverting changeset {0}", changesetId);
-                allcmds.add(revertChangeset(changesetId));
-                Logging.info("Reverted changeset {0}", changesetId);
+                Logging.info("Reverting changeset {0}", Long.toString(changesetId));
+                RevertChangesetCommand cmd = revertChangeset(changesetId);
+                if (cmd != null) {
+                    allcmds.add(cmd);
+                }
+                Logging.info("Reverted changeset {0}", Long.toString(changesetId));
                 newLayer = false; // reuse layer for subsequent reverts
             } catch (OsmTransferException e) {
@@ -154 +159 @@
         List<Command> cmds = rev.getCommands();
         if (cmds.isEmpty()) {
-            String msg = MessageFormat.format("No revert commands found for changeset {0}", changesetId);
-            Logging.warn(msg);
-            throw new OsmTransferException(msg);
+            Logging.warn(MessageFormat.format("No revert commands found for changeset {0}", Long.toString(changesetId)));
+            return null;
         }
         for (Command c : cmds) {