Changeset 4310 in josm for trunk/src/org/openstreetmap/josm/gui/io
- Timestamp:
- 2011-08-11T00:26:21+02:00 (13 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/io
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java
r3083 r4310 8 8 public abstract class AbstractIOTask implements Runnable { 9 9 10 /** indicates whether the task has been cancel led */11 private boolean cancel led;10 /** indicates whether the task has been canceled */ 11 private boolean canceled; 12 12 /** indicates whether the task has been failed */ 13 13 private boolean failed; … … 16 16 17 17 public AbstractIOTask() { 18 cancel led = false;18 canceled = false; 19 19 failed = false; 20 20 lastException = null; … … 22 22 23 23 /** 24 * Replies true if the task has been cancel led24 * Replies true if the task has been canceled 25 25 * 26 * @return true if the task has been cancel led26 * @return true if the task has been canceled 27 27 */ 28 public boolean isCancel led() {29 return cancel led;28 public boolean isCanceled() { 29 return canceled; 30 30 } 31 31 32 32 /** 33 * Set whether this task has been cancel led33 * Set whether this task has been canceled 34 34 * 35 * @param cancel led true, if the task has been cancelled; false otherwise35 * @param canceled true, if the task has been canceled; false otherwise 36 36 */ 37 protected void setCancel led(boolean cancelled) {38 this.cancel led = cancelled;37 protected void setCanceled(boolean canceled) { 38 this.canceled = canceled; 39 39 } 40 40 … … 77 77 /** 78 78 * Replies true if this task was successful, i.e. if it wasn't 79 * cancel led and didn't fail79 * canceled and didn't fail 80 80 * 81 81 * @return true if this task was successful 82 82 */ 83 83 public boolean isSuccessful() { 84 return !isCancel led() && !isFailed();84 return !isCanceled() && !isFailed(); 85 85 } 86 86 -
trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java
r3501 r4310 42 42 /** the list */ 43 43 private JList lstOpenChangesets; 44 /** true if the user cancel led the dialog */44 /** true if the user canceled the dialog */ 45 45 private boolean canceled; 46 46 /** the list model */ -
trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java
r3083 r4310 23 23 */ 24 24 public class CloseChangesetTask extends PleaseWaitRunnable { 25 private boolean cancel led;25 private boolean canceled; 26 26 private Exception lastException; 27 27 private Collection<Changeset> changesets; … … 46 46 @Override 47 47 protected void cancel() { 48 this.cancel led = true;48 this.canceled = true; 49 49 OsmApi.getOsmApi().cancel(); 50 50 } … … 52 52 @Override 53 53 protected void finish() { 54 if (cancel led)54 if (canceled) 55 55 return; 56 56 if (lastException != null) { … … 70 70 try { 71 71 for (Changeset cs: changesets) { 72 if (cancel led) return;72 if (canceled) return; 73 73 if (cs == null || cs.getId() <= 0 || ! cs.isOpen()) { 74 74 continue; … … 79 79 } 80 80 } catch(Exception e) { 81 if (cancel led)81 if (canceled) 82 82 return; 83 83 lastException = e; -
trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java
r3083 r4310 30 30 public class DownloadOpenChangesetsTask extends PleaseWaitRunnable { 31 31 32 private boolean cancel led;32 private boolean canceled; 33 33 private OsmServerChangesetReader reader; 34 34 private List<Changeset> changesets; … … 48 48 @Override 49 49 protected void cancel() { 50 this.cancel led = true;50 this.canceled = true; 51 51 synchronized(this) { 52 52 if (reader != null) { … … 71 71 return; 72 72 } 73 if (cancel led)return;73 if (canceled)return; 74 74 if (lastException != null) { 75 75 ExceptionDialogUtil.explainException(lastException); … … 133 133 refreshUserIdentity(); 134 134 } 135 if (cancel led)return;135 if (canceled)return; 136 136 synchronized(this) { 137 137 reader = new OsmServerChangesetReader(); … … 155 155 ); 156 156 } catch(Exception e) { 157 if (cancel led)157 if (canceled) 158 158 return; 159 159 lastException = e; … … 161 161 } 162 162 163 public boolean isCancel led() {164 return cancel led;163 public boolean isCanceled() { 164 return canceled; 165 165 } 166 166 } -
trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java
r3083 r4310 143 143 * <ul> 144 144 * <li>{@see UploadOrSaveState#OK} if {@see #getLayer() was successfully uploaded</li> 145 * <li>{@see UploadOrSaveState# CANCELLED} if uploading {@see #getLayer() was cancelled</li>145 * <li>{@see UploadOrSaveState#canceled} if uploading {@see #getLayer() was canceled</li> 146 146 * <li>{@see UploadOrSaveState#FAILED} if uploading {@see #getLayer() has failed</li> 147 147 * </ul> … … 166 166 * <ul> 167 167 * <li>{@see UploadOrSaveState#OK} if {@see #getLayer() was successfully saved to file</li> 168 * <li>{@see UploadOrSaveState# CANCELLED} if saving {@see #getLayer() was cancelled</li>168 * <li>{@see UploadOrSaveState#canceled} if saving {@see #getLayer() was canceled</li> 169 169 * <li>{@see UploadOrSaveState#FAILED} if saving {@see #getLayer() has failed</li> 170 170 * </ul> -
trunk/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java
r4114 r4310 52 52 return; 53 53 } 54 if (!isCancel led()) {54 if (!isCanceled()) { 55 55 layerInfo.getLayer().onPostSaveToFile(); 56 56 } … … 63 63 @Override 64 64 public void cancel() { 65 setCancel led(true);65 setCanceled(true); 66 66 } 67 67 } -
trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
r3501 r4310 50 50 PROCEED, 51 51 /** 52 * save/upload of layers was not successful or user cancel led52 * save/upload of layers was not successful or user canceled 53 53 * operation 54 54 */ … … 392 392 private ProgressMonitor monitor; 393 393 private ExecutorService worker; 394 private boolean cancel led;394 private boolean canceled; 395 395 private Future<?> currentFuture; 396 396 private AbstractIOTask currentTask; … … 404 404 protected void uploadLayers(List<SaveLayerInfo> toUpload) { 405 405 for (final SaveLayerInfo layerInfo: toUpload) { 406 if (cancel led) {407 model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCEL LED);406 if (canceled) { 407 model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCELED); 408 408 continue; 409 409 } … … 418 418 dialog.setVisible(true); 419 419 if (dialog.isCanceled()) { 420 model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCEL LED);420 model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCELED); 421 421 continue; 422 422 } … … 435 435 currentFuture.get(); 436 436 } catch(CancellationException e) { 437 model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCEL LED);437 model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCELED); 438 438 } catch(Exception e) { 439 439 e.printStackTrace(); … … 441 441 ExceptionDialogUtil.explainException(e); 442 442 } 443 if (currentTask.isCancel led()) {444 model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCEL LED);443 if (currentTask.isCanceled()) { 444 model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCELED); 445 445 } else if (currentTask.isFailed()) { 446 446 currentTask.getLastException().printStackTrace(); … … 457 457 protected void saveLayers(List<SaveLayerInfo> toSave) { 458 458 for (final SaveLayerInfo layerInfo: toSave) { 459 if (cancel led) {460 model.setSaveState(layerInfo.getLayer(), UploadOrSaveState.CANCEL LED);459 if (canceled) { 460 model.setSaveState(layerInfo.getLayer(), UploadOrSaveState.CANCELED); 461 461 continue; 462 462 } … … 469 469 currentFuture.get(); 470 470 } catch(CancellationException e) { 471 model.setSaveState(layerInfo.getLayer(), UploadOrSaveState.CANCEL LED);471 model.setSaveState(layerInfo.getLayer(), UploadOrSaveState.CANCELED); 472 472 } catch(Exception e) { 473 473 e.printStackTrace(); … … 475 475 ExceptionDialogUtil.explainException(e); 476 476 } 477 if (currentTask.isCancel led()) {478 model.setSaveState(layerInfo.getLayer(), UploadOrSaveState.CANCEL LED);477 if (currentTask.isCanceled()) { 478 model.setSaveState(layerInfo.getLayer(), UploadOrSaveState.CANCELED); 479 479 } else if (currentTask.isFailed()) { 480 480 if (currentTask.getLastException() != null) { … … 496 496 String msg = trn( 497 497 "<html>An upload and/or save operation of one layer with modifications<br>" 498 + "was cancel led or has failed.</html>",498 + "was canceled or has failed.</html>", 499 499 "<html>Upload and/or save operations of {0} layers with modifications<br>" 500 + "were cancel led or have failed.</html>",500 + "were canceled or have failed.</html>", 501 501 numProblems, 502 502 numProblems … … 524 524 warnBecauseOfUnsavedData(); 525 525 model.setMode(Mode.EDITING_DATA); 526 if (cancel led) {526 if (canceled) { 527 527 setUserAction(UserAction.CANCEL); 528 528 closeDialog(); … … 538 538 currentTask.cancel(); 539 539 } 540 cancel led = true;540 canceled = true; 541 541 } 542 542 } -
trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java
r4114 r4310 197 197 int ret = 0; 198 198 for (SaveLayerInfo info: layerInfo) { 199 if (UploadOrSaveState.CANCEL LED.equals(info.getSaveState())200 || UploadOrSaveState.CANCEL LED.equals(info.getUploadState())) {199 if (UploadOrSaveState.CANCELED.equals(info.getSaveState()) 200 || UploadOrSaveState.CANCELED.equals(info.getUploadState())) { 201 201 ret++; 202 202 } -
trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java
r4191 r4310 183 183 184 184 185 // make sure the theconfiguration panels listen to each other185 // make sure the configuration panels listen to each other 186 186 // changes 187 187 // -
trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java
r4100 r4310 122 122 try { 123 123 ProgressMonitor m = monitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false); 124 if (isCancel led()) return;124 if (isCanceled()) return; 125 125 writer.uploadOsm(strategy, toUpload, changeset, m); 126 126 processedPrimitives.addAll((Collection) writer.getProcessedPrimitives()); // OsmPrimitive in => OsmPrimitive out … … 136 136 } 137 137 } catch (Exception sxe) { 138 if (isCancel led()) {139 System.out.println("Ignoring exception caught because upload is cancel led. Exception is: " + sxe.toString());138 if (isCanceled()) { 139 System.out.println("Ignoring exception caught because upload is canceled. Exception is: " + sxe.toString()); 140 140 return; 141 141 } … … 143 143 } 144 144 145 if (isCancel led())145 if (isCanceled()) 146 146 return; 147 147 layer.cleanupAfterUpload(processedPrimitives); … … 154 154 @Override 155 155 public void cancel() { 156 setCancel led(true);156 setCanceled(true); 157 157 if (writer != null) { 158 158 writer.cancel(); -
trunk/src/org/openstreetmap/josm/gui/io/UploadOrSaveState.java
r3083 r4310 12 12 FAILED, 13 13 /** 14 * uploading or saving a data layer was cancel led14 * uploading or saving a data layer was canceled 15 15 */ 16 CANCEL LED16 CANCELED 17 17 } -
trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java
r4191 r4310 29 29 import org.openstreetmap.josm.io.OsmApiPrimitiveGoneException; 30 30 import org.openstreetmap.josm.io.OsmServerWriter; 31 import org.openstreetmap.josm.io.OsmTransferCancel ledException;31 import org.openstreetmap.josm.io.OsmTransferCanceledException; 32 32 import org.openstreetmap.josm.io.OsmTransferException; 33 33 import org.openstreetmap.josm.tools.ImageProvider; … … 39 39 */ 40 40 public class UploadPrimitivesTask extends AbstractUploadTask { 41 private boolean uploadCancel led = false;41 private boolean uploadCanceled = false; 42 42 private Exception lastException = null; 43 43 private APIDataSet toUpload; … … 236 236 // 237 237 break; 238 } catch(OsmTransferCancel ledException e) {238 } catch(OsmTransferCanceledException e) { 239 239 e.printStackTrace(); 240 uploadCancel led = true;240 uploadCanceled = true; 241 241 break uploadloop; 242 242 } catch(OsmApiPrimitiveGoneException e) { … … 283 283 } 284 284 } catch (Exception e) { 285 if (uploadCancel led) {285 if (uploadCanceled) { 286 286 System.out.println(tr("Ignoring caught exception because upload is canceled. Exception is: {0}", e.toString())); 287 287 } else { … … 289 289 } 290 290 } 291 if (uploadCancel led && processedPrimitives.isEmpty()) return;291 if (uploadCanceled && processedPrimitives.isEmpty()) return; 292 292 cleanupAfterUpload(); 293 293 } 294 294 295 295 @Override protected void finish() { 296 if (uploadCancel led)296 if (uploadCanceled) 297 297 return; 298 298 … … 353 353 354 354 @Override protected void cancel() { 355 uploadCancel led = true;355 uploadCanceled = true; 356 356 synchronized(this) { 357 357 if (writer != null) {
Note:
See TracChangeset
for help on using the changeset viewer.