[PATCH] Fix small typos

[naoliv]

data/validator/numeric.mapcss

@@ -29 +29 @@
 }
 
 *[building:levels][building:levels !~ /^(([0-9]|[1-9][0-9]*)(\.5)?)$/],
-*[level][level !~ /^((((-*[1-9]|[0-9])|-*[1-9][0-9]*)(\.5)?)|-0\.5)(;((((-*[1-9]|[0-9])|-*[1-9][0-9]*)(\.5)?)|-0\.5))*$/] { /* all numbers from -∞ to ∞ in 0.5 steps, optional multiple values seperated by a ; */
+*[level][level !~ /^((((-*[1-9]|[0-9])|-*[1-9][0-9]*)(\.5)?)|-0\.5)(;((((-*[1-9]|[0-9])|-*[1-9][0-9]*)(\.5)?)|-0\.5))*$/] { /* all numbers from -∞ to ∞ in 0.5 steps, optional multiple values separated by a ; */
   throwWarning: tr("{0} should have numbers only with optional .5 increments", "{0.key}");
   assertMatch: "node level=one";
   assertMatch: "node level=01";
@@ -342 +342 @@
   assertNoMatch: "node ele=-12.1 m";
   assertNoMatch: "node ele=12";
   assertMatch: "node ele=high";
-}
- No newline at end of file
+}

src/javax/json/stream/JsonGenerator.java

@@ -99 +99 @@
  *
  * <p>
  * Other JSON values (that are not JSON objects or arrays) can be created
- * by calling the appropiate {@code write} methods.
+ * by calling the appropriate {@code write} methods.
  * <p>
  * The following example shows how to generate a JSON string:
  * <pre><code>

src/org/apache/commons/jcs/utils/props/PropertyLoader.java

@@ -48 +48 @@
 
     /**
      * Looks up a resource named 'name' in the classpath. The resource must map
-     * to a file with .ccf extention. The name is assumed to be absolute and can
+     * to a file with .ccf extension. The name is assumed to be absolute and can
      * use either "/" or "." for package segment separation with an optional
      * leading "/" and optional ".ccf" suffix.
      * <p>

src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java

@@ -91 +91 @@
      * @param lo1 longitude of first point
      * @param la2 latitude of second point
      * @param lo2 longitude of second point
-     * @return the distance betwen first and second point, in m.
+     * @return the distance between first and second point, in m.
      */
     double getDistance(double la1, double lo1, double la2, double lo2);
 

src/org/openstreetmap/josm/actions/AbstractMergeAction.java

@@ -98 +98 @@
      * @param title title of dialog
      * @param buttonText text of button used to select target layer
      * @param buttonIcon icon name of button used to select target layer
-     * @return choosen target layer
+     * @return chosen target layer
      */
     @SuppressWarnings("unchecked")
     public static <T extends Layer> T askTargetLayer(T[] targetLayers, String label, String title, String buttonText, String buttonIcon) {

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

@@ -151 +151 @@
         }
 
         /**
-         * Returns the last exception that occured.
-         * @return the last exception that occured, or {@code null}
+         * Returns the last exception that occurred.
+         * @return the last exception that occurred, or {@code null}
          */
         public Exception getLastException() {
             return lastException;

src/org/openstreetmap/josm/actions/JosmAction.java

@@ -227 +227 @@
     }
 
     /**
-     * Overwrite this if {@link #updateEnabledState()} should be called when the active / availabe layers change. Default is true.
+     * Overwrite this if {@link #updateEnabledState()} should be called when the active / available layers change. Default is true.
      * @return <code>true</code> if a {@link LayerChangeListener} and a {@link ActiveLayerChangeListener} should be registered.
      * @since 10353
      */

src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -736 +736 @@
             }
 
             // If ALT is pressed, a new way should be created and that new way should get
-            // selected. This works everytime unless the ways the nodes get inserted into
+            // selected. This works every time unless the ways the nodes get inserted into
             // are already selected. This is the case when creating a self-overlapping way
             // but pressing ALT prevents this. Therefore we must de-select the way manually
             // here so /only/ the new way will be selected after this method finishes.

src/org/openstreetmap/josm/command/RotateCommand.java

@@ -34 +34 @@
 
     /**
      * Creates a RotateCommand.
-     * Assign the initial object set, compute pivot point and inital rotation angle.
+     * Assign the initial object set, compute pivot point and initial rotation angle.
      * @param objects objects to fetch nodes from
      * @param currentEN cuurent eats/north
      */

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

@@ -154 +154 @@
     }
 
     /**
-     * Replies true if this is a local build, i.e. an inofficial development build.
+     * Replies true if this is a local build, i.e. an unofficial development build.
      *
-     * @return true if this is a local build, i.e. an inofficial development build.
+     * @return true if this is a local build, i.e. an unofficial development build.
      */
     public boolean isLocalBuild() {
         return isLocalBuild;

src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

@@ -383 +383 @@
                     Logging.debug("JCS - Caching empty object {0}", getUrl());
                     return true;
                 } else {
-                    Logging.debug("JCS - failure during load - reponse is not loadable nor cached as empty");
+                    Logging.debug("JCS - failure during load - response is not loadable nor cached as empty");
                     return false;
                 }
             }

src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

@@ -489 +489 @@
         supportedMimeTypes.add("image/jpgpng");         // used by ESRI
         supportedMimeTypes.add("image/png8");           // used by geoserver
         if (supportedMimeTypes.contains("image/jpeg")) {
-            supportedMimeTypes.add("image/jpg"); // sometimes mispelled by Arcgis
+            supportedMimeTypes.add("image/jpg"); // sometimes misspelled by Arcgis
         }
         Collection<String> unsupportedFormats = new ArrayList<>();
 

src/org/openstreetmap/josm/data/osm/Storage.java

@@ -14 +14 @@
 
 /**
  * A Set-like class that allows looking up equivalent preexising instance.
- * It is useful whereever one would use self-mapping construct like
+ * It is useful wherever one would use self-mapping construct like
  * <code>Map&lt;T,T&gt;.put(t,t)</code>, that is, for caches, uniqueness filters or similar.
  *
  * The semantics of equivalency can be external to the object, using the

src/org/openstreetmap/josm/data/osm/visitor/paint/ArrowPaintHelper.java

@@ -30 +30 @@
      * Paint the arrow
      * @param path The path to append the arrow to.
      * @param point The point to paint the tip at
-     * @param fromDirection The direction the line is comming from.
+     * @param fromDirection The direction the line is coming from.
      */
     public void paintArrowAt(MapPath2D path, MapViewPoint point, MapViewPoint fromDirection) {
         double x = point.getInViewX();

src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -161 +161 @@
             boolean negative = (value & 0x80000000L) != 0;
             // Invert the sign bit, so that negative numbers are lower
             value ^= 0x80000000L;
-            // Now do the shift. Do it before accounting for negative numbers (symetry)
+            // Now do the shift. Do it before accounting for negative numbers (symmetry)
             if (totalBits < 32) {
                 value >>= (32 - totalBits);
             }

src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java

@@ -45 +45 @@
  * <p>Grid Shift files can be read as InputStreams or RandomAccessFiles.
  * Loading an InputStream places all the required node information
  * (accuracy data is optional) into heap based Java arrays. This is the
- * highest perfomance option, and is useful for large volume transformations.
+ * highest performance option, and is useful for large volume transformations.
  * Non-file data sources (eg using an SQL Blob) are also supported through
  * InputStream. The RandonAccessFile option has a much smaller memory
  * footprint as only the Sub Grid headers are stored in memory, but

src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java

@@ -111 +111 @@
     /**
      * Calculates the meridian distance. This is the distance along the central
      * meridian from the equator to {@code phi}. Accurate to < 1e-5 meters
-     * when used in conjuction with typical major axis values.
+     * when used in conjunction with typical major axis values.
      *
      * @param phi latitude to calculate meridian distance for.
      * @param sphi sin(phi).
@@ -132 +132 @@
      * Calculates the latitude ({@code phi}) from a meridian distance.
      * Determines phi to TOL (1e-11) radians, about 1e-6 seconds.
      *
-     * @param arg meridian distance to calulate latitude for.
+     * @param arg meridian distance to calculate latitude for.
      * @return the latitude of the meridian distance.
      * @throws RuntimeException if the itteration does not converge.
      */

src/org/openstreetmap/josm/data/projection/proj/EquidistantCylindrical.java

@@ -36 +36 @@
 
     @Override
     public String getName() {
-        return tr("Equidistant Cylindrical (Plate Caree)");
+        return tr("Equidistant Cylindrical (Plate Carrée)");
     }
 
     @Override

src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java

@@ -141 +141 @@
     //////
 
     /**
-     * The azimuth of the central line passing throught the centre of the projection, in radians.
+     * The azimuth of the central line passing through the centre of the projection, in radians.
      */
     protected double azimuth;
 

src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java

@@ -15 +15 @@
  * is a cylindrical projection, in which the cylinder has been rotated 90°.
  * Instead of being tangent to the equator (or to an other standard latitude),
  * it is tangent to a central meridian. Deformation are more important as we
- * are going futher from the central meridian. The Transverse Mercator
- * projection is appropriate for region wich have a greater extent north-south
+ * are going further from the central meridian. The Transverse Mercator
+ * projection is appropriate for region which have a greater extent north-south
  * than east-west.
  * <p>
  *

src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java

@@ -1880 +1880 @@
      * @since 1.5.1 made public and added read-only array references
      */
     public enum ArrayType {
-        /** Update (or get a copy of) the GENERIC_TLDS_PLUS table containing additonal generic TLDs */
+        /** Update (or get a copy of) the GENERIC_TLDS_PLUS table containing additional generic TLDs */
         GENERIC_PLUS,
         /** Update (or get a copy of) the GENERIC_TLDS_MINUS table containing deleted generic TLDs */
         GENERIC_MINUS,
-        /** Update (or get a copy of) the COUNTRY_CODE_TLDS_PLUS table containing additonal country code TLDs */
+        /** Update (or get a copy of) the COUNTRY_CODE_TLDS_PLUS table containing additional country code TLDs */
         COUNTRY_CODE_PLUS,
         /** Update (or get a copy of) the COUNTRY_CODE_TLDS_MINUS table containing deleted country code TLDs */
         COUNTRY_CODE_MINUS,

src/org/openstreetmap/josm/data/validation/routines/package.html

@@ -19 +19 @@
 <title>Package Documentation for org.openstreetmap.josm.data.validation.routines Package</title>
 </head>
 <body bgcolor="white">
-    <p>This package contains <i>independant</i> validation routines adapted from Apache Commons Validator 1.5.0.</p>
+    <p>This package contains <i>independent</i> validation routines adapted from Apache Commons Validator 1.5.0.</p>
 <h1>Table of Contents</h1>
 
 <ul>

src/org/openstreetmap/josm/data/validation/tests/Addresses.java

@@ -262 +262 @@
         checkHouseNumbersWithoutStreet(r);
         checkForDuplicate(r);
         if (r.hasTag("type", ASSOCIATED_STREET)) {
-            // Used to count occurences of each house number in order to find duplicates
+            // Used to count occurrences of each house number in order to find duplicates
             Map<String, List<OsmPrimitive>> map = new HashMap<>();
             // Used to detect different street names
             String relationName = r.get("name");

src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -247 +247 @@
     public static class ParseResult {
         /** Checks successfully parsed */
         public final List<TagCheck> parseChecks;
-        /** Errors that occured during parsing */
+        /** Errors that occurred during parsing */
         public final Collection<Throwable> parseErrors;
 
         /**
          * Constructs a new {@code ParseResult}.
          * @param parseChecks Checks successfully parsed
-         * @param parseErrors Errors that occured during parsing
+         * @param parseErrors Errors that occurred during parsing
          */
         public ParseResult(List<TagCheck> parseChecks, Collection<Throwable> parseErrors) {
             this.parseChecks = parseChecks;

src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java

@@ -265 +265 @@
      *
      * @param n relation to validate
      * @param allroles contains presets for specified relation
-     * @param map contains statistics of occurances of specified role types in relation
+     * @param map contains statistics of occurrences of specified role types in relation
      */
     private void checkRoles(Relation n, Map<Role, String> allroles, Map<String, RoleInfo> map) {
         // go through all members of relation

src/org/openstreetmap/josm/gui/GettingStarted.java

@@ -114 +114 @@
             // We assume a default of myVersion because it only kicks in in two cases:
             // 1. Not yet written - but so isn't the interval variable, so it gets updated anyway
             // 2. Cannot be written (e.g. while developing). Obviously we don't want to update
-            // everytime because of something we can't read.
+            // every time because of something we can't read.
             return (Config.getPref().getInt("cache.motd.html.version", -999) == myVersion)
             && Config.getPref().get("cache.motd.html.java").equals(myJava)
             && Config.getPref().get("cache.motd.html.lang").equals(myLang);

src/org/openstreetmap/josm/gui/MainApplication.java

@@ -977 +977 @@
         if ("true".equals(Config.getPref().get("prefer.ipv6", "auto"))
                 && !"true".equals(Utils.updateSystemProperty("java.net.preferIPv6Addresses", "true"))) {
             // never set this to false, only true!
-            Logging.info(tr("Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early startup)."));
+            Logging.info(tr("Try enabling IPv6 network, preferring IPv6 over IPv4 (only works on early startup)."));
         }
         Utils.updateSystemProperty("http.agent", Version.getInstance().getAgentString());
         Utils.updateSystemProperty("user.language", Config.getPref().get("language"));
@@ -1192 +1192 @@
                                 SSLSocketFactory.getDefault().createSocket(a, 443).close();
                                 Utils.updateSystemProperty("java.net.preferIPv6Addresses", "true");
                                 if (!wasv6) {
-                                    Logging.info(tr("Detected useable IPv6 network, prefering IPv6 over IPv4 after next restart."));
+                                    Logging.info(tr("Detected useable IPv6 network, preferring IPv6 over IPv4 after next restart."));
                                 } else {
-                                    Logging.info(tr("Detected useable IPv6 network, prefering IPv6 over IPv4."));
+                                    Logging.info(tr("Detected useable IPv6 network, preferring IPv6 over IPv4."));
                                 }
                                 hasv6 = true;
                             }
@@ -1206 +1206 @@
                     Logging.trace(e);
                 }
                 if (wasv6 && !hasv6) {
-                    Logging.info(tr("Detected no useable IPv6 network, prefering IPv4 over IPv6 after next restart."));
+                    Logging.info(tr("Detected no useable IPv6 network, preferring IPv4 over IPv6 after next restart."));
                     Config.getPref().putBoolean("validated.ipv6", hasv6); // be sure it is stored before the restart!
                     try {
                         RestartAction.restartJOSM();

src/org/openstreetmap/josm/gui/MainFrame.java

@@ -61 +61 @@
 
     /**
      * Create a new main window. The parameter will be removed in the future.
-     * @param geometry The inital geometry to use.
+     * @param geometry The initial geometry to use.
      * @since 12127
      */
     public MainFrame(WindowGeometry geometry) {

src/org/openstreetmap/josm/gui/MapViewState.java

@@ -361 +361 @@
      * Creates a new state that is the same as the current state except for that it is using the location of the given component.
      * <p>
      * The view is moved so that the center is the same as the old center.
-     * @param positon The new location to use.
+     * @param position The new location to use.
      * @return The new state.
      * @since 10375
      */
-    public MapViewState usingLocation(JComponent positon) {
+    public MapViewState usingLocation(JComponent position) {
         EastNorth center = this.getCenter().getEastNorth();
-        return new MapViewState(positon, this).usingCenter(center);
+        return new MapViewState(position, this).usingCenter(center);
     }
 
     /**
@@ -540 +540 @@
 
         /**
          * Gets the direction in which this point is outside of the given view rectangle.
-         * @param rect The rectangle to check agains.
+         * @param rect The rectangle to check against.
          * @return The direction in which it is outside of the view, as OUTSIDE_... flags.
          * @since 10827
          */

src/org/openstreetmap/josm/gui/bbox/BBoxChooser.java

@@ -26 +26 @@
 
     /**
      * Replies the currently selected bounding box in this BBoxChooser.
-     * Replies null, if currently there isn't a bbox choosen in this
+     * Replies null, if currently there isn't a bbox chosen in this
      * BBoxChooser.
      *
      * @return the currently selected bounding box

src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

@@ -370 +370 @@
 
     /**
      * Sets the current bounding box in this bbox chooser without
-     * emiting a property change event.
+     * emitting a property change event.
      *
      * @param bbox the bounding box. null to reset the bounding box
      */

src/org/openstreetmap/josm/gui/bugreport/DebugTextDisplay.java

@@ -34 +34 @@
     }
 
     /**
-     * Creates a new text area with an inital text to display
+     * Creates a new text area with an initial text to display
      * @param textToDisplay The text to display.
      */
     public DebugTextDisplay(String textToDisplay) {

src/org/openstreetmap/josm/gui/bugreport/JosmUpdatePanel.java

@@ -75 +75 @@
      * Display that there was an error while checking the current version.
      */
     private void displayError() {
-        testedVersionField.setText(tr("An error occured while checking if your JOSM instance is up to date."));
+        testedVersionField.setText(tr("An error occurred while checking if your JOSM instance is up to date."));
         showUpdateButton();
     }
 

src/org/openstreetmap/josm/gui/datatransfer/data/LayerTransferData.java

@@ -40 +40 @@
     }
 
     /**
-     * Gets the layer to be transfered.
+     * Gets the layer to be transferred.
      * @return The layer
      */
     public Layer getLayer() {

src/org/openstreetmap/josm/gui/datatransfer/data/PrimitiveTransferData.java

@@ -21 +21 @@
 import org.openstreetmap.josm.tools.CompositeList;
 
 /**
- * A list of primitives that are transfered. The list allows you to implicitly add primitives.
+ * A list of primitives that are transferred. The list allows you to implicitly add primitives.
  * It distinguishes between primitives that were directly added and implicitly added ones.
  * @author Michael Zangl
  * @since 10604

src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -558 +558 @@
         /**
          * Replies the collection of OSM primitives currently selected in the view of this model
          *
-         * @return choosen elements in the view
+         * @return chosen elements in the view
          */
         public synchronized Collection<OsmPrimitive> getSelected() {
             Set<OsmPrimitive> sel = new HashSet<>();

src/org/openstreetmap/josm/gui/download/PlaceSelection.java

@@ -268 +268 @@
             } catch (SAXParseException e) {
                 if (!canceled) {
                     // Nominatim sometimes returns garbage, see #5934, #10643
-                    Logging.log(Logging.LEVEL_WARN, tr("Error occured with query ''{0}'': ''{1}''", urlString, e.getMessage()), e);
+                    Logging.log(Logging.LEVEL_WARN, tr("Error occurred with query ''{0}'': ''{1}''", urlString, e.getMessage()), e);
                     GuiHelper.runInEDTAndWait(() -> HelpAwareOptionPane.showOptionDialog(
                             MainApplication.getMainFrame(),
                             tr("Name server returned invalid data. Please try again."),

src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java

@@ -210 +210 @@
     }
 
     /**
-     * Should be called everytime either reference of current changes to update the diff.
+     * Should be called every time either reference of current changes to update the diff.
      * TODO: Maybe rename to reflect this? eg. updateNodeListTableModels
      */
     private void initNodeListTableModels() {

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

@@ -234 +234 @@
     }
 
     /**
-     * Returns the last exception that occured during loading, if any.
-     * @return the last exception that occured during loading, or {@code null}
+     * Returns the last exception that occurred during loading, if any.
+     * @return the last exception that occurred during loading, or {@code null}
      */
     public Exception getLastException() {
         return lastException;

src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java

@@ -229 +229 @@
     /**
      * Updates the content of this panel based on the changeset information given by {@code primitive}.
      * @param primitive the primitive to extract the changeset information from
-     * @param isLatest whether this relates to a not yet commited changeset
+     * @param isLatest whether this relates to a not yet committed changeset
      */
     public void update(final OsmPrimitive primitive, final boolean isLatest) {
         update(Changeset.fromPrimitive(primitive), isLatest, primitive.getTimestamp(), primitive.getVersion());
@@ -238 +238 @@
     /**
      * Updates the content of this panel based on the changeset information given by {@code cs}.
      * @param cs the changeset information
-     * @param isLatest whether this relates to a not yet commited changeset
+     * @param isLatest whether this relates to a not yet committed changeset
      * @param timestamp the timestamp
      * @param version the version of the primitive
      */

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

@@ -106 +106 @@
             // have the respective privileges or if he didn't or he can't authenticate with
             // a username/password-pair.
             //
-            // Downgrade your knowlege about its identity if we've assumed that he was fully
+            // Downgrade your knowledge about its identity if we've assumed that he was fully
             // identified. Otherwise, if he is anonymous or partially identified, keep our level
-            // of knowlege.
+            // of knowledge.
             //
             if (im.isFullyIdentified()) {
                 im.setPartiallyIdentified(im.getUserName());

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

@@ -654 +654 @@
             int numProblems = model.getNumCancel() + model.getNumFailed();
             if (numProblems == 0)
                 return;
-            Logging.warn(numProblems + " problems occured during upload/save");
+            Logging.warn(numProblems + " problems occurred during upload/save");
             String msg = trn(
                     "<html>An upload and/or save operation of one layer with modifications<br>"
                     + "was canceled or has failed.</html>",

src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -839 +839 @@
     /**
      * Zoom out from map.
      *
-     * @return    true, if zoom increasing was successfull, false othervise
+     * @return    true, if zoom increasing was successful, false othervise
      */
     public boolean decreaseZoomLevel() {
         if (zoomDecreaseAllowed()) {

src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java

@@ -109 +109 @@
     }
 
     /**
-     * Gets the "download near" choosen value
-     * @return the "download near" choosen value (0: track only, 1: waypoints only, 2: both)
+     * Gets the "download near" chosen value
+     * @return the "download near" chosen value (0: track only, 1: waypoints only, 2: both)
      */
     public final int getNear() {
         return downloadNear.getSelectedIndex();

src/org/openstreetmap/josm/gui/layer/imagery/TileCoordinateConverter.java

@@ -112 +112 @@
     /**
      * Gets the position of the tile inside the map view.
      * @param tile The tile
-     * @return The positon as a rectangle in screen coordinates
+     * @return The position as a rectangle in screen coordinates
      */
     public Rectangle2D getRectangleForTile(Tile tile) {
         ICoordinate c1 = tile.getTileSource().tileXYToLatLon(tile);

src/org/openstreetmap/josm/gui/mappaint/StyleSource.java

@@ -140 +140 @@
     }
 
     /**
-     * Log an error that occured with this style.
+     * Log an error that occurred with this style.
      * @param e error
      */
     public void logError(Throwable e) {
@@ -148 +148 @@
     }
 
     /**
-     * Log a warning that occured with this style.
+     * Log a warning that occurred with this style.
      * @param w warnings
      */
     public void logWarning(String w) {
@@ -156 +156 @@
     }
 
     /**
-     * Replies the collection of errors that occured with this style.
+     * Replies the collection of errors that occurred with this style.
      * @return collection of errors
      */
     public Collection<Throwable> getErrors() {
@@ -164 +164 @@
     }
 
     /**
-     * Replies the collection of warnings that occured with this style.
+     * Replies the collection of warnings that occurred with this style.
      * @return collection of warnings
      */
     public Collection<String> getWarnings() {

src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSException.java

@@ -6 +6 @@
  */
 public class MapCSSException extends RuntimeException {
 
-    /** line number at which the parse error occured */
+    /** line number at which the parse error occurred */
     protected Integer line;
-    /** column number at which the parse error occured */
+    /** column number at which the parse error occurred */
     protected Integer column;
 
     /**
@@ -29 +29 @@
     }
 
     /**
-     * Sets the column number at which the parse error occured.
-     * @param column the column number at which the parse error occured
+     * Sets the column number at which the parse error occurred.
+     * @param column the column number at which the parse error occurred
      */
     public void setColumn(int column) {
         this.column = column;
     }
 
     /**
-     * Sets the line number at which the parse error occured.
-     * @param line the line number at which the parse error occured
+     * Sets the line number at which the parse error occurred.
+     * @param line the line number at which the parse error occurred
      */
     public void setLine(int line) {
         this.line = line;

src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/OnLineStrategy.java

@@ -133 +133 @@
             }
         });
 
-        // find the segment with the best quality. If there are several with best quality, the one close to the center is prefered.
+        // find the segment with the best quality. If there are several with best quality, the one close to the center is preferred.
         return longHalfSegment.stream().max(
                 Comparator.comparingDouble(segment -> segment.quality - 1e-5 * Math.abs(segment.offset - length / 2)));
     }

src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java

@@ -13 +13 @@
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 
 /**
- * Combo box that lets the user choose one of the avaliable {@link AuthorizationProcedure}s.
+ * Combo box that lets the user choose one of the available {@link AuthorizationProcedure}s.
  */
 public class AuthorizationProcedureComboBox extends JosmComboBox<AuthorizationProcedure> {
 

src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

@@ -419 +419 @@
 
             if (task != null) {
                 // if we have to launch a plugin download task we do it asynchronously, followed
-                // by the remaining "save preferences" activites run on the Swing EDT.
+                // by the remaining "save preferences" activities run on the Swing EDT.
                 MainApplication.worker.submit(task);
                 MainApplication.worker.submit(() -> GuiHelper.runInEDT(continuation));
             } else {

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

@@ -711 +711 @@
     }
 
     /**
-     * A listener that is called whenever the cells may be updated from outside the editor and the editor should thus be commited.
+     * A listener that is called whenever the cells may be updated from outside the editor and the editor should thus be committed.
      * @since 10604
      */
     @FunctionalInterface

src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetNameTemplateList.java

@@ -47 +47 @@
     }
 
     /**
-     * Finds and returns the first occurence of preset with template name matching the given primitive
+     * Finds and returns the first occurrence of preset with template name matching the given primitive
      * @param primitive The primitive to match
-     * @return the first occurence of preset with template name matching the primitive
+     * @return the first occurrence of preset with template name matching the primitive
      */
     public TaggingPreset findPresetTemplate(IPrimitive primitive) {
         synchronized (this) {

src/org/openstreetmap/josm/gui/util/WindowGeometry.java

@@ -365 +365 @@
     }
 
     /**
-     * Determines if the bug affecting getMaximumWindowBounds() occured.
+     * Determines if the bug affecting getMaximumWindowBounds() occurred.
      *
      * @param maxbounds result of getMaximumWindowBounds()
      * @return {@code true} if the bug happened, {@code false otherwise}

src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java

@@ -129 +129 @@
                     try {
                         pasteAction.actionPerformed(e);
                     } catch (NullPointerException npe) { // NOPMD
-                        Logging.log(Logging.LEVEL_ERROR, "NullPointerException occured because of JDK bug 6322854. "
+                        Logging.log(Logging.LEVEL_ERROR, "NullPointerException occurred because of JDK bug 6322854. "
                                 +"Copy/Paste operation has not been performed. Please complain to Oracle: "+
                                 "https://bugs.openjdk.java.net/browse/JDK-6322854", npe);
                     }

src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java

@@ -591 +591 @@
     /* First pass of the layout algorithm.
      *
      * If the Dividers are "floating" then set the bounds of each
-     * node to accomodate the preferred size of all of the
+     * node to accommodate the preferred size of all of the
      * Leaf's java.awt.Components.  Otherwise, just set the bounds
      * of each Leaf/Split node so that it's to the left of (for
      * Split.isRowLayout() Split children) or directly above

src/org/openstreetmap/josm/io/DefaultProxySelector.java

@@ -204 +204 @@
     }
 
     /**
-     * Determines if proxy errors have occured.
-     * @return {@code true} if errors have occured, {@code false} otherwise.
+     * Determines if proxy errors have occurred.
+     * @return {@code true} if errors have occurred, {@code false} otherwise.
      * @since 6523
      */
     public final boolean hasErrors() {

src/org/openstreetmap/josm/io/NetworkManager.java

@@ -58 +58 @@
     }
 
     /**
-     * Returns the network errors that occured until now.
-     * @return the network errors that occured until now, indexed by URL
+     * Returns the network errors that occurred until now.
+     * @return the network errors that occurred until now, indexed by URL
      */
     public static Map<String, Throwable> getNetworkErrors() {
         return new HashMap<>(NETWORK_ERRORS);

src/org/openstreetmap/josm/io/OsmApiException.java

@@ -23 +23 @@
      * See {@link java.net.HttpURLConnection HttpURLConnection} for predefined HTTP response code values
      * @param errorHeader The error header, as transmitted in the {@code Error} field of the HTTP response header
      * @param errorBody The error body, as transmitted in the HTTP response body
-     * @param accessedUrl The complete URL accessed when this error occured
+     * @param accessedUrl The complete URL accessed when this error occurred
      * @param login the login used to connect to OSM API (can be null)
      * @param contentType the response content-type
      * @since 13499
@@ -43 +43 @@
      * See {@link java.net.HttpURLConnection HttpURLConnection} for predefined HTTP response code values
      * @param errorHeader The error header, as transmitted in the {@code Error} field of the HTTP response header
      * @param errorBody The error body, as transmitted in the HTTP response body
-     * @param accessedUrl The complete URL accessed when this error occured
+     * @param accessedUrl The complete URL accessed when this error occurred
      * @param login the login used to connect to OSM API (can be null)
      * @since 12992
      */
@@ -57 +57 @@
      * See {@link java.net.HttpURLConnection HttpURLConnection} for predefined HTTP response code values
      * @param errorHeader The error header, as transmitted in the {@code Error} field of the HTTP response header
      * @param errorBody The error body, as transmitted in the HTTP response body
-     * @param accessedUrl The complete URL accessed when this error occured
+     * @param accessedUrl The complete URL accessed when this error occurred
      * @since 5584
      */
     public OsmApiException(int responseCode, String errorHeader, String errorBody, String accessedUrl) {
@@ -215 +215 @@
     }
 
     /**
-     * Sets the complete URL accessed when this error occured.
+     * Sets the complete URL accessed when this error occurred.
      * This is distinct from the one set with {@link #setUrl}, which is generally only the base URL of the server.
-     * @param url the complete URL accessed when this error occured.
+     * @param url the complete URL accessed when this error occurred.
      */
     public void setAccessedUrl(String url) {
         this.accessedUrl = url;
     }
 
     /**
-     * Replies the complete URL accessed when this error occured.
+     * Replies the complete URL accessed when this error occurred.
      * This is distinct from the one returned by {@link #getUrl}, which is generally only the base URL of the server.
-     * @return the complete URL accessed when this error occured.
+     * @return the complete URL accessed when this error occurred.
      */
     public String getAccessedUrl() {
         return accessedUrl;

src/org/openstreetmap/josm/io/OsmApiInitializationException.java

@@ -2 +2 @@
 package org.openstreetmap.josm.io;
 
 /**
- * Exception thrown when a communication error occured with the OSM server during API initialization.
+ * Exception thrown when a communication error occurred with the OSM server during API initialization.
  * @see OsmApi#initialize
  */
 public class OsmApiInitializationException extends OsmTransferException {

src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java

@@ -46 +46 @@
     private Way way;
 
     /**
-     * The place to remeber already added nodes (they are reused if needed @since 5845
+     * The place to remember already added nodes (they are reused if needed @since 5845
      */
     private Map<LatLon, Node> addedNodes;
 

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

@@ -212 +212 @@
     }
 
     /**
-     * Replies the last exception that occured during download, or {@code null}.
-     * @return the last exception that occured during download, or {@code null}
+     * Replies the last exception that occurred during download, or {@code null}.
+     * @return the last exception that occurred during download, or {@code null}
      * @since 9621
      */
     public Exception getLastException() {

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

@@ -270 +270 @@
     static final Collection<PluginProxy> pluginList = new LinkedList<>();
 
     /**
-     * All exceptions that occured during plugin loading
+     * All exceptions that occurred during plugin loading
      */
     static final Map<String, Throwable> pluginLoadingExceptions = new HashMap<>();
 
@@ -1418 +1418 @@
             stack.addAll(Arrays.asList(current.getStackTrace()));
             Throwable cause = current.getCause();
             if (cause != null && seen.contains(cause)) {
-                break; // circular refernce
+                break; // circular reference
             }
             current = cause;
         }

src/org/openstreetmap/josm/tools/Geometry.java

@@ -365 +365 @@
         // Basically, the formula from wikipedia is used:
         //  https://en.wikipedia.org/wiki/Line%E2%80%93line_intersection
         // However, large numbers lead to rounding errors (see #10286).
-        // To avoid this, p1 is first substracted from each of the points:
+        // To avoid this, p1 is first subtracted from each of the points:
         //  p1' = 0
         //  p2' = p2 - p1
         //  p3' = p3 - p1

src/org/openstreetmap/josm/tools/Logging.java

@@ -460 +460 @@
     }
 
     /**
-     * Provides direct access to the logger used. Use of methods like {@link #warn(String)} is prefered.
+     * Provides direct access to the logger used. Use of methods like {@link #warn(String)} is preferred.
      * @return The logger
      */
     public static Logger getLogger() {

src/org/openstreetmap/josm/tools/MemoryManager.java

@@ -115 +115 @@
         /**
          * Gets the content of this memory area.
          * <p>
-         * This method should be the prefered access to the memory since it will do error checking when {@link #free()} was called.
+         * This method should be the preferred access to the memory since it will do error checking when {@link #free()} was called.
          * @return The memory area content.
          */
         T get();

src/org/openstreetmap/josm/tools/PlatformHook.java

@@ -59 +59 @@
     Platform getPlatform();
 
     /**
-      * The preStartupHook will be called extremly early. It is
+      * The preStartupHook will be called extremely early. It is
       * guaranteed to be called before the GUI setup has started.
       *
       * Reason: On OSX we need to inform the Swing libraries

src/org/openstreetmap/josm/tools/PlatformHookWindows.java

@@ -429 +429 @@
             }
         } catch (ArrayIndexOutOfBoundsException e) {
             // catch error of JDK-8172244 as bug seems to not be fixed anytime soon
-            Logging.log(Logging.LEVEL_ERROR, "JDK-8172244 occured. Abort HTTPS setup", e);
+            Logging.log(Logging.LEVEL_ERROR, "JDK-8172244 occurred. Abort HTTPS setup", e);
             return false;
         }
         if (!GraphicsEnvironment.isHeadless()) {

src/org/openstreetmap/josm/tools/XmlParsingException.java

@@ -40 +40 @@
     }
 
     /**
-     * Sets the location (line/column) where the exception occured.
-     * @param locator object giving the location (line/column) where the exception occured
+     * Sets the location (line/column) where the exception occurred.
+     * @param locator object giving the location (line/column) where the exception occurred
      * @return {@code this}
      */
     public XmlParsingException rememberLocation(Locator locator) {
@@ -64 +64 @@
     }
 
     /**
-     * Returns the column number where the exception occured.
-     * @return the column number where the exception occured
+     * Returns the column number where the exception occurred.
+     * @return the column number where the exception occurred
      */
     public int getColumnNumber() {
         return columnNumber;
     }
 
     /**
-     * Returns the line number where the exception occured.
-     * @return the line number where the exception occured
+     * Returns the line number where the exception occurred.
+     * @return the line number where the exception occurred
      */
     public int getLineNumber() {
         return lineNumber;

src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java

@@ -160 +160 @@
     }
 
     /**
-     * Returns the error message that could have occured during bug sending.
+     * Returns the error message that could have occurred during bug sending.
      * @return the error message, or {@code null} if successful
      */
     public final String getErrorMessage() {

test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java

@@ -116 +116 @@
     private static Collection<RefEntry> readData() throws IOException {
         Collection<RefEntry> result = new ArrayList<>();
         if (!new File(REFERENCE_DATA_FILE).exists()) {
-            System.err.println("Warning: refrence file does not exist.");
+            System.err.println("Warning: reference file does not exist.");
             return result;
         }
         try (BufferedReader in = new BufferedReader(new InputStreamReader(

test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java

@@ -41 +41 @@
     }
 
     /**
-     * Check for mispelled key.
+     * Check for misspelled key.
      * @throws IOException if any I/O error occurs
      */
     @Test
@@ -54 +54 @@
     }
 
     /**
-     * Check for mispelled key.
+     * Check for misspelled key.
      * @throws IOException if any I/O error occurs
      */
     @Test
@@ -67 +67 @@
     }
 
     /**
-     * Check for mispelled key where the suggested alternative is in use. The error should not be fixable.
+     * Check for misspelled key where the suggested alternative is in use. The error should not be fixable.
      * @throws IOException if any I/O error occurs
      */
     @Test
@@ -93 +93 @@
     }
 
     /**
-     * Check for mispelled value.
+     * Check for misspelled value.
      * @throws IOException if any I/O error occurs
      */
     @Test

test/unit/org/openstreetmap/josm/gui/layer/MainLayerManagerTest.java

@@ -138 +138 @@
     }
 
     /**
-     * Test if {@link MainLayerManager#addActiveLayerChangeListener(ActiveLayerChangeListener)} prevents listener from beeing added twice.
+     * Test if {@link MainLayerManager#addActiveLayerChangeListener(ActiveLayerChangeListener)} prevents listener from being added twice.
      */
     @Test(expected = IllegalArgumentException.class)
     public void testAddActiveLayerChangeListenerTwice() {

test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java

@@ -410 +410 @@
 
     /**
      * Set up before running a test
-     * @throws InitializationError If an error occured while creating the required environment.
+     * @throws InitializationError If an error occurred while creating the required environment.
      * @throws ReflectiveOperationException if a reflective access error occurs
      */
     protected void before() throws InitializationError, ReflectiveOperationException {

[stoecker]

In 14273/josm:

fix typos - patch by naoliv - fix #16781 - Thanks a lot

[stoecker]

How did you find so many different types of typos?

[naoliv]

I was translating some strings in launchpad when I saw that "Plate Caree" wasn't right.
Then I did use ​https://github.com/ss18/grep-typos to spot more typos :-)

[stoecker]

Nice. I'm happy you spotted only few in translatable strings.

[Don-vip]

Wow, awesome. We could automate a check to avoid new typos :)

[stoecker]

Probably first fix the plugins...

[Don-vip]

In 14302/josm:

see #16781 - fix more typos using ​https://github.com/vlajos/misspell-fixer

[Don-vip]

In 14303/josm:

see #16781 - missed a big one

[gaben]

I fixed a bunch of typos, 94 files affected so far. Should I open a new ticket or attach the patch here?

[stoecker]

New one!

[gaben]

Alright, see #20129.