Ignore:
Timestamp:
2011-08-11T00:26:21+02:00 (15 years ago)
Author:
stoecker
Message:

fix #6680, fix #6677 - i18n issues

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java

    r3501 r4310  
    5050        PROCEED,
    5151        /**
    52          * save/upload of layers was not successful or user cancelled
     52         * save/upload of layers was not successful or user canceled
    5353         * operation
    5454         */
    … …  
    392392        private ProgressMonitor monitor;
    393393        private ExecutorService worker;
    394         private boolean cancelled;
     394        private boolean canceled;
    395395        private Future<?> currentFuture;
    396396        private AbstractIOTask currentTask;
    … …  
    404404        protected void uploadLayers(List<SaveLayerInfo> toUpload) {
    405405            for (final SaveLayerInfo layerInfo: toUpload) {
    406                 if (cancelled) {
    407                     model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCELLED);
     406                if (canceled) {
     407                    model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCELED);
    408408                    continue;
    409409                }
    … …  
    418418                dialog.setVisible(true);
    419419                if (dialog.isCanceled()) {
    420                     model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCELLED);
     420                    model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCELED);
    421421                    continue;
    422422                }
    … …  
    435435                    currentFuture.get();
    436436                } catch(CancellationException e) {
    437                     model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCELLED);
     437                    model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCELED);
    438438                } catch(Exception e) {
    439439                    e.printStackTrace();
    … …  
    441441                    ExceptionDialogUtil.explainException(e);
    442442                }
    443                 if (currentTask.isCancelled()) {
    444                     model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCELLED);
     443                if (currentTask.isCanceled()) {
     444                    model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCELED);
    445445                } else if (currentTask.isFailed()) {
    446446                    currentTask.getLastException().printStackTrace();
    … …  
    457457        protected void saveLayers(List<SaveLayerInfo> toSave) {
    458458            for (final SaveLayerInfo layerInfo: toSave) {
    459                 if (cancelled) {
    460                     model.setSaveState(layerInfo.getLayer(), UploadOrSaveState.CANCELLED);
     459                if (canceled) {
     460                    model.setSaveState(layerInfo.getLayer(), UploadOrSaveState.CANCELED);
    461461                    continue;
    462462                }
    … …  
    469469                    currentFuture.get();
    470470                } catch(CancellationException e) {
    471                     model.setSaveState(layerInfo.getLayer(), UploadOrSaveState.CANCELLED);
     471                    model.setSaveState(layerInfo.getLayer(), UploadOrSaveState.CANCELED);
    472472                } catch(Exception e) {
    473473                    e.printStackTrace();
    … …  
    475475                    ExceptionDialogUtil.explainException(e);
    476476                }
    477                 if (currentTask.isCancelled()) {
    478                     model.setSaveState(layerInfo.getLayer(), UploadOrSaveState.CANCELLED);
     477                if (currentTask.isCanceled()) {
     478                    model.setSaveState(layerInfo.getLayer(), UploadOrSaveState.CANCELED);
    479479                } else if (currentTask.isFailed()) {
    480480                    if (currentTask.getLastException() != null) {
    … …  
    496496            String msg = trn(
    497497                    "<html>An upload and/or save operation of one layer with modifications<br>"
    498                     + "was cancelled or has failed.</html>",
     498                    + "was canceled or has failed.</html>",
    499499                    "<html>Upload and/or save operations of {0} layers with modifications<br>"
    500                     + "were cancelled or have failed.</html>",
     500                    + "were canceled or have failed.</html>",
    501501                    numProblems,
    502502                    numProblems
    … …  
    524524                warnBecauseOfUnsavedData();
    525525                model.setMode(Mode.EDITING_DATA);
    526                 if (cancelled) {
     526                if (canceled) {
    527527                    setUserAction(UserAction.CANCEL);
    528528                    closeDialog();
    … …  
    538538                currentTask.cancel();
    539539            }
    540             cancelled = true;
     540            canceled = true;
    541541        }
    542542    }
Note: See TracChangeset for help on using the changeset viewer.