Changeset 3102 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java

Timestamp:

10.03.2010 10:00:20 (2 years ago)

Author:

Gubaer

Message:

fixed #4651: Ability to download incomplete relation from selection
fixed #4098: Popup Menu entry "download relation members" in relation dialog should be "download incomplete relation members"
fixed two NPEs in RelationListDialog and SelectionListDialog
refactored SelectionListDialog to support better user feedback (enabled/disabled buttons and menu items)
Finally removed the sort() method on DataSet, marked as FIXME since a long time.

CAVEAT: DataSet.getSelected() now returns an unmodifiable list instead of a copy of the selection list. This may lead to UnsupportedOperationExceptions in the next few days. I tried to make sure the JOSM core uses getSelected() only for reading, but I didn't check the plugins.

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java (modified) (4 diffs)

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

@@ -8 +8 @@
 import java.io.IOException;
 import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
 
 import javax.swing.SwingUtilities;
@@ -32 +34 @@
     private boolean cancelled;
     private Exception lastException;
-    private Relation parent;
+    private final Set<Relation> parents = new HashSet<Relation>();
     private Collection<OsmPrimitive> children;
     private OsmDataLayer curLayer;
     private MultiFetchServerObjectReader objectReader;
 
-    public DownloadRelationMemberTask(Relation parent, Collection<OsmPrimitive> children, OsmDataLayer curLayer, MemberTableModel memberTableModel, Dialog dialog) {
+    public DownloadRelationMemberTask(Relation parent, Collection<OsmPrimitive> children, OsmDataLayer curLayer, Dialog dialog) {
         super(tr("Download relation members"), new PleaseWaitProgressMonitor(dialog), false /* don't ignore exception */);
-        this.parent = parent;
+        this.parents.add(parent);
         this.children = children;
         this.curLayer = curLayer;
     }
 
-    public DownloadRelationMemberTask(Relation parent, Collection<OsmPrimitive> children, OsmDataLayer curLayer, MemberTableModel memberTableModel) {
+    public DownloadRelationMemberTask(Relation parent, Collection<OsmPrimitive> children, OsmDataLayer curLayer) {
         super(tr("Download relation members"), false /* don't ignore exception */);
-        this.parent = parent;
+        this.parents.add(parent);
+        this.children = children;
+        this.curLayer = curLayer;
+    }
+
+    /**
+     * Creates a download task for downloading the child primitives {@code children} for all parent
+     * relations in {@code parents}.
+     * 
+     * @param parents the collection of parent relations
+     * @param children the collection of child primitives to download
+     * @param curLayer the current OSM layer
+     */
+    public DownloadRelationMemberTask(Collection<Relation> parents, Collection<OsmPrimitive> children, OsmDataLayer curLayer) {
+        super(tr("Download relation members"), false /* don't ignore exception */);
+        this.parents.addAll(parents);
         this.children = children;
         this.curLayer = curLayer;
@@ -71 +88 @@
     }
 
+    protected String buildDownloadFeedbackMessage() {
+        if (parents.size() == 1) {
+            Relation parent = parents.iterator().next();
+            return trn("Downloading {0} incomplete child of relation ''{1}''",
+                    "Downloading {0} incomplete children of relation ''{1}''",
+                    children.size(),
+                    children.size(),
+                    parent.getDisplayName(DefaultNameFormatter.getInstance())
+            );
+        } else
+            return trn("Downloading {0} incomplete child of {1} parent relations",
+                    "Downloading {0} incomplete children of  {1} parent relations",
+                    children.size(),
+                    children.size(),
+                    parents.size()
+            );
+    }
+
     @Override
     protected void realRun() throws SAXException, IOException, OsmTransferException {
@@ -80 +115 @@
             objectReader.append(children);
             progressMonitor.indeterminateSubTask(
-                    trn("Downloading {0} incomplete child of relation ''{1}''",
-                            "Downloading {0} incomplete children of relation ''{1}''",
-                            children.size(),
-                            children.size(),
-                            parent.getDisplayName(DefaultNameFormatter.getInstance())
-                    )
+                    buildDownloadFeedbackMessage()
             );
             final DataSet dataSet = objectReader.parseOsm(progressMonitor