Changeset 17206 in josm for trunk/src

Timestamp:

2020-10-15T16:30:03+02:00 (4 years ago)

Author:

GerdP

Message:

fix #19939 Replace ParentRelationLoadingTask by DownloadReferrersTask

• remove class ParentRelationLoadingTask
• adapt code to use DownloadReferrersTask instead

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/relation

Files:

• MemberTableModel.java (modified) (1 diff)
• ParentRelationLoadingTask.java (deleted)
• ReferringRelationsBrowser.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

@@ -134 +134 @@
         // just trigger a repaint - the display name of the relation members may have changed
         Collection<RelationMember> sel = getSelectedMembers();
-        GuiHelper.runInEDT(this::fireTableDataChanged);
+        GuiHelper.runInEDTAndWait(this::fireTableDataChanged);
         setSelectedMembers(sel);
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java

@@ -10 +10 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.swing.AbstractAction;
@@ -23 +26 @@
 import javax.swing.event.ListSelectionListener;
 
+import org.openstreetmap.josm.actions.downloadtasks.DownloadReferrersTask;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.PrimitiveRenderer;
+import org.openstreetmap.josm.gui.io.DownloadPrimitivesTask;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.progress.swing.PleaseWaitProgressMonitor;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -118 +125 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            boolean full = cbReadFull.isSelected();
-            final ParentRelationLoadingTask task = new ParentRelationLoadingTask(
-                    model.getRelation(),
-                    getLayer(),
-                    full,
-                    new PleaseWaitProgressMonitor(tr("Loading parent relations"))
-            );
-            task.setContinuation(() -> {
-                    if (task.isCanceled() || task.hasError())
-                        return;
-                    model.populate(task.getParents());
-                });
+            DownloadReferrersTask task = new DownloadReferrersTask(getLayer(), Collections.singleton(model.getRelation()));
             MainApplication.worker.submit(task);
+            MainApplication.worker.submit(() -> {
+                if (cbReadFull.isSelected() && !task.getProgressMonitor().isCanceled()) {
+                    // download all members of parents
+                    List<PrimitiveId> parentsChildren = model.getRelation().referrers(Relation.class)
+                            .collect(Collectors.toSet()).stream().flatMap(r -> r.getMemberPrimitives().stream())
+                            .distinct().map(OsmPrimitive::getPrimitiveId).distinct().collect(Collectors.toList());
+                    new DownloadPrimitivesTask(getLayer(), parentsChildren, false).run();
+                }
+            });
+            GuiHelper.executeByMainWorkerInEDT(() ->
+                model.populate(model.getRelation().getReferrers().stream()
+                        .filter(Relation.class::isInstance)
+                        .map(Relation.class::cast)
+                        .collect(Collectors.toList()))
+                );
         }