Changeset 4310 in josm

Timestamp:

2011-08-11T00:26:21+02:00 (13 years ago)

Author:

stoecker

Message:

fix #6680, fix #6677 - i18n issues

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/CloseChangesetAction.java (modified) (6 diffs)
• actions/CombineWayAction.java (modified) (1 diff)
• actions/JoinAreasAction.java (modified) (2 diffs)
• actions/MergeNodesAction.java (modified) (1 diff)
• actions/OpenFileAction.java (modified) (4 diffs)
• actions/OpenLocationAction.java (modified) (2 diffs)
• actions/downloadtasks/DownloadOsmTask.java (modified) (2 diffs)
• actions/downloadtasks/DownloadReferrersTask.java (modified) (9 diffs)
• actions/upload/ApiPreconditionCheckerHook.java (modified) (2 diffs)
• actions/upload/ValidateUploadHook.java (modified) (1 diff)
• data/Preferences.java (modified) (1 diff)
• data/Version.java (modified) (1 diff)
• data/osm/DataSet.java (modified) (1 diff)
• data/osm/visitor/paint/MapRendererFactory.java (modified) (1 diff)
• data/validation/Test.java (modified) (1 diff)
• data/validation/tests/UnconnectedWays.java (modified) (4 diffs)
• gui/PleaseWaitRunnable.java (modified) (2 diffs)
• gui/bbox/TileSelectionBBoxChooser.java (modified) (1 diff)
• gui/conflict/pair/ListMerger.java (modified) (1 diff)
• gui/conflict/pair/properties/PropertiesMergeModel.java (modified) (1 diff)
• gui/conflict/pair/properties/PropertiesMerger.java (modified) (2 diffs)
• gui/conflict/tags/CombinePrimitiveResolverDialog.java (modified) (5 diffs)
• gui/dialogs/InspectPrimitiveDialog.java (modified) (1 diff)
• gui/dialogs/changeset/ChangesetContentDownloadTask.java (modified) (2 diffs)
• gui/dialogs/changeset/ChangesetHeaderDownloadTask.java (modified) (1 diff)
• gui/dialogs/changeset/query/ChangesetQueryTask.java (modified) (2 diffs)
• gui/dialogs/relation/ChildRelationBrowser.java (modified) (10 diffs)
• gui/dialogs/relation/DownloadRelationMemberTask.java (modified) (7 diffs)
• gui/dialogs/relation/DownloadRelationTask.java (modified) (6 diffs)
• gui/dialogs/relation/ParentRelationLoadingTask.java (modified) (6 diffs)
• gui/dialogs/relation/ReferringRelationsBrowser.java (modified) (1 diff)
• gui/dialogs/relation/RelationTree.java (modified) (3 diffs)
• gui/history/HistoryLoadTask.java (modified) (5 diffs)
• gui/io/AbstractIOTask.java (modified) (4 diffs)
• gui/io/CloseChangesetDialog.java (modified) (1 diff)
• gui/io/CloseChangesetTask.java (modified) (5 diffs)
• gui/io/DownloadOpenChangesetsTask.java (modified) (6 diffs)
• gui/io/SaveLayerInfo.java (modified) (2 diffs)
• gui/io/SaveLayerTask.java (modified) (2 diffs)
• gui/io/SaveLayersDialog.java (modified) (12 diffs)
• gui/io/SaveLayersModel.java (modified) (1 diff)
• gui/io/UploadDialog.java (modified) (1 diff)
• gui/io/UploadLayerTask.java (modified) (4 diffs)
• gui/io/UploadOrSaveState.java (modified) (1 diff)
• gui/io/UploadPrimitivesTask.java (modified) (6 diffs)
• gui/layer/geoimage/GeoImageLayer.java (modified) (6 diffs)
• gui/mappaint/TextElement.java (modified) (1 diff)
• gui/oauth/OAuthAuthorizationWizard.java (modified) (1 diff)
• gui/oauth/OsmOAuthAuthorizationClient.java (modified) (10 diffs)
• gui/oauth/RetrieveAccessTokenTask.java (modified) (2 diffs)
• gui/oauth/RetrieveRequestTokenTask.java (modified) (2 diffs)
• gui/preferences/RemoteControlPreference.java (modified) (1 diff)
• gui/preferences/plugin/PluginUpdatePolicyPanel.java (modified) (2 diffs)
• gui/progress/AbstractProgressMonitor.java (modified) (1 diff)
• gui/progress/NullProgressMonitor.java (modified) (1 diff)
• gui/progress/ProgressMonitor.java (modified) (1 diff)
• gui/tagging/TagEditorModel.java (modified) (1 diff)
• gui/tagging/TagTable.java (modified) (1 diff)
• io/GpxImporter.java (modified) (1 diff)
• io/JpgImporter.java (modified) (2 diffs)
• io/OsmApi.java (modified) (6 diffs)
• io/OsmChangeBuilder.java (modified) (3 diffs)
• io/OsmReader.java (modified) (1 diff)
• io/OsmServerReader.java (modified) (2 diffs)
• io/OsmTransferCanceledException.java (moved) (moved from trunk/src/org/openstreetmap/josm/io/OsmTransferCancelledException.java ) (1 diff)
• io/auth/CredentialsAgentResponse.java (modified) (1 diff)
• io/imagery/ImageryReader.java (modified) (2 diffs)
• plugins/PluginDownloadTask.java (modified) (1 diff)
• plugins/PluginHandler.java (modified) (1 diff)
• plugins/PluginInformation.java (modified) (1 diff)
• plugins/ReadLocalPluginInformationTask.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java

@@ -75 +75 @@
     private class DownloadOpenChangesetsTask extends PleaseWaitRunnable {
 
-        private boolean cancelled;
+        private boolean canceled;
         private OsmServerChangesetReader reader;
         private List<Changeset> changesets;
@@ -92 +92 @@
         @Override
         protected void cancel() {
-            this.cancelled = true;
+            this.canceled = true;
             reader.cancel();
         }
@@ -105 +105 @@
                             }
                             ChangesetCache.getInstance().update(changesets);
-                            if (!cancelled && lastException == null) {
+                            if (!canceled && lastException == null) {
                                 onPostDownloadOpenChangesets();
                             }
@@ -129 +129 @@
             try {
                 userInfo = fetchUserInfo();
-                if (cancelled)
+                if (canceled)
                     return;
                 reader = new OsmServerChangesetReader();
@@ -138 +138 @@
                 );
             } catch(Exception e) {
-                if (cancelled)
+                if (canceled)
                     return;
                 lastException = e;
@@ -144 +144 @@
         }
 
-        public boolean isCancelled() {
-            return cancelled;
+        public boolean isCanceled() {
+            return canceled;
         }
 

trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

@@ -226 +226 @@
         if (!completeWayTags.isApplicableToPrimitive() || !parentRelations.isEmpty()) {
             dialog.setVisible(true);
-            if (dialog.isCancelled())
+            if (dialog.isCanceled())
                 throw new UserCancelException();
         }

trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

@@ -366 +366 @@
         if (!resolveTagConflicts(areas))
             return;
-        //user cancelled, do nothing.
+        //user canceled, do nothing.
 
         try {
@@ -570 +570 @@
         if (!completeWayTags.isApplicableToPrimitive() || !parentRelations.isEmpty()) {
             dialog.setVisible(true);
-            if (dialog.isCancelled())
+            if (dialog.isCanceled())
                 return false;
         }

trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

@@ -248 +248 @@
         if (! nodeTags.isApplicableToPrimitive() || relationToNodeReferences.size() > 1) {
             dialog.setVisible(true);
-            if (dialog.isCancelled())
+            if (dialog.isCanceled())
                 return null;
         }

trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java

@@ -87 +87 @@
         private List<File> successfullyOpenedFiles = new ArrayList<File>();
         private FileFilter fileFilter;
-        private boolean cancelled;
+        private boolean canceled;
         private boolean recordHistory = false;
 
@@ -114 +114 @@
         @Override
         protected void cancel() {
-            this.cancelled = true;
+            this.canceled = true;
         }
 
@@ -291 +291 @@
         public void importData(FileImporter importer, List<File> files) {
             if (importer.isBatchImporter()) {
-                if (cancelled) return;
+                if (canceled) return;
                 String msg;
                 if (files.size() == 1) {
@@ -305 +305 @@
             } else {
                 for (File f : files) {
-                    if (cancelled) return;
+                    if (canceled) return;
                     getProgressMonitor().indeterminateSubTask(tr("Opening file ''{0}'' ...", f.getAbsolutePath()));
                     if (importer.importDataHandleExceptions(f, getProgressMonitor().createSubTaskMonitor(1, false))) {

trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java

@@ -77 +77 @@
         gc.anchor = GridBagConstraints.FIRST_LINE_START;
         all.add(new JLabel(tr("Enter URL to download:")), gc);
-        HistoryComboBox uploadAdresses = new HistoryComboBox();
-        uploadAdresses.setToolTipText(tr("Enter an URL from where data should be downloaded"));
-        restoreUploadAddressHistory(uploadAdresses);
+        HistoryComboBox uploadAddresses = new HistoryComboBox();
+        uploadAddresses.setToolTipText(tr("Enter an URL from where data should be downloaded"));
+        restoreUploadAddressHistory(uploadAddresses);
         gc.gridy = 1;
-        all.add(uploadAdresses, gc);
+        all.add(uploadAddresses, gc);
         gc.gridy = 2;
         gc.fill = GridBagConstraints.BOTH;
@@ -99 +99 @@
         dialog.showDialog();
         if (dialog.getValue() != 1) return;
-        remindUploadAddressHistory(uploadAdresses);
-        openUrl(layer.isSelected(), uploadAdresses.getText());
+        remindUploadAddressHistory(uploadAddresses);
+        openUrl(layer.isSelected(), uploadAddresses.getText());
     }
 

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -21 +21 @@
 import org.openstreetmap.josm.io.OsmServerLocationReader;
 import org.openstreetmap.josm.io.OsmServerReader;
-import org.openstreetmap.josm.io.OsmTransferCancelledException;
+import org.openstreetmap.josm.io.OsmTransferCanceledException;
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.xml.sax.SAXException;
@@ -89 +89 @@
             } catch(Exception e) {
                 if (isCanceled()) {
-                    System.out.println(tr("Ignoring exception because download has been cancelled. Exception was: {0}", e.toString()));
+                    System.out.println(tr("Ignoring exception because download has been canceled. Exception was: {0}", e.toString()));
                     return;
                 }
-                if (e instanceof OsmTransferCancelledException) {
+                if (e instanceof OsmTransferCanceledException) {
                     setCanceled(true);
                     return;

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java

@@ -41 +41 @@
  */
 public class DownloadReferrersTask extends PleaseWaitRunnable {
-    private boolean cancelled;
+    private boolean canceled;
     private Exception lastException;
     private OsmServerReader reader;
@@ -61 +61 @@
         super("Download referrers", false /* don't ignore exception*/);
         CheckParameterUtil.ensureParameterNotNull(targetLayer, "targetLayer");
-        cancelled = false;
+        canceled = false;
         this.children = new HashMap<Long, OsmPrimitiveType>();
         if (children != null) {
@@ -85 +85 @@
         super("Download referrers", false /* don't ignore exception*/);
         CheckParameterUtil.ensureParameterNotNull(targetLayer, "targetLayer");
-        cancelled = false;
+        canceled = false;
         this.children = new HashMap<Long, OsmPrimitiveType>();
         if (children != null) {
@@ -115 +115 @@
             throw new IllegalArgumentException(MessageFormat.format("Id > 0 required, got {0}", id));
         CheckParameterUtil.ensureParameterNotNull(type, "type");
-        cancelled = false;
+        canceled = false;
         this.children = new HashMap<Long, OsmPrimitiveType>();
         this.children.put(id, type);
@@ -136 +136 @@
         if (primitiveId.isNew())
             throw new IllegalArgumentException(MessageFormat.format("Cannot download referrers for new primitives (ID {0})", primitiveId.getUniqueId()));
-        cancelled = false;
+        canceled = false;
         this.children = new HashMap<Long, OsmPrimitiveType>();
         this.children.put(primitiveId.getUniqueId(), primitiveId.getType());
@@ -145 +145 @@
     @Override
     protected void cancel() {
-        cancelled = true;
+        canceled = true;
         synchronized(this) {
             if (reader != null) {
@@ -155 +155 @@
     @Override
     protected void finish() {
-        if (cancelled)
+        if (canceled)
             return;
         if (lastException != null) {
@@ -227 +227 @@
             int i=1;
             for (Entry<Long, OsmPrimitiveType> entry: children.entrySet()) {
-                if (cancelled)
+                if (canceled)
                     return;
                 String msg = "";
@@ -240 +240 @@
             }
         } catch(Exception e) {
-            if (cancelled)
+            if (canceled)
                 return;
             lastException = e;

trunk/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java

@@ -17 +17 @@
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.io.OsmApiInitializationException;
-import org.openstreetmap.josm.io.OsmTransferCancelledException;
+import org.openstreetmap.josm.io.OsmTransferCanceledException;
 
 public class ApiPreconditionCheckerHook implements UploadHook {
@@ -39 +39 @@
                     return false;
             }
-        } catch(OsmTransferCancelledException e){
+        } catch(OsmTransferCanceledException e){
             return false;
         } catch (OsmApiInitializationException e) {

trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java

@@ -133 +133 @@
 
         ExtendedDialog ed = new ExtendedDialog(Main.parent,
-                tr("Supicious data found. Upload anyway?"),
+                tr("Suspicious data found. Upload anyway?"),
                 new String[] {tr("Continue upload"), tr("Cancel")});
         ed.setButtonIcons(new String[] {"ok.png", "cancel.png"});

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -529 +529 @@
             } catch(IOException e1) {
                 e1.printStackTrace();
-                System.err.println(tr("Warning: Failed to initialize preferences.Failed to reset preference file to default: {0}", getPreferenceFile()));
+                System.err.println(tr("Warning: Failed to initialize preferences. Failed to reset preference file to default: {0}", getPreferenceFile()));
             }
         }

trunk/src/org/openstreetmap/josm/data/Version.java

@@ -110 +110 @@
             } catch(NumberFormatException e) {
                 version = 0;
-                System.err.println(tr("Warning: unexpected JOSM version number in revison file, value is ''{0}''", value));
+                System.err.println(tr("Warning: unexpected JOSM version number in revision file, value is ''{0}''", value));
             }
         } else {

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -736 +736 @@
         if (result == null) {
             System.out.println(tr("JOSM expected to find primitive [{0} {1}] in dataset but it is not there. Please report this "
-                    + " at http://josm.openstreetmap.de . This is not a critical error, it should be safe to continue in your work.",
+                    + "at http://josm.openstreetmap.de/. This is not a critical error, it should be safe to continue in your work.",
                     primitiveId.getType(), Long.toString(primitiveId.getUniqueId())));
             new Exception().printStackTrace();

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java

@@ -39 +39 @@
 public class MapRendererFactory {
 
-    /** preference key for the the renderer class name. Default: class name for {@link StyledMapRenderer}
+    /** preference key for the renderer class name. Default: class name for {@link StyledMapRenderer}
      * 
      */

trunk/src/org/openstreetmap/josm/data/validation/Test.java

@@ -217 +217 @@
     }
 
-    public boolean isCancelled() {
-        return progressMonitor.isCancelled();
+    public boolean isCanceled() {
+        return progressMonitor.isCanceled();
     }
 }

trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java

@@ -102 +102 @@
                     map.put(en, s.w);
                 }
-                if(isCancelled())
+                if(isCanceled())
                     return;
             }
@@ -114 +114 @@
         map.clear();
         for (MyWaySegment s : ways) {
-            if(isCancelled())
+            if(isCanceled())
                 return;
             for (Node en : s.nearbyNodes(mindist)) {
@@ -134 +134 @@
             map.clear();
             for (MyWaySegment s : ways) {
-                if(isCancelled())
+                if(isCanceled())
                     return;
                 for (Node en : s.nearbyNodes(minmiddledist)) {
@@ -154 +154 @@
             for (MyWaySegment s : ways) {
                 for (Node en : s.nearbyNodes(minmiddledist)) {
-                    if(isCancelled())
+                    if(isCanceled())
                         return;
                     if (!othernodes.contains(en)) {

trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java

@@ -23 +23 @@
  */
 public abstract class PleaseWaitRunnable implements Runnable, CancelListener {
-    private boolean cancelled = false;
+    private boolean canceled = false;
     private boolean ignoreException;
     private final String title;
@@ -113 +113 @@
 
     public final void run() {
-        if (cancelled)
+        if (canceled)
             return; // since realRun isn't executed, do not call to finish
 

trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java

@@ -435 +435 @@
             HtmlPanel msg = new HtmlPanel();
             msg.setText(tr("<html>Alternatively you may enter a <strong>tile address</strong> for a single tile "
-                    + "in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile adresses "
+                    + "in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile addresses "
                     + "in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</html>"));
             pnl.add(msg);

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

@@ -284 +284 @@
         gc.gridy = 0;
         lblMergedVersion = new JLabel(tr("Merged version"));
-        lblMergedVersion.setToolTipText(tr("List of merged elements. They will replace the my elements when the merge decisions are applied."));
+        lblMergedVersion.setToolTipText(tr("List of merged elements. They will replace the list of my elements when the merge decisions are applied."));
         add(lblMergedVersion, gc);
 

trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java

@@ -23 +23 @@
 /**
  * This is the model for resolving conflicts in the properties of the
- * {@see OsmPrimitive}s. In particular, it represents conflicts in the coordiates of {@see Node}s and
+ * {@see OsmPrimitive}s. In particular, it represents conflicts in the coordinates of {@see Node}s and
  * the deleted or visible state of {@see OsmPrimitive}s.
  *

trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java

@@ -394 +394 @@
         public KeepMyCoordinatesAction() {
             putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeepmine"));
-            putValue(Action.SHORT_DESCRIPTION, tr("Keep my coordiates"));
+            putValue(Action.SHORT_DESCRIPTION, tr("Keep my coordinates"));
         }
 
@@ -409 +409 @@
         public KeepTheirCoordinatesAction() {
             putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeeptheir"));
-            putValue(Action.SHORT_DESCRIPTION, tr("Keep their coordiates"));
+            putValue(Action.SHORT_DESCRIPTION, tr("Keep their coordinates"));
         }
 

trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

@@ -66 +66 @@
  * merged to, see {@see #setTargetPrimitive(OsmPrimitive)}.
  *
- * After the dialog is closed use {@see #isCancelled()} to check whether the user canceled
+ * After the dialog is closed use {@see #isCanceled()} to check whether the user canceled
  * the dialog. If it wasn't canceled you may build a collection of {@see Command} objects
  * which reflect the conflict resolution decisions the user made in the dialog:
@@ -93 +93 @@
     private TagConflictResolver pnlTagConflictResolver;
     private RelationMemberConflictResolver pnlRelationMemberConflictResolver;
-    private boolean cancelled;
+    private boolean canceled;
     private JPanel pnlButtons;
     private OsmPrimitive targetPrimitive;
@@ -318 +318 @@
     }
 
-    protected void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
-    }
-
-    public boolean isCancelled() {
-        return cancelled;
+    protected void setCanceled(boolean canceled) {
+        this.canceled = canceled;
+    }
+
+    public boolean isCanceled() {
+        return canceled;
     }
 
@@ -332 +332 @@
             new WindowGeometry(getClass().getName() + ".geometry", WindowGeometry.centerInWindow(Main.parent,
                     new Dimension(600, 400))).applySafe(this);
-            setCancelled(false);
+            setCanceled(false);
             btnApply.requestFocusInWindow();
         } else {
@@ -350 +350 @@
 
         public void actionPerformed(ActionEvent arg0) {
-            setCancelled(true);
+            setCanceled(true);
             setVisible(false);
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java

@@ -329 +329 @@
         if (s instanceof MapCSSStyleSource)
             return tr("mapcss");
-        return tr("unkown");
+        return tr("unknown");
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java

@@ -20 +20 @@
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.io.OsmServerChangesetReader;
-import org.openstreetmap.josm.io.OsmTransferCancelledException;
+import org.openstreetmap.josm.io.OsmTransferCanceledException;
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.xml.sax.SAXException;
@@ -186 +186 @@
                 getProgressMonitor().worked(1);
             }
-        } catch(OsmTransferCancelledException e) {
-            // the download was cancelled by the user. This exception is caught if the
+        } catch(OsmTransferCanceledException e) {
+            // the download was canceled by the user. This exception is caught if the
             // user canceled the authentication dialog.
             //

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java

@@ -182 +182 @@
         } catch(OsmTransferException e) {
             if (canceled)
-                // ignore exception if cancelled
+                // ignore exception if canceled
                 return;
             // remember other exceptions

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java

@@ -21 +21 @@
 import org.openstreetmap.josm.io.OsmServerChangesetReader;
 import org.openstreetmap.josm.io.OsmServerUserInfoReader;
-import org.openstreetmap.josm.io.OsmTransferCancelledException;
+import org.openstreetmap.josm.io.OsmTransferCanceledException;
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.BugReportExceptionHandler;
@@ -171 +171 @@
                 changesetReader = null;
             }
-        } catch(OsmTransferCancelledException e) {
+        } catch(OsmTransferCanceledException e) {
             // thrown if user cancel the authentication dialog
             canceled = true;

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java

@@ -278 +278 @@
      */
     class DownloadAllChildrenTask extends PleaseWaitRunnable {
-        private boolean cancelled;
+        private boolean canceled;
         private int conflictsCount;
         private Exception lastException;
@@ -299 +299 @@
         @Override
         protected void cancel() {
-            cancelled = true;
+            canceled = true;
             OsmApi.getOsmApi().cancel();
         }
@@ -314 +314 @@
         @Override
         protected void finish() {
-            if (cancelled)
+            if (canceled)
                 return;
             if (lastException != null) {
@@ -391 +391 @@
         protected void realRun() throws SAXException, IOException, OsmTransferException {
             try {
-                while(! relationsToDownload.isEmpty() && !cancelled) {
+                while(! relationsToDownload.isEmpty() && !canceled) {
                     Relation r = relationsToDownload.pop();
                     if (r.isNew()) {
@@ -415 +415 @@
                 }
             } catch (Exception e) {
-                if (cancelled) {
-                    System.out.println(tr("Warning: Ignoring exception because task was cancelled. Exception: {0}", e
+                if (canceled) {
+                    System.out.println(tr("Warning: Ignoring exception because task was canceled. Exception: {0}", e
                             .toString()));
                     return;
@@ -429 +429 @@
      */
     class DownloadRelationSetTask extends PleaseWaitRunnable {
-        private boolean cancelled;
+        private boolean canceled;
         private int conflictsCount;
         private Exception lastException;
@@ -445 +445 @@
         @Override
         protected void cancel() {
-            cancelled = true;
+            canceled = true;
             OsmApi.getOsmApi().cancel();
         }
@@ -460 +460 @@
         @Override
         protected void finish() {
-            if (cancelled)
+            if (canceled)
                 return;
             if (lastException != null) {
@@ -494 +494 @@
             try {
                 Iterator<Relation> it = relations.iterator();
-                while(it.hasNext() && !cancelled) {
+                while(it.hasNext() && !canceled) {
                     Relation r = it.next();
                     if (r.isNew()) {
@@ -508 +508 @@
                 }
             } catch (Exception e) {
-                if (cancelled) {
-                    System.out.println(tr("Warning: Ignoring exception because task was cancelled. Exception: {0}", e
+                if (canceled) {
+                    System.out.println(tr("Warning: Ignoring exception because task was canceled. Exception: {0}", e
                             .toString()));
                     return;

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java

@@ -32 +32 @@
  */
 public class DownloadRelationMemberTask extends PleaseWaitRunnable {
-    private boolean cancelled;
+    private boolean canceled;
     private Exception lastException;
     private final Set<Relation> parents = new HashSet<Relation>();
@@ -72 +72 @@
     @Override
     protected void cancel() {
-        cancelled = true;
+        canceled = true;
         synchronized(this) {
             if (objectReader != null) {
@@ -83 +83 @@
     protected void finish() {
         Main.map.repaint();
-        if (cancelled)
+        if (canceled)
             return;
         if (lastException != null) {
@@ -105 +105 @@
         } else {
             return trn("Downloading {0} incomplete child of {1} parent relations",
-                    "Downloading {0} incomplete children of  {1} parent relations",
+                    "Downloading {0} incomplete children of {1} parent relations",
                     children.size(),
                     children.size(),
@@ -116 +116 @@
         try {
             synchronized (this) {
-                if (cancelled) return;
+                if (canceled) return;
                 objectReader = new MultiFetchServerObjectReader();
             }
@@ -129 +129 @@
             dataSet.deleteInvisible();
             synchronized (this) {
-                if (cancelled) return;
+                if (canceled) return;
                 objectReader = null;
             }
@@ -143 +143 @@
 
         } catch (Exception e) {
-            if (cancelled) {
-                System.out.println(tr("Warning: Ignoring exception because task was cancelled. Exception: {0}", e
+            if (canceled) {
+                System.out.println(tr("Warning: Ignoring exception because task was canceled. Exception: {0}", e
                         .toString()));
                 return;

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java

@@ -28 +28 @@
  */
 public class DownloadRelationTask extends PleaseWaitRunnable {
-    private boolean cancelled;
+    private boolean canceled;
     private Exception lastException;
     private Collection<Relation> relations;
@@ -52 +52 @@
     @Override
     protected void cancel() {
-        cancelled = true;
+        canceled = true;
         synchronized(this) {
             if (objectReader != null) {
@@ -62 +62 @@
     @Override
     protected void finish() {
-        if (cancelled)
+        if (canceled)
             return;
         if (lastException != null) {
@@ -79 +79 @@
                 getProgressMonitor().setCustomText(tr("({0}/{1}): Downloading relation ''{2}''...", i,relations.size(),relation.getDisplayName(DefaultNameFormatter.getInstance())));
                 synchronized (this) {
-                    if (cancelled) return;
+                    if (canceled) return;
                     objectReader = new OsmServerObjectReader(relation.getPrimitiveId(), true /* full download */);
                 }
@@ -88 +88 @@
                     return;
                 synchronized (this) {
-                    if (cancelled) return;
+                    if (canceled) return;
                     objectReader = null;
                 }
@@ -106 +106 @@
             );
         } catch (Exception e) {
-            if (cancelled) {
-                System.out.println(tr("Warning: Ignoring exception because task was cancelled. Exception: {0}", e
+            if (canceled) {
+                System.out.println(tr("Warning: Ignoring exception because task was canceled. Exception: {0}", e
                         .toString()));
                 return;

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java

@@ -39 +39 @@
  *       new Runnable() {
  *          public void run() {
- *              if (task.isCancelled() || task.hasError())
+ *              if (task.isCanceled() || task.hasError())
  *                  return;
  *              List<Relation> parents = task.getParents();
@@ -52 +52 @@
  */
 public class ParentRelationLoadingTask extends PleaseWaitRunnable{
-    private boolean cancelled;
+    private boolean canceled;
     private Exception lastException;
     private DataSet referrers;
@@ -93 +93 @@
 
     /**
-     * Replies true if this has been cancelled by the user.
-     *
-     * @return true if this has been cancelled by the user.
-     */
-    public boolean isCancelled() {
-        return cancelled;
+     * Replies true if this has been canceled by the user.
+     *
+     * @return true if this has been canceled by the user.
+     */
+    public boolean isCanceled() {
+        return canceled;
     }
 
@@ -120 +120 @@
     @Override
     protected void cancel() {
-        cancelled = true;
+        canceled = true;
         OsmApi.getOsmApi().cancel();
     }
@@ -139 +139 @@
     @Override
     protected void finish() {
-        if (cancelled) return;
+        if (canceled) return;
         if (lastException != null) {
             showLastException();
@@ -191 +191 @@
             }
         } catch(Exception e) {
-            if (cancelled) {
-                System.out.println(tr("Warning: Ignoring exception because task was cancelled. Exception: {0}", e.toString()));
+            if (canceled) {
+                System.out.println(tr("Warning: Ignoring exception because task was canceled. Exception: {0}", e.toString()));
                 return;
             }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java

@@ -109 +109 @@
                     new Runnable() {
                         public void run() {
-                            if (task.isCancelled() || task.hasError())
+                            if (task.isCanceled() || task.hasError())
                                 return;
                             model.populate(task.getParents());

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java

@@ -102 +102 @@
      */
     class RelationLoader extends PleaseWaitRunnable {
-        private boolean cancelled;
+        private boolean canceled;
         private Exception lastException;
         private Relation relation;
@@ -122 +122 @@
         protected void cancel() {
             OsmApi.getOsmApi().cancel();
-            this.cancelled = true;
+            this.canceled = true;
         }
 
         @Override
         protected void finish() {
-            if (cancelled)
+            if (canceled)
                 return;
             if (lastException != null) {
@@ -155 +155 @@
                         .createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
             } catch(Exception e) {
-                if (cancelled) {
-                    System.out.println(tr("Warning: Ignoring exception because task was cancelled. Exception: {0}", e.toString()));
+                if (canceled) {
+                    System.out.println(tr("Warning: Ignoring exception because task was canceled. Exception: {0}", e.toString()));
                     return;
                 }

trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java

@@ -47 +47 @@
 public class HistoryLoadTask extends PleaseWaitRunnable {
 
-    private boolean cancelled = false;
+    private boolean canceled = false;
     private Exception lastException  = null;
     private HashSet<PrimitiveId> toLoad;
@@ -160 +160 @@
     protected void cancel() {
         OsmApi.getOsmApi().cancel();
-        cancelled = true;
+        canceled = true;
     }
 
     @Override
     protected void finish() {
-        if (isCancelled())
+        if (isCanceled())
             return;
         if (lastException != null) {
@@ -179 +179 @@
         try {
             for(PrimitiveId pid: toLoad) {
-                if (cancelled) {
+                if (canceled) {
                     break;
                 }
@@ -196 +196 @@
                     ds = reader.parseHistory(progressMonitor.createSubTaskMonitor(1, false));
                 } catch(OsmTransferException e) {
-                    if (cancelled)
+                    if (canceled)
                         return;
                     throw e;
@@ -208 +208 @@
     }
 
-    public boolean isCancelled() {
-        return cancelled;
+    public boolean isCanceled() {
+        return canceled;
     }
 

trunk/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java

@@ -8 +8 @@
 public abstract class AbstractIOTask implements Runnable {
 
-    /** indicates whether the task has been cancelled */
-    private boolean cancelled;
+    /** indicates whether the task has been canceled */
+    private boolean canceled;
     /** indicates whether the task has been failed */
     private boolean failed;
@@ -16 +16 @@
 
     public AbstractIOTask() {
-        cancelled = false;
+        canceled = false;
         failed = false;
         lastException = null;
@@ -22 +22 @@
 
     /**
-     * Replies true if the task has been cancelled
+     * Replies true if the task has been canceled
      *
-     * @return true if the task has been cancelled
+     * @return true if the task has been canceled
      */
-    public boolean isCancelled() {
-        return cancelled;
+    public boolean isCanceled() {
+        return canceled;
     }
 
     /**
-     * Set whether this task has been cancelled
+     * Set whether this task has been canceled
      *
-     * @param cancelled true, if the task has been cancelled; false otherwise
+     * @param canceled true, if the task has been canceled; false otherwise
      */
-    protected void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
+    protected void setCanceled(boolean canceled) {
+        this.canceled = canceled;
     }
 
@@ -77 +77 @@
     /**
      * Replies true if this  task was successful, i.e. if it wasn't
-     * cancelled and didn't fail
+     * canceled and didn't fail
      *
      * @return true if this  task was successful
      */
     public boolean isSuccessful() {
-        return !isCancelled() && !isFailed();
+        return !isCanceled() && !isFailed();
     }
 

trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java

@@ -42 +42 @@
     /** the list */
     private JList lstOpenChangesets;
-    /** true if the user cancelled the dialog */
+    /** true if the user canceled the dialog */
     private boolean canceled;
     /** the list model */

trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java

@@ -23 +23 @@
  */
 public class CloseChangesetTask extends PleaseWaitRunnable {
-    private boolean cancelled;
+    private boolean canceled;
     private Exception lastException;
     private Collection<Changeset> changesets;
@@ -46 +46 @@
     @Override
     protected void cancel() {
-        this.cancelled = true;
+        this.canceled = true;
         OsmApi.getOsmApi().cancel();
     }
@@ -52 +52 @@
     @Override
     protected void finish() {
-        if (cancelled)
+        if (canceled)
             return;
         if (lastException != null) {
@@ -70 +70 @@
         try {
             for (Changeset cs: changesets) {
-                if (cancelled) return;
+                if (canceled) return;
                 if (cs == null || cs.getId() <= 0 || ! cs.isOpen()) {
                     continue;
@@ -79 +79 @@
             }
         } catch(Exception e) {
-            if (cancelled)
+            if (canceled)
                 return;
             lastException = e;

trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java

@@ -30 +30 @@
 public class DownloadOpenChangesetsTask extends PleaseWaitRunnable {
 
-    private boolean cancelled;
+    private boolean canceled;
     private OsmServerChangesetReader reader;
     private List<Changeset> changesets;
@@ -48 +48 @@
     @Override
     protected void cancel() {
-        this.cancelled = true;
+        this.canceled = true;
         synchronized(this) {
             if (reader != null) {
@@ -71 +71 @@
             return;
         }
-        if (cancelled)return;
+        if (canceled)return;
         if (lastException != null) {
             ExceptionDialogUtil.explainException(lastException);
@@ -133 +133 @@
                 refreshUserIdentity();
             }
-            if (cancelled)return;
+            if (canceled)return;
             synchronized(this) {
                 reader = new OsmServerChangesetReader();
@@ -155 +155 @@
             );
         } catch(Exception e) {
-            if (cancelled)
+            if (canceled)
                 return;
             lastException = e;
@@ -161 +161 @@
     }
 
-    public boolean isCancelled() {
-        return cancelled;
+    public boolean isCanceled() {
+        return canceled;
     }
 }

trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java

@@ -143 +143 @@
      * <ul>
      *   <li>{@see UploadOrSaveState#OK} if {@see #getLayer() was successfully uploaded</li>
-     *   <li>{@see UploadOrSaveState#CANCELLED} if uploading {@see #getLayer() was cancelled</li>
+     *   <li>{@see UploadOrSaveState#canceled} if uploading {@see #getLayer() was canceled</li>
      *   <li>{@see UploadOrSaveState#FAILED} if uploading {@see #getLayer() has failed</li>
      * </ul>
@@ -166 +166 @@
      * <ul>
      *   <li>{@see UploadOrSaveState#OK} if {@see #getLayer() was successfully saved to file</li>
-     *   <li>{@see UploadOrSaveState#CANCELLED} if saving {@see #getLayer() was cancelled</li>
+     *   <li>{@see UploadOrSaveState#canceled} if saving {@see #getLayer() was canceled</li>
      *   <li>{@see UploadOrSaveState#FAILED} if saving {@see #getLayer() has failed</li>
      * </ul>

trunk/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java

@@ -52 +52 @@
                 return;
             }
-            if (!isCancelled()) {
+            if (!isCanceled()) {
                 layerInfo.getLayer().onPostSaveToFile();
             }
@@ -63 +63 @@
     @Override
     public void cancel() {
-        setCancelled(true);
+        setCanceled(true);
     }
 }

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

@@ -50 +50 @@
         PROCEED,
         /**
-         * save/upload of layers was not successful or user cancelled
+         * save/upload of layers was not successful or user canceled
          * operation
          */
@@ -392 +392 @@
         private ProgressMonitor monitor;
         private ExecutorService worker;
-        private boolean cancelled;
+        private boolean canceled;
         private Future<?> currentFuture;
         private AbstractIOTask currentTask;
@@ -404 +404 @@
         protected void uploadLayers(List<SaveLayerInfo> toUpload) {
             for (final SaveLayerInfo layerInfo: toUpload) {
-                if (cancelled) {
-                    model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCELLED);
+                if (canceled) {
+                    model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCELED);
                     continue;
                 }
@@ -418 +418 @@
                 dialog.setVisible(true);
                 if (dialog.isCanceled()) {
-                    model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCELLED);
+                    model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCELED);
                     continue;
                 }
@@ -435 +435 @@
                     currentFuture.get();
                 } catch(CancellationException e) {
-                    model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCELLED);
+                    model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCELED);
                 } catch(Exception e) {
                     e.printStackTrace();
@@ -441 +441 @@
                     ExceptionDialogUtil.explainException(e);
                 }
-                if (currentTask.isCancelled()) {
-                    model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCELLED);
+                if (currentTask.isCanceled()) {
+                    model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCELED);
                 } else if (currentTask.isFailed()) {
                     currentTask.getLastException().printStackTrace();
@@ -457 +457 @@
         protected void saveLayers(List<SaveLayerInfo> toSave) {
             for (final SaveLayerInfo layerInfo: toSave) {
-                if (cancelled) {
-                    model.setSaveState(layerInfo.getLayer(), UploadOrSaveState.CANCELLED);
+                if (canceled) {
+                    model.setSaveState(layerInfo.getLayer(), UploadOrSaveState.CANCELED);
                     continue;
                 }
@@ -469 +469 @@
                     currentFuture.get();
                 } catch(CancellationException e) {
-                    model.setSaveState(layerInfo.getLayer(), UploadOrSaveState.CANCELLED);
+                    model.setSaveState(layerInfo.getLayer(), UploadOrSaveState.CANCELED);
                 } catch(Exception e) {
                     e.printStackTrace();
@@ -475 +475 @@
                     ExceptionDialogUtil.explainException(e);
                 }
-                if (currentTask.isCancelled()) {
-                    model.setSaveState(layerInfo.getLayer(), UploadOrSaveState.CANCELLED);
+                if (currentTask.isCanceled()) {
+                    model.setSaveState(layerInfo.getLayer(), UploadOrSaveState.CANCELED);
                 } else if (currentTask.isFailed()) {
                     if (currentTask.getLastException() != null) {
@@ -496 +496 @@
             String msg = trn(
                     "<html>An upload and/or save operation of one layer with modifications<br>"
-                    + "was cancelled or has failed.</html>",
+                    + "was canceled or has failed.</html>",
                     "<html>Upload and/or save operations of {0} layers with modifications<br>"
-                    + "were cancelled or have failed.</html>",
+                    + "were canceled or have failed.</html>",
                     numProblems,
                     numProblems
@@ -524 +524 @@
                 warnBecauseOfUnsavedData();
                 model.setMode(Mode.EDITING_DATA);
-                if (cancelled) {
+                if (canceled) {
                     setUserAction(UserAction.CANCEL);
                     closeDialog();
@@ -538 +538 @@
                 currentTask.cancel();
             }
-            cancelled = true;
+            canceled = true;
         }
     }

trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java

@@ -197 +197 @@
         int ret = 0;
         for (SaveLayerInfo info: layerInfo) {
-            if (UploadOrSaveState.CANCELLED.equals(info.getSaveState())
-                    || UploadOrSaveState.CANCELLED.equals(info.getUploadState())) {
+            if (UploadOrSaveState.CANCELED.equals(info.getSaveState())
+                    || UploadOrSaveState.CANCELED.equals(info.getUploadState())) {
                 ret++;
             }

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -183 +183 @@
 
 
-        // make sure the the configuration panels listen to each other
+        // make sure the configuration panels listen to each other
         // changes
         //

trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java

@@ -122 +122 @@
                 try {
                     ProgressMonitor m = monitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false);
-                    if (isCancelled()) return;
+                    if (isCanceled()) return;
                     writer.uploadOsm(strategy, toUpload, changeset, m);
                     processedPrimitives.addAll((Collection) writer.getProcessedPrimitives()); // OsmPrimitive in => OsmPrimitive out
@@ -136 +136 @@
             }
         } catch (Exception sxe) {
-            if (isCancelled()) {
-                System.out.println("Ignoring exception caught because upload is cancelled. Exception is: " + sxe.toString());
+            if (isCanceled()) {
+                System.out.println("Ignoring exception caught because upload is canceled. Exception is: " + sxe.toString());
                 return;
             }
@@ -143 +143 @@
         }
 
-        if (isCancelled())
+        if (isCanceled())
             return;
         layer.cleanupAfterUpload(processedPrimitives);
@@ -154 +154 @@
     @Override
     public void cancel() {
-        setCancelled(true);
+        setCanceled(true);
         if (writer != null) {
             writer.cancel();

trunk/src/org/openstreetmap/josm/gui/io/UploadOrSaveState.java

@@ -12 +12 @@
     FAILED,
     /**
-     * uploading or saving a data layer was cancelled
+     * uploading or saving a data layer was canceled
      */
-    CANCELLED
+    CANCELED
 }

trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java

@@ -29 +29 @@
 import org.openstreetmap.josm.io.OsmApiPrimitiveGoneException;
 import org.openstreetmap.josm.io.OsmServerWriter;
-import org.openstreetmap.josm.io.OsmTransferCancelledException;
+import org.openstreetmap.josm.io.OsmTransferCanceledException;
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -39 +39 @@
  */
 public class UploadPrimitivesTask extends  AbstractUploadTask {
-    private boolean uploadCancelled = false;
+    private boolean uploadCanceled = false;
     private Exception lastException = null;
     private APIDataSet toUpload;
@@ -236 +236 @@
                     //
                     break;
-                } catch(OsmTransferCancelledException e) {
+                } catch(OsmTransferCanceledException e) {
                     e.printStackTrace();
-                    uploadCancelled = true;
+                    uploadCanceled = true;
                     break uploadloop;
                 } catch(OsmApiPrimitiveGoneException e) {
@@ -283 +283 @@
         }
         } catch (Exception e) {
-            if (uploadCancelled) {
+            if (uploadCanceled) {
                 System.out.println(tr("Ignoring caught exception because upload is canceled. Exception is: {0}", e.toString()));
             } else {
@@ -289 +289 @@
             }
         }
-        if (uploadCancelled && processedPrimitives.isEmpty()) return;
+        if (uploadCanceled && processedPrimitives.isEmpty()) return;
         cleanupAfterUpload();
     }
 
     @Override protected void finish() {
-        if (uploadCancelled)
+        if (uploadCanceled)
             return;
 
@@ -353 +353 @@
 
     @Override protected void cancel() {
-        uploadCancelled = true;
+        uploadCanceled = true;
         synchronized(this) {
             if (writer != null) {

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -90 +90 @@
     private static final class Loader extends PleaseWaitRunnable {
 
-        private boolean cancelled = false;
+        private boolean canceled = false;
         private GeoImageLayer layer;
         private Collection<File> selection;
@@ -118 +118 @@
             }
 
-            if (cancelled)
+            if (canceled)
                 return;
             progressMonitor.subTask(tr("Read photos..."));
@@ -131 +131 @@
             for (File f : files) {
 
-                if (cancelled) {
+                if (canceled) {
                     break;
                 }
@@ -161 +161 @@
             for (File f : sel) {
 
-                if(cancelled) {
+                if(canceled) {
                     break;
                 }
@@ -241 +241 @@
                 }
 
-                if (! cancelled && layer.data.size() > 0) {
+                if (! canceled && layer.data.size() > 0) {
                     boolean noGeotagFound = true;
                     for (ImageEntry e : layer.data) {
@@ -256 +256 @@
 
         @Override protected void cancel() {
-            cancelled = true;
+            canceled = true;
         }
     }

trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java

@@ -162 +162 @@
      * Replies the label to be rendered for the primitive {@code osm}.
      * 
-     * @param osm the the OSM object
+     * @param osm the OSM object
      * @return the label, or null, if {@code osm} is null or if no label can be
      * derived for {@code osm}

trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java

@@ -251 +251 @@
 
     /**
-     * Replies true if the dialog was cancelled
-     *
-     * @return true if the dialog was cancelled
+     * Replies true if the dialog was canceled
+     *
+     * @return true if the dialog was canceled
      */
     public boolean isCanceled() {

trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java

@@ -32 +32 @@
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
-import org.openstreetmap.josm.io.OsmTransferCancelledException;
+import org.openstreetmap.josm.io.OsmTransferCanceledException;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
@@ -119 +119 @@
      * @throws OsmOAuthAuthorizationException thrown if something goes wrong when retrieving the request token
      */
-    public OAuthToken getRequestToken(ProgressMonitor monitor) throws OsmOAuthAuthorizationException, OsmTransferCancelledException {
+    public OAuthToken getRequestToken(ProgressMonitor monitor) throws OsmOAuthAuthorizationException, OsmTransferCanceledException {
         if (monitor == null) {
             monitor = NullProgressMonitor.INSTANCE;
@@ -130 +130 @@
         } catch(OAuthCommunicationException e){
             if (canceled)
-                throw new OsmTransferCancelledException();
+                throw new OsmTransferCanceledException();
             throw new OsmOAuthAuthorizationException(e);
         } catch(OAuthException e){
             if (canceled)
-                throw new OsmTransferCancelledException();
+                throw new OsmTransferCanceledException();
             throw new OsmOAuthAuthorizationException(e);
         } finally {
@@ -152 +152 @@
      * @see #getRequestToken(ProgressMonitor)
      */
-    public OAuthToken getAccessToken(ProgressMonitor monitor) throws OsmOAuthAuthorizationException, OsmTransferCancelledException {
+    public OAuthToken getAccessToken(ProgressMonitor monitor) throws OsmOAuthAuthorizationException, OsmTransferCanceledException {
         if (monitor == null) {
             monitor = NullProgressMonitor.INSTANCE;
@@ -163 +163 @@
         } catch(OAuthCommunicationException e){
             if (canceled)
-                throw new OsmTransferCancelledException();
+                throw new OsmTransferCanceledException();
             throw new OsmOAuthAuthorizationException(e);
         } catch(OAuthException e){
             if (canceled)
-                throw new OsmTransferCancelledException();
+                throw new OsmTransferCanceledException();
             throw new OsmOAuthAuthorizationException(e);
         } finally {
@@ -465 +465 @@
      * @throws IllegalArgumentException thrown if privileges is null
      * @throws OsmOAuthAuthorizationException thrown if the authorisation fails
-     * @throws OsmTransferCancelledException thrown if the task is cancelled by the user
-     */
-    public void authorise(OAuthToken requestToken, String osmUserName, String osmPassword, OsmPrivileges privileges, ProgressMonitor monitor) throws IllegalArgumentException, OsmOAuthAuthorizationException, OsmTransferCancelledException{
+     * @throws OsmTransferCanceledException thrown if the task is canceled by the user
+     */
+    public void authorise(OAuthToken requestToken, String osmUserName, String osmPassword, OsmPrivileges privileges, ProgressMonitor monitor) throws IllegalArgumentException, OsmOAuthAuthorizationException, OsmTransferCanceledException{
         CheckParameterUtil.ensureParameterNotNull(requestToken, "requestToken");
         CheckParameterUtil.ensureParameterNotNull(osmUserName, "osmUserName");
@@ -482 +482 @@
             String sessionId = fetchOsmWebsiteSessionId();
             if (canceled)
-                throw new OsmTransferCancelledException();
+                throw new OsmTransferCanceledException();
             monitor.worked(1);
 
@@ -488 +488 @@
             authenticateOsmSession(sessionId, osmUserName, osmPassword);
             if (canceled)
-                throw new OsmTransferCancelledException();
+                throw new OsmTransferCanceledException();
             monitor.worked(1);
 
@@ -494 +494 @@
             sendAuthorisationRequest(sessionId, requestToken, privileges);
             if (canceled)
-                throw new OsmTransferCancelledException();
+                throw new OsmTransferCanceledException();
             monitor.worked(1);
 
@@ -500 +500 @@
             logoutOsmSession(sessionId);
             if (canceled)
-                throw new OsmTransferCancelledException();
+                throw new OsmTransferCanceledException();
             monitor.worked(1);
         } catch(OsmOAuthAuthorizationException e) {
             if (canceled)
-                throw new OsmTransferCancelledException();
+                throw new OsmTransferCanceledException();
             throw e;
         } finally {

trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java

@@ -14 +14 @@
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.help.HelpUtil;
-import org.openstreetmap.josm.io.OsmTransferCancelledException;
+import org.openstreetmap.josm.io.OsmTransferCanceledException;
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -84 +84 @@
             }
             accessToken = client.getAccessToken(getProgressMonitor().createSubTaskMonitor(0, false));
-        } catch(OsmTransferCancelledException e) {
+        } catch(OsmTransferCanceledException e) {
             return;
         } catch (OsmOAuthAuthorizationException e) {

trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java

@@ -14 +14 @@
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.help.HelpUtil;
-import org.openstreetmap.josm.io.OsmTransferCancelledException;
+import org.openstreetmap.josm.io.OsmTransferCanceledException;
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -78 +78 @@
             }
             requestToken = client.getRequestToken(getProgressMonitor().createSubTaskMonitor(0, false));
-        } catch(OsmTransferCancelledException e) {
+        } catch(OsmTransferCanceledException e) {
             return;
         } catch (OsmOAuthAuthorizationException e) {

trunk/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java

@@ -86 +86 @@
         wrapper.add(alwaysAskUserConfirm, GBC.eol().fill(GBC.HORIZONTAL));
 
-        final JLabel portLabel = new JLabel("<html>"+tr("JOSM will always listen at port 8111 on localhost." +
+        final JLabel portLabel = new JLabel("<html>"+tr("JOSM will always listen at port 8111 on localhost. " +
                 "This port is not configurable because it is referenced by external applications talking to JOSM.") + "</html>");
         portLabel.setFont(portLabel.getFont().deriveFont(Font.PLAIN));

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java

@@ -74 +74 @@
         bgVersionBasedUpdatePolicy.add(btn);
 
-        btn = new JRadioButton(tr("Always update withouth asking"));
+        btn = new JRadioButton(tr("Always update without asking"));
         rbVersionBasedUpatePolicy.put(Policy.ALWAYS, btn);
         bgVersionBasedUpdatePolicy.add(btn);
@@ -116 +116 @@
         bgTimeBasedUpdatePolicy.add(btn);
 
-        btn = new JRadioButton(tr("Always update withouth asking"));
+        btn = new JRadioButton(tr("Always update without asking"));
         btn.addChangeListener(changeListener);
         rbTimeBasedUpatePolicy.put(Policy.ALWAYS, btn);

trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java

@@ -181 +181 @@
     }
 
-    public boolean isCancelled() {
+    public boolean isCanceled() {
         return cancelHandler.isCanceled();
     }

trunk/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java

@@ -43 +43 @@
     }
 
-    public boolean isCancelled() {
+    public boolean isCanceled() {
         return false;
     }

trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java

@@ -115 +115 @@
     ProgressMonitor createSubTaskMonitor(int ticks, boolean internal);
 
-    boolean isCancelled();
+    boolean isCanceled();
     void cancel();
     void addCancelListener(CancelListener listener);

trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java

@@ -441 +441 @@
 
     /**
-     * Replies the the tags in this tag editor model as {@see TagCollection}.
-     *
-     * @return the the tags in this tag editor model as {@see TagCollection}
+     * Replies the tags in this tag editor model as {@see TagCollection}.
+     *
+     * @return the tags in this tag editor model as {@see TagCollection}
      */
     public TagCollection getTagCollection() {

trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java

@@ -51 +51 @@
     private TagCellEditor editor = null;
 
-    /** a list of components to which focus can be transferred withouth stopping
+    /** a list of components to which focus can be transferred without stopping
      * cell editing this table.
      */

trunk/src/org/openstreetmap/josm/io/GpxImporter.java

@@ -56 +56 @@
                     }
                     if (!parsedProperly) {
-                        JOptionPane.showMessageDialog(null, tr("Error occured while parsing gpx file {0}. Only part of the file will be available", file.getName()));
+                        JOptionPane.showMessageDialog(null, tr("Error occurred while parsing gpx file {0}. Only a part of the file will be available.", file.getName()));
                     }
                 }

trunk/src/org/openstreetmap/josm/io/JpgImporter.java

@@ -42 +42 @@
             addRecursiveFiles(files, visitedDirs, sel, progressMonitor.createSubTaskMonitor(1, true));
 
-            if (progressMonitor.isCancelled())
+            if (progressMonitor.isCanceled())
                 return;
 
@@ -56 +56 @@
     private void addRecursiveFiles(List<File> files, Set<String> visitedDirs, List<File> sel, ProgressMonitor progressMonitor) throws IOException {
 
-        if (progressMonitor.isCancelled())
+        if (progressMonitor.isCanceled())
             return;
 

trunk/src/org/openstreetmap/josm/io/OsmApi.java

@@ -146 +146 @@
     }
 
-    public void initialize(ProgressMonitor monitor) throws OsmApiInitializationException, OsmTransferCancelledException {
+    public void initialize(ProgressMonitor monitor) throws OsmApiInitializationException, OsmTransferCanceledException {
         initialize(monitor, false);
     }
@@ -156 +156 @@
      * @exception OsmApiInitializationException thrown, if an exception occurs
      */
-    public void initialize(ProgressMonitor monitor, boolean fastFail) throws OsmApiInitializationException, OsmTransferCancelledException {
+    public void initialize(ProgressMonitor monitor, boolean fastFail) throws OsmApiInitializationException, OsmTransferCanceledException {
         if (initialized)
             return;
@@ -213 +213 @@
             initialized = false;
             throw new OsmApiInitializationException(e);
-        } catch(OsmTransferCancelledException e){
+        } catch(OsmTransferCanceledException e){
             throw e;
         } catch(OsmTransferException e) {
@@ -477 +477 @@
     }
 
-    private void sleepAndListen(int retry, ProgressMonitor monitor) throws OsmTransferCancelledException {
+    private void sleepAndListen(int retry, ProgressMonitor monitor) throws OsmTransferCanceledException {
         System.out.print(tr("Waiting 10 seconds ... "));
         for(int i=0; i < 10; i++) {
@@ -484 +484 @@
             }
             if (cancel)
-                throw new OsmTransferCancelledException();
+                throw new OsmTransferCanceledException();
             try {
                 Thread.sleep(1000);
@@ -646 +646 @@
             } catch(IOException e){
                 throw new OsmTransferException(e);
-            } catch(OsmTransferCancelledException e){
+            } catch(OsmTransferCanceledException e){
                 throw e;
             } catch(OsmTransferException e) {

trunk/src/org/openstreetmap/josm/io/OsmChangeBuilder.java

@@ -91 +91 @@
         if (primitives == null) return;
         if (!prologWritten)
-            throw new IllegalStateException(tr("Prolog of OsmChange document not written yet. Please write frst."));
+            throw new IllegalStateException(tr("Prolog of OsmChange document not written yet. Please write first."));
         for (IPrimitive p : primitives) {
             write(p);
@@ -109 +109 @@
         if (p == null) return;
         if (!prologWritten)
-            throw new IllegalStateException(tr("Prolog of OsmChange document not written yet. Please write frst."));
+            throw new IllegalStateException(tr("Prolog of OsmChange document not written yet. Please write first."));
         write(p);
     }
@@ -120 +120 @@
     public void finish() throws IllegalStateException {
         if (!prologWritten)
-            throw new IllegalStateException(tr("Prolog of OsmChange document not written yet. Please write frst."));
+            throw new IllegalStateException(tr("Prolog of OsmChange document not written yet. Please write first."));
         if (currentMode != null) {
             writer.print("</");

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -158 +158 @@
                     } else {
                         throwException(tr(
-                                "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''.",
+                                "Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''.",
                                 minlon, minlat, maxlon, maxlat, origin
                         ));

trunk/src/org/openstreetmap/josm/io/OsmServerReader.java

@@ -71 +71 @@
             }
             if (cancel)
-                throw new OsmTransferCancelledException();
+                throw new OsmTransferCanceledException();
             if (Main.pref.getBoolean("osm-server.use-compression", true)) {
                 activeConnection.setRequestProperty("Accept-Encoding", "gzip, deflate");
@@ -90 +90 @@
 
                 if (activeConnection.getResponseCode() == HttpURLConnection.HTTP_PROXY_AUTH)
-                    throw new OsmTransferCancelledException();
+                    throw new OsmTransferCanceledException();
 
                 String encoding = activeConnection.getContentEncoding();

trunk/src/org/openstreetmap/josm/io/OsmTransferCanceledException.java

@@ -2 +2 @@
 package org.openstreetmap.josm.io;
 
-public class OsmTransferCancelledException extends OsmTransferException {
+public class OsmTransferCanceledException extends OsmTransferException {
 
 }

trunk/src/org/openstreetmap/josm/io/auth/CredentialsAgentResponse.java

@@ -29 +29 @@
         return canceled;
     }
-    public void setCanceled(boolean cancelled) {
-        this.canceled = cancelled;
+    public void setCanceled(boolean canceled) {
+        this.canceled = canceled;
     }
 }

trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

@@ -101 +101 @@
             Utils.close(in);
         }
-        System.err.println("Warning: Could not detect type of imagery source '"+source+"'. Using default (xml).");
+        Main.warn(tr("Warning: Could not detect type of imagery source '{0}'. Using default (xml).", source));
         return true;
     }
@@ -261 +261 @@
             }
             /**
-             * Did not recognize the element, so the new state is UNKOWN.
+             * Did not recognize the element, so the new state is UNKNOWN.
              * This includes the case where we are already inside an unknown
              * element, i.e. we do not try to understand the inner content

trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java

@@ -178 +178 @@
 
     /**
-     * Replies true if the task was cancelled by the user
+     * Replies true if the task was canceled by the user
      *
      * @return

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -354 +354 @@
      * Alerts the user if a plugin required by another plugin is missing
      *
-     * @param plugin the the plugin
+     * @param plugin the plugin
      * @param missingRequiredPlugin the missing required plugin
      */

trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java

@@ -70 +70 @@
     /**
      * Creates a plugin information object for the plugin with name {@code name}.
-     * Information about the plugin is extracted from the maifest file in the the plugin jar
+     * Information about the plugin is extracted from the maifest file in the plugin jar
      * {@code file}.
      * @param file the plugin jar

trunk/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java

@@ -242 +242 @@
 
     /**
-     * Replies true if the task was cancelled by the user
+     * Replies true if the task was canceled by the user
      *
-     * @return true if the task was cancelled by the user
+     * @return true if the task was canceled by the user
      */
     public boolean isCanceled() {