Changeset 4100 in josm for trunk/src/org/openstreetmap/josm/gui/io

Timestamp:

2011-05-29T21:04:54+02:00 (13 years ago)

Author:

bastiK

Message:

use IPrimitive to make upload code work for both OsmPrimitive and PrimitiveData

Location:

trunk/src/org/openstreetmap/josm/gui/io

Files:

• UploadLayerTask.java (modified) (2 diffs)
• UploadPrimitivesTask.java (modified) (4 diffs)

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

@@ -93 +93 @@
             //
             System.out.println(tr("Warning: object ''{0}'' is already deleted on the server. Skipping this object and retrying to upload.", p.getDisplayName(DefaultNameFormatter.getInstance())));
-            processedPrimitives.addAll(writer.getProcessedPrimitives());
+            processedPrimitives.addAll((Collection) writer.getProcessedPrimitives());
             processedPrimitives.add(p);
             toUpload.removeAll(processedPrimitives);
@@ -124 +124 @@
                     if (isCancelled()) return;
                     writer.uploadOsm(strategy, toUpload, changeset, m);
-                    processedPrimitives.addAll(writer.getProcessedPrimitives());
+                    processedPrimitives.addAll((Collection) writer.getProcessedPrimitives()); // OsmPrimitive in => OsmPrimitive out
                     break;
                 } catch(OsmApiPrimitiveGoneException e) {

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

@@ -9 +9 @@
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.logging.Logger;
@@ -194 +195 @@
             System.out.println(tr("Warning: object ''{0}'' is already deleted on the server. Skipping this object and retrying to upload.", p.getDisplayName(DefaultNameFormatter.getInstance())));
             monitor.appendLogMessage(tr("Object ''{0}'' is already deleted. Skipping object in upload.",p.getDisplayName(DefaultNameFormatter.getInstance())));
-            processedPrimitives.addAll(writer.getProcessedPrimitives());
+            processedPrimitives.addAll((Collection) writer.getProcessedPrimitives());
             processedPrimitives.add(p);
             toUpload.removeProcessed(processedPrimitives);
@@ -248 +249 @@
                     recoverFromGoneOnServer(e, getProgressMonitor());
                 } catch(ChangesetClosedException e) {
-                    processedPrimitives.addAll(writer.getProcessedPrimitives());
+                    processedPrimitives.addAll((Collection) writer.getProcessedPrimitives()); // OsmPrimitive in => OsmPrimitive out
                     changeset.setOpen(false);
                     switch(e.getSource()) {
@@ -273 +274 @@
                 } finally {
                     if (writer != null) {
-                        processedPrimitives.addAll(writer.getProcessedPrimitives());
+                        processedPrimitives.addAll((Collection) writer.getProcessedPrimitives());
                     }
                     synchronized(this) {