Index: /trunk/data/validator/numeric.mapcss =================================================================== --- /trunk/data/validator/numeric.mapcss (revision 14272) +++ /trunk/data/validator/numeric.mapcss (revision 14273) @@ -30,5 +30,5 @@ *[building:levels][building:levels !~ /^(([0-9]|[1-9][0-9]*)(\.5)?)$/], -*[level][level !~ /^((((-*[1-9]|[0-9])|-*[1-9][0-9]*)(\.5)?)|-0\.5)(;((((-*[1-9]|[0-9])|-*[1-9][0-9]*)(\.5)?)|-0\.5))*$/] { /* all numbers from -∞ to ∞ in 0.5 steps, optional multiple values seperated by a ; */ +*[level][level !~ /^((((-*[1-9]|[0-9])|-*[1-9][0-9]*)(\.5)?)|-0\.5)(;((((-*[1-9]|[0-9])|-*[1-9][0-9]*)(\.5)?)|-0\.5))*$/] { /* all numbers from -∞ to ∞ in 0.5 steps, optional multiple values separated by a ; */ throwWarning: tr("{0} should have numbers only with optional .5 increments", "{0.key}"); assertMatch: "node level=one"; Index: /trunk/src/javax/json/stream/JsonGenerator.java =================================================================== --- /trunk/src/javax/json/stream/JsonGenerator.java (revision 14272) +++ /trunk/src/javax/json/stream/JsonGenerator.java (revision 14273) @@ -100,5 +100,5 @@ *
* Other JSON values (that are not JSON objects or arrays) can be created - * by calling the appropiate {@code write} methods. + * by calling the appropriate {@code write} methods. *
* The following example shows how to generate a JSON string:
Index: /trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java (revision 14273)
@@ -99,5 +99,5 @@
* @param buttonText text of button used to select target layer
* @param buttonIcon icon name of button used to select target layer
- * @return choosen target layer
+ * @return chosen target layer
*/
@SuppressWarnings("unchecked")
Index: /trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java (revision 14273)
@@ -152,6 +152,6 @@
/**
- * Returns the last exception that occured.
- * @return the last exception that occured, or {@code null}
+ * Returns the last exception that occurred.
+ * @return the last exception that occurred, or {@code null}
*/
public Exception getLastException() {
Index: /trunk/src/org/openstreetmap/josm/actions/JosmAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/JosmAction.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/actions/JosmAction.java (revision 14273)
@@ -228,5 +228,5 @@
/**
- * Overwrite this if {@link #updateEnabledState()} should be called when the active / availabe layers change. Default is true.
+ * Overwrite this if {@link #updateEnabledState()} should be called when the active / available layers change. Default is true.
* @return
Index: /trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java (revision 14273)
@@ -1881,9 +1881,9 @@
*/
public enum ArrayType {
- /** Update (or get a copy of) the GENERIC_TLDS_PLUS table containing additonal generic TLDs */
+ /** Update (or get a copy of) the GENERIC_TLDS_PLUS table containing additional generic TLDs */
GENERIC_PLUS,
/** Update (or get a copy of) the GENERIC_TLDS_MINUS table containing deleted generic TLDs */
GENERIC_MINUS,
- /** Update (or get a copy of) the COUNTRY_CODE_TLDS_PLUS table containing additonal country code TLDs */
+ /** Update (or get a copy of) the COUNTRY_CODE_TLDS_PLUS table containing additional country code TLDs */
COUNTRY_CODE_PLUS,
/** Update (or get a copy of) the COUNTRY_CODE_TLDS_MINUS table containing deleted country code TLDs */
Index: /trunk/src/org/openstreetmap/josm/data/validation/routines/package.html
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/routines/package.html (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/data/validation/routines/package.html (revision 14273)
@@ -20,5 +20,5 @@
This package contains independant validation routines adapted from Apache Commons Validator 1.5.0. This package contains independent validation routines adapted from Apache Commons Validator 1.5.0.
* The view is moved so that the center is the same as the old center.
- * @param positon The new location to use.
+ * @param position The new location to use.
* @return The new state.
* @since 10375
*/
- public MapViewState usingLocation(JComponent positon) {
+ public MapViewState usingLocation(JComponent position) {
EastNorth center = this.getCenter().getEastNorth();
- return new MapViewState(positon, this).usingCenter(center);
+ return new MapViewState(position, this).usingCenter(center);
}
@@ -541,5 +541,5 @@
/**
* Gets the direction in which this point is outside of the given view rectangle.
- * @param rect The rectangle to check agains.
+ * @param rect The rectangle to check against.
* @return The direction in which it is outside of the view, as OUTSIDE_... flags.
* @since 10827
Index: /trunk/src/org/openstreetmap/josm/gui/bbox/BBoxChooser.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/bbox/BBoxChooser.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/gui/bbox/BBoxChooser.java (revision 14273)
@@ -27,5 +27,5 @@
/**
* Replies the currently selected bounding box in this BBoxChooser.
- * Replies null, if currently there isn't a bbox choosen in this
+ * Replies null, if currently there isn't a bbox chosen in this
* BBoxChooser.
*
Index: /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (revision 14273)
@@ -371,5 +371,5 @@
/**
* Sets the current bounding box in this bbox chooser without
- * emiting a property change event.
+ * emitting a property change event.
*
* @param bbox the bounding box. null to reset the bounding box
Index: /trunk/src/org/openstreetmap/josm/gui/bugreport/DebugTextDisplay.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/bugreport/DebugTextDisplay.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/gui/bugreport/DebugTextDisplay.java (revision 14273)
@@ -35,5 +35,5 @@
/**
- * Creates a new text area with an inital text to display
+ * Creates a new text area with an initial text to display
* @param textToDisplay The text to display.
*/
Index: /trunk/src/org/openstreetmap/josm/gui/bugreport/JosmUpdatePanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/bugreport/JosmUpdatePanel.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/gui/bugreport/JosmUpdatePanel.java (revision 14273)
@@ -76,5 +76,5 @@
*/
private void displayError() {
- testedVersionField.setText(tr("An error occured while checking if your JOSM instance is up to date."));
+ testedVersionField.setText(tr("An error occurred while checking if your JOSM instance is up to date."));
showUpdateButton();
}
Index: /trunk/src/org/openstreetmap/josm/gui/datatransfer/data/LayerTransferData.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/datatransfer/data/LayerTransferData.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/gui/datatransfer/data/LayerTransferData.java (revision 14273)
@@ -41,5 +41,5 @@
/**
- * Gets the layer to be transfered.
+ * Gets the layer to be transferred.
* @return The layer
*/
Index: /trunk/src/org/openstreetmap/josm/gui/datatransfer/data/PrimitiveTransferData.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/datatransfer/data/PrimitiveTransferData.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/gui/datatransfer/data/PrimitiveTransferData.java (revision 14273)
@@ -22,5 +22,5 @@
/**
- * A list of primitives that are transfered. The list allows you to implicitly add primitives.
+ * A list of primitives that are transferred. The list allows you to implicitly add primitives.
* It distinguishes between primitives that were directly added and implicitly added ones.
* @author Michael Zangl
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 14273)
@@ -559,5 +559,5 @@
* Replies the collection of OSM primitives currently selected in the view of this model
*
- * @return choosen elements in the view
+ * @return chosen elements in the view
*/
public synchronized Collection
- * This method should be the prefered access to the memory since it will do error checking when {@link #free()} was called.
+ * This method should be the preferred access to the memory since it will do error checking when {@link #free()} was called.
* @return The memory area content.
*/
Index: /trunk/src/org/openstreetmap/josm/tools/PlatformHook.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/PlatformHook.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/tools/PlatformHook.java (revision 14273)
@@ -60,5 +60,5 @@
/**
- * The preStartupHook will be called extremly early. It is
+ * The preStartupHook will be called extremely early. It is
* guaranteed to be called before the GUI setup has started.
*
Index: /trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java (revision 14273)
@@ -430,5 +430,5 @@
} catch (ArrayIndexOutOfBoundsException e) {
// catch error of JDK-8172244 as bug seems to not be fixed anytime soon
- Logging.log(Logging.LEVEL_ERROR, "JDK-8172244 occured. Abort HTTPS setup", e);
+ Logging.log(Logging.LEVEL_ERROR, "JDK-8172244 occurred. Abort HTTPS setup", e);
return false;
}
Index: /trunk/src/org/openstreetmap/josm/tools/XmlParsingException.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/XmlParsingException.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/tools/XmlParsingException.java (revision 14273)
@@ -41,6 +41,6 @@
/**
- * Sets the location (line/column) where the exception occured.
- * @param locator object giving the location (line/column) where the exception occured
+ * Sets the location (line/column) where the exception occurred.
+ * @param locator object giving the location (line/column) where the exception occurred
* @return {@code this}
*/
@@ -65,6 +65,6 @@
/**
- * Returns the column number where the exception occured.
- * @return the column number where the exception occured
+ * Returns the column number where the exception occurred.
+ * @return the column number where the exception occurred
*/
public int getColumnNumber() {
@@ -73,6 +73,6 @@
/**
- * Returns the line number where the exception occured.
- * @return the line number where the exception occured
+ * Returns the line number where the exception occurred.
+ * @return the line number where the exception occurred
*/
public int getLineNumber() {
Index: /trunk/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java (revision 14273)
@@ -161,5 +161,5 @@
/**
- * Returns the error message that could have occured during bug sending.
+ * Returns the error message that could have occurred during bug sending.
* @return the error message, or {@code null} if successful
*/
Index: /trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java (revision 14272)
+++ /trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java (revision 14273)
@@ -117,5 +117,5 @@
Collectiontrue
if a {@link LayerChangeListener} and a {@link ActiveLayerChangeListener} should be registered.
* @since 10353
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 14273)
@@ -737,5 +737,5 @@
// If ALT is pressed, a new way should be created and that new way should get
- // selected. This works everytime unless the ways the nodes get inserted into
+ // selected. This works every time unless the ways the nodes get inserted into
// are already selected. This is the case when creating a self-overlapping way
// but pressing ALT prevents this. Therefore we must de-select the way manually
Index: /trunk/src/org/openstreetmap/josm/command/RotateCommand.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/command/RotateCommand.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/command/RotateCommand.java (revision 14273)
@@ -35,5 +35,5 @@
/**
* Creates a RotateCommand.
- * Assign the initial object set, compute pivot point and inital rotation angle.
+ * Assign the initial object set, compute pivot point and initial rotation angle.
* @param objects objects to fetch nodes from
* @param currentEN cuurent eats/north
Index: /trunk/src/org/openstreetmap/josm/data/Version.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/Version.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/data/Version.java (revision 14273)
@@ -155,7 +155,7 @@
/**
- * Replies true if this is a local build, i.e. an inofficial development build.
- *
- * @return true if this is a local build, i.e. an inofficial development build.
+ * Replies true if this is a local build, i.e. an unofficial development build.
+ *
+ * @return true if this is a local build, i.e. an unofficial development build.
*/
public boolean isLocalBuild() {
Index: /trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (revision 14273)
@@ -384,5 +384,5 @@
return true;
} else {
- Logging.debug("JCS - failure during load - reponse is not loadable nor cached as empty");
+ Logging.debug("JCS - failure during load - response is not loadable nor cached as empty");
return false;
}
Index: /trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (revision 14273)
@@ -490,5 +490,5 @@
supportedMimeTypes.add("image/png8"); // used by geoserver
if (supportedMimeTypes.contains("image/jpeg")) {
- supportedMimeTypes.add("image/jpg"); // sometimes mispelled by Arcgis
+ supportedMimeTypes.add("image/jpg"); // sometimes misspelled by Arcgis
}
CollectionMap<T,T>.put(t,t)
, that is, for caches, uniqueness filters or similar.
*
Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/ArrowPaintHelper.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/ArrowPaintHelper.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/ArrowPaintHelper.java (revision 14273)
@@ -31,5 +31,5 @@
* @param path The path to append the arrow to.
* @param point The point to paint the tip at
- * @param fromDirection The direction the line is comming from.
+ * @param fromDirection The direction the line is coming from.
*/
public void paintArrowAt(MapPath2D path, MapViewPoint point, MapViewPoint fromDirection) {
Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 14273)
@@ -162,5 +162,5 @@
// Invert the sign bit, so that negative numbers are lower
value ^= 0x80000000L;
- // Now do the shift. Do it before accounting for negative numbers (symetry)
+ // Now do the shift. Do it before accounting for negative numbers (symmetry)
if (totalBits < 32) {
value >>= (32 - totalBits);
Index: /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java (revision 14273)
@@ -46,5 +46,5 @@
* Loading an InputStream places all the required node information
* (accuracy data is optional) into heap based Java arrays. This is the
- * highest perfomance option, and is useful for large volume transformations.
+ * highest performance option, and is useful for large volume transformations.
* Non-file data sources (eg using an SQL Blob) are also supported through
* InputStream. The RandonAccessFile option has a much smaller memory
Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java (revision 14273)
@@ -112,5 +112,5 @@
* Calculates the meridian distance. This is the distance along the central
* meridian from the equator to {@code phi}. Accurate to < 1e-5 meters
- * when used in conjuction with typical major axis values.
+ * when used in conjunction with typical major axis values.
*
* @param phi latitude to calculate meridian distance for.
@@ -133,5 +133,5 @@
* Determines phi to TOL (1e-11) radians, about 1e-6 seconds.
*
- * @param arg meridian distance to calulate latitude for.
+ * @param arg meridian distance to calculate latitude for.
* @return the latitude of the meridian distance.
* @throws RuntimeException if the itteration does not converge.
Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/EquidistantCylindrical.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/projection/proj/EquidistantCylindrical.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/data/projection/proj/EquidistantCylindrical.java (revision 14273)
@@ -37,5 +37,5 @@
@Override
public String getName() {
- return tr("Equidistant Cylindrical (Plate Caree)");
+ return tr("Equidistant Cylindrical (Plate Carrée)");
}
Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java (revision 14273)
@@ -142,5 +142,5 @@
/**
- * The azimuth of the central line passing throught the centre of the projection, in radians.
+ * The azimuth of the central line passing through the centre of the projection, in radians.
*/
protected double azimuth;
Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java (revision 14273)
@@ -16,6 +16,6 @@
* Instead of being tangent to the equator (or to an other standard latitude),
* it is tangent to a central meridian. Deformation are more important as we
- * are going futher from the central meridian. The Transverse Mercator
- * projection is appropriate for region wich have a greater extent north-south
+ * are going further from the central meridian. The Transverse Mercator
+ * projection is appropriate for region which have a greater extent north-south
* than east-west.
* Table of Contents
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/Addresses.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/Addresses.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/Addresses.java (revision 14273)
@@ -263,5 +263,5 @@
checkForDuplicate(r);
if (r.hasTag("type", ASSOCIATED_STREET)) {
- // Used to count occurences of each house number in order to find duplicates
+ // Used to count occurrences of each house number in order to find duplicates
Map
"
Index: /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (revision 14273)
@@ -840,5 +840,5 @@
* Zoom out from map.
*
- * @return true, if zoom increasing was successfull, false othervise
+ * @return true, if zoom increasing was successful, false othervise
*/
public boolean decreaseZoomLevel() {
Index: /trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java (revision 14273)
@@ -110,6 +110,6 @@
/**
- * Gets the "download near" choosen value
- * @return the "download near" choosen value (0: track only, 1: waypoints only, 2: both)
+ * Gets the "download near" chosen value
+ * @return the "download near" chosen value (0: track only, 1: waypoints only, 2: both)
*/
public final int getNear() {
Index: /trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileCoordinateConverter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileCoordinateConverter.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileCoordinateConverter.java (revision 14273)
@@ -113,5 +113,5 @@
* Gets the position of the tile inside the map view.
* @param tile The tile
- * @return The positon as a rectangle in screen coordinates
+ * @return The position as a rectangle in screen coordinates
*/
public Rectangle2D getRectangleForTile(Tile tile) {
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java (revision 14273)
@@ -141,5 +141,5 @@
/**
- * Log an error that occured with this style.
+ * Log an error that occurred with this style.
* @param e error
*/
@@ -149,5 +149,5 @@
/**
- * Log a warning that occured with this style.
+ * Log a warning that occurred with this style.
* @param w warnings
*/
@@ -157,5 +157,5 @@
/**
- * Replies the collection of errors that occured with this style.
+ * Replies the collection of errors that occurred with this style.
* @return collection of errors
*/
@@ -165,5 +165,5 @@
/**
- * Replies the collection of warnings that occured with this style.
+ * Replies the collection of warnings that occurred with this style.
* @return collection of warnings
*/
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSException.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSException.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSException.java (revision 14273)
@@ -7,7 +7,7 @@
public class MapCSSException extends RuntimeException {
- /** line number at which the parse error occured */
+ /** line number at which the parse error occurred */
protected Integer line;
- /** column number at which the parse error occured */
+ /** column number at which the parse error occurred */
protected Integer column;
@@ -30,6 +30,6 @@
/**
- * Sets the column number at which the parse error occured.
- * @param column the column number at which the parse error occured
+ * Sets the column number at which the parse error occurred.
+ * @param column the column number at which the parse error occurred
*/
public void setColumn(int column) {
@@ -38,6 +38,6 @@
/**
- * Sets the line number at which the parse error occured.
- * @param line the line number at which the parse error occured
+ * Sets the line number at which the parse error occurred.
+ * @param line the line number at which the parse error occurred
*/
public void setLine(int line) {
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/OnLineStrategy.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/OnLineStrategy.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/OnLineStrategy.java (revision 14273)
@@ -134,5 +134,5 @@
});
- // find the segment with the best quality. If there are several with best quality, the one close to the center is prefered.
+ // find the segment with the best quality. If there are several with best quality, the one close to the center is preferred.
return longHalfSegment.stream().max(
Comparator.comparingDouble(segment -> segment.quality - 1e-5 * Math.abs(segment.offset - length / 2)));
Index: /trunk/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java (revision 14272)
+++ /trunk/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java (revision 14273)
@@ -14,5 +14,5 @@
/**
- * Combo box that lets the user choose one of the avaliable {@link AuthorizationProcedure}s.
+ * Combo box that lets the user choose one of the available {@link AuthorizationProcedure}s.
*/
public class AuthorizationProcedureComboBox extends JosmComboBox