Changeset 2569 in josm for trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java

Timestamp:

2009-12-04T15:53:55+01:00 (14 years ago)

Author:

Gubaer

Message:

fixed #3684: Add "chunked" upload mode
Removed support for API "0.5" when uploading (there are still 0.5-files around, but I'm not aware of any 0.5-servers)

File:

• trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (modified) (5 diffs)

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

@@ -44 +44 @@
     private Collection<OsmPrimitive> toUpload;
     private HashSet<OsmPrimitive> processedPrimitives;
+    private UploadStrategySpecification strategy;
 
     /**
-     *
+     * Creates the upload task
+     * 
+     * @param strategy the upload strategy specification
      * @param layer the layer. Must not be null.
      * @param monitor  a progress monitor. If monitor is null, uses {@see NullProgressMonitor#INSTANCE}
@@ -52 +55 @@
      * @param closeChangesetAfterUpload true, if the changeset should be closed after the upload
      * @throws IllegalArgumentException thrown, if layer is null
+     * @throws IllegalArgumentException thrown if strategy is null
      */
-    public UploadLayerTask(OsmDataLayer layer, ProgressMonitor monitor, Changeset changeset, boolean closeChangesetAfterUpload) {
+    public UploadLayerTask(UploadStrategySpecification strategy, OsmDataLayer layer, ProgressMonitor monitor, Changeset changeset, boolean closeChangesetAfterUpload) {
         if (layer == null)
-            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", layer));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "layer"));
+        if (strategy == null)
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "strategy"));
         if (monitor == null) {
             monitor = NullProgressMonitor.INSTANCE;
@@ -62 +68 @@
         this.monitor = monitor;
         this.changeset = changeset;
+        this.strategy = strategy;
         this.closeChangesetAfterUpload = closeChangesetAfterUpload;
         processedPrimitives = new HashSet<OsmPrimitive>();
@@ -103 +110 @@
     @Override
     public void run() {
-        monitor.subTask(tr("Preparing primitives to upload ..."));
+        monitor.indeterminateSubTask(tr("Preparing primitives to upload ..."));
         APIDataSet ds = new APIDataSet(layer.data);
         try {
@@ -120 +127 @@
                     ProgressMonitor m = monitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false);
                     if (isCancelled()) return;
-                    writer.uploadOsm(layer.data.getVersion(), toUpload, changeset, m);
+                    writer.uploadOsm(strategy, toUpload, changeset, m);
                     processedPrimitives.addAll(writer.getProcessedPrimitives());
                     break;