Changeset 4497 in josm for trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java

Timestamp:

2011-10-07T21:50:14+02:00 (13 years ago)

Author:

simon04

Message:

fix #6542 - option to download relation without its members for "Download object" dialog

File:

• trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java

@@ -39 +39 @@
 
     private OsmDataLayer layer;
+    private boolean fullRelation;
     private MultiFetchServerObjectReader multiObjectReader;
     private OsmServerObjectReader objectReader;
@@ -48 +49 @@
      * @param toUpdate a collection of primitives to update from the server. Set to
      * the empty collection if null.
+     * @param fullRelation true if a full download is required, i.e.,
+     * a download including the immediate children of a relation.
      * @throws IllegalArgumentException thrown if layer is null.
      */
-    public DownloadPrimitivesTask(OsmDataLayer layer, List<PrimitiveId>  ids) throws IllegalArgumentException {
+    public DownloadPrimitivesTask(OsmDataLayer layer, List<PrimitiveId>  ids, boolean fullRelation) throws IllegalArgumentException {
         super(tr("Download objects"), false /* don't ignore exception */);
         ensureParameterNotNull(layer, "layer");
         this.ids = ids;
         this.layer = layer;
+        this.fullRelation = fullRelation;
     }
 
@@ -145 +149 @@
                     synchronized(this) {
                         if (canceled) return;
-                        objectReader = new OsmServerObjectReader(r.getId(), OsmPrimitiveType.RELATION, true /* full */);
+                        objectReader = new OsmServerObjectReader(r.getId(), OsmPrimitiveType.RELATION, fullRelation);
                     }
                     theirDataSet = objectReader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));