Changeset 17251 in josm for trunk/src/org

Timestamp:

2020-10-22T11:30:37+02:00 (4 years ago)

Author:

GerdP

Message:

fix #19375 Avoid to download changesets contents twice

• check if changeset is closed and content is already known
• simplify code

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java

@@ -50 +50 @@
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.ChangesetCache;
-import org.openstreetmap.josm.data.osm.ChangesetDataSet;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
-import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -71 +69 @@
 import org.openstreetmap.josm.tools.InputMapUtils;
 import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.StreamUtils;
 
 /**
@@ -584 +581 @@
         public void actionPerformed(ActionEvent e) {
             if (!GraphicsEnvironment.isHeadless()) {
-                actDownloadSelectedContent.actionPerformed(e);
+                if (model.getSelectedChangesets().stream().anyMatch(cs -> !cs.hasContent() || cs.isOpen()))
+                    actDownloadSelectedContent.actionPerformed(e);
                 MainApplication.worker.submit(() -> {
                     final List<PrimitiveId> primitiveIds = model.getSelectedChangesets().stream()
                             .map(Changeset::getContent)
                             .filter(Objects::nonNull)
-                            .flatMap(content -> StreamUtils.toStream(content::iterator))
-                            .map(ChangesetDataSet.ChangesetDataSetEntry::getPrimitive)
-                            .map(HistoryOsmPrimitive::getPrimitiveId)
+                            .flatMap(content -> content.getIds().stream())
                             .distinct()
                             .collect(Collectors.toList());