Changeset 35638 in osm

Timestamp:

2020-11-05T15:23:26+01:00 (3 years ago)

Author:

GerdP

Message:

see #19582: Stays silent if download is incomplete cause of timeouts

• rethrow OsmTransferException instead of only logging a warning so that a popup is shown
• show a Notification if revert was cancelled, as it sometimes reacts a bit late

This will only improve reverter with JOSM 17920 or later, plugin is compatible with older versions.

Location:

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

Files:

• OsmServerMultiObjectReader.java (modified) (2 diffs)
• RevertChangesetTask.java (modified) (3 diffs)

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

@@ -43 +43 @@
         }
     }
-    private List<String> makeQueryStrings(OsmPrimitiveType type, Map<Long,Integer> list) {
+    private static List<String> makeQueryStrings(OsmPrimitiveType type, Map<Long,Integer> list) {
         List<String> result = new ArrayList<>((list.size()+maxQueryIds-1)/maxQueryIds);
         StringBuilder sb = new StringBuilder();
@@ -73 +73 @@
 
     protected static final int maxQueryIds = 128;
-    public void readMultiObjects(OsmPrimitiveType type, Map<Long,Integer> list, ProgressMonitor progressMonitor) {
+    public void readMultiObjects(OsmPrimitiveType type, Map<Long,Integer> list, ProgressMonitor progressMonitor) throws OsmTransferException {
         for (String query : makeQueryStrings(type,list)) {
             if (progressMonitor.isCanceled()) {
                 return;
             }
-            rdr.callback = new ParseCallback() {
-                @Override
-                public void primitiveParsed(PrimitiveId id) {
-                    if (id.getType() == type && list.remove(id.getUniqueId()) != null) {
-                        progressMonitor.worked(1);
-                    }
+            rdr.callback = id -> {
+                if (id.getType() == type && list.remove(id.getUniqueId()) != null) {
+                    progressMonitor.worked(1);
                 }
             };
             try (InputStream in = getInputStream(query, NullProgressMonitor.INSTANCE)) {
                 rdr.addData(in);
-            } catch (IOException | IllegalDataException | OsmTransferException e) {
+            } catch (IOException | IllegalDataException e) {
                 Logging.warn(e);
+                throw new OsmTransferException(e);
             } finally {
                 rdr.callback = null;

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

@@ -98 +98 @@
                 newLayer = false; // reuse layer for subsequent reverts
             } catch (OsmTransferException e) {
-                if (!allcmds.isEmpty()) {
-                    GuiHelper.runInEDT(() -> UndoRedoHandler.getInstance().undo(allcmds.size()));
-                }
+                rollback(allcmds);
                 Logging.error(e);
                 throw e;
             } catch (UserCancelException e) {
-                if (!allcmds.isEmpty()) {
-                    GuiHelper.runInEDT(() -> UndoRedoHandler.getInstance().undo(allcmds.size()));
-                }
-                Logging.warn("Revert canceled");
+                rollback(allcmds);
+                GuiHelper.executeByMainWorkerInEDT(() -> new Notification(tr("Revert was canceled")).show());
                 Logging.trace(e);
                 return;
@@ -120 +116 @@
                 }
             });
+        }
+    }
+
+    private static void rollback(List<Command> allcmds) {
+        if (!allcmds.isEmpty()) {
+            GuiHelper.runInEDT(() -> UndoRedoHandler.getInstance().undo(allcmds.size()));
         }
     }
@@ -185 +187 @@
     }
 
-    @Override
-    protected void cancel() {
+        @Override
+        protected void cancel() {
         // nothing to do
-    }
-
-    @Override
-    protected void finish() {
+        }
+
+        @Override
+        protected void finish() {
         // nothing to do
 
-    }
+        }
 
     /**
+     * Return number of conflicts for this changeset.
      * @return number of conflicts for this changeset
      */