Ticket #23754: 23754.patch
File 23754.patch, 2.2 KB (added by , 3 months ago) |
---|
-
src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java
50 50 public class UploadPrimitivesTask extends AbstractUploadTask { 51 51 private boolean uploadCanceled; 52 52 private Exception lastException; 53 /** The objects to upload. Successfully uploaded objects are removed. */ 53 54 private final APIDataSet toUpload; 54 55 private OsmServerWriter writer; 55 56 private final OsmDataLayer layer; … … 56 57 private Changeset changeset; 57 58 private final Set<IPrimitive> processedPrimitives; 58 59 private final UploadStrategySpecification strategy; 60 /** Initial number of objects to be uploaded */ 61 private final int numObjectsToUpload; 59 62 60 63 /** 61 64 * Creates the task … … 76 79 ensureParameterNotNull(strategy, "strategy"); 77 80 ensureParameterNotNull(changeset, "changeset"); 78 81 this.toUpload = toUpload; 82 this.numObjectsToUpload = toUpload.getSize(); 79 83 this.layer = layer; 80 84 this.changeset = changeset; 81 85 this.strategy = strategy; … … 108 112 null /* no specific help text */ 109 113 ) 110 114 }; 111 int numObjectsToUploadLeft = toUpload.getSize()- processedPrimitives.size();115 int numObjectsToUploadLeft = numObjectsToUpload - processedPrimitives.size(); 112 116 String msg1 = tr("The server reported that the current changeset was closed.<br>" 113 117 + "This is most likely because the changesets size exceeded the max. size<br>" 114 118 + "of {0} objects on the server ''{1}''.", … … 160 164 * @throws OsmTransferException "if something goes wrong." 161 165 */ 162 166 protected boolean handleChangesetFullResponse() throws OsmTransferException { 163 if (processedPrimitives.size() == toUpload.getSize()) {167 if (processedPrimitives.size() >= numObjectsToUpload) { 164 168 strategy.setPolicy(MaxChangesetSizeExceededPolicy.ABORT); 165 169 return false; 166 170 }