Changeset 4534 in josm for trunk/src/org/openstreetmap/josm/gui/io
- Timestamp:
- 2011-10-21T19:13:08+02:00 (13 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/io
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java
r4310 r4534 10 10 import org.openstreetmap.josm.data.APIDataSet; 11 11 import org.openstreetmap.josm.data.osm.Changeset; 12 import org.openstreetmap.josm.data.osm.IPrimitive; 12 13 import org.openstreetmap.josm.data.osm.OsmPrimitive; 13 14 import org.openstreetmap.josm.data.osm.OsmPrimitiveType; … … 43 44 private Changeset changeset; 44 45 private Collection<OsmPrimitive> toUpload; 45 private HashSet< OsmPrimitive> processedPrimitives;46 private HashSet<IPrimitive> processedPrimitives; 46 47 private UploadStrategySpecification strategy; 47 48 … … 66 67 this.changeset = changeset; 67 68 this.strategy = strategy; 68 processedPrimitives = new HashSet< OsmPrimitive>();69 processedPrimitives = new HashSet<IPrimitive>(); 69 70 } 70 71 … … 93 94 // 94 95 System.out.println(tr("Warning: object ''{0}'' is already deleted on the server. Skipping this object and retrying to upload.", p.getDisplayName(DefaultNameFormatter.getInstance()))); 95 processedPrimitives.addAll( (Collection)writer.getProcessedPrimitives());96 processedPrimitives.addAll(writer.getProcessedPrimitives()); 96 97 processedPrimitives.add(p); 97 98 toUpload.removeAll(processedPrimitives); … … 124 125 if (isCanceled()) return; 125 126 writer.uploadOsm(strategy, toUpload, changeset, m); 126 processedPrimitives.addAll( (Collection)writer.getProcessedPrimitives()); // OsmPrimitive in => OsmPrimitive out127 processedPrimitives.addAll(writer.getProcessedPrimitives()); // OsmPrimitive in => OsmPrimitive out 127 128 break; 128 129 } catch(OsmApiPrimitiveGoneException e) { -
trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java
r4310 r4534 9 9 import java.io.IOException; 10 10 import java.lang.reflect.InvocationTargetException; 11 import java.util.Collection;12 11 import java.util.HashSet; 13 12 … … 19 18 import org.openstreetmap.josm.data.osm.Changeset; 20 19 import org.openstreetmap.josm.data.osm.ChangesetCache; 20 import org.openstreetmap.josm.data.osm.IPrimitive; 21 21 import org.openstreetmap.josm.data.osm.OsmPrimitive; 22 22 import org.openstreetmap.josm.gui.DefaultNameFormatter; … … 45 45 private OsmDataLayer layer; 46 46 private Changeset changeset; 47 private HashSet< OsmPrimitive> processedPrimitives;47 private HashSet<IPrimitive> processedPrimitives; 48 48 private UploadStrategySpecification strategy; 49 49 … … 70 70 this.changeset = changeset; 71 71 this.strategy = strategy; 72 this.processedPrimitives = new HashSet< OsmPrimitive>();72 this.processedPrimitives = new HashSet<IPrimitive>(); 73 73 } 74 74 … … 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()))); 192 192 monitor.appendLogMessage(tr("Object ''{0}'' is already deleted. Skipping object in upload.",p.getDisplayName(DefaultNameFormatter.getInstance()))); 193 processedPrimitives.addAll( (Collection)writer.getProcessedPrimitives());193 processedPrimitives.addAll(writer.getProcessedPrimitives()); 194 194 processedPrimitives.add(p); 195 195 toUpload.removeProcessed(processedPrimitives); … … 245 245 recoverFromGoneOnServer(e, getProgressMonitor()); 246 246 } catch(ChangesetClosedException e) { 247 processedPrimitives.addAll( (Collection)writer.getProcessedPrimitives()); // OsmPrimitive in => OsmPrimitive out247 processedPrimitives.addAll(writer.getProcessedPrimitives()); // OsmPrimitive in => OsmPrimitive out 248 248 changeset.setOpen(false); 249 249 switch(e.getSource()) { … … 270 270 } finally { 271 271 if (writer != null) { 272 processedPrimitives.addAll( (Collection)writer.getProcessedPrimitives());272 processedPrimitives.addAll(writer.getProcessedPrimitives()); 273 273 } 274 274 synchronized(this) {
Note:
See TracChangeset
for help on using the changeset viewer.