Index: /trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java (revision 4310) @@ -75,5 +75,5 @@ private class DownloadOpenChangesetsTask extends PleaseWaitRunnable { - private boolean cancelled; + private boolean canceled; private OsmServerChangesetReader reader; private List changesets; @@ -92,5 +92,5 @@ @Override protected void cancel() { - this.cancelled = true; + this.canceled = true; reader.cancel(); } @@ -105,5 +105,5 @@ } ChangesetCache.getInstance().update(changesets); - if (!cancelled && lastException == null) { + if (!canceled && lastException == null) { onPostDownloadOpenChangesets(); } @@ -129,5 +129,5 @@ try { userInfo = fetchUserInfo(); - if (cancelled) + if (canceled) return; reader = new OsmServerChangesetReader(); @@ -138,5 +138,5 @@ ); } catch(Exception e) { - if (cancelled) + if (canceled) return; lastException = e; @@ -144,6 +144,6 @@ } - public boolean isCancelled() { - return cancelled; + public boolean isCanceled() { + return canceled; } Index: /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 4310) @@ -226,5 +226,5 @@ if (!completeWayTags.isApplicableToPrimitive() || !parentRelations.isEmpty()) { dialog.setVisible(true); - if (dialog.isCancelled()) + if (dialog.isCanceled()) throw new UserCancelException(); } Index: /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (revision 4310) @@ -366,5 +366,5 @@ if (!resolveTagConflicts(areas)) return; - //user cancelled, do nothing. + //user canceled, do nothing. try { @@ -570,5 +570,5 @@ if (!completeWayTags.isApplicableToPrimitive() || !parentRelations.isEmpty()) { dialog.setVisible(true); - if (dialog.isCancelled()) + if (dialog.isCanceled()) return false; } Index: /trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 4310) @@ -248,5 +248,5 @@ if (! nodeTags.isApplicableToPrimitive() || relationToNodeReferences.size() > 1) { dialog.setVisible(true); - if (dialog.isCancelled()) + if (dialog.isCanceled()) return null; } Index: /trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 4310) @@ -87,5 +87,5 @@ private List successfullyOpenedFiles = new ArrayList(); private FileFilter fileFilter; - private boolean cancelled; + private boolean canceled; private boolean recordHistory = false; @@ -114,5 +114,5 @@ @Override protected void cancel() { - this.cancelled = true; + this.canceled = true; } @@ -291,5 +291,5 @@ public void importData(FileImporter importer, List files) { if (importer.isBatchImporter()) { - if (cancelled) return; + if (canceled) return; String msg; if (files.size() == 1) { @@ -305,5 +305,5 @@ } 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))) { Index: /trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java (revision 4310) @@ -77,9 +77,9 @@ 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,6 +99,6 @@ dialog.showDialog(); if (dialog.getValue() != 1) return; - remindUploadAddressHistory(uploadAdresses); - openUrl(layer.isSelected(), uploadAdresses.getText()); + remindUploadAddressHistory(uploadAddresses); + openUrl(layer.isSelected(), uploadAddresses.getText()); } Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (revision 4310) @@ -21,5 +21,5 @@ 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,8 +89,8 @@ } 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; Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java (revision 4310) @@ -41,5 +41,5 @@ */ public class DownloadReferrersTask extends PleaseWaitRunnable { - private boolean cancelled; + private boolean canceled; private Exception lastException; private OsmServerReader reader; @@ -61,5 +61,5 @@ super("Download referrers", false /* don't ignore exception*/); CheckParameterUtil.ensureParameterNotNull(targetLayer, "targetLayer"); - cancelled = false; + canceled = false; this.children = new HashMap(); if (children != null) { @@ -85,5 +85,5 @@ super("Download referrers", false /* don't ignore exception*/); CheckParameterUtil.ensureParameterNotNull(targetLayer, "targetLayer"); - cancelled = false; + canceled = false; this.children = new HashMap(); if (children != null) { @@ -115,5 +115,5 @@ throw new IllegalArgumentException(MessageFormat.format("Id > 0 required, got {0}", id)); CheckParameterUtil.ensureParameterNotNull(type, "type"); - cancelled = false; + canceled = false; this.children = new HashMap(); this.children.put(id, type); @@ -136,5 +136,5 @@ 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(); this.children.put(primitiveId.getUniqueId(), primitiveId.getType()); @@ -145,5 +145,5 @@ @Override protected void cancel() { - cancelled = true; + canceled = true; synchronized(this) { if (reader != null) { @@ -155,5 +155,5 @@ @Override protected void finish() { - if (cancelled) + if (canceled) return; if (lastException != null) { @@ -227,5 +227,5 @@ int i=1; for (Entry entry: children.entrySet()) { - if (cancelled) + if (canceled) return; String msg = ""; @@ -240,5 +240,5 @@ } } catch(Exception e) { - if (cancelled) + if (canceled) return; lastException = e; Index: /trunk/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java (revision 4310) @@ -17,5 +17,5 @@ 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,5 +39,5 @@ return false; } - } catch(OsmTransferCancelledException e){ + } catch(OsmTransferCanceledException e){ return false; } catch (OsmApiInitializationException e) { Index: /trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java (revision 4310) @@ -133,5 +133,5 @@ 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"}); Index: /trunk/src/org/openstreetmap/josm/data/Preferences.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 4310) @@ -529,5 +529,5 @@ } 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())); } } Index: /trunk/src/org/openstreetmap/josm/data/Version.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/Version.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/data/Version.java (revision 4310) @@ -110,5 +110,5 @@ } 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 { Index: /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (revision 4310) @@ -736,5 +736,5 @@ 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(); Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java (revision 4310) @@ -39,5 +39,5 @@ 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} * */ Index: /trunk/src/org/openstreetmap/josm/data/validation/Test.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/Test.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/data/validation/Test.java (revision 4310) @@ -217,6 +217,6 @@ } - public boolean isCancelled() { - return progressMonitor.isCancelled(); + public boolean isCanceled() { + return progressMonitor.isCanceled(); } } Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java (revision 4310) @@ -102,5 +102,5 @@ map.put(en, s.w); } - if(isCancelled()) + if(isCanceled()) return; } @@ -114,5 +114,5 @@ map.clear(); for (MyWaySegment s : ways) { - if(isCancelled()) + if(isCanceled()) return; for (Node en : s.nearbyNodes(mindist)) { @@ -134,5 +134,5 @@ map.clear(); for (MyWaySegment s : ways) { - if(isCancelled()) + if(isCanceled()) return; for (Node en : s.nearbyNodes(minmiddledist)) { @@ -154,5 +154,5 @@ for (MyWaySegment s : ways) { for (Node en : s.nearbyNodes(minmiddledist)) { - if(isCancelled()) + if(isCanceled()) return; if (!othernodes.contains(en)) { Index: /trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (revision 4310) @@ -23,5 +23,5 @@ */ public abstract class PleaseWaitRunnable implements Runnable, CancelListener { - private boolean cancelled = false; + private boolean canceled = false; private boolean ignoreException; private final String title; @@ -113,5 +113,5 @@ public final void run() { - if (cancelled) + if (canceled) return; // since realRun isn't executed, do not call to finish Index: /trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (revision 4310) @@ -435,5 +435,5 @@ HtmlPanel msg = new HtmlPanel(); msg.setText(tr("Alternatively you may enter a tile address for a single tile " - + "in the format zoomlevel/x/y, i.e. 15/256/223. Tile adresses " + + "in the format zoomlevel/x/y, i.e. 15/256/223. Tile addresses " + "in the format zoom,x,y or zoom;x;y are valid too.")); pnl.add(msg); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 4310) @@ -284,5 +284,5 @@ 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); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java (revision 4310) @@ -23,5 +23,5 @@ /** * 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. * Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java (revision 4310) @@ -394,5 +394,5 @@ 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,5 +409,5 @@ 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")); } Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (revision 4310) @@ -66,5 +66,5 @@ * 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,5 +93,5 @@ private TagConflictResolver pnlTagConflictResolver; private RelationMemberConflictResolver pnlRelationMemberConflictResolver; - private boolean cancelled; + private boolean canceled; private JPanel pnlButtons; private OsmPrimitive targetPrimitive; @@ -318,10 +318,10 @@ } - 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,5 +332,5 @@ new WindowGeometry(getClass().getName() + ".geometry", WindowGeometry.centerInWindow(Main.parent, new Dimension(600, 400))).applySafe(this); - setCancelled(false); + setCanceled(false); btnApply.requestFocusInWindow(); } else { @@ -350,5 +350,5 @@ public void actionPerformed(ActionEvent arg0) { - setCancelled(true); + setCanceled(true); setVisible(false); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java (revision 4310) @@ -329,5 +329,5 @@ if (s instanceof MapCSSStyleSource) return tr("mapcss"); - return tr("unkown"); + return tr("unknown"); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java (revision 4310) @@ -20,5 +20,5 @@ 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,6 +186,6 @@ 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. // Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java (revision 4310) @@ -182,5 +182,5 @@ } catch(OsmTransferException e) { if (canceled) - // ignore exception if cancelled + // ignore exception if canceled return; // remember other exceptions Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java (revision 4310) @@ -21,5 +21,5 @@ 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,5 +171,5 @@ changesetReader = null; } - } catch(OsmTransferCancelledException e) { + } catch(OsmTransferCanceledException e) { // thrown if user cancel the authentication dialog canceled = true; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (revision 4310) @@ -278,5 +278,5 @@ */ class DownloadAllChildrenTask extends PleaseWaitRunnable { - private boolean cancelled; + private boolean canceled; private int conflictsCount; private Exception lastException; @@ -299,5 +299,5 @@ @Override protected void cancel() { - cancelled = true; + canceled = true; OsmApi.getOsmApi().cancel(); } @@ -314,5 +314,5 @@ @Override protected void finish() { - if (cancelled) + if (canceled) return; if (lastException != null) { @@ -391,5 +391,5 @@ protected void realRun() throws SAXException, IOException, OsmTransferException { try { - while(! relationsToDownload.isEmpty() && !cancelled) { + while(! relationsToDownload.isEmpty() && !canceled) { Relation r = relationsToDownload.pop(); if (r.isNew()) { @@ -415,6 +415,6 @@ } } 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,5 +429,5 @@ */ class DownloadRelationSetTask extends PleaseWaitRunnable { - private boolean cancelled; + private boolean canceled; private int conflictsCount; private Exception lastException; @@ -445,5 +445,5 @@ @Override protected void cancel() { - cancelled = true; + canceled = true; OsmApi.getOsmApi().cancel(); } @@ -460,5 +460,5 @@ @Override protected void finish() { - if (cancelled) + if (canceled) return; if (lastException != null) { @@ -494,5 +494,5 @@ try { Iterator it = relations.iterator(); - while(it.hasNext() && !cancelled) { + while(it.hasNext() && !canceled) { Relation r = it.next(); if (r.isNew()) { @@ -508,6 +508,6 @@ } } 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; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java (revision 4310) @@ -32,5 +32,5 @@ */ public class DownloadRelationMemberTask extends PleaseWaitRunnable { - private boolean cancelled; + private boolean canceled; private Exception lastException; private final Set parents = new HashSet(); @@ -72,5 +72,5 @@ @Override protected void cancel() { - cancelled = true; + canceled = true; synchronized(this) { if (objectReader != null) { @@ -83,5 +83,5 @@ protected void finish() { Main.map.repaint(); - if (cancelled) + if (canceled) return; if (lastException != null) { @@ -105,5 +105,5 @@ } 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,5 +116,5 @@ try { synchronized (this) { - if (cancelled) return; + if (canceled) return; objectReader = new MultiFetchServerObjectReader(); } @@ -129,5 +129,5 @@ dataSet.deleteInvisible(); synchronized (this) { - if (cancelled) return; + if (canceled) return; objectReader = null; } @@ -143,6 +143,6 @@ } 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; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java (revision 4310) @@ -28,5 +28,5 @@ */ public class DownloadRelationTask extends PleaseWaitRunnable { - private boolean cancelled; + private boolean canceled; private Exception lastException; private Collection relations; @@ -52,5 +52,5 @@ @Override protected void cancel() { - cancelled = true; + canceled = true; synchronized(this) { if (objectReader != null) { @@ -62,5 +62,5 @@ @Override protected void finish() { - if (cancelled) + if (canceled) return; if (lastException != null) { @@ -79,5 +79,5 @@ 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,5 +88,5 @@ return; synchronized (this) { - if (cancelled) return; + if (canceled) return; objectReader = null; } @@ -106,6 +106,6 @@ ); } 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; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (revision 4310) @@ -39,5 +39,5 @@ * new Runnable() { * public void run() { - * if (task.isCancelled() || task.hasError()) + * if (task.isCanceled() || task.hasError()) * return; * List parents = task.getParents(); @@ -52,5 +52,5 @@ */ public class ParentRelationLoadingTask extends PleaseWaitRunnable{ - private boolean cancelled; + private boolean canceled; private Exception lastException; private DataSet referrers; @@ -93,10 +93,10 @@ /** - * 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,5 +120,5 @@ @Override protected void cancel() { - cancelled = true; + canceled = true; OsmApi.getOsmApi().cancel(); } @@ -139,5 +139,5 @@ @Override protected void finish() { - if (cancelled) return; + if (canceled) return; if (lastException != null) { showLastException(); @@ -191,6 +191,6 @@ } } 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; } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (revision 4310) @@ -109,5 +109,5 @@ new Runnable() { public void run() { - if (task.isCancelled() || task.hasError()) + if (task.isCanceled() || task.hasError()) return; model.populate(task.getParents()); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java (revision 4310) @@ -102,5 +102,5 @@ */ class RelationLoader extends PleaseWaitRunnable { - private boolean cancelled; + private boolean canceled; private Exception lastException; private Relation relation; @@ -122,10 +122,10 @@ 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,6 +155,6 @@ .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; } Index: /trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java (revision 4310) @@ -47,5 +47,5 @@ public class HistoryLoadTask extends PleaseWaitRunnable { - private boolean cancelled = false; + private boolean canceled = false; private Exception lastException = null; private HashSet toLoad; @@ -160,10 +160,10 @@ protected void cancel() { OsmApi.getOsmApi().cancel(); - cancelled = true; + canceled = true; } @Override protected void finish() { - if (isCancelled()) + if (isCanceled()) return; if (lastException != null) { @@ -179,5 +179,5 @@ try { for(PrimitiveId pid: toLoad) { - if (cancelled) { + if (canceled) { break; } @@ -196,5 +196,5 @@ ds = reader.parseHistory(progressMonitor.createSubTaskMonitor(1, false)); } catch(OsmTransferException e) { - if (cancelled) + if (canceled) return; throw e; @@ -208,6 +208,6 @@ } - public boolean isCancelled() { - return cancelled; + public boolean isCanceled() { + return canceled; } Index: /trunk/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java (revision 4310) @@ -8,6 +8,6 @@ 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,5 +16,5 @@ public AbstractIOTask() { - cancelled = false; + canceled = false; failed = false; lastException = null; @@ -22,19 +22,19 @@ /** - * 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,10 +77,10 @@ /** * 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(); } Index: /trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java (revision 4310) @@ -42,5 +42,5 @@ /** 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 */ Index: /trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java (revision 4310) @@ -23,5 +23,5 @@ */ public class CloseChangesetTask extends PleaseWaitRunnable { - private boolean cancelled; + private boolean canceled; private Exception lastException; private Collection changesets; @@ -46,5 +46,5 @@ @Override protected void cancel() { - this.cancelled = true; + this.canceled = true; OsmApi.getOsmApi().cancel(); } @@ -52,5 +52,5 @@ @Override protected void finish() { - if (cancelled) + if (canceled) return; if (lastException != null) { @@ -70,5 +70,5 @@ try { for (Changeset cs: changesets) { - if (cancelled) return; + if (canceled) return; if (cs == null || cs.getId() <= 0 || ! cs.isOpen()) { continue; @@ -79,5 +79,5 @@ } } catch(Exception e) { - if (cancelled) + if (canceled) return; lastException = e; Index: /trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java (revision 4310) @@ -30,5 +30,5 @@ public class DownloadOpenChangesetsTask extends PleaseWaitRunnable { - private boolean cancelled; + private boolean canceled; private OsmServerChangesetReader reader; private List changesets; @@ -48,5 +48,5 @@ @Override protected void cancel() { - this.cancelled = true; + this.canceled = true; synchronized(this) { if (reader != null) { @@ -71,5 +71,5 @@ return; } - if (cancelled)return; + if (canceled)return; if (lastException != null) { ExceptionDialogUtil.explainException(lastException); @@ -133,5 +133,5 @@ refreshUserIdentity(); } - if (cancelled)return; + if (canceled)return; synchronized(this) { reader = new OsmServerChangesetReader(); @@ -155,5 +155,5 @@ ); } catch(Exception e) { - if (cancelled) + if (canceled) return; lastException = e; @@ -161,6 +161,6 @@ } - public boolean isCancelled() { - return cancelled; + public boolean isCanceled() { + return canceled; } } Index: /trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java (revision 4310) @@ -143,5 +143,5 @@ *
    *
  • {@see UploadOrSaveState#OK} if {@see #getLayer() was successfully uploaded
    • - *
  • {@see UploadOrSaveState#CANCELLED} if uploading {@see #getLayer() was cancelled
    • + *
  • {@see UploadOrSaveState#canceled} if uploading {@see #getLayer() was canceled
    • *
  • {@see UploadOrSaveState#FAILED} if uploading {@see #getLayer() has failed
    • *
@@ -166,5 +166,5 @@ *
    *
  • {@see UploadOrSaveState#OK} if {@see #getLayer() was successfully saved to file
    • - *
  • {@see UploadOrSaveState#CANCELLED} if saving {@see #getLayer() was cancelled
    • + *
  • {@see UploadOrSaveState#canceled} if saving {@see #getLayer() was canceled
    • *
  • {@see UploadOrSaveState#FAILED} if saving {@see #getLayer() has failed
    • *
Index: /trunk/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java (revision 4310) @@ -52,5 +52,5 @@ return; } - if (!isCancelled()) { + if (!isCanceled()) { layerInfo.getLayer().onPostSaveToFile(); } @@ -63,5 +63,5 @@ @Override public void cancel() { - setCancelled(true); + setCanceled(true); } } Index: /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 4310) @@ -50,5 +50,5 @@ PROCEED, /** - * save/upload of layers was not successful or user cancelled + * save/upload of layers was not successful or user canceled * operation */ @@ -392,5 +392,5 @@ private ProgressMonitor monitor; private ExecutorService worker; - private boolean cancelled; + private boolean canceled; private Future currentFuture; private AbstractIOTask currentTask; @@ -404,6 +404,6 @@ protected void uploadLayers(List toUpload) { for (final SaveLayerInfo layerInfo: toUpload) { - if (cancelled) { - model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCELLED); + if (canceled) { + model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCELED); continue; } @@ -418,5 +418,5 @@ dialog.setVisible(true); if (dialog.isCanceled()) { - model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCELLED); + model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCELED); continue; } @@ -435,5 +435,5 @@ currentFuture.get(); } catch(CancellationException e) { - model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCELLED); + model.setUploadState(layerInfo.getLayer(), UploadOrSaveState.CANCELED); } catch(Exception e) { e.printStackTrace(); @@ -441,6 +441,6 @@ 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,6 +457,6 @@ protected void saveLayers(List toSave) { for (final SaveLayerInfo layerInfo: toSave) { - if (cancelled) { - model.setSaveState(layerInfo.getLayer(), UploadOrSaveState.CANCELLED); + if (canceled) { + model.setSaveState(layerInfo.getLayer(), UploadOrSaveState.CANCELED); continue; } @@ -469,5 +469,5 @@ currentFuture.get(); } catch(CancellationException e) { - model.setSaveState(layerInfo.getLayer(), UploadOrSaveState.CANCELLED); + model.setSaveState(layerInfo.getLayer(), UploadOrSaveState.CANCELED); } catch(Exception e) { e.printStackTrace(); @@ -475,6 +475,6 @@ 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,7 +496,7 @@ String msg = trn( "An upload and/or save operation of one layer with modifications
" - + "was cancelled or has failed.", + + "was canceled or has failed.", "Upload and/or save operations of {0} layers with modifications
" - + "were cancelled or have failed.", + + "were canceled or have failed.", numProblems, numProblems @@ -524,5 +524,5 @@ warnBecauseOfUnsavedData(); model.setMode(Mode.EDITING_DATA); - if (cancelled) { + if (canceled) { setUserAction(UserAction.CANCEL); closeDialog(); @@ -538,5 +538,5 @@ currentTask.cancel(); } - cancelled = true; + canceled = true; } } Index: /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java (revision 4310) @@ -197,6 +197,6 @@ 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++; } Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 4310) @@ -183,5 +183,5 @@ - // make sure the the configuration panels listen to each other + // make sure the configuration panels listen to each other // changes // Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (revision 4310) @@ -122,5 +122,5 @@ 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,6 +136,6 @@ } } 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,5 +143,5 @@ } - if (isCancelled()) + if (isCanceled()) return; layer.cleanupAfterUpload(processedPrimitives); @@ -154,5 +154,5 @@ @Override public void cancel() { - setCancelled(true); + setCanceled(true); if (writer != null) { writer.cancel(); Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadOrSaveState.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadOrSaveState.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadOrSaveState.java (revision 4310) @@ -12,6 +12,6 @@ FAILED, /** - * uploading or saving a data layer was cancelled + * uploading or saving a data layer was canceled */ - CANCELLED + CANCELED } Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (revision 4310) @@ -29,5 +29,5 @@ 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,5 +39,5 @@ */ public class UploadPrimitivesTask extends AbstractUploadTask { - private boolean uploadCancelled = false; + private boolean uploadCanceled = false; private Exception lastException = null; private APIDataSet toUpload; @@ -236,7 +236,7 @@ // break; - } catch(OsmTransferCancelledException e) { + } catch(OsmTransferCanceledException e) { e.printStackTrace(); - uploadCancelled = true; + uploadCanceled = true; break uploadloop; } catch(OsmApiPrimitiveGoneException e) { @@ -283,5 +283,5 @@ } } 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,10 +289,10 @@ } } - if (uploadCancelled && processedPrimitives.isEmpty()) return; + if (uploadCanceled && processedPrimitives.isEmpty()) return; cleanupAfterUpload(); } @Override protected void finish() { - if (uploadCancelled) + if (uploadCanceled) return; @@ -353,5 +353,5 @@ @Override protected void cancel() { - uploadCancelled = true; + uploadCanceled = true; synchronized(this) { if (writer != null) { Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 4310) @@ -90,5 +90,5 @@ private static final class Loader extends PleaseWaitRunnable { - private boolean cancelled = false; + private boolean canceled = false; private GeoImageLayer layer; private Collection selection; @@ -118,5 +118,5 @@ } - if (cancelled) + if (canceled) return; progressMonitor.subTask(tr("Read photos...")); @@ -131,5 +131,5 @@ for (File f : files) { - if (cancelled) { + if (canceled) { break; } @@ -161,5 +161,5 @@ for (File f : sel) { - if(cancelled) { + if(canceled) { break; } @@ -241,5 +241,5 @@ } - if (! cancelled && layer.data.size() > 0) { + if (! canceled && layer.data.size() > 0) { boolean noGeotagFound = true; for (ImageEntry e : layer.data) { @@ -256,5 +256,5 @@ @Override protected void cancel() { - cancelled = true; + canceled = true; } } Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java (revision 4310) @@ -162,5 +162,5 @@ * 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} Index: /trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (revision 4310) @@ -251,7 +251,7 @@ /** - * 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() { Index: /trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (revision 4310) @@ -32,5 +32,5 @@ 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,5 +119,5 @@ * @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,9 +130,9 @@ } 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,5 +152,5 @@ * @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,9 +163,9 @@ } 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,7 +465,7 @@ * @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,5 +482,5 @@ String sessionId = fetchOsmWebsiteSessionId(); if (canceled) - throw new OsmTransferCancelledException(); + throw new OsmTransferCanceledException(); monitor.worked(1); @@ -488,5 +488,5 @@ authenticateOsmSession(sessionId, osmUserName, osmPassword); if (canceled) - throw new OsmTransferCancelledException(); + throw new OsmTransferCanceledException(); monitor.worked(1); @@ -494,5 +494,5 @@ sendAuthorisationRequest(sessionId, requestToken, privileges); if (canceled) - throw new OsmTransferCancelledException(); + throw new OsmTransferCanceledException(); monitor.worked(1); @@ -500,9 +500,9 @@ 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 { Index: /trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java (revision 4310) @@ -14,5 +14,5 @@ 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,5 +84,5 @@ } accessToken = client.getAccessToken(getProgressMonitor().createSubTaskMonitor(0, false)); - } catch(OsmTransferCancelledException e) { + } catch(OsmTransferCanceledException e) { return; } catch (OsmOAuthAuthorizationException e) { Index: /trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java (revision 4310) @@ -14,5 +14,5 @@ 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,5 +78,5 @@ } requestToken = client.getRequestToken(getProgressMonitor().createSubTaskMonitor(0, false)); - } catch(OsmTransferCancelledException e) { + } catch(OsmTransferCanceledException e) { return; } catch (OsmOAuthAuthorizationException e) { Index: /trunk/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java (revision 4310) @@ -86,5 +86,5 @@ wrapper.add(alwaysAskUserConfirm, GBC.eol().fill(GBC.HORIZONTAL)); - final JLabel portLabel = new JLabel(""+tr("JOSM will always listen at port 8111 on localhost." + + final JLabel portLabel = new JLabel(""+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.") + ""); portLabel.setFont(portLabel.getFont().deriveFont(Font.PLAIN)); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java (revision 4310) @@ -74,5 +74,5 @@ 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,5 +116,5 @@ 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); Index: /trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java (revision 4310) @@ -181,5 +181,5 @@ } - public boolean isCancelled() { + public boolean isCanceled() { return cancelHandler.isCanceled(); } Index: /trunk/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java (revision 4310) @@ -43,5 +43,5 @@ } - public boolean isCancelled() { + public boolean isCanceled() { return false; } Index: /trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java (revision 4310) @@ -115,5 +115,5 @@ ProgressMonitor createSubTaskMonitor(int ticks, boolean internal); - boolean isCancelled(); + boolean isCanceled(); void cancel(); void addCancelListener(CancelListener listener); Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java (revision 4310) @@ -441,7 +441,7 @@ /** - * 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() { Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 4310) @@ -51,5 +51,5 @@ 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. */ Index: /trunk/src/org/openstreetmap/josm/io/GpxImporter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/GpxImporter.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/io/GpxImporter.java (revision 4310) @@ -56,5 +56,5 @@ } 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())); } } Index: /trunk/src/org/openstreetmap/josm/io/JpgImporter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/JpgImporter.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/io/JpgImporter.java (revision 4310) @@ -42,5 +42,5 @@ addRecursiveFiles(files, visitedDirs, sel, progressMonitor.createSubTaskMonitor(1, true)); - if (progressMonitor.isCancelled()) + if (progressMonitor.isCanceled()) return; @@ -56,5 +56,5 @@ private void addRecursiveFiles(List files, Set visitedDirs, List sel, ProgressMonitor progressMonitor) throws IOException { - if (progressMonitor.isCancelled()) + if (progressMonitor.isCanceled()) return; Index: /trunk/src/org/openstreetmap/josm/io/OsmApi.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 4310) @@ -146,5 +146,5 @@ } - public void initialize(ProgressMonitor monitor) throws OsmApiInitializationException, OsmTransferCancelledException { + public void initialize(ProgressMonitor monitor) throws OsmApiInitializationException, OsmTransferCanceledException { initialize(monitor, false); } @@ -156,5 +156,5 @@ * @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,5 +213,5 @@ initialized = false; throw new OsmApiInitializationException(e); - } catch(OsmTransferCancelledException e){ + } catch(OsmTransferCanceledException e){ throw e; } catch(OsmTransferException e) { @@ -477,5 +477,5 @@ } - 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,5 +484,5 @@ } if (cancel) - throw new OsmTransferCancelledException(); + throw new OsmTransferCanceledException(); try { Thread.sleep(1000); @@ -646,5 +646,5 @@ } catch(IOException e){ throw new OsmTransferException(e); - } catch(OsmTransferCancelledException e){ + } catch(OsmTransferCanceledException e){ throw e; } catch(OsmTransferException e) { Index: /trunk/src/org/openstreetmap/josm/io/OsmChangeBuilder.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmChangeBuilder.java (revision 4309) +++ /trunk/src/org/openstreetmap/josm/io/OsmChangeBuilder.java (revision 4310) @@ -91,5 +91,5 @@ 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,5 +109,5 @@ 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,5 +120,5 @@ 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("