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

Timestamp:

2011-10-21T19:13:08+02:00 (15 years ago)

Author:

Don-vip

Message:

Fixed a bunch of compile warnings

File:

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

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

@@ -10 +10 @@
 import org.openstreetmap.josm.data.APIDataSet;
 import org.openstreetmap.josm.data.osm.Changeset;
+import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -43 +44 @@
     private Changeset changeset;
     private Collection<OsmPrimitive> toUpload;
-    private HashSet<OsmPrimitive> processedPrimitives;
+    private HashSet<IPrimitive> processedPrimitives;
     private UploadStrategySpecification strategy;
 
@@ -66 +67 @@
         this.changeset = changeset;
         this.strategy = strategy;
-        processedPrimitives = new HashSet<OsmPrimitive>();
+        processedPrimitives = new HashSet<IPrimitive>();
     }
 
@@ -93 +94 @@
             //
             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((Collection) writer.getProcessedPrimitives());
+            processedPrimitives.addAll(writer.getProcessedPrimitives());
             processedPrimitives.add(p);
             toUpload.removeAll(processedPrimitives);
@@ -124 +125 @@
                     if (isCanceled()) return;
                     writer.uploadOsm(strategy, toUpload, changeset, m);
-                    processedPrimitives.addAll((Collection) writer.getProcessedPrimitives()); // OsmPrimitive in => OsmPrimitive out
+                    processedPrimitives.addAll(writer.getProcessedPrimitives()); // OsmPrimitive in => OsmPrimitive out
                     break;
                 } catch(OsmApiPrimitiveGoneException e) {