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

Timestamp:

2009-09-03T18:51:04+02:00 (15 years ago)

Author:

Gubaer

Message:

improved upload dialog
new: tags for changesets
new: multiple uploads to the same changeset
fixed #3381: simple imput of a changeset source
fixed #2491: Allow arbitrary key-value pairs in changesets
fixed #2436: Allow multiple uploads to one changeset

File:

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

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

@@ -7 +7 @@
 
 import org.openstreetmap.josm.data.APIDataSet;
+import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -12 +13 @@
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.io.ChangesetProcessingType;
 import org.openstreetmap.josm.io.OsmServerWriter;
 
@@ -33 +35 @@
     private OsmDataLayer layer;
     private ProgressMonitor monitor;
+    private Changeset changeset;
+    private ChangesetProcessingType changesetProcessingType;
 
     /**
@@ -38 +42 @@
      * @param layer the layer. Must not be null.
      * @param monitor  a progress monitor. If monitor is null, uses {@see NullProgressMonitor#INSTANCE}
+     * @param changeset the changeset to be used if <code>changesetProcessingType</code> indicates that a new
+     *   changeset is to be used
+     * @param changesetProcessingType how we handle changesets
      * @throws IllegalArgumentException thrown, if layer is null
      */
-    public UploadLayerTask(OsmDataLayer layer, ProgressMonitor monitor) {
+    public UploadLayerTask(OsmDataLayer layer, ProgressMonitor monitor, Changeset changeset, ChangesetProcessingType changesetProcessingType) {
         if (layer == null)
             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", layer));
@@ -48 +55 @@
         this.layer = layer;
         this.monitor = monitor;
+        this.changeset = changeset;
+        this.changesetProcessingType = changesetProcessingType == null ? ChangesetProcessingType.USE_NEW_AND_CLOSE : changesetProcessingType;
     }
 
@@ -60 +69 @@
             ProgressMonitor m = monitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false);
             if (isCancelled()) return;
-            writer.uploadOsm(layer.data.version, toUpload, m);
+            writer.uploadOsm(layer.data.version, toUpload, changeset, changesetProcessingType, m);
         } catch (Exception sxe) {
             if (isCancelled()) {