Ticket #16781: patch.txt

File patch.txt, 65.7 KB (added by naoliv, 8 years ago)
Line 
1diff --git a/data/validator/numeric.mapcss b/data/validator/numeric.mapcss
2index 27e197c..5646988 100644
3--- a/data/validator/numeric.mapcss
4+++ b/data/validator/numeric.mapcss
5@@ -29,7 +29,7 @@
6 }
7
8 *[building:levels][building:levels !~ /^(([0-9]|[1-9][0-9]*)(\.5)?)$/],
9-*[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 ; */
10+*[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 ; */
11 throwWarning: tr("{0} should have numbers only with optional .5 increments", "{0.key}");
12 assertMatch: "node level=one";
13 assertMatch: "node level=01";
14@@ -342,4 +342,4 @@ way["lanes:forward"]["lanes:forward" !~ /^[1-9]([0-9]*)$/][highway],
15 assertNoMatch: "node ele=-12.1 m";
16 assertNoMatch: "node ele=12";
17 assertMatch: "node ele=high";
18-}
19\ No newline at end of file
20+}
21diff --git a/src/javax/json/stream/JsonGenerator.java b/src/javax/json/stream/JsonGenerator.java
22index d85cbd6..73cbd85 100644
23--- a/src/javax/json/stream/JsonGenerator.java
24+++ b/src/javax/json/stream/JsonGenerator.java
25@@ -99,7 +99,7 @@ import java.math.BigInteger;
26 *
27 * <p>
28 * Other JSON values (that are not JSON objects or arrays) can be created
29- * by calling the appropiate {@code write} methods.
30+ * by calling the appropriate {@code write} methods.
31 * <p>
32 * The following example shows how to generate a JSON string:
33 * <pre><code>
34diff --git a/src/org/apache/commons/jcs/utils/props/PropertyLoader.java b/src/org/apache/commons/jcs/utils/props/PropertyLoader.java
35index 1baaf0a..d1497c8 100644
36--- a/src/org/apache/commons/jcs/utils/props/PropertyLoader.java
37+++ b/src/org/apache/commons/jcs/utils/props/PropertyLoader.java
38@@ -48,7 +48,7 @@ public abstract class PropertyLoader
39
40 /**
41 * Looks up a resource named 'name' in the classpath. The resource must map
42- * to a file with .ccf extention. The name is assumed to be absolute and can
43+ * to a file with .ccf extension. The name is assumed to be absolute and can
44 * use either "/" or "." for package segment separation with an optional
45 * leading "/" and optional ".ccf" suffix.
46 * <p>
47diff --git a/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java b/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java
48index 550e708..febf633 100644
49--- a/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java
50+++ b/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java
51@@ -91,7 +91,7 @@ public interface TileSource extends Attributed {
52 * @param lo1 longitude of first point
53 * @param la2 latitude of second point
54 * @param lo2 longitude of second point
55- * @return the distance betwen first and second point, in m.
56+ * @return the distance between first and second point, in m.
57 */
58 double getDistance(double la1, double lo1, double la2, double lo2);
59
60diff --git a/src/org/openstreetmap/josm/actions/AbstractMergeAction.java b/src/org/openstreetmap/josm/actions/AbstractMergeAction.java
61index c02a743..ebcfdae 100644
62--- a/src/org/openstreetmap/josm/actions/AbstractMergeAction.java
63+++ b/src/org/openstreetmap/josm/actions/AbstractMergeAction.java
64@@ -98,7 +98,7 @@ public abstract class AbstractMergeAction extends JosmAction {
65 * @param title title of dialog
66 * @param buttonText text of button used to select target layer
67 * @param buttonIcon icon name of button used to select target layer
68- * @return choosen target layer
69+ * @return chosen target layer
70 */
71 @SuppressWarnings("unchecked")
72 public static <T extends Layer> T askTargetLayer(T[] targetLayers, String label, String title, String buttonText, String buttonIcon) {
73diff --git a/src/org/openstreetmap/josm/actions/CloseChangesetAction.java b/src/org/openstreetmap/josm/actions/CloseChangesetAction.java
74index 171eb6b..c7bd3b6 100644
75--- a/src/org/openstreetmap/josm/actions/CloseChangesetAction.java
76+++ b/src/org/openstreetmap/josm/actions/CloseChangesetAction.java
77@@ -151,8 +151,8 @@ public class CloseChangesetAction extends JosmAction {
78 }
79
80 /**
81- * Returns the last exception that occured.
82- * @return the last exception that occured, or {@code null}
83+ * Returns the last exception that occurred.
84+ * @return the last exception that occurred, or {@code null}
85 */
86 public Exception getLastException() {
87 return lastException;
88diff --git a/src/org/openstreetmap/josm/actions/JosmAction.java b/src/org/openstreetmap/josm/actions/JosmAction.java
89index b741c91..255d6e2 100644
90--- a/src/org/openstreetmap/josm/actions/JosmAction.java
91+++ b/src/org/openstreetmap/josm/actions/JosmAction.java
92@@ -227,7 +227,7 @@ public abstract class JosmAction extends AbstractAction implements Destroyable {
93 }
94
95 /**
96- * Overwrite this if {@link #updateEnabledState()} should be called when the active / availabe layers change. Default is true.
97+ * Overwrite this if {@link #updateEnabledState()} should be called when the active / available layers change. Default is true.
98 * @return <code>true</code> if a {@link LayerChangeListener} and a {@link ActiveLayerChangeListener} should be registered.
99 * @since 10353
100 */
101diff --git a/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java b/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
102index 80ae5c1..a4e8b0a 100644
103--- a/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
104+++ b/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
105@@ -736,7 +736,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, DataSelecti
106 }
107
108 // If ALT is pressed, a new way should be created and that new way should get
109- // selected. This works everytime unless the ways the nodes get inserted into
110+ // selected. This works every time unless the ways the nodes get inserted into
111 // are already selected. This is the case when creating a self-overlapping way
112 // but pressing ALT prevents this. Therefore we must de-select the way manually
113 // here so /only/ the new way will be selected after this method finishes.
114diff --git a/src/org/openstreetmap/josm/command/RotateCommand.java b/src/org/openstreetmap/josm/command/RotateCommand.java
115index 2b4f17a..3d9a213 100644
116--- a/src/org/openstreetmap/josm/command/RotateCommand.java
117+++ b/src/org/openstreetmap/josm/command/RotateCommand.java
118@@ -34,7 +34,7 @@ public class RotateCommand extends TransformNodesCommand {
119
120 /**
121 * Creates a RotateCommand.
122- * Assign the initial object set, compute pivot point and inital rotation angle.
123+ * Assign the initial object set, compute pivot point and initial rotation angle.
124 * @param objects objects to fetch nodes from
125 * @param currentEN cuurent eats/north
126 */
127diff --git a/src/org/openstreetmap/josm/data/Version.java b/src/org/openstreetmap/josm/data/Version.java
128index f8bfa31..19e6195 100644
129--- a/src/org/openstreetmap/josm/data/Version.java
130+++ b/src/org/openstreetmap/josm/data/Version.java
131@@ -154,9 +154,9 @@ public class Version {
132 }
133
134 /**
135- * Replies true if this is a local build, i.e. an inofficial development build.
136+ * Replies true if this is a local build, i.e. an unofficial development build.
137 *
138- * @return true if this is a local build, i.e. an inofficial development build.
139+ * @return true if this is a local build, i.e. an unofficial development build.
140 */
141 public boolean isLocalBuild() {
142 return isLocalBuild;
143diff --git a/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java b/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
144index d936240..335db15 100644
145--- a/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
146+++ b/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
147@@ -383,7 +383,7 @@ public abstract class JCSCachedTileLoaderJob<K, V extends CacheEntry> implements
148 Logging.debug("JCS - Caching empty object {0}", getUrl());
149 return true;
150 } else {
151- Logging.debug("JCS - failure during load - reponse is not loadable nor cached as empty");
152+ Logging.debug("JCS - failure during load - response is not loadable nor cached as empty");
153 return false;
154 }
155 }
156diff --git a/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java b/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
157index f587aae..7333b4f 100644
158--- a/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
159+++ b/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
160@@ -489,7 +489,7 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
161 supportedMimeTypes.add("image/jpgpng"); // used by ESRI
162 supportedMimeTypes.add("image/png8"); // used by geoserver
163 if (supportedMimeTypes.contains("image/jpeg")) {
164- supportedMimeTypes.add("image/jpg"); // sometimes mispelled by Arcgis
165+ supportedMimeTypes.add("image/jpg"); // sometimes misspelled by Arcgis
166 }
167 Collection<String> unsupportedFormats = new ArrayList<>();
168
169diff --git a/src/org/openstreetmap/josm/data/osm/Storage.java b/src/org/openstreetmap/josm/data/osm/Storage.java
170index 451bc65..af72ea9 100644
171--- a/src/org/openstreetmap/josm/data/osm/Storage.java
172+++ b/src/org/openstreetmap/josm/data/osm/Storage.java
173@@ -14,7 +14,7 @@ import org.openstreetmap.josm.tools.Utils;
174
175 /**
176 * A Set-like class that allows looking up equivalent preexising instance.
177- * It is useful whereever one would use self-mapping construct like
178+ * It is useful wherever one would use self-mapping construct like
179 * <code>Map&lt;T,T&gt;.put(t,t)</code>, that is, for caches, uniqueness filters or similar.
180 *
181 * The semantics of equivalency can be external to the object, using the
182diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/ArrowPaintHelper.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/ArrowPaintHelper.java
183index 3322d7f..196eccb 100644
184--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/ArrowPaintHelper.java
185+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/ArrowPaintHelper.java
186@@ -30,7 +30,7 @@ public class ArrowPaintHelper {
187 * Paint the arrow
188 * @param path The path to append the arrow to.
189 * @param point The point to paint the tip at
190- * @param fromDirection The direction the line is comming from.
191+ * @param fromDirection The direction the line is coming from.
192 */
193 public void paintArrowAt(MapPath2D path, MapViewPoint point, MapViewPoint fromDirection) {
194 double x = point.getInViewX();
195diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
196index 94d3657..2f6e925 100644
197--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
198+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
199@@ -161,7 +161,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
200 boolean negative = (value & 0x80000000L) != 0;
201 // Invert the sign bit, so that negative numbers are lower
202 value ^= 0x80000000L;
203- // Now do the shift. Do it before accounting for negative numbers (symetry)
204+ // Now do the shift. Do it before accounting for negative numbers (symmetry)
205 if (totalBits < 32) {
206 value >>= (32 - totalBits);
207 }
208diff --git a/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java b/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java
209index 96443ea..29e17fd 100644
210--- a/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java
211+++ b/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java
212@@ -45,7 +45,7 @@ import org.openstreetmap.josm.tools.Logging;
213 * <p>Grid Shift files can be read as InputStreams or RandomAccessFiles.
214 * Loading an InputStream places all the required node information
215 * (accuracy data is optional) into heap based Java arrays. This is the
216- * highest perfomance option, and is useful for large volume transformations.
217+ * highest performance option, and is useful for large volume transformations.
218 * Non-file data sources (eg using an SQL Blob) are also supported through
219 * InputStream. The RandonAccessFile option has a much smaller memory
220 * footprint as only the Sub Grid headers are stored in memory, but
221diff --git a/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java b/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java
222index 8412304..6e3e6ed 100644
223--- a/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java
224+++ b/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java
225@@ -111,7 +111,7 @@ public abstract class AbstractProj implements Proj {
226 /**
227 * Calculates the meridian distance. This is the distance along the central
228 * meridian from the equator to {@code phi}. Accurate to &lt; 1e-5 meters
229- * when used in conjuction with typical major axis values.
230+ * when used in conjunction with typical major axis values.
231 *
232 * @param phi latitude to calculate meridian distance for.
233 * @param sphi sin(phi).
234@@ -132,7 +132,7 @@ public abstract class AbstractProj implements Proj {
235 * Calculates the latitude ({@code phi}) from a meridian distance.
236 * Determines phi to TOL (1e-11) radians, about 1e-6 seconds.
237 *
238- * @param arg meridian distance to calulate latitude for.
239+ * @param arg meridian distance to calculate latitude for.
240 * @return the latitude of the meridian distance.
241 * @throws RuntimeException if the itteration does not converge.
242 */
243diff --git a/src/org/openstreetmap/josm/data/projection/proj/EquidistantCylindrical.java b/src/org/openstreetmap/josm/data/projection/proj/EquidistantCylindrical.java
244index 0395a08..341ce5b 100644
245--- a/src/org/openstreetmap/josm/data/projection/proj/EquidistantCylindrical.java
246+++ b/src/org/openstreetmap/josm/data/projection/proj/EquidistantCylindrical.java
247@@ -36,7 +36,7 @@ public class EquidistantCylindrical extends AbstractProj {
248
249 @Override
250 public String getName() {
251- return tr("Equidistant Cylindrical (Plate Caree)");
252+ return tr("Equidistant Cylindrical (Plate Carrée)");
253 }
254
255 @Override
256diff --git a/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java b/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java
257index 5ba4a42..ca4ad6f 100644
258--- a/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java
259+++ b/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java
260@@ -141,7 +141,7 @@ public class ObliqueMercator extends AbstractProj implements ICentralMeridianPro
261 //////
262
263 /**
264- * The azimuth of the central line passing throught the centre of the projection, in radians.
265+ * The azimuth of the central line passing through the centre of the projection, in radians.
266 */
267 protected double azimuth;
268
269diff --git a/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java b/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java
270index e5132fd..d59d8fe 100644
271--- a/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java
272+++ b/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java
273@@ -15,8 +15,8 @@ import org.openstreetmap.josm.tools.Utils;
274 * is a cylindrical projection, in which the cylinder has been rotated 90°.
275 * Instead of being tangent to the equator (or to an other standard latitude),
276 * it is tangent to a central meridian. Deformation are more important as we
277- * are going futher from the central meridian. The Transverse Mercator
278- * projection is appropriate for region wich have a greater extent north-south
279+ * are going further from the central meridian. The Transverse Mercator
280+ * projection is appropriate for region which have a greater extent north-south
281 * than east-west.
282 * <p>
283 *
284diff --git a/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java b/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
285index e208bfd..c2b0b42 100644
286--- a/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
287+++ b/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
288@@ -1880,11 +1880,11 @@ public final class DomainValidator extends AbstractValidator {
289 * @since 1.5.1 made public and added read-only array references
290 */
291 public enum ArrayType {
292- /** Update (or get a copy of) the GENERIC_TLDS_PLUS table containing additonal generic TLDs */
293+ /** Update (or get a copy of) the GENERIC_TLDS_PLUS table containing additional generic TLDs */
294 GENERIC_PLUS,
295 /** Update (or get a copy of) the GENERIC_TLDS_MINUS table containing deleted generic TLDs */
296 GENERIC_MINUS,
297- /** Update (or get a copy of) the COUNTRY_CODE_TLDS_PLUS table containing additonal country code TLDs */
298+ /** Update (or get a copy of) the COUNTRY_CODE_TLDS_PLUS table containing additional country code TLDs */
299 COUNTRY_CODE_PLUS,
300 /** Update (or get a copy of) the COUNTRY_CODE_TLDS_MINUS table containing deleted country code TLDs */
301 COUNTRY_CODE_MINUS,
302diff --git a/src/org/openstreetmap/josm/data/validation/routines/package.html b/src/org/openstreetmap/josm/data/validation/routines/package.html
303index 5f50ef5..c594733 100644
304--- a/src/org/openstreetmap/josm/data/validation/routines/package.html
305+++ b/src/org/openstreetmap/josm/data/validation/routines/package.html
306@@ -19,7 +19,7 @@
307 <title>Package Documentation for org.openstreetmap.josm.data.validation.routines Package</title>
308 </head>
309 <body bgcolor="white">
310- <p>This package contains <i>independant</i> validation routines adapted from Apache Commons Validator 1.5.0.</p>
311+ <p>This package contains <i>independent</i> validation routines adapted from Apache Commons Validator 1.5.0.</p>
312 <h1>Table of Contents</h1>
313
314 <ul>
315diff --git a/src/org/openstreetmap/josm/data/validation/tests/Addresses.java b/src/org/openstreetmap/josm/data/validation/tests/Addresses.java
316index 7856201..abfe687 100644
317--- a/src/org/openstreetmap/josm/data/validation/tests/Addresses.java
318+++ b/src/org/openstreetmap/josm/data/validation/tests/Addresses.java
319@@ -262,7 +262,7 @@ public class Addresses extends Test {
320 checkHouseNumbersWithoutStreet(r);
321 checkForDuplicate(r);
322 if (r.hasTag("type", ASSOCIATED_STREET)) {
323- // Used to count occurences of each house number in order to find duplicates
324+ // Used to count occurrences of each house number in order to find duplicates
325 Map<String, List<OsmPrimitive>> map = new HashMap<>();
326 // Used to detect different street names
327 String relationName = r.get("name");
328diff --git a/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java b/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
329index 115edef..91633fb 100644
330--- a/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
331+++ b/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
332@@ -247,13 +247,13 @@ public class MapCSSTagChecker extends Test.TagTest {
333 public static class ParseResult {
334 /** Checks successfully parsed */
335 public final List<TagCheck> parseChecks;
336- /** Errors that occured during parsing */
337+ /** Errors that occurred during parsing */
338 public final Collection<Throwable> parseErrors;
339
340 /**
341 * Constructs a new {@code ParseResult}.
342 * @param parseChecks Checks successfully parsed
343- * @param parseErrors Errors that occured during parsing
344+ * @param parseErrors Errors that occurred during parsing
345 */
346 public ParseResult(List<TagCheck> parseChecks, Collection<Throwable> parseErrors) {
347 this.parseChecks = parseChecks;
348diff --git a/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java b/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
349index 15eb670..b7c11aa 100644
350--- a/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
351+++ b/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
352@@ -265,7 +265,7 @@ public class RelationChecker extends Test {
353 *
354 * @param n relation to validate
355 * @param allroles contains presets for specified relation
356- * @param map contains statistics of occurances of specified role types in relation
357+ * @param map contains statistics of occurrences of specified role types in relation
358 */
359 private void checkRoles(Relation n, Map<Role, String> allroles, Map<String, RoleInfo> map) {
360 // go through all members of relation
361diff --git a/src/org/openstreetmap/josm/gui/GettingStarted.java b/src/org/openstreetmap/josm/gui/GettingStarted.java
362index 71cfe5c..951829f 100644
363--- a/src/org/openstreetmap/josm/gui/GettingStarted.java
364+++ b/src/org/openstreetmap/josm/gui/GettingStarted.java
365@@ -114,7 +114,7 @@ public final class GettingStarted extends JPanel implements ProxyPreferenceListe
366 // We assume a default of myVersion because it only kicks in in two cases:
367 // 1. Not yet written - but so isn't the interval variable, so it gets updated anyway
368 // 2. Cannot be written (e.g. while developing). Obviously we don't want to update
369- // everytime because of something we can't read.
370+ // every time because of something we can't read.
371 return (Config.getPref().getInt("cache.motd.html.version", -999) == myVersion)
372 && Config.getPref().get("cache.motd.html.java").equals(myJava)
373 && Config.getPref().get("cache.motd.html.lang").equals(myLang);
374diff --git a/src/org/openstreetmap/josm/gui/MainApplication.java b/src/org/openstreetmap/josm/gui/MainApplication.java
375index aceadf9..7fbe8ab 100644
376--- a/src/org/openstreetmap/josm/gui/MainApplication.java
377+++ b/src/org/openstreetmap/josm/gui/MainApplication.java
378@@ -977,7 +977,7 @@ public class MainApplication {
379 if ("true".equals(Config.getPref().get("prefer.ipv6", "auto"))
380 && !"true".equals(Utils.updateSystemProperty("java.net.preferIPv6Addresses", "true"))) {
381 // never set this to false, only true!
382- Logging.info(tr("Try enabling IPv6 network, prefering IPv6 over IPv4 (only works on early startup)."));
383+ Logging.info(tr("Try enabling IPv6 network, preferring IPv6 over IPv4 (only works on early startup)."));
384 }
385 Utils.updateSystemProperty("http.agent", Version.getInstance().getAgentString());
386 Utils.updateSystemProperty("user.language", Config.getPref().get("language"));
387@@ -1192,9 +1192,9 @@ public class MainApplication {
388 SSLSocketFactory.getDefault().createSocket(a, 443).close();
389 Utils.updateSystemProperty("java.net.preferIPv6Addresses", "true");
390 if (!wasv6) {
391- Logging.info(tr("Detected useable IPv6 network, prefering IPv6 over IPv4 after next restart."));
392+ Logging.info(tr("Detected useable IPv6 network, preferring IPv6 over IPv4 after next restart."));
393 } else {
394- Logging.info(tr("Detected useable IPv6 network, prefering IPv6 over IPv4."));
395+ Logging.info(tr("Detected useable IPv6 network, preferring IPv6 over IPv4."));
396 }
397 hasv6 = true;
398 }
399@@ -1206,7 +1206,7 @@ public class MainApplication {
400 Logging.trace(e);
401 }
402 if (wasv6 && !hasv6) {
403- Logging.info(tr("Detected no useable IPv6 network, prefering IPv4 over IPv6 after next restart."));
404+ Logging.info(tr("Detected no useable IPv6 network, preferring IPv4 over IPv6 after next restart."));
405 Config.getPref().putBoolean("validated.ipv6", hasv6); // be sure it is stored before the restart!
406 try {
407 RestartAction.restartJOSM();
408diff --git a/src/org/openstreetmap/josm/gui/MainFrame.java b/src/org/openstreetmap/josm/gui/MainFrame.java
409index 28cd8ae..576a2bb 100644
410--- a/src/org/openstreetmap/josm/gui/MainFrame.java
411+++ b/src/org/openstreetmap/josm/gui/MainFrame.java
412@@ -61,7 +61,7 @@ public class MainFrame extends JFrame {
413
414 /**
415 * Create a new main window. The parameter will be removed in the future.
416- * @param geometry The inital geometry to use.
417+ * @param geometry The initial geometry to use.
418 * @since 12127
419 */
420 public MainFrame(WindowGeometry geometry) {
421diff --git a/src/org/openstreetmap/josm/gui/MapViewState.java b/src/org/openstreetmap/josm/gui/MapViewState.java
422index 1c3ecce..8e6a3bc 100644
423--- a/src/org/openstreetmap/josm/gui/MapViewState.java
424+++ b/src/org/openstreetmap/josm/gui/MapViewState.java
425@@ -361,13 +361,13 @@ public final class MapViewState implements Serializable {
426 * Creates a new state that is the same as the current state except for that it is using the location of the given component.
427 * <p>
428 * The view is moved so that the center is the same as the old center.
429- * @param positon The new location to use.
430+ * @param position The new location to use.
431 * @return The new state.
432 * @since 10375
433 */
434- public MapViewState usingLocation(JComponent positon) {
435+ public MapViewState usingLocation(JComponent position) {
436 EastNorth center = this.getCenter().getEastNorth();
437- return new MapViewState(positon, this).usingCenter(center);
438+ return new MapViewState(position, this).usingCenter(center);
439 }
440
441 /**
442@@ -540,7 +540,7 @@ public final class MapViewState implements Serializable {
443
444 /**
445 * Gets the direction in which this point is outside of the given view rectangle.
446- * @param rect The rectangle to check agains.
447+ * @param rect The rectangle to check against.
448 * @return The direction in which it is outside of the view, as OUTSIDE_... flags.
449 * @since 10827
450 */
451diff --git a/src/org/openstreetmap/josm/gui/bbox/BBoxChooser.java b/src/org/openstreetmap/josm/gui/bbox/BBoxChooser.java
452index 12404a8..83faee8 100644
453--- a/src/org/openstreetmap/josm/gui/bbox/BBoxChooser.java
454+++ b/src/org/openstreetmap/josm/gui/bbox/BBoxChooser.java
455@@ -26,7 +26,7 @@ public interface BBoxChooser {
456
457 /**
458 * Replies the currently selected bounding box in this BBoxChooser.
459- * Replies null, if currently there isn't a bbox choosen in this
460+ * Replies null, if currently there isn't a bbox chosen in this
461 * BBoxChooser.
462 *
463 * @return the currently selected bounding box
464diff --git a/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java b/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
465index 2138a79..907a515 100644
466--- a/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
467+++ b/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
468@@ -370,7 +370,7 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser, Cha
469
470 /**
471 * Sets the current bounding box in this bbox chooser without
472- * emiting a property change event.
473+ * emitting a property change event.
474 *
475 * @param bbox the bounding box. null to reset the bounding box
476 */
477diff --git a/src/org/openstreetmap/josm/gui/bugreport/DebugTextDisplay.java b/src/org/openstreetmap/josm/gui/bugreport/DebugTextDisplay.java
478index d6cc58c..1d47551 100644
479--- a/src/org/openstreetmap/josm/gui/bugreport/DebugTextDisplay.java
480+++ b/src/org/openstreetmap/josm/gui/bugreport/DebugTextDisplay.java
481@@ -34,7 +34,7 @@ public class DebugTextDisplay extends JScrollPane {
482 }
483
484 /**
485- * Creates a new text area with an inital text to display
486+ * Creates a new text area with an initial text to display
487 * @param textToDisplay The text to display.
488 */
489 public DebugTextDisplay(String textToDisplay) {
490diff --git a/src/org/openstreetmap/josm/gui/bugreport/JosmUpdatePanel.java b/src/org/openstreetmap/josm/gui/bugreport/JosmUpdatePanel.java
491index ce4b958..7d854b5 100644
492--- a/src/org/openstreetmap/josm/gui/bugreport/JosmUpdatePanel.java
493+++ b/src/org/openstreetmap/josm/gui/bugreport/JosmUpdatePanel.java
494@@ -75,7 +75,7 @@ public class JosmUpdatePanel extends JPanel {
495 * Display that there was an error while checking the current version.
496 */
497 private void displayError() {
498- testedVersionField.setText(tr("An error occured while checking if your JOSM instance is up to date."));
499+ testedVersionField.setText(tr("An error occurred while checking if your JOSM instance is up to date."));
500 showUpdateButton();
501 }
502
503diff --git a/src/org/openstreetmap/josm/gui/datatransfer/data/LayerTransferData.java b/src/org/openstreetmap/josm/gui/datatransfer/data/LayerTransferData.java
504index d15b7c7..eccfc1e 100644
505--- a/src/org/openstreetmap/josm/gui/datatransfer/data/LayerTransferData.java
506+++ b/src/org/openstreetmap/josm/gui/datatransfer/data/LayerTransferData.java
507@@ -40,7 +40,7 @@ public class LayerTransferData extends LayerTransferable.Data {
508 }
509
510 /**
511- * Gets the layer to be transfered.
512+ * Gets the layer to be transferred.
513 * @return The layer
514 */
515 public Layer getLayer() {
516diff --git a/src/org/openstreetmap/josm/gui/datatransfer/data/PrimitiveTransferData.java b/src/org/openstreetmap/josm/gui/datatransfer/data/PrimitiveTransferData.java
517index 4c9cd38..0251b83 100644
518--- a/src/org/openstreetmap/josm/gui/datatransfer/data/PrimitiveTransferData.java
519+++ b/src/org/openstreetmap/josm/gui/datatransfer/data/PrimitiveTransferData.java
520@@ -21,7 +21,7 @@ import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
521 import org.openstreetmap.josm.tools.CompositeList;
522
523 /**
524- * A list of primitives that are transfered. The list allows you to implicitly add primitives.
525+ * A list of primitives that are transferred. The list allows you to implicitly add primitives.
526 * It distinguishes between primitives that were directly added and implicitly added ones.
527 * @author Michael Zangl
528 * @since 10604
529diff --git a/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java b/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
530index a33a975..faa333e 100644
531--- a/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
532+++ b/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
533@@ -558,7 +558,7 @@ public class SelectionListDialog extends ToggleDialog {
534 /**
535 * Replies the collection of OSM primitives currently selected in the view of this model
536 *
537- * @return choosen elements in the view
538+ * @return chosen elements in the view
539 */
540 public synchronized Collection<OsmPrimitive> getSelected() {
541 Set<OsmPrimitive> sel = new HashSet<>();
542diff --git a/src/org/openstreetmap/josm/gui/download/PlaceSelection.java b/src/org/openstreetmap/josm/gui/download/PlaceSelection.java
543index a019345..a3a3bdb 100644
544--- a/src/org/openstreetmap/josm/gui/download/PlaceSelection.java
545+++ b/src/org/openstreetmap/josm/gui/download/PlaceSelection.java
546@@ -268,7 +268,7 @@ public class PlaceSelection implements DownloadSelection {
547 } catch (SAXParseException e) {
548 if (!canceled) {
549 // Nominatim sometimes returns garbage, see #5934, #10643
550- Logging.log(Logging.LEVEL_WARN, tr("Error occured with query ''{0}'': ''{1}''", urlString, e.getMessage()), e);
551+ Logging.log(Logging.LEVEL_WARN, tr("Error occurred with query ''{0}'': ''{1}''", urlString, e.getMessage()), e);
552 GuiHelper.runInEDTAndWait(() -> HelpAwareOptionPane.showOptionDialog(
553 MainApplication.getMainFrame(),
554 tr("Name server returned invalid data. Please try again."),
555diff --git a/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java b/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
556index f252687..19b23be 100644
557--- a/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
558+++ b/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
559@@ -210,7 +210,7 @@ public class HistoryBrowserModel extends ChangeNotifier implements ActiveLayerCh
560 }
561
562 /**
563- * Should be called everytime either reference of current changes to update the diff.
564+ * Should be called every time either reference of current changes to update the diff.
565 * TODO: Maybe rename to reflect this? eg. updateNodeListTableModels
566 */
567 private void initNodeListTableModels() {
568diff --git a/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java b/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java
569index 29191be..648145c 100644
570--- a/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java
571+++ b/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java
572@@ -234,8 +234,8 @@ public class HistoryLoadTask extends PleaseWaitRunnable {
573 }
574
575 /**
576- * Returns the last exception that occured during loading, if any.
577- * @return the last exception that occured during loading, or {@code null}
578+ * Returns the last exception that occurred during loading, if any.
579+ * @return the last exception that occurred during loading, or {@code null}
580 */
581 public Exception getLastException() {
582 return lastException;
583diff --git a/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java b/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
584index 712d226..8640456 100644
585--- a/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
586+++ b/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
587@@ -229,7 +229,7 @@ public class VersionInfoPanel extends JPanel implements ChangeListener {
588 /**
589 * Updates the content of this panel based on the changeset information given by {@code primitive}.
590 * @param primitive the primitive to extract the changeset information from
591- * @param isLatest whether this relates to a not yet commited changeset
592+ * @param isLatest whether this relates to a not yet committed changeset
593 */
594 public void update(final OsmPrimitive primitive, final boolean isLatest) {
595 update(Changeset.fromPrimitive(primitive), isLatest, primitive.getTimestamp(), primitive.getVersion());
596@@ -238,7 +238,7 @@ public class VersionInfoPanel extends JPanel implements ChangeListener {
597 /**
598 * Updates the content of this panel based on the changeset information given by {@code cs}.
599 * @param cs the changeset information
600- * @param isLatest whether this relates to a not yet commited changeset
601+ * @param isLatest whether this relates to a not yet committed changeset
602 * @param timestamp the timestamp
603 * @param version the version of the primitive
604 */
605diff --git a/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java b/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java
606index fbe06c9..1fefad0 100644
607--- a/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java
608+++ b/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java
609@@ -106,9 +106,9 @@ public class DownloadOpenChangesetsTask extends PleaseWaitRunnable {
610 // have the respective privileges or if he didn't or he can't authenticate with
611 // a username/password-pair.
612 //
613- // Downgrade your knowlege about its identity if we've assumed that he was fully
614+ // Downgrade your knowledge about its identity if we've assumed that he was fully
615 // identified. Otherwise, if he is anonymous or partially identified, keep our level
616- // of knowlege.
617+ // of knowledge.
618 //
619 if (im.isFullyIdentified()) {
620 im.setPartiallyIdentified(im.getUserName());
621diff --git a/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java b/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
622index 5e61352..551a83e 100644
623--- a/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
624+++ b/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
625@@ -654,7 +654,7 @@ public class SaveLayersDialog extends JDialog implements TableModelListener {
626 int numProblems = model.getNumCancel() + model.getNumFailed();
627 if (numProblems == 0)
628 return;
629- Logging.warn(numProblems + " problems occured during upload/save");
630+ Logging.warn(numProblems + " problems occurred during upload/save");
631 String msg = trn(
632 "<html>An upload and/or save operation of one layer with modifications<br>"
633 + "was canceled or has failed.</html>",
634diff --git a/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java b/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
635index ce7cdda..4634a9a 100644
636--- a/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
637+++ b/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
638@@ -839,7 +839,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
639 /**
640 * Zoom out from map.
641 *
642- * @return true, if zoom increasing was successfull, false othervise
643+ * @return true, if zoom increasing was successful, false othervise
644 */
645 public boolean decreaseZoomLevel() {
646 if (zoomDecreaseAllowed()) {
647diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java b/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java
648index 6558bae..bfd3a7f 100644
649--- a/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java
650+++ b/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java
651@@ -109,8 +109,8 @@ public class DownloadAlongPanel extends JPanel {
652 }
653
654 /**
655- * Gets the "download near" choosen value
656- * @return the "download near" choosen value (0: track only, 1: waypoints only, 2: both)
657+ * Gets the "download near" chosen value
658+ * @return the "download near" chosen value (0: track only, 1: waypoints only, 2: both)
659 */
660 public final int getNear() {
661 return downloadNear.getSelectedIndex();
662diff --git a/src/org/openstreetmap/josm/gui/layer/imagery/TileCoordinateConverter.java b/src/org/openstreetmap/josm/gui/layer/imagery/TileCoordinateConverter.java
663index fd2d3f8..1807fa4 100644
664--- a/src/org/openstreetmap/josm/gui/layer/imagery/TileCoordinateConverter.java
665+++ b/src/org/openstreetmap/josm/gui/layer/imagery/TileCoordinateConverter.java
666@@ -112,7 +112,7 @@ public class TileCoordinateConverter {
667 /**
668 * Gets the position of the tile inside the map view.
669 * @param tile The tile
670- * @return The positon as a rectangle in screen coordinates
671+ * @return The position as a rectangle in screen coordinates
672 */
673 public Rectangle2D getRectangleForTile(Tile tile) {
674 ICoordinate c1 = tile.getTileSource().tileXYToLatLon(tile);
675diff --git a/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java b/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java
676index 4af8090..6ef613d 100644
677--- a/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java
678+++ b/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java
679@@ -140,7 +140,7 @@ public abstract class StyleSource extends SourceEntry {
680 }
681
682 /**
683- * Log an error that occured with this style.
684+ * Log an error that occurred with this style.
685 * @param e error
686 */
687 public void logError(Throwable e) {
688@@ -148,7 +148,7 @@ public abstract class StyleSource extends SourceEntry {
689 }
690
691 /**
692- * Log a warning that occured with this style.
693+ * Log a warning that occurred with this style.
694 * @param w warnings
695 */
696 public void logWarning(String w) {
697@@ -156,7 +156,7 @@ public abstract class StyleSource extends SourceEntry {
698 }
699
700 /**
701- * Replies the collection of errors that occured with this style.
702+ * Replies the collection of errors that occurred with this style.
703 * @return collection of errors
704 */
705 public Collection<Throwable> getErrors() {
706@@ -164,7 +164,7 @@ public abstract class StyleSource extends SourceEntry {
707 }
708
709 /**
710- * Replies the collection of warnings that occured with this style.
711+ * Replies the collection of warnings that occurred with this style.
712 * @return collection of warnings
713 */
714 public Collection<String> getWarnings() {
715diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSException.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSException.java
716index 3c0b61c..023f8ec 100644
717--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSException.java
718+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSException.java
719@@ -6,9 +6,9 @@ package org.openstreetmap.josm.gui.mappaint.mapcss;
720 */
721 public class MapCSSException extends RuntimeException {
722
723- /** line number at which the parse error occured */
724+ /** line number at which the parse error occurred */
725 protected Integer line;
726- /** column number at which the parse error occured */
727+ /** column number at which the parse error occurred */
728 protected Integer column;
729
730 /**
731@@ -29,16 +29,16 @@ public class MapCSSException extends RuntimeException {
732 }
733
734 /**
735- * Sets the column number at which the parse error occured.
736- * @param column the column number at which the parse error occured
737+ * Sets the column number at which the parse error occurred.
738+ * @param column the column number at which the parse error occurred
739 */
740 public void setColumn(int column) {
741 this.column = column;
742 }
743
744 /**
745- * Sets the line number at which the parse error occured.
746- * @param line the line number at which the parse error occured
747+ * Sets the line number at which the parse error occurred.
748+ * @param line the line number at which the parse error occurred
749 */
750 public void setLine(int line) {
751 this.line = line;
752diff --git a/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/OnLineStrategy.java b/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/OnLineStrategy.java
753index b5d8b50..cf5c523 100644
754--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/OnLineStrategy.java
755+++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/OnLineStrategy.java
756@@ -133,7 +133,7 @@ public class OnLineStrategy implements PositionForAreaStrategy {
757 }
758 });
759
760- // find the segment with the best quality. If there are several with best quality, the one close to the center is prefered.
761+ // find the segment with the best quality. If there are several with best quality, the one close to the center is preferred.
762 return longHalfSegment.stream().max(
763 Comparator.comparingDouble(segment -> segment.quality - 1e-5 * Math.abs(segment.offset - length / 2)));
764 }
765diff --git a/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java b/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java
766index 0a9b3a6..c4b0412 100644
767--- a/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java
768+++ b/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java
769@@ -13,7 +13,7 @@ import javax.swing.UIManager;
770 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
771
772 /**
773- * Combo box that lets the user choose one of the avaliable {@link AuthorizationProcedure}s.
774+ * Combo box that lets the user choose one of the available {@link AuthorizationProcedure}s.
775 */
776 public class AuthorizationProcedureComboBox extends JosmComboBox<AuthorizationProcedure> {
777
778diff --git a/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java b/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
779index 44b5770..cde499e 100644
780--- a/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
781+++ b/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
782@@ -419,7 +419,7 @@ public final class PreferenceTabbedPane extends JTabbedPane implements MouseWhee
783
784 if (task != null) {
785 // if we have to launch a plugin download task we do it asynchronously, followed
786- // by the remaining "save preferences" activites run on the Swing EDT.
787+ // by the remaining "save preferences" activities run on the Swing EDT.
788 MainApplication.worker.submit(task);
789 MainApplication.worker.submit(() -> GuiHelper.runInEDT(continuation));
790 } else {
791diff --git a/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java b/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java
792index 1211fa4..d7740a1 100644
793--- a/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java
794+++ b/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java
795@@ -711,7 +711,7 @@ public class TagEditorModel extends AbstractTableModel {
796 }
797
798 /**
799- * A listener that is called whenever the cells may be updated from outside the editor and the editor should thus be commited.
800+ * A listener that is called whenever the cells may be updated from outside the editor and the editor should thus be committed.
801 * @since 10604
802 */
803 @FunctionalInterface
804diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetNameTemplateList.java b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetNameTemplateList.java
805index 878ca73..e163f1a 100644
806--- a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetNameTemplateList.java
807+++ b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetNameTemplateList.java
808@@ -47,9 +47,9 @@ public final class TaggingPresetNameTemplateList implements TaggingPresetListene
809 }
810
811 /**
812- * Finds and returns the first occurence of preset with template name matching the given primitive
813+ * Finds and returns the first occurrence of preset with template name matching the given primitive
814 * @param primitive The primitive to match
815- * @return the first occurence of preset with template name matching the primitive
816+ * @return the first occurrence of preset with template name matching the primitive
817 */
818 public TaggingPreset findPresetTemplate(IPrimitive primitive) {
819 synchronized (this) {
820diff --git a/src/org/openstreetmap/josm/gui/util/WindowGeometry.java b/src/org/openstreetmap/josm/gui/util/WindowGeometry.java
821index 59e4789..b749006 100644
822--- a/src/org/openstreetmap/josm/gui/util/WindowGeometry.java
823+++ b/src/org/openstreetmap/josm/gui/util/WindowGeometry.java
824@@ -365,7 +365,7 @@ public class WindowGeometry {
825 }
826
827 /**
828- * Determines if the bug affecting getMaximumWindowBounds() occured.
829+ * Determines if the bug affecting getMaximumWindowBounds() occurred.
830 *
831 * @param maxbounds result of getMaximumWindowBounds()
832 * @return {@code true} if the bug happened, {@code false otherwise}
833diff --git a/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java b/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java
834index 4c308a3..294726e 100644
835--- a/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java
836+++ b/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java
837@@ -129,7 +129,7 @@ public class JosmPasswordField extends JPasswordField implements FocusListener {
838 try {
839 pasteAction.actionPerformed(e);
840 } catch (NullPointerException npe) { // NOPMD
841- Logging.log(Logging.LEVEL_ERROR, "NullPointerException occured because of JDK bug 6322854. "
842+ Logging.log(Logging.LEVEL_ERROR, "NullPointerException occurred because of JDK bug 6322854. "
843 +"Copy/Paste operation has not been performed. Please complain to Oracle: "+
844 "https://bugs.openjdk.java.net/browse/JDK-6322854", npe);
845 }
846diff --git a/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java b/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
847index 3042957..b71e934 100644
848--- a/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
849+++ b/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
850@@ -591,7 +591,7 @@ public class MultiSplitLayout implements LayoutManager {
851 /* First pass of the layout algorithm.
852 *
853 * If the Dividers are "floating" then set the bounds of each
854- * node to accomodate the preferred size of all of the
855+ * node to accommodate the preferred size of all of the
856 * Leaf's java.awt.Components. Otherwise, just set the bounds
857 * of each Leaf/Split node so that it's to the left of (for
858 * Split.isRowLayout() Split children) or directly above
859diff --git a/src/org/openstreetmap/josm/io/DefaultProxySelector.java b/src/org/openstreetmap/josm/io/DefaultProxySelector.java
860index 32bd8b0..4cf8d47 100644
861--- a/src/org/openstreetmap/josm/io/DefaultProxySelector.java
862+++ b/src/org/openstreetmap/josm/io/DefaultProxySelector.java
863@@ -204,8 +204,8 @@ public class DefaultProxySelector extends ProxySelector {
864 }
865
866 /**
867- * Determines if proxy errors have occured.
868- * @return {@code true} if errors have occured, {@code false} otherwise.
869+ * Determines if proxy errors have occurred.
870+ * @return {@code true} if errors have occurred, {@code false} otherwise.
871 * @since 6523
872 */
873 public final boolean hasErrors() {
874diff --git a/src/org/openstreetmap/josm/io/NetworkManager.java b/src/org/openstreetmap/josm/io/NetworkManager.java
875index 44a49b7..9b1b314 100644
876--- a/src/org/openstreetmap/josm/io/NetworkManager.java
877+++ b/src/org/openstreetmap/josm/io/NetworkManager.java
878@@ -58,8 +58,8 @@ public final class NetworkManager {
879 }
880
881 /**
882- * Returns the network errors that occured until now.
883- * @return the network errors that occured until now, indexed by URL
884+ * Returns the network errors that occurred until now.
885+ * @return the network errors that occurred until now, indexed by URL
886 */
887 public static Map<String, Throwable> getNetworkErrors() {
888 return new HashMap<>(NETWORK_ERRORS);
889diff --git a/src/org/openstreetmap/josm/io/OsmApiException.java b/src/org/openstreetmap/josm/io/OsmApiException.java
890index 7dbf290..c0cee75 100644
891--- a/src/org/openstreetmap/josm/io/OsmApiException.java
892+++ b/src/org/openstreetmap/josm/io/OsmApiException.java
893@@ -23,7 +23,7 @@ public class OsmApiException extends OsmTransferException {
894 * See {@link java.net.HttpURLConnection HttpURLConnection} for predefined HTTP response code values
895 * @param errorHeader The error header, as transmitted in the {@code Error} field of the HTTP response header
896 * @param errorBody The error body, as transmitted in the HTTP response body
897- * @param accessedUrl The complete URL accessed when this error occured
898+ * @param accessedUrl The complete URL accessed when this error occurred
899 * @param login the login used to connect to OSM API (can be null)
900 * @param contentType the response content-type
901 * @since 13499
902@@ -43,7 +43,7 @@ public class OsmApiException extends OsmTransferException {
903 * See {@link java.net.HttpURLConnection HttpURLConnection} for predefined HTTP response code values
904 * @param errorHeader The error header, as transmitted in the {@code Error} field of the HTTP response header
905 * @param errorBody The error body, as transmitted in the HTTP response body
906- * @param accessedUrl The complete URL accessed when this error occured
907+ * @param accessedUrl The complete URL accessed when this error occurred
908 * @param login the login used to connect to OSM API (can be null)
909 * @since 12992
910 */
911@@ -57,7 +57,7 @@ public class OsmApiException extends OsmTransferException {
912 * See {@link java.net.HttpURLConnection HttpURLConnection} for predefined HTTP response code values
913 * @param errorHeader The error header, as transmitted in the {@code Error} field of the HTTP response header
914 * @param errorBody The error body, as transmitted in the HTTP response body
915- * @param accessedUrl The complete URL accessed when this error occured
916+ * @param accessedUrl The complete URL accessed when this error occurred
917 * @since 5584
918 */
919 public OsmApiException(int responseCode, String errorHeader, String errorBody, String accessedUrl) {
920@@ -215,18 +215,18 @@ public class OsmApiException extends OsmTransferException {
921 }
922
923 /**
924- * Sets the complete URL accessed when this error occured.
925+ * Sets the complete URL accessed when this error occurred.
926 * This is distinct from the one set with {@link #setUrl}, which is generally only the base URL of the server.
927- * @param url the complete URL accessed when this error occured.
928+ * @param url the complete URL accessed when this error occurred.
929 */
930 public void setAccessedUrl(String url) {
931 this.accessedUrl = url;
932 }
933
934 /**
935- * Replies the complete URL accessed when this error occured.
936+ * Replies the complete URL accessed when this error occurred.
937 * This is distinct from the one returned by {@link #getUrl}, which is generally only the base URL of the server.
938- * @return the complete URL accessed when this error occured.
939+ * @return the complete URL accessed when this error occurred.
940 */
941 public String getAccessedUrl() {
942 return accessedUrl;
943diff --git a/src/org/openstreetmap/josm/io/OsmApiInitializationException.java b/src/org/openstreetmap/josm/io/OsmApiInitializationException.java
944index ba3492e..d09a047 100644
945--- a/src/org/openstreetmap/josm/io/OsmApiInitializationException.java
946+++ b/src/org/openstreetmap/josm/io/OsmApiInitializationException.java
947@@ -2,7 +2,7 @@
948 package org.openstreetmap.josm.io;
949
950 /**
951- * Exception thrown when a communication error occured with the OSM server during API initialization.
952+ * Exception thrown when a communication error occurred with the OSM server during API initialization.
953 * @see OsmApi#initialize
954 */
955 public class OsmApiInitializationException extends OsmTransferException {
956diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java
957index bc67b13..1199b02 100644
958--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java
959+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java
960@@ -46,7 +46,7 @@ public class AddWayHandler extends RequestHandler {
961 private Way way;
962
963 /**
964- * The place to remeber already added nodes (they are reused if needed @since 5845
965+ * The place to remember already added nodes (they are reused if needed @since 5845
966 */
967 private Map<LatLon, Node> addedNodes;
968
969diff --git a/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java b/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java
970index 7740072..ac22f6f 100644
971--- a/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java
972+++ b/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java
973@@ -212,8 +212,8 @@ public class PluginDownloadTask extends PleaseWaitRunnable {
974 }
975
976 /**
977- * Replies the last exception that occured during download, or {@code null}.
978- * @return the last exception that occured during download, or {@code null}
979+ * Replies the last exception that occurred during download, or {@code null}.
980+ * @return the last exception that occurred during download, or {@code null}
981 * @since 9621
982 */
983 public Exception getLastException() {
984diff --git a/src/org/openstreetmap/josm/plugins/PluginHandler.java b/src/org/openstreetmap/josm/plugins/PluginHandler.java
985index 587e313..2fd2b56 100644
986--- a/src/org/openstreetmap/josm/plugins/PluginHandler.java
987+++ b/src/org/openstreetmap/josm/plugins/PluginHandler.java
988@@ -270,7 +270,7 @@ public final class PluginHandler {
989 static final Collection<PluginProxy> pluginList = new LinkedList<>();
990
991 /**
992- * All exceptions that occured during plugin loading
993+ * All exceptions that occurred during plugin loading
994 */
995 static final Map<String, Throwable> pluginLoadingExceptions = new HashMap<>();
996
997@@ -1418,7 +1418,7 @@ public final class PluginHandler {
998 stack.addAll(Arrays.asList(current.getStackTrace()));
999 Throwable cause = current.getCause();
1000 if (cause != null && seen.contains(cause)) {
1001- break; // circular refernce
1002+ break; // circular reference
1003 }
1004 current = cause;
1005 }
1006diff --git a/src/org/openstreetmap/josm/tools/Geometry.java b/src/org/openstreetmap/josm/tools/Geometry.java
1007index 926f63a..78f51c3 100644
1008--- a/src/org/openstreetmap/josm/tools/Geometry.java
1009+++ b/src/org/openstreetmap/josm/tools/Geometry.java
1010@@ -365,7 +365,7 @@ public final class Geometry {
1011 // Basically, the formula from wikipedia is used:
1012 // https://en.wikipedia.org/wiki/Line%E2%80%93line_intersection
1013 // However, large numbers lead to rounding errors (see #10286).
1014- // To avoid this, p1 is first substracted from each of the points:
1015+ // To avoid this, p1 is first subtracted from each of the points:
1016 // p1' = 0
1017 // p2' = p2 - p1
1018 // p3' = p3 - p1
1019diff --git a/src/org/openstreetmap/josm/tools/Logging.java b/src/org/openstreetmap/josm/tools/Logging.java
1020index c345656..eb38866 100644
1021--- a/src/org/openstreetmap/josm/tools/Logging.java
1022+++ b/src/org/openstreetmap/josm/tools/Logging.java
1023@@ -460,7 +460,7 @@ public final class Logging {
1024 }
1025
1026 /**
1027- * Provides direct access to the logger used. Use of methods like {@link #warn(String)} is prefered.
1028+ * Provides direct access to the logger used. Use of methods like {@link #warn(String)} is preferred.
1029 * @return The logger
1030 */
1031 public static Logger getLogger() {
1032diff --git a/src/org/openstreetmap/josm/tools/MemoryManager.java b/src/org/openstreetmap/josm/tools/MemoryManager.java
1033index 9d2d8a9..f188b7c 100644
1034--- a/src/org/openstreetmap/josm/tools/MemoryManager.java
1035+++ b/src/org/openstreetmap/josm/tools/MemoryManager.java
1036@@ -115,7 +115,7 @@ public class MemoryManager {
1037 /**
1038 * Gets the content of this memory area.
1039 * <p>
1040- * This method should be the prefered access to the memory since it will do error checking when {@link #free()} was called.
1041+ * This method should be the preferred access to the memory since it will do error checking when {@link #free()} was called.
1042 * @return The memory area content.
1043 */
1044 T get();
1045diff --git a/src/org/openstreetmap/josm/tools/PlatformHook.java b/src/org/openstreetmap/josm/tools/PlatformHook.java
1046index 14b8dfc..9130199 100644
1047--- a/src/org/openstreetmap/josm/tools/PlatformHook.java
1048+++ b/src/org/openstreetmap/josm/tools/PlatformHook.java
1049@@ -59,7 +59,7 @@ public interface PlatformHook {
1050 Platform getPlatform();
1051
1052 /**
1053- * The preStartupHook will be called extremly early. It is
1054+ * The preStartupHook will be called extremely early. It is
1055 * guaranteed to be called before the GUI setup has started.
1056 *
1057 * Reason: On OSX we need to inform the Swing libraries
1058diff --git a/src/org/openstreetmap/josm/tools/PlatformHookWindows.java b/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
1059index 49129d1..8b99465 100644
1060--- a/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
1061+++ b/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
1062@@ -429,7 +429,7 @@ public class PlatformHookWindows implements PlatformHook {
1063 }
1064 } catch (ArrayIndexOutOfBoundsException e) {
1065 // catch error of JDK-8172244 as bug seems to not be fixed anytime soon
1066- Logging.log(Logging.LEVEL_ERROR, "JDK-8172244 occured. Abort HTTPS setup", e);
1067+ Logging.log(Logging.LEVEL_ERROR, "JDK-8172244 occurred. Abort HTTPS setup", e);
1068 return false;
1069 }
1070 if (!GraphicsEnvironment.isHeadless()) {
1071diff --git a/src/org/openstreetmap/josm/tools/XmlParsingException.java b/src/org/openstreetmap/josm/tools/XmlParsingException.java
1072index 032f987..83f53ff 100644
1073--- a/src/org/openstreetmap/josm/tools/XmlParsingException.java
1074+++ b/src/org/openstreetmap/josm/tools/XmlParsingException.java
1075@@ -40,8 +40,8 @@ public class XmlParsingException extends SAXException {
1076 }
1077
1078 /**
1079- * Sets the location (line/column) where the exception occured.
1080- * @param locator object giving the location (line/column) where the exception occured
1081+ * Sets the location (line/column) where the exception occurred.
1082+ * @param locator object giving the location (line/column) where the exception occurred
1083 * @return {@code this}
1084 */
1085 public XmlParsingException rememberLocation(Locator locator) {
1086@@ -64,16 +64,16 @@ public class XmlParsingException extends SAXException {
1087 }
1088
1089 /**
1090- * Returns the column number where the exception occured.
1091- * @return the column number where the exception occured
1092+ * Returns the column number where the exception occurred.
1093+ * @return the column number where the exception occurred
1094 */
1095 public int getColumnNumber() {
1096 return columnNumber;
1097 }
1098
1099 /**
1100- * Returns the line number where the exception occured.
1101- * @return the line number where the exception occured
1102+ * Returns the line number where the exception occurred.
1103+ * @return the line number where the exception occurred
1104 */
1105 public int getLineNumber() {
1106 return lineNumber;
1107diff --git a/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java b/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java
1108index 6658632..1f0ec13 100644
1109--- a/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java
1110+++ b/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java
1111@@ -160,7 +160,7 @@ public class BugReportSender extends Thread {
1112 }
1113
1114 /**
1115- * Returns the error message that could have occured during bug sending.
1116+ * Returns the error message that could have occurred during bug sending.
1117 * @return the error message, or {@code null} if successful
1118 */
1119 public final String getErrorMessage() {
1120diff --git a/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java b/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java
1121index ab8660b..652e1ee 100644
1122--- a/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java
1123+++ b/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java
1124@@ -116,7 +116,7 @@ public class ProjectionRefTest {
1125 private static Collection<RefEntry> readData() throws IOException {
1126 Collection<RefEntry> result = new ArrayList<>();
1127 if (!new File(REFERENCE_DATA_FILE).exists()) {
1128- System.err.println("Warning: refrence file does not exist.");
1129+ System.err.println("Warning: reference file does not exist.");
1130 return result;
1131 }
1132 try (BufferedReader in = new BufferedReader(new InputStreamReader(
1133diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java
1134index 6f05aac..6422f3a 100644
1135--- a/test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java
1136+++ b/test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java
1137@@ -41,7 +41,7 @@ public class TagCheckerTest {
1138 }
1139
1140 /**
1141- * Check for mispelled key.
1142+ * Check for misspelled key.
1143 * @throws IOException if any I/O error occurs
1144 */
1145 @Test
1146@@ -54,7 +54,7 @@ public class TagCheckerTest {
1147 }
1148
1149 /**
1150- * Check for mispelled key.
1151+ * Check for misspelled key.
1152 * @throws IOException if any I/O error occurs
1153 */
1154 @Test
1155@@ -67,7 +67,7 @@ public class TagCheckerTest {
1156 }
1157
1158 /**
1159- * Check for mispelled key where the suggested alternative is in use. The error should not be fixable.
1160+ * Check for misspelled key where the suggested alternative is in use. The error should not be fixable.
1161 * @throws IOException if any I/O error occurs
1162 */
1163 @Test
1164@@ -93,7 +93,7 @@ public class TagCheckerTest {
1165 }
1166
1167 /**
1168- * Check for mispelled value.
1169+ * Check for misspelled value.
1170 * @throws IOException if any I/O error occurs
1171 */
1172 @Test
1173diff --git a/test/unit/org/openstreetmap/josm/gui/layer/MainLayerManagerTest.java b/test/unit/org/openstreetmap/josm/gui/layer/MainLayerManagerTest.java
1174index 7cc61bf..fca3326 100644
1175--- a/test/unit/org/openstreetmap/josm/gui/layer/MainLayerManagerTest.java
1176+++ b/test/unit/org/openstreetmap/josm/gui/layer/MainLayerManagerTest.java
1177@@ -138,7 +138,7 @@ public class MainLayerManagerTest extends LayerManagerTest {
1178 }
1179
1180 /**
1181- * Test if {@link MainLayerManager#addActiveLayerChangeListener(ActiveLayerChangeListener)} prevents listener from beeing added twice.
1182+ * Test if {@link MainLayerManager#addActiveLayerChangeListener(ActiveLayerChangeListener)} prevents listener from being added twice.
1183 */
1184 @Test(expected = IllegalArgumentException.class)
1185 public void testAddActiveLayerChangeListenerTwice() {
1186diff --git a/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java b/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
1187index 16f329e..eed522f 100644
1188--- a/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
1189+++ b/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
1190@@ -410,7 +410,7 @@ public class JOSMTestRules implements TestRule {
1191
1192 /**
1193 * Set up before running a test
1194- * @throws InitializationError If an error occured while creating the required environment.
1195+ * @throws InitializationError If an error occurred while creating the required environment.
1196 * @throws ReflectiveOperationException if a reflective access error occurs
1197 */
1198 protected void before() throws InitializationError, ReflectiveOperationException {