Changeset 18443 in josm

Timestamp:

2022-05-10T18:42:34+02:00 (2 years ago)

Author:

taylor.smock

Message:

Fix #17288: Notes progress bar shows no progress (patch by gaben, modified)

The patch provided by gaben was modified to only count modified notes for
the progress bar and count. Technically speaking, this is a little less
efficient, as the modified notes will have to iterate through comments
twice instead of once. This should not be noticeable to end users, as
they should not (generally speaking) be closing enough notes for this
to be an issue.

UploadNotesTask now has a test (not by gaben) to check for correctness.

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/actions/upload/UploadNotesTaskTest.java (added)

trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java

@@ -5 +5 @@
 
 import java.io.IOException;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -64 +66 @@
         @Override
         protected void realRun() throws SAXException, IOException, OsmTransferException {
-            ProgressMonitor monitor = progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false);
             OsmApi api = OsmApi.getOsmApi();
-            for (Note note : noteData.getNotes()) {
+            final Collection<Note> modifiedNotes = noteData.getNotes().stream()
+                    .filter(note -> Optional.ofNullable(note.getLastComment()).map(NoteComment::isNew).orElse(false))
+                    .collect(Collectors.toList());
+            getProgressMonitor().setTicksCount(modifiedNotes.size());
+            for (Note note : modifiedNotes) {
+                getProgressMonitor().setCustomText(tr("Uploading notes {0}/{1}", getProgressMonitor().getTicks(),
+                        getProgressMonitor().getTicksCount()));
                 if (isCanceled) {
                     Logging.info("Note upload interrupted by user");
@@ -74 +81 @@
                     if (comment.isNew()) {
                         Logging.debug("found note change to upload");
-                        processNoteComment(monitor, api, note, comment);
+                        processNoteComment(getProgressMonitor(), api, note, comment);
                     }
                 }
+                getProgressMonitor().worked(1);
             }
         }