Index: /trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (revision 14301) +++ /trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (revision 14302) @@ -74,5 +74,5 @@ public CreateMultipolygonAction(final boolean update) { super(getName(update), /* ICON */ "multipoly_create", getName(update), - /* atleast three lines for each shortcut or the server extractor fails */ + /* at least three lines for each shortcut or the server extractor fails */ update ? Shortcut.registerShortcut("tools:multipoly_update", tr("Tool: {0}", getName(true)), Index: /trunk/src/org/openstreetmap/josm/command/MoveCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/MoveCommand.java (revision 14301) +++ /trunk/src/org/openstreetmap/josm/command/MoveCommand.java (revision 14302) @@ -219,5 +219,5 @@ /** - * Save curent displacement to restore in case of some problems + * Save current displacement to restore in case of some problems */ public final void saveCheckpoint() { Index: /trunk/src/org/openstreetmap/josm/data/osm/Stylable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/Stylable.java (revision 14301) +++ /trunk/src/org/openstreetmap/josm/data/osm/Stylable.java (revision 14302) @@ -5,5 +5,5 @@ /** - * Object that can be rendered using a cachable style. + * Object that can be rendered using a cacheable style. * @since 13636 */ Index: /trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java (revision 14301) +++ /trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java (revision 14302) @@ -216,6 +216,18 @@ * @return The number of thimes this tag is used in this collection. * @since 10736 - */ + * @deprecated use {@link #getTagOccurrence} + */ + @Deprecated public int getTagOccurence(Tag tag) { + return getTagOccurrence(tag); + } + + /** + * Gets the number of this this tag was added to the collection. + * @param tag The tag + * @return The number of thimes this tag is used in this collection. + * @since 14301 + */ + public int getTagOccurrence(Tag tag) { return tags.getOrDefault(tag, 0); } Index: /trunk/src/org/openstreetmap/josm/data/osm/Way.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/Way.java (revision 14301) +++ /trunk/src/org/openstreetmap/josm/data/osm/Way.java (revision 14302) @@ -193,5 +193,5 @@ /** - * Contructs a new {@code Way} with id 0. + * Constructs a new {@code Way} with id 0. * @since 86 */ @@ -201,5 +201,5 @@ /** - * Contructs a new {@code Way} from an existing {@code Way}. + * Constructs a new {@code Way} from an existing {@code Way}. * @param original The original {@code Way} to be identically cloned. Must not be null * @param clearMetadata If {@code true}, clears the OSM id and other metadata as defined by {@link #clearOsmMetadata}. @@ -216,5 +216,5 @@ /** - * Contructs a new {@code Way} from an existing {@code Way} (including its id). + * Constructs a new {@code Way} from an existing {@code Way} (including its id). * @param original The original {@code Way} to be identically cloned. Must not be null * @since 86 @@ -225,5 +225,5 @@ /** - * Contructs a new {@code Way} for the given id. If the id > 0, the way is marked + * Constructs a new {@code Way} for the given id. If the id > 0, the way is marked * as incomplete. If id == 0 then way is marked as new * @@ -237,5 +237,5 @@ /** - * Contructs a new {@code Way} with given id and version. + * Constructs a new {@code Way} with given id and version. * @param id the id. >= 0 required * @param version the version Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/Proj.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/Proj.java (revision 14301) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/Proj.java (revision 14302) @@ -93,5 +93,5 @@ /** - * Checks wether the result of projecting a lon coordinate only has a linear relation to the east coordinate and + * Checks whether the result of projecting a lon coordinate only has a linear relation to the east coordinate and * is not related to lat/north at all. * @return true if lon has a linear relationship to east only. Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java (revision 14301) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java (revision 14302) @@ -64,5 +64,5 @@ /** * Check connections between coastline ways. - * The nodes of a coastline way have to fullfil these rules: + * The nodes of a coastline way have to fulfil these rules: * 1) the first node must be connected to the last node of a coastline way (which might be the same way) * 2) the last node must be connected to the first node of a coastline way (which might be the same way) Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDataText.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDataText.java (revision 14301) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDataText.java (revision 14302) @@ -55,5 +55,5 @@ private static String getNameAndId(String name, long id) { if (name != null) { - return name + tr(" ({0})", /* sic to avoid thousand seperators */ Long.toString(id)); + return name + tr(" ({0})", /* sic to avoid thousand separators */ Long.toString(id)); } else { return Long.toString(id); Index: /trunk/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java (revision 14301) +++ /trunk/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java (revision 14302) @@ -16,5 +16,5 @@ /** - * Contructs a new {@code AbstractIOTask}. + * Constructs a new {@code AbstractIOTask}. */ public AbstractIOTask() { Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 14301) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 14302) @@ -425,5 +425,5 @@ Collections.sort(data); - // Supress the double photos. + // Suppress the double photos. if (data.size() > 1) { ImageEntry cur; Index: /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java (revision 14301) +++ /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java (revision 14302) @@ -125,5 +125,5 @@ * Makes a new marker layer derived from this GpxLayer containing at least one audio marker * which the given audio file is associated with. Markers are derived from the following (a) - * explict waypoints in the GPX layer, or (b) named trackpoints in the GPX layer, or (d) + * explicit waypoints in the GPX layer, or (b) named trackpoints in the GPX layer, or (d) * timestamp on the audio file (e) (in future) voice recognised markers in the sound recording (f) * a single marker at the beginning of the track Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (revision 14301) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (revision 14302) @@ -607,5 +607,5 @@ set = BooleanStyleSetting.create(c, this, e.getKey()); } else { - Logging.warn("Unkown setting type: "+type); + Logging.warn("Unknown setting type: "+type); } if (set != null) { Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java (revision 14301) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java (revision 14302) @@ -252,9 +252,9 @@ * Rescale excessively large images. * @param image the unscaled image - * @return The scaled down version to 16x16 pixels if the image height and width exceeds 48 pixels and no size has been explicitely specified + * @return The scaled down version to 16x16 pixels if the image height and width exceeds 48 pixels and no size has been explicitly specified */ private Image rescale(Image image) { if (image == null) return null; - // Scale down large (.svg) images to 16x16 pixels if no size is explicitely specified + // Scale down large (.svg) images to 16x16 pixels if no size is explicitly specified if (mustRescale(image)) { return ImageProvider.createBoundedImage(image, 16); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java (revision 14301) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java (revision 14302) @@ -100,5 +100,5 @@ break; default: - Logging.warn("Unkown unit: " + units.indexOf(e.getItem())); + Logging.warn("Unknown unit: " + units.indexOf(e.getItem())); } minimumCacheExpiry.setValue(newValue); Index: /trunk/src/org/openstreetmap/josm/gui/progress/swing/PleaseWaitProgressMonitor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/progress/swing/PleaseWaitProgressMonitor.java (revision 14301) +++ /trunk/src/org/openstreetmap/josm/gui/progress/swing/PleaseWaitProgressMonitor.java (revision 14302) @@ -60,5 +60,5 @@ /** * Display that the current progress cannot be determined - * @param newValue wether the progress cannot be determined + * @param newValue whether the progress cannot be determined */ void setIndeterminate(boolean newValue); Index: /trunk/src/org/openstreetmap/josm/gui/util/StayOpenCheckBoxMenuItem.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/util/StayOpenCheckBoxMenuItem.java (revision 14301) +++ /trunk/src/org/openstreetmap/josm/gui/util/StayOpenCheckBoxMenuItem.java (revision 14302) @@ -25,5 +25,5 @@ /** - * Contructs a new {@code StayOpenCheckBoxMenuItem} whose properties are taken from the Action supplied. + * Constructs a new {@code StayOpenCheckBoxMenuItem} whose properties are taken from the Action supplied. * @param a action */ Index: /trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java (revision 14301) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java (revision 14302) @@ -130,5 +130,5 @@ // With a "classic" renderer, we could call setPrototypeDisplayValue(value) + getPreferredSize() // but not with TaggingPreset custom renderer that return a dummy height if index is equal to -1 - // So we explicitely call the renderer by simulating a correct index for the current value + // So we explicitly call the renderer by simulating a correct index for the current value @SuppressWarnings("unchecked") Component c = getRenderer().getListCellRendererComponent(list, value, i, true, true); Index: /trunk/src/org/openstreetmap/josm/tools/Logging.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/Logging.java (revision 14301) +++ /trunk/src/org/openstreetmap/josm/tools/Logging.java (revision 14302) @@ -53,5 +53,5 @@ /** * A {@link ConsoleHandler} with a couple of extra features, allowing it to be targeted at an - * an arbitrary {@link OutputStream} which it can be asked to reaquire the reference for on demand + * an arbitrary {@link OutputStream} which it can be asked to reacquire the reference for on demand * through {@link #reacquireOutputStream()}. It can also prevent a LogRecord's output if a * specified {@code prioritizedHandler} would have outputted it. Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/TagCollectionTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/osm/TagCollectionTest.java (revision 14301) +++ /trunk/test/unit/org/openstreetmap/josm/data/osm/TagCollectionTest.java (revision 14302) @@ -44,8 +44,8 @@ private void assertTagCounts(TagCollection collection, int a, int b, int c, int d) { - assertEquals(a, collection.getTagOccurence(tagA)); - assertEquals(b, collection.getTagOccurence(tagB)); - assertEquals(c, collection.getTagOccurence(tagC)); - assertEquals(d, collection.getTagOccurence(tagD)); + assertEquals(a, collection.getTagOccurrence(tagA)); + assertEquals(b, collection.getTagOccurrence(tagB)); + assertEquals(c, collection.getTagOccurrence(tagC)); + assertEquals(d, collection.getTagOccurrence(tagD)); } @@ -92,5 +92,5 @@ public void testUnionOfAllPrimitivesCollectionOfQextendsTagged() { TagCollection c = TagCollection.unionOfAllPrimitives(Arrays.asList(tagA)); - assertEquals(1, c.getTagOccurence(tagA)); + assertEquals(1, c.getTagOccurrence(tagA)); TagCollection d = TagCollection.unionOfAllPrimitives(Arrays.asList(tagA, tagC)); @@ -187,8 +187,8 @@ public void testGetTagCount() { TagCollection c = new TagCollection(Arrays.asList(tagA, tagC, tagC)); - assertEquals(2, c.getTagOccurence(tagC)); - assertEquals(0, c.getTagOccurence(tagB)); - assertEquals(0, c.getTagOccurence(tagNullKey)); - assertEquals(0, c.getTagOccurence(tagNullValue)); + assertEquals(2, c.getTagOccurrence(tagC)); + assertEquals(0, c.getTagOccurrence(tagB)); + assertEquals(0, c.getTagOccurrence(tagNullKey)); + assertEquals(0, c.getTagOccurrence(tagNullValue)); } @@ -415,5 +415,5 @@ TagCollection collection = d.getTagsFor("k"); assertTagCounts(collection, 1, 1, 0, 0); - assertEquals(1, collection.getTagOccurence(tagEmpty)); + assertEquals(1, collection.getTagOccurrence(tagEmpty)); } @@ -426,5 +426,5 @@ TagCollection collection = d.getTagsFor(Arrays.asList("k", "k2")); assertTagCounts(collection, 1, 1, 1, 0); - assertEquals(1, collection.getTagOccurence(tagEmpty)); + assertEquals(1, collection.getTagOccurrence(tagEmpty)); } @@ -628,6 +628,6 @@ TagCollection c = c1.intersect(c2); assertEquals(2, c.getKeys().size()); - assertEquals(1, c.getTagOccurence(tagA)); - assertEquals(1, c.getTagOccurence(tagD)); + assertEquals(1, c.getTagOccurrence(tagA)); + assertEquals(1, c.getTagOccurrence(tagD)); } @@ -641,6 +641,6 @@ TagCollection c = c1.minus(c2); assertEquals(2, c.getKeys().size()); - assertEquals(1, c.getTagOccurence(tagC)); - assertEquals(1, c.getTagOccurence(tagEmpty)); + assertEquals(1, c.getTagOccurrence(tagC)); + assertEquals(1, c.getTagOccurrence(tagEmpty)); } @@ -653,9 +653,9 @@ TagCollection c2 = new TagCollection(Arrays.asList(tagA, tagB, tagD)); TagCollection c = c1.union(c2); - assertEquals(2, c.getTagOccurence(tagA)); - assertEquals(1, c.getTagOccurence(tagB)); - assertEquals(1, c.getTagOccurence(tagC)); - assertEquals(2, c.getTagOccurence(tagD)); - assertEquals(1, c.getTagOccurence(tagEmpty)); + assertEquals(2, c.getTagOccurrence(tagA)); + assertEquals(1, c.getTagOccurrence(tagB)); + assertEquals(1, c.getTagOccurrence(tagC)); + assertEquals(2, c.getTagOccurrence(tagD)); + assertEquals(1, c.getTagOccurrence(tagEmpty)); } @@ -669,6 +669,6 @@ TagCollection c = c1.emptyTagsForKeysMissingIn(c2); assertEquals(2, c.getKeys().size()); - assertEquals(1, c.getTagOccurence(new Tag(tagC.getKey(), ""))); - assertEquals(1, c.getTagOccurence(tagEmpty)); + assertEquals(1, c.getTagOccurrence(new Tag(tagC.getKey(), ""))); + assertEquals(1, c.getTagOccurrence(tagEmpty)); }