Changeset 4534 in josm

Timestamp:

Oct 21, 2011 7:13:08 PM (19 months ago)

Author:

Don-vip

Message:

Fixed a bunch of compile warnings

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/APIDataSet.java (modified) (2 diffs)
• gui/io/UploadLayerTask.java (modified) (5 diffs)
• gui/io/UploadPrimitivesTask.java (modified) (7 diffs)
• gui/layer/OsmDataLayer.java (modified) (2 diffs)
• tools/Diff.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/APIDataSet.java

@@ -17 +17 @@
 import org.openstreetmap.josm.data.conflict.ConflictCollection;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -216 +217 @@
     }
 
-    public void removeProcessed(Collection<OsmPrimitive> processed) {
+    public void removeProcessed(Collection<IPrimitive> processed) {
         if (processed == null) return;
         toAdd.removeAll(processed);

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) {

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;
 
@@ -19 +18 @@
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.ChangesetCache;
+import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
@@ -45 +45 @@
     private OsmDataLayer layer;
     private Changeset changeset;
-    private HashSet<OsmPrimitive> processedPrimitives;
+    private HashSet<IPrimitive> processedPrimitives;
     private UploadStrategySpecification strategy;
 
@@ -70 +70 @@
         this.changeset = changeset;
         this.strategy = strategy;
-        this.processedPrimitives = new HashSet<OsmPrimitive>();
+        this.processedPrimitives = new HashSet<IPrimitive>();
     }
 
@@ -191 +191 @@
             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((Collection) writer.getProcessedPrimitives());
+            processedPrimitives.addAll(writer.getProcessedPrimitives());
             processedPrimitives.add(p);
             toUpload.removeProcessed(processedPrimitives);
@@ -245 +245 @@
                     recoverFromGoneOnServer(e, getProgressMonitor());
                 } catch(ChangesetClosedException e) {
-                    processedPrimitives.addAll((Collection) writer.getProcessedPrimitives()); // OsmPrimitive in => OsmPrimitive out
+                    processedPrimitives.addAll(writer.getProcessedPrimitives()); // OsmPrimitive in => OsmPrimitive out
                     changeset.setOpen(false);
                     switch(e.getSource()) {
@@ -270 +270 @@
                 } finally {
                     if (writer != null) {
-                        processedPrimitives.addAll((Collection) writer.getProcessedPrimitives());
+                        processedPrimitives.addAll(writer.getProcessedPrimitives());
                     }
                     synchronized(this) {

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -51 +51 @@
 import org.openstreetmap.josm.data.osm.DataSource;
 import org.openstreetmap.josm.data.osm.DatasetConsistencyTest;
+import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -396 +397 @@
      *         May be <code>null</code>, which means nothing has been uploaded
      */
-    public void cleanupAfterUpload(final Collection<OsmPrimitive> processed) {
+    public void cleanupAfterUpload(final Collection<IPrimitive> processed) {
         // return immediately if an upload attempt failed
         if (processed == null || processed.isEmpty())

trunk/src/org/openstreetmap/josm/tools/Diff.java

@@ -75 +75 @@
      */
     public Diff(Object[] a,Object[] b) {
-        Hashtable h = new Hashtable(a.length + b.length);
+        Hashtable<Object, Integer> h = new Hashtable<Object, Integer>(a.length + b.length);
         filevec[0] = new file_data(a,h);
         filevec[1] = new file_data(b,h);
@@ -344 +344 @@
             int d = diag (xoff, xlim, yoff, ylim);
             int c = cost;
-            int f = fdiag[fdiagoff + d];
+            //int f = fdiag[fdiagoff + d];
             int b = bdiag[bdiagoff + d];
 
@@ -804 +804 @@
         }
 
-        file_data(Object[] data,Hashtable h) {
+        file_data(Object[] data,Hashtable<Object, Integer> h) {
             buffered_lines = data.length;