Changeset 14302 in josm


Ignore:
Timestamp:
2018-10-06T23:29:06+02:00 (6 weeks ago)
Author:
Don-vip
Message:

see #16781 - fix more typos using https://github.com/vlajos/misspell-fixer

Location:
trunk
Files:
19 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java

    r14134 r14302  
    7474    public CreateMultipolygonAction(final boolean update) {
    7575        super(getName(update), /* ICON */ "multipoly_create", getName(update),
    76                 /* atleast three lines for each shortcut or the server extractor fails */
     76                /* at least three lines for each shortcut or the server extractor fails */
    7777                update ? Shortcut.registerShortcut("tools:multipoly_update",
    7878                            tr("Tool: {0}", getName(true)),
  • trunk/src/org/openstreetmap/josm/command/MoveCommand.java

    r14120 r14302  
    219219
    220220    /**
    221      * Save curent displacement to restore in case of some problems
     221     * Save current displacement to restore in case of some problems
    222222     */
    223223    public final void saveCheckpoint() {
  • trunk/src/org/openstreetmap/josm/data/osm/Stylable.java

    r13636 r14302  
    55
    66/**
    7  * Object that can be rendered using a cachable style.
     7 * Object that can be rendered using a cacheable style.
    88 * @since 13636
    99 */
  • trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java

    r12620 r14302  
    216216     * @return The number of thimes this tag is used in this collection.
    217217     * @since 10736
    218      */
     218     * @deprecated use {@link #getTagOccurrence}
     219     */
     220    @Deprecated
    219221    public int getTagOccurence(Tag tag) {
     222        return getTagOccurrence(tag);
     223    }
     224
     225    /**
     226     * Gets the number of this this tag was added to the collection.
     227     * @param tag The tag
     228     * @return The number of thimes this tag is used in this collection.
     229     * @since 14301
     230     */
     231    public int getTagOccurrence(Tag tag) {
    220232        return tags.getOrDefault(tag, 0);
    221233    }
  • trunk/src/org/openstreetmap/josm/data/osm/Way.java

    r13922 r14302  
    193193
    194194    /**
    195      * Contructs a new {@code Way} with id 0.
     195     * Constructs a new {@code Way} with id 0.
    196196     * @since 86
    197197     */
     
    201201
    202202    /**
    203      * Contructs a new {@code Way} from an existing {@code Way}.
     203     * Constructs a new {@code Way} from an existing {@code Way}.
    204204     * @param original The original {@code Way} to be identically cloned. Must not be null
    205205     * @param clearMetadata If {@code true}, clears the OSM id and other metadata as defined by {@link #clearOsmMetadata}.
     
    216216
    217217    /**
    218      * Contructs a new {@code Way} from an existing {@code Way} (including its id).
     218     * Constructs a new {@code Way} from an existing {@code Way} (including its id).
    219219     * @param original The original {@code Way} to be identically cloned. Must not be null
    220220     * @since 86
     
    225225
    226226    /**
    227      * Contructs a new {@code Way} for the given id. If the id > 0, the way is marked
     227     * Constructs a new {@code Way} for the given id. If the id > 0, the way is marked
    228228     * as incomplete. If id == 0 then way is marked as new
    229229     *
     
    237237
    238238    /**
    239      * Contructs a new {@code Way} with given id and version.
     239     * Constructs a new {@code Way} with given id and version.
    240240     * @param id the id. >= 0 required
    241241     * @param version the version
  • trunk/src/org/openstreetmap/josm/data/projection/proj/Proj.java

    r10805 r14302  
    9393
    9494    /**
    95      * Checks wether the result of projecting a lon coordinate only has a linear relation to the east coordinate and
     95     * Checks whether the result of projecting a lon coordinate only has a linear relation to the east coordinate and
    9696     * is not related to lat/north at all.
    9797     * @return <code>true</code> if lon has a linear relationship to east only.
  • trunk/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java

    r11608 r14302  
    6464    /**
    6565     * Check connections between coastline ways.
    66      * The nodes of a coastline way have to fullfil these rules:
     66     * The nodes of a coastline way have to fulfil these rules:
    6767     * 1) the first node must be connected to the last node of a coastline way (which might be the same way)
    6868     * 2) the last node must be connected to the first node of a coastline way (which might be the same way)
  • trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDataText.java

    r14120 r14302  
    5555    private static String getNameAndId(String name, long id) {
    5656        if (name != null) {
    57             return name + tr(" ({0})", /* sic to avoid thousand seperators */ Long.toString(id));
     57            return name + tr(" ({0})", /* sic to avoid thousand separators */ Long.toString(id));
    5858        } else {
    5959            return Long.toString(id);
  • trunk/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java

    r10153 r14302  
    1616
    1717    /**
    18      * Contructs a new {@code AbstractIOTask}.
     18     * Constructs a new {@code AbstractIOTask}.
    1919     */
    2020    public AbstractIOTask() {
  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

    r14153 r14302  
    425425        Collections.sort(data);
    426426
    427         // Supress the double photos.
     427        // Suppress the double photos.
    428428        if (data.size() > 1) {
    429429            ImageEntry cur;
  • trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java

    r14153 r14302  
    125125     * Makes a new marker layer derived from this GpxLayer containing at least one audio marker
    126126     * which the given audio file is associated with. Markers are derived from the following (a)
    127      * explict waypoints in the GPX layer, or (b) named trackpoints in the GPX layer, or (d)
     127     * explicit waypoints in the GPX layer, or (b) named trackpoints in the GPX layer, or (d)
    128128     * timestamp on the audio file (e) (in future) voice recognised markers in the sound recording (f)
    129129     * a single marker at the beginning of the track
  • trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

    r13917 r14302  
    607607                set = BooleanStyleSetting.create(c, this, e.getKey());
    608608            } else {
    609                 Logging.warn("Unkown setting type: "+type);
     609                Logging.warn("Unknown setting type: "+type);
    610610            }
    611611            if (set != null) {
  • trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java

    r13657 r14302  
    252252     * Rescale excessively large images.
    253253     * @param image the unscaled image
    254      * @return The scaled down version to 16x16 pixels if the image height and width exceeds 48 pixels and no size has been explicitely specified
     254     * @return The scaled down version to 16x16 pixels if the image height and width exceeds 48 pixels and no size has been explicitly specified
    255255     */
    256256    private Image rescale(Image image) {
    257257        if (image == null) return null;
    258         // Scale down large (.svg) images to 16x16 pixels if no size is explicitely specified
     258        // Scale down large (.svg) images to 16x16 pixels if no size is explicitly specified
    259259        if (mustRescale(image)) {
    260260            return ImageProvider.createBoundedImage(image, 16);
  • trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java

    r13829 r14302  
    100100                    break;
    101101                default:
    102                     Logging.warn("Unkown unit: " + units.indexOf(e.getItem()));
     102                    Logging.warn("Unknown unit: " + units.indexOf(e.getItem()));
    103103                }
    104104                minimumCacheExpiry.setValue(newValue);
  • trunk/src/org/openstreetmap/josm/gui/progress/swing/PleaseWaitProgressMonitor.java

    r14153 r14302  
    6060        /**
    6161         * Display that the current progress cannot be determined
    62          * @param newValue wether the progress cannot be determined
     62         * @param newValue whether the progress cannot be determined
    6363         */
    6464        void setIndeterminate(boolean newValue);
  • trunk/src/org/openstreetmap/josm/gui/util/StayOpenCheckBoxMenuItem.java

    r10611 r14302  
    2525
    2626  /**
    27    * Contructs a new {@code StayOpenCheckBoxMenuItem} whose properties are taken from the Action supplied.
     27   * Constructs a new {@code StayOpenCheckBoxMenuItem} whose properties are taken from the Action supplied.
    2828   * @param a action
    2929   */
  • trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java

    r9576 r14302  
    130130                        // With a "classic" renderer, we could call setPrototypeDisplayValue(value) + getPreferredSize()
    131131                        // but not with TaggingPreset custom renderer that return a dummy height if index is equal to -1
    132                         // So we explicitely call the renderer by simulating a correct index for the current value
     132                        // So we explicitly call the renderer by simulating a correct index for the current value
    133133                        @SuppressWarnings("unchecked")
    134134                        Component c = getRenderer().getListCellRendererComponent(list, value, i, true, true);
  • trunk/src/org/openstreetmap/josm/tools/Logging.java

    r14273 r14302  
    5353    /**
    5454     * A {@link ConsoleHandler} with a couple of extra features, allowing it to be targeted at an
    55      * an arbitrary {@link OutputStream} which it can be asked to reaquire the reference for on demand
     55     * an arbitrary {@link OutputStream} which it can be asked to reacquire the reference for on demand
    5656     * through {@link #reacquireOutputStream()}. It can also prevent a LogRecord's output if a
    5757     * specified {@code prioritizedHandler} would have outputted it.
  • trunk/test/unit/org/openstreetmap/josm/data/osm/TagCollectionTest.java

    r10736 r14302  
    4444
    4545    private void assertTagCounts(TagCollection collection, int a, int b, int c, int d) {
    46         assertEquals(a, collection.getTagOccurence(tagA));
    47         assertEquals(b, collection.getTagOccurence(tagB));
    48         assertEquals(c, collection.getTagOccurence(tagC));
    49         assertEquals(d, collection.getTagOccurence(tagD));
     46        assertEquals(a, collection.getTagOccurrence(tagA));
     47        assertEquals(b, collection.getTagOccurrence(tagB));
     48        assertEquals(c, collection.getTagOccurrence(tagC));
     49        assertEquals(d, collection.getTagOccurrence(tagD));
    5050    }
    5151
     
    9292    public void testUnionOfAllPrimitivesCollectionOfQextendsTagged() {
    9393        TagCollection c = TagCollection.unionOfAllPrimitives(Arrays.asList(tagA));
    94         assertEquals(1, c.getTagOccurence(tagA));
     94        assertEquals(1, c.getTagOccurrence(tagA));
    9595
    9696        TagCollection d = TagCollection.unionOfAllPrimitives(Arrays.asList(tagA, tagC));
     
    187187    public void testGetTagCount() {
    188188        TagCollection c = new TagCollection(Arrays.asList(tagA, tagC, tagC));
    189         assertEquals(2, c.getTagOccurence(tagC));
    190         assertEquals(0, c.getTagOccurence(tagB));
    191         assertEquals(0, c.getTagOccurence(tagNullKey));
    192         assertEquals(0, c.getTagOccurence(tagNullValue));
     189        assertEquals(2, c.getTagOccurrence(tagC));
     190        assertEquals(0, c.getTagOccurrence(tagB));
     191        assertEquals(0, c.getTagOccurrence(tagNullKey));
     192        assertEquals(0, c.getTagOccurrence(tagNullValue));
    193193    }
    194194
     
    415415        TagCollection collection = d.getTagsFor("k");
    416416        assertTagCounts(collection, 1, 1, 0, 0);
    417         assertEquals(1, collection.getTagOccurence(tagEmpty));
     417        assertEquals(1, collection.getTagOccurrence(tagEmpty));
    418418    }
    419419
     
    426426        TagCollection collection = d.getTagsFor(Arrays.asList("k", "k2"));
    427427        assertTagCounts(collection, 1, 1, 1, 0);
    428         assertEquals(1, collection.getTagOccurence(tagEmpty));
     428        assertEquals(1, collection.getTagOccurrence(tagEmpty));
    429429    }
    430430
     
    628628        TagCollection c = c1.intersect(c2);
    629629        assertEquals(2, c.getKeys().size());
    630         assertEquals(1, c.getTagOccurence(tagA));
    631         assertEquals(1, c.getTagOccurence(tagD));
     630        assertEquals(1, c.getTagOccurrence(tagA));
     631        assertEquals(1, c.getTagOccurrence(tagD));
    632632    }
    633633
     
    641641        TagCollection c = c1.minus(c2);
    642642        assertEquals(2, c.getKeys().size());
    643         assertEquals(1, c.getTagOccurence(tagC));
    644         assertEquals(1, c.getTagOccurence(tagEmpty));
     643        assertEquals(1, c.getTagOccurrence(tagC));
     644        assertEquals(1, c.getTagOccurrence(tagEmpty));
    645645    }
    646646
     
    653653        TagCollection c2 = new TagCollection(Arrays.asList(tagA, tagB, tagD));
    654654        TagCollection c = c1.union(c2);
    655         assertEquals(2, c.getTagOccurence(tagA));
    656         assertEquals(1, c.getTagOccurence(tagB));
    657         assertEquals(1, c.getTagOccurence(tagC));
    658         assertEquals(2, c.getTagOccurence(tagD));
    659         assertEquals(1, c.getTagOccurence(tagEmpty));
     655        assertEquals(2, c.getTagOccurrence(tagA));
     656        assertEquals(1, c.getTagOccurrence(tagB));
     657        assertEquals(1, c.getTagOccurrence(tagC));
     658        assertEquals(2, c.getTagOccurrence(tagD));
     659        assertEquals(1, c.getTagOccurrence(tagEmpty));
    660660    }
    661661
     
    669669        TagCollection c = c1.emptyTagsForKeysMissingIn(c2);
    670670        assertEquals(2, c.getKeys().size());
    671         assertEquals(1, c.getTagOccurence(new Tag(tagC.getKey(), "")));
    672         assertEquals(1, c.getTagOccurence(tagEmpty));
     671        assertEquals(1, c.getTagOccurrence(new Tag(tagC.getKey(), "")));
     672        assertEquals(1, c.getTagOccurrence(tagEmpty));
    673673    }
    674674
Note: See TracChangeset for help on using the changeset viewer.