Modify

Opened 3 years ago

Closed 3 years ago

Last modified 7 months ago

#16781 closed enhancement (fixed)

[PATCH] Fix small typos

Reported by: naoliv Owned by: team
Priority: normal Milestone: 18.09
Component: Core Version:
Keywords: typo Cc:

Description

  • data/validator/numeric.mapcss

    diff --git a/data/validator/numeric.mapcss b/data/validator/numeric.mapcss
    index 27e197c..5646988 100644
    a b  
    2929}
    3030
    3131*[building:levels][building:levels !~ /^(([0-9]|[1-9][0-9]*)(\.5)?)$/],
    32 *[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 ; */
     32*[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 ; */
    3333  throwWarning: tr("{0} should have numbers only with optional .5 increments", "{0.key}");
    3434  assertMatch: "node level=one";
    3535  assertMatch: "node level=01";
    way["lanes:forward"]["lanes:forward" !~ /^[1-9]([0-9]*)$/][highway], 
    342342  assertNoMatch: "node ele=-12.1 m";
    343343  assertNoMatch: "node ele=12";
    344344  assertMatch: "node ele=high";
    345 }
    346  No newline at end of file
     345}
  • src/javax/json/stream/JsonGenerator.java

    diff --git a/src/javax/json/stream/JsonGenerator.java b/src/javax/json/stream/JsonGenerator.java
    index d85cbd6..73cbd85 100644
    a b import java.math.BigInteger; 
    9999 *
    100100 * <p>
    101101 * Other JSON values (that are not JSON objects or arrays) can be created
    102  * by calling the appropiate {@code write} methods.
     102 * by calling the appropriate {@code write} methods.
    103103 * <p>
    104104 * The following example shows how to generate a JSON string:
    105105 * <pre><code>
  • src/org/apache/commons/jcs/utils/props/PropertyLoader.java

    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 b public abstract class PropertyLoader 
    4848
    4949    /**
    5050     * Looks up a resource named 'name' in the classpath. The resource must map
    51      * to a file with .ccf extention. The name is assumed to be absolute and can
     51     * to a file with .ccf extension. The name is assumed to be absolute and can
    5252     * use either "/" or "." for package segment separation with an optional
    5353     * leading "/" and optional ".ccf" suffix.
    5454     * <p>
  • src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java

    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 b public interface TileSource extends Attributed { 
    9191     * @param lo1 longitude of first point
    9292     * @param la2 latitude of second point
    9393     * @param lo2 longitude of second point
    94      * @return the distance betwen first and second point, in m.
     94     * @return the distance between first and second point, in m.
    9595     */
    9696    double getDistance(double la1, double lo1, double la2, double lo2);
    9797
  • src/org/openstreetmap/josm/actions/AbstractMergeAction.java

    diff --git a/src/org/openstreetmap/josm/actions/AbstractMergeAction.java b/src/org/openstreetmap/josm/actions/AbstractMergeAction.java
    index c02a743..ebcfdae 100644
    a b public abstract class AbstractMergeAction extends JosmAction { 
    9898     * @param title title of dialog
    9999     * @param buttonText text of button used to select target layer
    100100     * @param buttonIcon icon name of button used to select target layer
    101      * @return choosen target layer
     101     * @return chosen target layer
    102102     */
    103103    @SuppressWarnings("unchecked")
    104104    public static <T extends Layer> T askTargetLayer(T[] targetLayers, String label, String title, String buttonText, String buttonIcon) {
  • src/org/openstreetmap/josm/actions/CloseChangesetAction.java

    diff --git a/src/org/openstreetmap/josm/actions/CloseChangesetAction.java b/src/org/openstreetmap/josm/actions/CloseChangesetAction.java
    index 171eb6b..c7bd3b6 100644
    a b public class CloseChangesetAction extends JosmAction { 
    151151        }
    152152
    153153        /**
    154          * Returns the last exception that occured.
    155          * @return the last exception that occured, or {@code null}
     154         * Returns the last exception that occurred.
     155         * @return the last exception that occurred, or {@code null}
    156156         */
    157157        public Exception getLastException() {
    158158            return lastException;
  • src/org/openstreetmap/josm/actions/JosmAction.java

    diff --git a/src/org/openstreetmap/josm/actions/JosmAction.java b/src/org/openstreetmap/josm/actions/JosmAction.java
    index b741c91..255d6e2 100644
    a b public abstract class JosmAction extends AbstractAction implements Destroyable { 
    227227    }
    228228
    229229    /**
    230      * Overwrite this if {@link #updateEnabledState()} should be called when the active / availabe layers change. Default is true.
     230     * Overwrite this if {@link #updateEnabledState()} should be called when the active / available layers change. Default is true.
    231231     * @return <code>true</code> if a {@link LayerChangeListener} and a {@link ActiveLayerChangeListener} should be registered.
    232232     * @since 10353
    233233     */
  • src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

    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 b public class DrawAction extends MapMode implements MapViewPaintable, DataSelecti 
    736736            }
    737737
    738738            // If ALT is pressed, a new way should be created and that new way should get
    739             // selected. This works everytime unless the ways the nodes get inserted into
     739            // selected. This works every time unless the ways the nodes get inserted into
    740740            // are already selected. This is the case when creating a self-overlapping way
    741741            // but pressing ALT prevents this. Therefore we must de-select the way manually
    742742            // here so /only/ the new way will be selected after this method finishes.
  • src/org/openstreetmap/josm/command/RotateCommand.java

    diff --git a/src/org/openstreetmap/josm/command/RotateCommand.java b/src/org/openstreetmap/josm/command/RotateCommand.java
    index 2b4f17a..3d9a213 100644
    a b public class RotateCommand extends TransformNodesCommand { 
    3434
    3535    /**
    3636     * Creates a RotateCommand.
    37      * Assign the initial object set, compute pivot point and inital rotation angle.
     37     * Assign the initial object set, compute pivot point and initial rotation angle.
    3838     * @param objects objects to fetch nodes from
    3939     * @param currentEN cuurent eats/north
    4040     */
  • src/org/openstreetmap/josm/data/Version.java

    diff --git a/src/org/openstreetmap/josm/data/Version.java b/src/org/openstreetmap/josm/data/Version.java
    index f8bfa31..19e6195 100644
    a b public class Version { 
    154154    }
    155155
    156156    /**
    157      * Replies true if this is a local build, i.e. an inofficial development build.
     157     * Replies true if this is a local build, i.e. an unofficial development build.
    158158     *
    159      * @return true if this is a local build, i.e. an inofficial development build.
     159     * @return true if this is a local build, i.e. an unofficial development build.
    160160     */
    161161    public boolean isLocalBuild() {
    162162        return isLocalBuild;
  • src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

    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 b public abstract class JCSCachedTileLoaderJob<K, V extends CacheEntry> implements 
    383383                    Logging.debug("JCS - Caching empty object {0}", getUrl());
    384384                    return true;
    385385                } else {
    386                     Logging.debug("JCS - failure during load - reponse is not loadable nor cached as empty");
     386                    Logging.debug("JCS - failure during load - response is not loadable nor cached as empty");
    387387                    return false;
    388388                }
    389389            }
  • src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

    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 b public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi 
    489489        supportedMimeTypes.add("image/jpgpng");         // used by ESRI
    490490        supportedMimeTypes.add("image/png8");           // used by geoserver
    491491        if (supportedMimeTypes.contains("image/jpeg")) {
    492             supportedMimeTypes.add("image/jpg"); // sometimes mispelled by Arcgis
     492            supportedMimeTypes.add("image/jpg"); // sometimes misspelled by Arcgis
    493493        }
    494494        Collection<String> unsupportedFormats = new ArrayList<>();
    495495
  • src/org/openstreetmap/josm/data/osm/Storage.java

    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 b import org.openstreetmap.josm.tools.Utils; 
    1414
    1515/**
    1616 * A Set-like class that allows looking up equivalent preexising instance.
    17  * It is useful whereever one would use self-mapping construct like
     17 * It is useful wherever one would use self-mapping construct like
    1818 * <code>Map&lt;T,T&gt;.put(t,t)</code>, that is, for caches, uniqueness filters or similar.
    1919 *
    2020 * The semantics of equivalency can be external to the object, using the
  • src/org/openstreetmap/josm/data/osm/visitor/paint/ArrowPaintHelper.java

    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 b public class ArrowPaintHelper { 
    3030     * Paint the arrow
    3131     * @param path The path to append the arrow to.
    3232     * @param point The point to paint the tip at
    33      * @param fromDirection The direction the line is comming from.
     33     * @param fromDirection The direction the line is coming from.
    3434     */
    3535    public void paintArrowAt(MapPath2D path, MapViewPoint point, MapViewPoint fromDirection) {
    3636        double x = point.getInViewX();
  • src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

    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 b public class StyledMapRenderer extends AbstractMapRenderer { 
    161161            boolean negative = (value & 0x80000000L) != 0;
    162162            // Invert the sign bit, so that negative numbers are lower
    163163            value ^= 0x80000000L;
    164             // Now do the shift. Do it before accounting for negative numbers (symetry)
     164            // Now do the shift. Do it before accounting for negative numbers (symmetry)
    165165            if (totalBits < 32) {
    166166                value >>= (32 - totalBits);
    167167            }
  • src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java

    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 b import org.openstreetmap.josm.tools.Logging; 
    4545 * <p>Grid Shift files can be read as InputStreams or RandomAccessFiles.
    4646 * Loading an InputStream places all the required node information
    4747 * (accuracy data is optional) into heap based Java arrays. This is the
    48  * highest perfomance option, and is useful for large volume transformations.
     48 * highest performance option, and is useful for large volume transformations.
    4949 * Non-file data sources (eg using an SQL Blob) are also supported through
    5050 * InputStream. The RandonAccessFile option has a much smaller memory
    5151 * footprint as only the Sub Grid headers are stored in memory, but
  • src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java

    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 b public abstract class AbstractProj implements Proj { 
    111111    /**
    112112     * Calculates the meridian distance. This is the distance along the central
    113113     * meridian from the equator to {@code phi}. Accurate to &lt; 1e-5 meters
    114      * when used in conjuction with typical major axis values.
     114     * when used in conjunction with typical major axis values.
    115115     *
    116116     * @param phi latitude to calculate meridian distance for.
    117117     * @param sphi sin(phi).
    public abstract class AbstractProj implements Proj { 
    132132     * Calculates the latitude ({@code phi}) from a meridian distance.
    133133     * Determines phi to TOL (1e-11) radians, about 1e-6 seconds.
    134134     *
    135      * @param arg meridian distance to calulate latitude for.
     135     * @param arg meridian distance to calculate latitude for.
    136136     * @return the latitude of the meridian distance.
    137137     * @throws RuntimeException if the itteration does not converge.
    138138     */
  • src/org/openstreetmap/josm/data/projection/proj/EquidistantCylindrical.java

    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 b public class EquidistantCylindrical extends AbstractProj { 
    3636
    3737    @Override
    3838    public String getName() {
    39         return tr("Equidistant Cylindrical (Plate Caree)");
     39        return tr("Equidistant Cylindrical (Plate Care)");
    4040    }
    4141
    4242    @Override
  • src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java

    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 b public class ObliqueMercator extends AbstractProj implements ICentralMeridianPro 
    141141    //////
    142142
    143143    /**
    144      * The azimuth of the central line passing throught the centre of the projection, in radians.
     144     * The azimuth of the central line passing through the centre of the projection, in radians.
    145145     */
    146146    protected double azimuth;
    147147
  • src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java

    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 b import org.openstreetmap.josm.tools.Utils; 
    1515 * is a cylindrical projection, in which the cylinder has been rotated 90°.
    1616 * Instead of being tangent to the equator (or to an other standard latitude),
    1717 * it is tangent to a central meridian. Deformation are more important as we
    18  * are going futher from the central meridian. The Transverse Mercator
    19  * projection is appropriate for region wich have a greater extent north-south
     18 * are going further from the central meridian. The Transverse Mercator
     19 * projection is appropriate for region which have a greater extent north-south
    2020 * than east-west.
    2121 * <p>
    2222 *
  • src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java

    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 b public final class DomainValidator extends AbstractValidator { 
    18801880     * @since 1.5.1 made public and added read-only array references
    18811881     */
    18821882    public enum ArrayType {
    1883         /** Update (or get a copy of) the GENERIC_TLDS_PLUS table containing additonal generic TLDs */
     1883        /** Update (or get a copy of) the GENERIC_TLDS_PLUS table containing additional generic TLDs */
    18841884        GENERIC_PLUS,
    18851885        /** Update (or get a copy of) the GENERIC_TLDS_MINUS table containing deleted generic TLDs */
    18861886        GENERIC_MINUS,
    1887         /** Update (or get a copy of) the COUNTRY_CODE_TLDS_PLUS table containing additonal country code TLDs */
     1887        /** Update (or get a copy of) the COUNTRY_CODE_TLDS_PLUS table containing additional country code TLDs */
    18881888        COUNTRY_CODE_PLUS,
    18891889        /** Update (or get a copy of) the COUNTRY_CODE_TLDS_MINUS table containing deleted country code TLDs */
    18901890        COUNTRY_CODE_MINUS,
  • src/org/openstreetmap/josm/data/validation/routines/package.html

    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 b  
    1919<title>Package Documentation for org.openstreetmap.josm.data.validation.routines Package</title>
    2020</head>
    2121<body bgcolor="white">
    22     <p>This package contains <i>independant</i> validation routines adapted from Apache Commons Validator 1.5.0.</p>
     22    <p>This package contains <i>independent</i> validation routines adapted from Apache Commons Validator 1.5.0.</p>
    2323<h1>Table of Contents</h1>
    2424
    2525<ul>
  • src/org/openstreetmap/josm/data/validation/tests/Addresses.java

    diff --git a/src/org/openstreetmap/josm/data/validation/tests/Addresses.java b/src/org/openstreetmap/josm/data/validation/tests/Addresses.java
    index 7856201..abfe687 100644
    a b public class Addresses extends Test { 
    262262        checkHouseNumbersWithoutStreet(r);
    263263        checkForDuplicate(r);
    264264        if (r.hasTag("type", ASSOCIATED_STREET)) {
    265             // Used to count occurences of each house number in order to find duplicates
     265            // Used to count occurrences of each house number in order to find duplicates
    266266            Map<String, List<OsmPrimitive>> map = new HashMap<>();
    267267            // Used to detect different street names
    268268            String relationName = r.get("name");
  • src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

    diff --git a/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java b/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
    index 115edef..91633fb 100644
    a b public class MapCSSTagChecker extends Test.TagTest { 
    247247    public static class ParseResult {
    248248        /** Checks successfully parsed */
    249249        public final List<TagCheck> parseChecks;
    250         /** Errors that occured during parsing */
     250        /** Errors that occurred during parsing */
    251251        public final Collection<Throwable> parseErrors;
    252252
    253253        /**
    254254         * Constructs a new {@code ParseResult}.
    255255         * @param parseChecks Checks successfully parsed
    256          * @param parseErrors Errors that occured during parsing
     256         * @param parseErrors Errors that occurred during parsing
    257257         */
    258258        public ParseResult(List<TagCheck> parseChecks, Collection<Throwable> parseErrors) {
    259259            this.parseChecks = parseChecks;
  • src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java

    diff --git a/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java b/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
    index 15eb670..b7c11aa 100644
    a b public class RelationChecker extends Test { 
    265265     *
    266266     * @param n relation to validate
    267267     * @param allroles contains presets for specified relation
    268      * @param map contains statistics of occurances of specified role types in relation
     268     * @param map contains statistics of occurrences of specified role types in relation
    269269     */
    270270    private void checkRoles(Relation n, Map<Role, String> allroles, Map<String, RoleInfo> map) {
    271271        // go through all members of relation
  • src/org/openstreetmap/josm/gui/GettingStarted.java

    diff --git a/src/org/openstreetmap/josm/gui/GettingStarted.java b/src/org/openstreetmap/josm/gui/GettingStarted.java
    index 71cfe5c..951829f 100644
    a b public final class GettingStarted extends JPanel implements ProxyPreferenceListe 
    114114            // We assume a default of myVersion because it only kicks in in two cases:
    115115            // 1. Not yet written - but so isn't the interval variable, so it gets updated anyway
    116116            // 2. Cannot be written (e.g. while developing). Obviously we don't want to update
    117             // everytime because of something we can't read.
     117            // every time because of something we can't read.
    118118            return (Config.getPref().getInt("cache.motd.html.version", -999) == myVersion)
    119119            && Config.getPref().get("cache.motd.html.java").equals(myJava)
    120120            && Config.getPref().get("cache.motd.html.lang").equals(myLang);
  • src/org/openstreetmap/josm/gui/MainApplication.java

    diff --git a/src/org/openstreetmap/josm/gui/MainApplication.java b/src/org/openstreetmap/josm/gui/MainApplication.java
    index aceadf9..7fbe8ab 100644
    a b public class MainApplication { 
    977977        if ("true".equals(Config.getPref().get("prefer.ipv6", "auto"))
    978978                && !"true".equals(Utils.updateSystemProperty("java.net.preferIPv6Addresses", "true"))) {
    979979            // never set this to false, only true!
    980             Logging.info(tr("Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early startup)."));
     980            Logging.info(tr("Try enabling IPv6 network, preferring IPv6 over IPv4 (only works on early startup)."));
    981981        }
    982982        Utils.updateSystemProperty("http.agent", Version.getInstance().getAgentString());
    983983        Utils.updateSystemProperty("user.language", Config.getPref().get("language"));
    public class MainApplication { 
    11921192                                SSLSocketFactory.getDefault().createSocket(a, 443).close();
    11931193                                Utils.updateSystemProperty("java.net.preferIPv6Addresses", "true");
    11941194                                if (!wasv6) {
    1195                                     Logging.info(tr("Detected useable IPv6 network, prefering IPv6 over IPv4 after next restart."));
     1195                                    Logging.info(tr("Detected useable IPv6 network, preferring IPv6 over IPv4 after next restart."));
    11961196                                } else {
    1197                                     Logging.info(tr("Detected useable IPv6 network, prefering IPv6 over IPv4."));
     1197                                    Logging.info(tr("Detected useable IPv6 network, preferring IPv6 over IPv4."));
    11981198                                }
    11991199                                hasv6 = true;
    12001200                            }
    public class MainApplication { 
    12061206                    Logging.trace(e);
    12071207                }
    12081208                if (wasv6 && !hasv6) {
    1209                     Logging.info(tr("Detected no useable IPv6 network, prefering IPv4 over IPv6 after next restart."));
     1209                    Logging.info(tr("Detected no useable IPv6 network, preferring IPv4 over IPv6 after next restart."));
    12101210                    Config.getPref().putBoolean("validated.ipv6", hasv6); // be sure it is stored before the restart!
    12111211                    try {
    12121212                        RestartAction.restartJOSM();
  • src/org/openstreetmap/josm/gui/MainFrame.java

    diff --git a/src/org/openstreetmap/josm/gui/MainFrame.java b/src/org/openstreetmap/josm/gui/MainFrame.java
    index 28cd8ae..576a2bb 100644
    a b public class MainFrame extends JFrame { 
    6161
    6262    /**
    6363     * Create a new main window. The parameter will be removed in the future.
    64      * @param geometry The inital geometry to use.
     64     * @param geometry The initial geometry to use.
    6565     * @since 12127
    6666     */
    6767    public MainFrame(WindowGeometry geometry) {
  • src/org/openstreetmap/josm/gui/MapViewState.java

    diff --git a/src/org/openstreetmap/josm/gui/MapViewState.java b/src/org/openstreetmap/josm/gui/MapViewState.java
    index 1c3ecce..8e6a3bc 100644
    a b public final class MapViewState implements Serializable { 
    361361     * Creates a new state that is the same as the current state except for that it is using the location of the given component.
    362362     * <p>
    363363     * The view is moved so that the center is the same as the old center.
    364      * @param positon The new location to use.
     364     * @param position The new location to use.
    365365     * @return The new state.
    366366     * @since 10375
    367367     */
    368     public MapViewState usingLocation(JComponent positon) {
     368    public MapViewState usingLocation(JComponent position) {
    369369        EastNorth center = this.getCenter().getEastNorth();
    370         return new MapViewState(positon, this).usingCenter(center);
     370        return new MapViewState(position, this).usingCenter(center);
    371371    }
    372372
    373373    /**
    public final class MapViewState implements Serializable { 
    540540
    541541        /**
    542542         * Gets the direction in which this point is outside of the given view rectangle.
    543          * @param rect The rectangle to check agains.
     543         * @param rect The rectangle to check against.
    544544         * @return The direction in which it is outside of the view, as OUTSIDE_... flags.
    545545         * @since 10827
    546546         */
  • src/org/openstreetmap/josm/gui/bbox/BBoxChooser.java

    diff --git a/src/org/openstreetmap/josm/gui/bbox/BBoxChooser.java b/src/org/openstreetmap/josm/gui/bbox/BBoxChooser.java
    index 12404a8..83faee8 100644
    a b public interface BBoxChooser { 
    2626
    2727    /**
    2828     * Replies the currently selected bounding box in this BBoxChooser.
    29      * Replies null, if currently there isn't a bbox choosen in this
     29     * Replies null, if currently there isn't a bbox chosen in this
    3030     * BBoxChooser.
    3131     *
    3232     * @return the currently selected bounding box
  • src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

    diff --git a/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java b/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
    index 2138a79..907a515 100644
    a b public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser, Cha 
    370370
    371371    /**
    372372     * Sets the current bounding box in this bbox chooser without
    373      * emiting a property change event.
     373     * emitting a property change event.
    374374     *
    375375     * @param bbox the bounding box. null to reset the bounding box
    376376     */
  • src/org/openstreetmap/josm/gui/bugreport/DebugTextDisplay.java

    diff --git a/src/org/openstreetmap/josm/gui/bugreport/DebugTextDisplay.java b/src/org/openstreetmap/josm/gui/bugreport/DebugTextDisplay.java
    index d6cc58c..1d47551 100644
    a b public class DebugTextDisplay extends JScrollPane { 
    3434    }
    3535
    3636    /**
    37      * Creates a new text area with an inital text to display
     37     * Creates a new text area with an initial text to display
    3838     * @param textToDisplay The text to display.
    3939     */
    4040    public DebugTextDisplay(String textToDisplay) {
  • src/org/openstreetmap/josm/gui/bugreport/JosmUpdatePanel.java

    diff --git a/src/org/openstreetmap/josm/gui/bugreport/JosmUpdatePanel.java b/src/org/openstreetmap/josm/gui/bugreport/JosmUpdatePanel.java
    index ce4b958..7d854b5 100644
    a b public class JosmUpdatePanel extends JPanel { 
    7575     * Display that there was an error while checking the current version.
    7676     */
    7777    private void displayError() {
    78         testedVersionField.setText(tr("An error occured while checking if your JOSM instance is up to date."));
     78        testedVersionField.setText(tr("An error occurred while checking if your JOSM instance is up to date."));
    7979        showUpdateButton();
    8080    }
    8181
  • src/org/openstreetmap/josm/gui/datatransfer/data/LayerTransferData.java

    diff --git a/src/org/openstreetmap/josm/gui/datatransfer/data/LayerTransferData.java b/src/org/openstreetmap/josm/gui/datatransfer/data/LayerTransferData.java
    index d15b7c7..eccfc1e 100644
    a b public class LayerTransferData extends LayerTransferable.Data { 
    4040    }
    4141
    4242    /**
    43      * Gets the layer to be transfered.
     43     * Gets the layer to be transferred.
    4444     * @return The layer
    4545     */
    4646    public Layer getLayer() {
  • src/org/openstreetmap/josm/gui/datatransfer/data/PrimitiveTransferData.java

    diff --git a/src/org/openstreetmap/josm/gui/datatransfer/data/PrimitiveTransferData.java b/src/org/openstreetmap/josm/gui/datatransfer/data/PrimitiveTransferData.java
    index 4c9cd38..0251b83 100644
    a b import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; 
    2121import org.openstreetmap.josm.tools.CompositeList;
    2222
    2323/**
    24  * A list of primitives that are transfered. The list allows you to implicitly add primitives.
     24 * A list of primitives that are transferred. The list allows you to implicitly add primitives.
    2525 * It distinguishes between primitives that were directly added and implicitly added ones.
    2626 * @author Michael Zangl
    2727 * @since 10604
  • src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

    diff --git a/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java b/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
    index a33a975..faa333e 100644
    a b public class SelectionListDialog extends ToggleDialog { 
    558558        /**
    559559         * Replies the collection of OSM primitives currently selected in the view of this model
    560560         *
    561          * @return choosen elements in the view
     561         * @return chosen elements in the view
    562562         */
    563563        public synchronized Collection<OsmPrimitive> getSelected() {
    564564            Set<OsmPrimitive> sel = new HashSet<>();
  • src/org/openstreetmap/josm/gui/download/PlaceSelection.java

    diff --git a/src/org/openstreetmap/josm/gui/download/PlaceSelection.java b/src/org/openstreetmap/josm/gui/download/PlaceSelection.java
    index a019345..a3a3bdb 100644
    a b public class PlaceSelection implements DownloadSelection { 
    268268            } catch (SAXParseException e) {
    269269                if (!canceled) {
    270270                    // Nominatim sometimes returns garbage, see #5934, #10643
    271                     Logging.log(Logging.LEVEL_WARN, tr("Error occured with query ''{0}'': ''{1}''", urlString, e.getMessage()), e);
     271                    Logging.log(Logging.LEVEL_WARN, tr("Error occurred with query ''{0}'': ''{1}''", urlString, e.getMessage()), e);
    272272                    GuiHelper.runInEDTAndWait(() -> HelpAwareOptionPane.showOptionDialog(
    273273                            MainApplication.getMainFrame(),
    274274                            tr("Name server returned invalid data. Please try again."),
  • src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java

    diff --git a/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java b/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
    index f252687..19b23be 100644
    a b public class HistoryBrowserModel extends ChangeNotifier implements ActiveLayerCh 
    210210    }
    211211
    212212    /**
    213      * Should be called everytime either reference of current changes to update the diff.
     213     * Should be called every time either reference of current changes to update the diff.
    214214     * TODO: Maybe rename to reflect this? eg. updateNodeListTableModels
    215215     */
    216216    private void initNodeListTableModels() {
  • src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java

    diff --git a/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java b/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java
    index 29191be..648145c 100644
    a b public class HistoryLoadTask extends PleaseWaitRunnable { 
    234234    }
    235235
    236236    /**
    237      * Returns the last exception that occured during loading, if any.
    238      * @return the last exception that occured during loading, or {@code null}
     237     * Returns the last exception that occurred during loading, if any.
     238     * @return the last exception that occurred during loading, or {@code null}
    239239     */
    240240    public Exception getLastException() {
    241241        return lastException;
  • src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java

    diff --git a/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java b/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
    index 712d226..8640456 100644
    a b public class VersionInfoPanel extends JPanel implements ChangeListener { 
    229229    /**
    230230     * Updates the content of this panel based on the changeset information given by {@code primitive}.
    231231     * @param primitive the primitive to extract the changeset information from
    232      * @param isLatest whether this relates to a not yet commited changeset
     232     * @param isLatest whether this relates to a not yet committed changeset
    233233     */
    234234    public void update(final OsmPrimitive primitive, final boolean isLatest) {
    235235        update(Changeset.fromPrimitive(primitive), isLatest, primitive.getTimestamp(), primitive.getVersion());
    public class VersionInfoPanel extends JPanel implements ChangeListener { 
    238238    /**
    239239     * Updates the content of this panel based on the changeset information given by {@code cs}.
    240240     * @param cs the changeset information
    241      * @param isLatest whether this relates to a not yet commited changeset
     241     * @param isLatest whether this relates to a not yet committed changeset
    242242     * @param timestamp the timestamp
    243243     * @param version the version of the primitive
    244244     */
  • src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java

    diff --git a/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java b/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java
    index fbe06c9..1fefad0 100644
    a b public class DownloadOpenChangesetsTask extends PleaseWaitRunnable { 
    106106            // have the respective privileges or if he didn't or he can't authenticate with
    107107            // a username/password-pair.
    108108            //
    109             // Downgrade your knowlege about its identity if we've assumed that he was fully
     109            // Downgrade your knowledge about its identity if we've assumed that he was fully
    110110            // identified. Otherwise, if he is anonymous or partially identified, keep our level
    111             // of knowlege.
     111            // of knowledge.
    112112            //
    113113            if (im.isFullyIdentified()) {
    114114                im.setPartiallyIdentified(im.getUserName());
  • src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java

    diff --git a/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java b/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
    index 5e61352..551a83e 100644
    a b public class SaveLayersDialog extends JDialog implements TableModelListener { 
    654654            int numProblems = model.getNumCancel() + model.getNumFailed();
    655655            if (numProblems == 0)
    656656                return;
    657             Logging.warn(numProblems + " problems occured during upload/save");
     657            Logging.warn(numProblems + " problems occurred during upload/save");
    658658            String msg = trn(
    659659                    "<html>An upload and/or save operation of one layer with modifications<br>"
    660660                    + "was canceled or has failed.</html>",
  • src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

    diff --git a/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java b/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
    index ce7cdda..4634a9a 100644
    a b implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi 
    839839    /**
    840840     * Zoom out from map.
    841841     *
    842      * @return    true, if zoom increasing was successfull, false othervise
     842     * @return    true, if zoom increasing was successful, false othervise
    843843     */
    844844    public boolean decreaseZoomLevel() {
    845845        if (zoomDecreaseAllowed()) {
  • src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java

    diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java b/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java
    index 6558bae..bfd3a7f 100644
    a b public class DownloadAlongPanel extends JPanel { 
    109109    }
    110110
    111111    /**
    112      * Gets the "download near" choosen value
    113      * @return the "download near" choosen value (0: track only, 1: waypoints only, 2: both)
     112     * Gets the "download near" chosen value
     113     * @return the "download near" chosen value (0: track only, 1: waypoints only, 2: both)
    114114     */
    115115    public final int getNear() {
    116116        return downloadNear.getSelectedIndex();
  • src/org/openstreetmap/josm/gui/layer/imagery/TileCoordinateConverter.java

    diff --git a/src/org/openstreetmap/josm/gui/layer/imagery/TileCoordinateConverter.java b/src/org/openstreetmap/josm/gui/layer/imagery/TileCoordinateConverter.java
    index fd2d3f8..1807fa4 100644
    a b public class TileCoordinateConverter { 
    112112    /**
    113113     * Gets the position of the tile inside the map view.
    114114     * @param tile The tile
    115      * @return The positon as a rectangle in screen coordinates
     115     * @return The position as a rectangle in screen coordinates
    116116     */
    117117    public Rectangle2D getRectangleForTile(Tile tile) {
    118118        ICoordinate c1 = tile.getTileSource().tileXYToLatLon(tile);
  • src/org/openstreetmap/josm/gui/mappaint/StyleSource.java

    diff --git a/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java b/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java
    index 4af8090..6ef613d 100644
    a b public abstract class StyleSource extends SourceEntry { 
    140140    }
    141141
    142142    /**
    143      * Log an error that occured with this style.
     143     * Log an error that occurred with this style.
    144144     * @param e error
    145145     */
    146146    public void logError(Throwable e) {
    public abstract class StyleSource extends SourceEntry { 
    148148    }
    149149
    150150    /**
    151      * Log a warning that occured with this style.
     151     * Log a warning that occurred with this style.
    152152     * @param w warnings
    153153     */
    154154    public void logWarning(String w) {
    public abstract class StyleSource extends SourceEntry { 
    156156    }
    157157
    158158    /**
    159      * Replies the collection of errors that occured with this style.
     159     * Replies the collection of errors that occurred with this style.
    160160     * @return collection of errors
    161161     */
    162162    public Collection<Throwable> getErrors() {
    public abstract class StyleSource extends SourceEntry { 
    164164    }
    165165
    166166    /**
    167      * Replies the collection of warnings that occured with this style.
     167     * Replies the collection of warnings that occurred with this style.
    168168     * @return collection of warnings
    169169     */
    170170    public Collection<String> getWarnings() {
  • src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSException.java

    diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSException.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSException.java
    index 3c0b61c..023f8ec 100644
    a b package org.openstreetmap.josm.gui.mappaint.mapcss; 
    66 */
    77public class MapCSSException extends RuntimeException {
    88
    9     /** line number at which the parse error occured */
     9    /** line number at which the parse error occurred */
    1010    protected Integer line;
    11     /** column number at which the parse error occured */
     11    /** column number at which the parse error occurred */
    1212    protected Integer column;
    1313
    1414    /**
    public class MapCSSException extends RuntimeException { 
    2929    }
    3030
    3131    /**
    32      * Sets the column number at which the parse error occured.
    33      * @param column the column number at which the parse error occured
     32     * Sets the column number at which the parse error occurred.
     33     * @param column the column number at which the parse error occurred
    3434     */
    3535    public void setColumn(int column) {
    3636        this.column = column;
    3737    }
    3838
    3939    /**
    40      * Sets the line number at which the parse error occured.
    41      * @param line the line number at which the parse error occured
     40     * Sets the line number at which the parse error occurred.
     41     * @param line the line number at which the parse error occurred
    4242     */
    4343    public void setLine(int line) {
    4444        this.line = line;
  • src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/OnLineStrategy.java

    diff --git a/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/OnLineStrategy.java b/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/OnLineStrategy.java
    index b5d8b50..cf5c523 100644
    a b public class OnLineStrategy implements PositionForAreaStrategy { 
    133133            }
    134134        });
    135135
    136         // find the segment with the best quality. If there are several with best quality, the one close to the center is prefered.
     136        // find the segment with the best quality. If there are several with best quality, the one close to the center is preferred.
    137137        return longHalfSegment.stream().max(
    138138                Comparator.comparingDouble(segment -> segment.quality - 1e-5 * Math.abs(segment.offset - length / 2)));
    139139    }
  • src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java

    diff --git a/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java b/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java
    index 0a9b3a6..c4b0412 100644
    a b import javax.swing.UIManager; 
    1313import org.openstreetmap.josm.gui.widgets.JosmComboBox;
    1414
    1515/**
    16  * Combo box that lets the user choose one of the avaliable {@link AuthorizationProcedure}s.
     16 * Combo box that lets the user choose one of the available {@link AuthorizationProcedure}s.
    1717 */
    1818public class AuthorizationProcedureComboBox extends JosmComboBox<AuthorizationProcedure> {
    1919
  • src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

    diff --git a/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java b/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
    index 44b5770..cde499e 100644
    a b public final class PreferenceTabbedPane extends JTabbedPane implements MouseWhee 
    419419
    420420            if (task != null) {
    421421                // if we have to launch a plugin download task we do it asynchronously, followed
    422                 // by the remaining "save preferences" activites run on the Swing EDT.
     422                // by the remaining "save preferences" activities run on the Swing EDT.
    423423                MainApplication.worker.submit(task);
    424424                MainApplication.worker.submit(() -> GuiHelper.runInEDT(continuation));
    425425            } else {
  • src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java

    diff --git a/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java b/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java
    index 1211fa4..d7740a1 100644
    a b public class TagEditorModel extends AbstractTableModel { 
    711711    }
    712712
    713713    /**
    714      * A listener that is called whenever the cells may be updated from outside the editor and the editor should thus be commited.
     714     * A listener that is called whenever the cells may be updated from outside the editor and the editor should thus be committed.
    715715     * @since 10604
    716716     */
    717717    @FunctionalInterface
  • src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetNameTemplateList.java

    diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetNameTemplateList.java b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetNameTemplateList.java
    index 878ca73..e163f1a 100644
    a b public final class TaggingPresetNameTemplateList implements TaggingPresetListene 
    4747    }
    4848
    4949    /**
    50      * Finds and returns the first occurence of preset with template name matching the given primitive
     50     * Finds and returns the first occurrence of preset with template name matching the given primitive
    5151     * @param primitive The primitive to match
    52      * @return the first occurence of preset with template name matching the primitive
     52     * @return the first occurrence of preset with template name matching the primitive
    5353     */
    5454    public TaggingPreset findPresetTemplate(IPrimitive primitive) {
    5555        synchronized (this) {
  • src/org/openstreetmap/josm/gui/util/WindowGeometry.java

    diff --git a/src/org/openstreetmap/josm/gui/util/WindowGeometry.java b/src/org/openstreetmap/josm/gui/util/WindowGeometry.java
    index 59e4789..b749006 100644
    a b public class WindowGeometry { 
    365365    }
    366366
    367367    /**
    368      * Determines if the bug affecting getMaximumWindowBounds() occured.
     368     * Determines if the bug affecting getMaximumWindowBounds() occurred.
    369369     *
    370370     * @param maxbounds result of getMaximumWindowBounds()
    371371     * @return {@code true} if the bug happened, {@code false otherwise}
  • src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java

    diff --git a/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java b/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java
    index 4c308a3..294726e 100644
    a b public class JosmPasswordField extends JPasswordField implements FocusListener { 
    129129                    try {
    130130                        pasteAction.actionPerformed(e);
    131131                    } catch (NullPointerException npe) { // NOPMD
    132                         Logging.log(Logging.LEVEL_ERROR, "NullPointerException occured because of JDK bug 6322854. "
     132                        Logging.log(Logging.LEVEL_ERROR, "NullPointerException occurred because of JDK bug 6322854. "
    133133                                +"Copy/Paste operation has not been performed. Please complain to Oracle: "+
    134134                                "https://bugs.openjdk.java.net/browse/JDK-6322854", npe);
    135135                    }
  • src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java

    diff --git a/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java b/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
    index 3042957..b71e934 100644
    a b public class MultiSplitLayout implements LayoutManager { 
    591591    /* First pass of the layout algorithm.
    592592     *
    593593     * If the Dividers are "floating" then set the bounds of each
    594      * node to accomodate the preferred size of all of the
     594     * node to accommodate the preferred size of all of the
    595595     * Leaf's java.awt.Components.  Otherwise, just set the bounds
    596596     * of each Leaf/Split node so that it's to the left of (for
    597597     * Split.isRowLayout() Split children) or directly above
  • src/org/openstreetmap/josm/io/DefaultProxySelector.java

    diff --git a/src/org/openstreetmap/josm/io/DefaultProxySelector.java b/src/org/openstreetmap/josm/io/DefaultProxySelector.java
    index 32bd8b0..4cf8d47 100644
    a b public class DefaultProxySelector extends ProxySelector { 
    204204    }
    205205
    206206    /**
    207      * Determines if proxy errors have occured.
    208      * @return {@code true} if errors have occured, {@code false} otherwise.
     207     * Determines if proxy errors have occurred.
     208     * @return {@code true} if errors have occurred, {@code false} otherwise.
    209209     * @since 6523
    210210     */
    211211    public final boolean hasErrors() {
  • src/org/openstreetmap/josm/io/NetworkManager.java

    diff --git a/src/org/openstreetmap/josm/io/NetworkManager.java b/src/org/openstreetmap/josm/io/NetworkManager.java
    index 44a49b7..9b1b314 100644
    a b public final class NetworkManager { 
    5858    }
    5959
    6060    /**
    61      * Returns the network errors that occured until now.
    62      * @return the network errors that occured until now, indexed by URL
     61     * Returns the network errors that occurred until now.
     62     * @return the network errors that occurred until now, indexed by URL
    6363     */
    6464    public static Map<String, Throwable> getNetworkErrors() {
    6565        return new HashMap<>(NETWORK_ERRORS);
  • src/org/openstreetmap/josm/io/OsmApiException.java

    diff --git a/src/org/openstreetmap/josm/io/OsmApiException.java b/src/org/openstreetmap/josm/io/OsmApiException.java
    index 7dbf290..c0cee75 100644
    a b public class OsmApiException extends OsmTransferException { 
    2323     * See {@link java.net.HttpURLConnection HttpURLConnection} for predefined HTTP response code values
    2424     * @param errorHeader The error header, as transmitted in the {@code Error} field of the HTTP response header
    2525     * @param errorBody The error body, as transmitted in the HTTP response body
    26      * @param accessedUrl The complete URL accessed when this error occured
     26     * @param accessedUrl The complete URL accessed when this error occurred
    2727     * @param login the login used to connect to OSM API (can be null)
    2828     * @param contentType the response content-type
    2929     * @since 13499
    public class OsmApiException extends OsmTransferException { 
    4343     * See {@link java.net.HttpURLConnection HttpURLConnection} for predefined HTTP response code values
    4444     * @param errorHeader The error header, as transmitted in the {@code Error} field of the HTTP response header
    4545     * @param errorBody The error body, as transmitted in the HTTP response body
    46      * @param accessedUrl The complete URL accessed when this error occured
     46     * @param accessedUrl The complete URL accessed when this error occurred
    4747     * @param login the login used to connect to OSM API (can be null)
    4848     * @since 12992
    4949     */
    public class OsmApiException extends OsmTransferException { 
    5757     * See {@link java.net.HttpURLConnection HttpURLConnection} for predefined HTTP response code values
    5858     * @param errorHeader The error header, as transmitted in the {@code Error} field of the HTTP response header
    5959     * @param errorBody The error body, as transmitted in the HTTP response body
    60      * @param accessedUrl The complete URL accessed when this error occured
     60     * @param accessedUrl The complete URL accessed when this error occurred
    6161     * @since 5584
    6262     */
    6363    public OsmApiException(int responseCode, String errorHeader, String errorBody, String accessedUrl) {
    public class OsmApiException extends OsmTransferException { 
    215215    }
    216216
    217217    /**
    218      * Sets the complete URL accessed when this error occured.
     218     * Sets the complete URL accessed when this error occurred.
    219219     * This is distinct from the one set with {@link #setUrl}, which is generally only the base URL of the server.
    220      * @param url the complete URL accessed when this error occured.
     220     * @param url the complete URL accessed when this error occurred.
    221221     */
    222222    public void setAccessedUrl(String url) {
    223223        this.accessedUrl = url;
    224224    }
    225225
    226226    /**
    227      * Replies the complete URL accessed when this error occured.
     227     * Replies the complete URL accessed when this error occurred.
    228228     * This is distinct from the one returned by {@link #getUrl}, which is generally only the base URL of the server.
    229      * @return the complete URL accessed when this error occured.
     229     * @return the complete URL accessed when this error occurred.
    230230     */
    231231    public String getAccessedUrl() {
    232232        return accessedUrl;
  • src/org/openstreetmap/josm/io/OsmApiInitializationException.java

    diff --git a/src/org/openstreetmap/josm/io/OsmApiInitializationException.java b/src/org/openstreetmap/josm/io/OsmApiInitializationException.java
    index ba3492e..d09a047 100644
    a b  
    22package org.openstreetmap.josm.io;
    33
    44/**
    5  * Exception thrown when a communication error occured with the OSM server during API initialization.
     5 * Exception thrown when a communication error occurred with the OSM server during API initialization.
    66 * @see OsmApi#initialize
    77 */
    88public class OsmApiInitializationException extends OsmTransferException {
  • src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java

    diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java
    index bc67b13..1199b02 100644
    a b public class AddWayHandler extends RequestHandler { 
    4646    private Way way;
    4747
    4848    /**
    49      * The place to remeber already added nodes (they are reused if needed @since 5845
     49     * The place to remember already added nodes (they are reused if needed @since 5845
    5050     */
    5151    private Map<LatLon, Node> addedNodes;
    5252
  • src/org/openstreetmap/josm/plugins/PluginDownloadTask.java

    diff --git a/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java b/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java
    index 7740072..ac22f6f 100644
    a b public class PluginDownloadTask extends PleaseWaitRunnable { 
    212212    }
    213213
    214214    /**
    215      * Replies the last exception that occured during download, or {@code null}.
    216      * @return the last exception that occured during download, or {@code null}
     215     * Replies the last exception that occurred during download, or {@code null}.
     216     * @return the last exception that occurred during download, or {@code null}
    217217     * @since 9621
    218218     */
    219219    public Exception getLastException() {
  • src/org/openstreetmap/josm/plugins/PluginHandler.java

    diff --git a/src/org/openstreetmap/josm/plugins/PluginHandler.java b/src/org/openstreetmap/josm/plugins/PluginHandler.java
    index 587e313..2fd2b56 100644
    a b public final class PluginHandler { 
    270270    static final Collection<PluginProxy> pluginList = new LinkedList<>();
    271271
    272272    /**
    273      * All exceptions that occured during plugin loading
     273     * All exceptions that occurred during plugin loading
    274274     */
    275275    static final Map<String, Throwable> pluginLoadingExceptions = new HashMap<>();
    276276
    public final class PluginHandler { 
    14181418            stack.addAll(Arrays.asList(current.getStackTrace()));
    14191419            Throwable cause = current.getCause();
    14201420            if (cause != null && seen.contains(cause)) {
    1421                 break; // circular refernce
     1421                break; // circular reference
    14221422            }
    14231423            current = cause;
    14241424        }
  • src/org/openstreetmap/josm/tools/Geometry.java

    diff --git a/src/org/openstreetmap/josm/tools/Geometry.java b/src/org/openstreetmap/josm/tools/Geometry.java
    index 926f63a..78f51c3 100644
    a b public final class Geometry { 
    365365        // Basically, the formula from wikipedia is used:
    366366        //  https://en.wikipedia.org/wiki/Line%E2%80%93line_intersection
    367367        // However, large numbers lead to rounding errors (see #10286).
    368         // To avoid this, p1 is first substracted from each of the points:
     368        // To avoid this, p1 is first subtracted from each of the points:
    369369        //  p1' = 0
    370370        //  p2' = p2 - p1
    371371        //  p3' = p3 - p1
  • src/org/openstreetmap/josm/tools/Logging.java

    diff --git a/src/org/openstreetmap/josm/tools/Logging.java b/src/org/openstreetmap/josm/tools/Logging.java
    index c345656..eb38866 100644
    a b public final class Logging { 
    460460    }
    461461
    462462    /**
    463      * Provides direct access to the logger used. Use of methods like {@link #warn(String)} is prefered.
     463     * Provides direct access to the logger used. Use of methods like {@link #warn(String)} is preferred.
    464464     * @return The logger
    465465     */
    466466    public static Logger getLogger() {
  • src/org/openstreetmap/josm/tools/MemoryManager.java

    diff --git a/src/org/openstreetmap/josm/tools/MemoryManager.java b/src/org/openstreetmap/josm/tools/MemoryManager.java
    index 9d2d8a9..f188b7c 100644
    a b public class MemoryManager { 
    115115        /**
    116116         * Gets the content of this memory area.
    117117         * <p>
    118          * This method should be the prefered access to the memory since it will do error checking when {@link #free()} was called.
     118         * This method should be the preferred access to the memory since it will do error checking when {@link #free()} was called.
    119119         * @return The memory area content.
    120120         */
    121121        T get();
  • src/org/openstreetmap/josm/tools/PlatformHook.java

    diff --git a/src/org/openstreetmap/josm/tools/PlatformHook.java b/src/org/openstreetmap/josm/tools/PlatformHook.java
    index 14b8dfc..9130199 100644
    a b public interface PlatformHook { 
    5959    Platform getPlatform();
    6060
    6161    /**
    62       * The preStartupHook will be called extremly early. It is
     62      * The preStartupHook will be called extremely early. It is
    6363      * guaranteed to be called before the GUI setup has started.
    6464      *
    6565      * Reason: On OSX we need to inform the Swing libraries
  • src/org/openstreetmap/josm/tools/PlatformHookWindows.java

    diff --git a/src/org/openstreetmap/josm/tools/PlatformHookWindows.java b/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
    index 49129d1..8b99465 100644
    a b public class PlatformHookWindows implements PlatformHook { 
    429429            }
    430430        } catch (ArrayIndexOutOfBoundsException e) {
    431431            // catch error of JDK-8172244 as bug seems to not be fixed anytime soon
    432             Logging.log(Logging.LEVEL_ERROR, "JDK-8172244 occured. Abort HTTPS setup", e);
     432            Logging.log(Logging.LEVEL_ERROR, "JDK-8172244 occurred. Abort HTTPS setup", e);
    433433            return false;
    434434        }
    435435        if (!GraphicsEnvironment.isHeadless()) {
  • src/org/openstreetmap/josm/tools/XmlParsingException.java

    diff --git a/src/org/openstreetmap/josm/tools/XmlParsingException.java b/src/org/openstreetmap/josm/tools/XmlParsingException.java
    index 032f987..83f53ff 100644
    a b public class XmlParsingException extends SAXException { 
    4040    }
    4141
    4242    /**
    43      * Sets the location (line/column) where the exception occured.
    44      * @param locator object giving the location (line/column) where the exception occured
     43     * Sets the location (line/column) where the exception occurred.
     44     * @param locator object giving the location (line/column) where the exception occurred
    4545     * @return {@code this}
    4646     */
    4747    public XmlParsingException rememberLocation(Locator locator) {
    public class XmlParsingException extends SAXException { 
    6464    }
    6565
    6666    /**
    67      * Returns the column number where the exception occured.
    68      * @return the column number where the exception occured
     67     * Returns the column number where the exception occurred.
     68     * @return the column number where the exception occurred
    6969     */
    7070    public int getColumnNumber() {
    7171        return columnNumber;
    7272    }
    7373
    7474    /**
    75      * Returns the line number where the exception occured.
    76      * @return the line number where the exception occured
     75     * Returns the line number where the exception occurred.
     76     * @return the line number where the exception occurred
    7777     */
    7878    public int getLineNumber() {
    7979        return lineNumber;
  • src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java

    diff --git a/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java b/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java
    index 6658632..1f0ec13 100644
    a b public class BugReportSender extends Thread { 
    160160    }
    161161
    162162    /**
    163      * Returns the error message that could have occured during bug sending.
     163     * Returns the error message that could have occurred during bug sending.
    164164     * @return the error message, or {@code null} if successful
    165165     */
    166166    public final String getErrorMessage() {
  • test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java

    diff --git a/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java b/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java
    index ab8660b..652e1ee 100644
    a b public class ProjectionRefTest { 
    116116    private static Collection<RefEntry> readData() throws IOException {
    117117        Collection<RefEntry> result = new ArrayList<>();
    118118        if (!new File(REFERENCE_DATA_FILE).exists()) {
    119             System.err.println("Warning: refrence file does not exist.");
     119            System.err.println("Warning: reference file does not exist.");
    120120            return result;
    121121        }
    122122        try (BufferedReader in = new BufferedReader(new InputStreamReader(
  • test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java

    diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java
    index 6f05aac..6422f3a 100644
    a b public class TagCheckerTest { 
    4141    }
    4242
    4343    /**
    44      * Check for mispelled key.
     44     * Check for misspelled key.
    4545     * @throws IOException if any I/O error occurs
    4646     */
    4747    @Test
    public class TagCheckerTest { 
    5454    }
    5555
    5656    /**
    57      * Check for mispelled key.
     57     * Check for misspelled key.
    5858     * @throws IOException if any I/O error occurs
    5959     */
    6060    @Test
    public class TagCheckerTest { 
    6767    }
    6868
    6969    /**
    70      * Check for mispelled key where the suggested alternative is in use. The error should not be fixable.
     70     * Check for misspelled key where the suggested alternative is in use. The error should not be fixable.
    7171     * @throws IOException if any I/O error occurs
    7272     */
    7373    @Test
    public class TagCheckerTest { 
    9393    }
    9494
    9595    /**
    96      * Check for mispelled value.
     96     * Check for misspelled value.
    9797     * @throws IOException if any I/O error occurs
    9898     */
    9999    @Test
  • test/unit/org/openstreetmap/josm/gui/layer/MainLayerManagerTest.java

    diff --git a/test/unit/org/openstreetmap/josm/gui/layer/MainLayerManagerTest.java b/test/unit/org/openstreetmap/josm/gui/layer/MainLayerManagerTest.java
    index 7cc61bf..fca3326 100644
    a b public class MainLayerManagerTest extends LayerManagerTest { 
    138138    }
    139139
    140140    /**
    141      * Test if {@link MainLayerManager#addActiveLayerChangeListener(ActiveLayerChangeListener)} prevents listener from beeing added twice.
     141     * Test if {@link MainLayerManager#addActiveLayerChangeListener(ActiveLayerChangeListener)} prevents listener from being added twice.
    142142     */
    143143    @Test(expected = IllegalArgumentException.class)
    144144    public void testAddActiveLayerChangeListenerTwice() {
  • test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java

    diff --git a/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java b/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
    index 16f329e..eed522f 100644
    a b public class JOSMTestRules implements TestRule { 
    410410
    411411    /**
    412412     * Set up before running a test
    413      * @throws InitializationError If an error occured while creating the required environment.
     413     * @throws InitializationError If an error occurred while creating the required environment.
    414414     * @throws ReflectiveOperationException if a reflective access error occurs
    415415     */
    416416    protected void before() throws InitializationError, ReflectiveOperationException {

Attachments (1)

patch.txt (65.7 KB) - added by naoliv 3 years ago.

Download all attachments as: .zip

Change History (14)

Changed 3 years ago by naoliv

Attachment: patch.txt added

comment:1 Changed 3 years ago by stoecker

Resolution: fixed
Status: newclosed

In 14273/josm:

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

comment:2 Changed 3 years ago by stoecker

How did you find so many different types of typos?

comment:3 Changed 3 years ago by 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 :-)

comment:4 Changed 3 years ago by stoecker

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

comment:5 Changed 3 years ago by stoecker

Milestone: 18.09

comment:6 Changed 3 years ago by Don-vip

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

comment:7 Changed 3 years ago by Don-vip

Keywords: typo added

comment:8 Changed 3 years ago by stoecker

Probably first fix the plugins...

comment:9 Changed 3 years ago by Don-vip

comment:10 Changed 3 years ago by Don-vip

In 14303/josm:

see #16781 - missed a big one

comment:11 Changed 7 months ago by gaben

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

comment:12 Changed 7 months ago by stoecker

New one!

comment:13 Changed 7 months ago by gaben

Alright, see #20129.

Modify Ticket

Change Properties
Set your email in Preferences
Action
as closed The owner will remain team.
as The resolution will be set.
The resolution will be deleted.

Add Comment


E-mail address and name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.