Index: src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (revision 17200) +++ src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (working copy) @@ -133,7 +133,7 @@ public void dataChanged(DataChangedEvent event) { // just trigger a repaint - the display name of the relation members may have changed Collection sel = getSelectedMembers(); - GuiHelper.runInEDT(this::fireTableDataChanged); + GuiHelper.runInEDTAndWait(this::fireTableDataChanged); setSelectedMembers(sel); } Index: src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (revision 17200) +++ src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (nonexistent) @@ -1,191 +0,0 @@ -// License: GPL. For details, see LICENSE file. -package org.openstreetmap.josm.gui.dialogs.relation; - -import static org.openstreetmap.josm.tools.I18n.tr; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; - -import javax.swing.JOptionPane; -import javax.swing.SwingUtilities; - -import org.openstreetmap.josm.data.osm.DataSet; -import org.openstreetmap.josm.data.osm.DataSetMerger; -import org.openstreetmap.josm.data.osm.Relation; -import org.openstreetmap.josm.gui.MainApplication; -import org.openstreetmap.josm.gui.PleaseWaitRunnable; -import org.openstreetmap.josm.gui.layer.OsmDataLayer; -import org.openstreetmap.josm.gui.progress.swing.PleaseWaitProgressMonitor; -import org.openstreetmap.josm.io.OsmApi; -import org.openstreetmap.josm.io.OsmServerBackreferenceReader; -import org.openstreetmap.josm.io.OsmTransferException; -import org.openstreetmap.josm.tools.CheckParameterUtil; -import org.openstreetmap.josm.tools.Logging; -import org.xml.sax.SAXException; - -/** - * This is an asynchronous task for loading the parents of a given relation. - * - * Typical usage: - * 
- *  final ParentRelationLoadingTask task = new ParentRelationLoadingTask(
- *                   child,   // the child relation
- *                   MainApplication.getLayerManager().getEditLayer(), // the edit layer
- *                   true,  // load fully
- *                   new PleaseWaitProgressMonitor()  // a progress monitor
- *   );
- *   task.setContinuation(
- *       new Runnable() {
- *          public void run() {
- *              if (task.isCanceled() || task.hasError())
- *                  return;
- *              List<Relation> parents = task.getParents();
- *              // do something with the parent relations
- *       }
- *   );
- *
- *   // start the task
- *   MainApplication.worker.submit(task);
- *
- * - */ -public class ParentRelationLoadingTask extends PleaseWaitRunnable { - private boolean canceled; - private Exception lastException; - private DataSet referrers; - private final boolean full; - private final OsmDataLayer layer; - private final Relation child; - private final List parents; - private Runnable continuation; - - /** - * Creates a new task for asynchronously downloading the parents of a child relation. - * - * @param child the child relation. Must not be null. Must have an id > 0. - * @param layer the OSM data layer. Must not be null. - * @param full if true, parent relations are fully downloaded (i.e. with their members) - * @param monitor the progress monitor to be used - * - * @throws IllegalArgumentException if child is null - * @throws IllegalArgumentException if layer is null - * @throws IllegalArgumentException if child.getId() == 0 - */ - public ParentRelationLoadingTask(Relation child, OsmDataLayer layer, boolean full, PleaseWaitProgressMonitor monitor) { - super(tr("Download referring relations"), monitor, false /* don't ignore exception */); - CheckParameterUtil.ensureThat(child.getUniqueId() > 0, "id > 0"); - CheckParameterUtil.ensureParameterNotNull(layer, "layer"); - if (!layer.isDownloadable()) { - throw new IllegalArgumentException("Non-downloadable layer: " + layer); - } - referrers = null; - this.layer = layer; - parents = new ArrayList<>(); - this.child = child; - this.full = full; - } - - /** - * Set a continuation which is called upon the job finished. - * - * @param continuation the continuation - */ - public void setContinuation(Runnable continuation) { - this.continuation = continuation; - } - - /** - * Replies true if this has been canceled by the user. - * - * @return true if this has been canceled by the user. - */ - public boolean isCanceled() { - return canceled; - } - - /** - * Replies true if an exception has been caught during the execution of this task. - * - * @return true if an exception has been caught during the execution of this task. - */ - public boolean hasError() { - return lastException != null; - } - - protected OsmDataLayer getLayer() { - return layer; - } - - public List getParents() { - return parents; - } - - @Override - protected void cancel() { - canceled = true; - OsmApi.getOsmApi().cancel(); - } - - protected void showLastException() { - JOptionPane.showMessageDialog( - MainApplication.getMainFrame(), - Optional.ofNullable(lastException.getMessage()).orElseGet(lastException::toString), - tr("Error"), - JOptionPane.ERROR_MESSAGE - ); - } - - @Override - protected void finish() { - if (canceled) return; - if (lastException != null) { - showLastException(); - return; - } - parents.clear(); - for (Relation parent : referrers.getRelations()) { - parents.add((Relation) getLayer().data.getPrimitiveById(parent)); - } - if (continuation != null) { - continuation.run(); - } - } - - @Override - protected void realRun() throws SAXException, IOException, OsmTransferException { - try { - progressMonitor.indeterminateSubTask(null); - OsmServerBackreferenceReader reader = new OsmServerBackreferenceReader(child, full); - referrers = reader.parseOsm(progressMonitor.createSubTaskMonitor(1, false)); - if (referrers != null) { - final DataSetMerger visitor = new DataSetMerger(getLayer().getDataSet(), referrers); - visitor.merge(); - - // copy the merged layer's data source info - getLayer().getDataSet().addDataSources(referrers.getDataSources()); - // FIXME: this is necessary because there are dialogs listening - // for DataChangeEvents which manipulate Swing components on this thread. - SwingUtilities.invokeLater(getLayer()::onPostDownloadFromServer); - - if (visitor.getConflicts().isEmpty()) - return; - getLayer().getConflicts().add(visitor.getConflicts()); - JOptionPane.showMessageDialog( - MainApplication.getMainFrame(), - tr("There were {0} conflicts during import.", - visitor.getConflicts().size()), - tr("Warning"), - JOptionPane.WARNING_MESSAGE - ); - } - } catch (OsmTransferException e) { - if (canceled) { - Logging.warn(tr("Ignoring exception because task was canceled. Exception: {0}", e.toString())); - return; - } - lastException = e; - } - } -} Property changes on: src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Index: src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (revision 17200) +++ src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (working copy) @@ -9,6 +9,9 @@ import java.awt.event.ActionEvent; 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; import javax.swing.JButton; @@ -22,11 +25,15 @@ import javax.swing.event.ListSelectionEvent; 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; /** @@ -117,19 +124,23 @@ @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 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())) + ); } @Override