Changeset 3422 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2010-08-08T13:45:20+02:00 (14 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
r3416 r3422 918 918 while (it.hasNext()) { 919 919 OsmPrimitive primitive = it.next(); 920 if (primitive.isDeleted() ) {920 if (primitive.isDeleted() && !primitive.isVisible()) { 921 921 selectedPrimitives.remove(primitive); 922 922 selectionSnapshot = null; -
trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java
r3240 r3422 235 235 } 236 236 writer.uploadOsm(strategy, toUpload.getPrimitives(), changeset, getProgressMonitor().createSubTaskMonitor(1, false)); 237 processedPrimitives.addAll(writer.getProcessedPrimitives());238 237 239 238 // if we get here we've successfully uploaded the data. Exit the loop. … … 243 242 e.printStackTrace(); 244 243 uploadCancelled = true; 245 return;244 break uploadloop; 246 245 } catch(OsmApiPrimitiveGoneException e) { 247 246 // try to recover from 410 Gone … … 273 272 } 274 273 } finally { 274 if (writer != null) { 275 processedPrimitives.addAll(writer.getProcessedPrimitives()); 276 } 275 277 synchronized(this) { 276 278 writer = null; … … 286 288 if (uploadCancelled) { 287 289 System.out.println(tr("Ignoring caught exception because upload is canceled. Exception is: {0}", e.toString())); 288 return;289 }290 lastException = e;291 } 292 if (uploadCancelled ) return;290 } else { 291 lastException = e; 292 } 293 } 294 if (uploadCancelled && processedPrimitives.isEmpty()) return; 293 295 cleanupAfterUpload(); 294 296 } -
trunk/src/org/openstreetmap/josm/io/DiffResultProcessor.java
r3336 r3422 126 126 p.setOsmId(entry.new_id, entry.new_version); 127 127 p.setVisible(true); 128 } else { 129 p.setVisible(false); 128 130 } 129 131 if (cs != null && !cs.isNew()) {
Note:
See TracChangeset
for help on using the changeset viewer.