diff --git a/data/validator/numeric.mapcss b/data/validator/numeric.mapcss index 27e197c..5646988 100644 --- a/data/validator/numeric.mapcss +++ b/data/validator/numeric.mapcss @@ -29,7 +29,7 @@ } *[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,4 +342,4 @@ way["lanes:forward"]["lanes:forward" !~ /^[1-9]([0-9]*)$/][highway], assertNoMatch: "node ele=-12.1 m"; assertNoMatch: "node ele=12"; assertMatch: "node ele=high"; -} \ No newline at end of file +} diff --git a/src/javax/json/stream/JsonGenerator.java b/src/javax/json/stream/JsonGenerator.java index d85cbd6..73cbd85 100644 --- a/src/javax/json/stream/JsonGenerator.java +++ b/src/javax/json/stream/JsonGenerator.java @@ -99,7 +99,7 @@ import java.math.BigInteger; * *

* 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. *

* The following example shows how to generate a JSON string: * 


diff --git a/src/org/apache/commons/jcs/utils/props/PropertyLoader.java b/src/org/apache/commons/jcs/utils/props/PropertyLoader.java
index 1baaf0a..d1497c8 100644
--- a/src/org/apache/commons/jcs/utils/props/PropertyLoader.java
+++ b/src/org/apache/commons/jcs/utils/props/PropertyLoader.java
@@ -48,7 +48,7 @@ public abstract class PropertyLoader
 
     /**
      * 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.
      * 

diff --git a/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java b/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java
index 550e708..febf633 100644
--- a/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java
+++ b/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java
@@ -91,7 +91,7 @@ public interface TileSource extends Attributed {
      * @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);
 
diff --git a/src/org/openstreetmap/josm/actions/AbstractMergeAction.java b/src/org/openstreetmap/josm/actions/AbstractMergeAction.java
index c02a743..ebcfdae 100644
--- a/src/org/openstreetmap/josm/actions/AbstractMergeAction.java
+++ b/src/org/openstreetmap/josm/actions/AbstractMergeAction.java
@@ -98,7 +98,7 @@ public abstract class AbstractMergeAction extends JosmAction {
      * @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 askTargetLayer(T[] targetLayers, String label, String title, String buttonText, String buttonIcon) {
diff --git a/src/org/openstreetmap/josm/actions/CloseChangesetAction.java b/src/org/openstreetmap/josm/actions/CloseChangesetAction.java
index 171eb6b..c7bd3b6 100644
--- a/src/org/openstreetmap/josm/actions/CloseChangesetAction.java
+++ b/src/org/openstreetmap/josm/actions/CloseChangesetAction.java
@@ -151,8 +151,8 @@ public class CloseChangesetAction extends JosmAction {
         }
 
         /**
-         * 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;
diff --git a/src/org/openstreetmap/josm/actions/JosmAction.java b/src/org/openstreetmap/josm/actions/JosmAction.java
index b741c91..255d6e2 100644
--- a/src/org/openstreetmap/josm/actions/JosmAction.java
+++ b/src/org/openstreetmap/josm/actions/JosmAction.java
@@ -227,7 +227,7 @@ public abstract class JosmAction extends AbstractAction implements Destroyable {
     }
 
     /**
-     * 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 true if a {@link LayerChangeListener} and a {@link ActiveLayerChangeListener} should be registered.
      * @since 10353
      */
diff --git a/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java b/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
index 80ae5c1..a4e8b0a 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
@@ -736,7 +736,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, DataSelecti
             }
 
             // 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.
diff --git a/src/org/openstreetmap/josm/command/RotateCommand.java b/src/org/openstreetmap/josm/command/RotateCommand.java
index 2b4f17a..3d9a213 100644
--- a/src/org/openstreetmap/josm/command/RotateCommand.java
+++ b/src/org/openstreetmap/josm/command/RotateCommand.java
@@ -34,7 +34,7 @@ public class RotateCommand extends TransformNodesCommand {
 
     /**
      * 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
      */
diff --git a/src/org/openstreetmap/josm/data/Version.java b/src/org/openstreetmap/josm/data/Version.java
index f8bfa31..19e6195 100644
--- a/src/org/openstreetmap/josm/data/Version.java
+++ b/src/org/openstreetmap/josm/data/Version.java
@@ -154,9 +154,9 @@ public class Version {
     }
 
     /**
-     * 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;
diff --git a/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java b/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
index d936240..335db15 100644
--- a/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
+++ b/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
@@ -383,7 +383,7 @@ public abstract class JCSCachedTileLoaderJob implements
                     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;
                 }
             }
diff --git a/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java b/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
index f587aae..7333b4f 100644
--- a/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
+++ b/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
@@ -489,7 +489,7 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
         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 unsupportedFormats = new ArrayList<>();
 
diff --git a/src/org/openstreetmap/josm/data/osm/Storage.java b/src/org/openstreetmap/josm/data/osm/Storage.java
index 451bc65..af72ea9 100644
--- a/src/org/openstreetmap/josm/data/osm/Storage.java
+++ b/src/org/openstreetmap/josm/data/osm/Storage.java
@@ -14,7 +14,7 @@ import org.openstreetmap.josm.tools.Utils;
 
 /**
  * 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
  * Map<T,T>.put(t,t), that is, for caches, uniqueness filters or similar.
  *
  * The semantics of equivalency can be external to the object, using the
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/ArrowPaintHelper.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/ArrowPaintHelper.java
index 3322d7f..196eccb 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/ArrowPaintHelper.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/ArrowPaintHelper.java
@@ -30,7 +30,7 @@ public class ArrowPaintHelper {
      * 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();
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
index 94d3657..2f6e925 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
@@ -161,7 +161,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
             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);
             }
diff --git a/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java b/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java
index 96443ea..29e17fd 100644
--- a/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java
+++ b/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java
@@ -45,7 +45,7 @@ import org.openstreetmap.josm.tools.Logging;
  * 
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
diff --git a/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java b/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java
index 8412304..6e3e6ed 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java
@@ -111,7 +111,7 @@ public abstract class AbstractProj implements Proj {
     /**
      * 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,7 +132,7 @@ public abstract class AbstractProj implements Proj {
      * 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.
      */
diff --git a/src/org/openstreetmap/josm/data/projection/proj/EquidistantCylindrical.java b/src/org/openstreetmap/josm/data/projection/proj/EquidistantCylindrical.java
index 0395a08..341ce5b 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/EquidistantCylindrical.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/EquidistantCylindrical.java
@@ -36,7 +36,7 @@ public class EquidistantCylindrical extends AbstractProj {
 
     @Override
     public String getName() {
-        return tr("Equidistant Cylindrical (Plate Caree)");
+        return tr("Equidistant Cylindrical (Plate Carrée)");
     }
 
     @Override
diff --git a/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java b/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java
index 5ba4a42..ca4ad6f 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java
@@ -141,7 +141,7 @@ public class ObliqueMercator extends AbstractProj implements ICentralMeridianPro
     //////
 
     /**
-     * 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;
 
diff --git a/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java b/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java
index e5132fd..d59d8fe 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java
@@ -15,8 +15,8 @@ import org.openstreetmap.josm.tools.Utils;
  * 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.
  * 

  *
diff --git a/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java b/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
index e208bfd..c2b0b42 100644
--- a/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
+++ b/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
@@ -1880,11 +1880,11 @@ public final class DomainValidator extends AbstractValidator {
      * @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,
diff --git a/src/org/openstreetmap/josm/data/validation/routines/package.html b/src/org/openstreetmap/josm/data/validation/routines/package.html
index 5f50ef5..c594733 100644
--- a/src/org/openstreetmap/josm/data/validation/routines/package.html
+++ b/src/org/openstreetmap/josm/data/validation/routines/package.html
@@ -19,7 +19,7 @@
 Package Documentation for org.openstreetmap.josm.data.validation.routines Package
 
 
-    
This package contains independant validation routines adapted from Apache Commons Validator 1.5.0.

+    
This package contains independent validation routines adapted from Apache Commons Validator 1.5.0.

 
Table of Contents