Changeset 5816 in josm for trunk


Ignore:
Timestamp:
2013-03-31T15:09:56+02:00 (7 years ago)
Author:
stoecker
Message:

javadoc fixes

Location:
trunk/src/org/openstreetmap/josm
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java

    r5266 r5816  
    1111/**
    1212 * This is the common base class for {@link Command}s which manipulate {@link Conflict}s in
    13  * addition to {@link OsmPrimitive}s.
     13 * addition to {@link org.openstreetmap.josm.data.osm.OsmPrimitive}s.
    1414 *
    1515 * A ConflictResolverCommand can remember a collection of conflicts it resolves. Upon undoing
  • trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java

    r5266 r5816  
    2626
    2727    /**
    28      * constructor
     28     * constructor for coordinate conflict
    2929     *
    30      * @param my  my node
    31      * @param their  their node
     30     * @param conflict the conflict data set
    3231     * @param decision the merge decision
    3332     */
  • trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java

    r5266 r5816  
    3030     * constructor
    3131     *
    32      * @param my  my node
    33      * @param their  their node
     32     * @param conflict the conflict data set
    3433     * @param decision the merge decision
    3534     */
  • trunk/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java

    r5266 r5816  
    2727    /**
    2828     * constructor
    29      * @param my  my primitive (i.e. the primitive from the local dataset)
    30      * @param their their primitive (i.e. the primitive from the server)
     29     * @param conflict the conflict data set
    3130     */
    3231    public ModifiedConflictResolveCommand(Conflict<? extends OsmPrimitive> conflict) {
  • trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java

    r5266 r5816  
    4646     * constructor
    4747     *
    48      * @param my  my primitive
    49      * @param their  their primitive
     48     * @param conflict the conflict data set
    5049     * @param mergeItems the list of merge decisions, represented as {@link TagMergeItem}s
    5150     */
  • trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java

    r5266 r5816  
    2525    /**
    2626     * constructor
    27      * @param my  my primitive (i.e. the primitive from the local dataset)
    28      * @param their their primitive (i.e. the primitive from the server)
     27     * @param conflict the conflict data set
    2928     */
    3029    public VersionConflictResolveCommand(Conflict<? extends OsmPrimitive> conflict) {
  • trunk/src/org/openstreetmap/josm/gui/bbox/BBoxChooser.java

    r5266 r5816  
    1212
    1313    /**
    14      * A BBoxChooser emits {@link ProperyChangeEvent}s for this property
     14     * A BBoxChooser emits {@link java.beans.PropertyChangeEvent}s for this property
    1515     * if the current bounding box changes.
    1616     */
  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java

    r5266 r5816  
    1616/**
    1717 * The table cell renderer used in the changeset content table, except for the "name"
    18  * column in which we use a {@link OsmPrimitivRenderer}.
     18 * column in which we use a {@link org.openstreetmap.josm.gui.OsmPrimitivRenderer}.
    1919 *
    2020 */
  • trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java

    r4590 r5816  
    239239     * @return the current URL
    240240     */
    241 
    242241    public String getUrl() {
    243242        return url;
     
    544543
    545544        /**
    546          * Checks whether the hyperlink event originated on a <a ...> element with
     545         * Checks whether the hyperlink event originated on a &lt;a ...&gt; element with
    547546         * a relative href consisting of a URL fragment only, i.e.
    548          * <a href="#thisIsALocalFragment">. If so, replies the fragment, i.e.
     547         * &lt;a href="#thisIsALocalFragment"&gt;. If so, replies the fragment, i.e.
    549548         * "thisIsALocalFragment".
    550549         *
    551          * Otherwise, replies null
     550         * Otherwise, replies <code>null</code>
    552551         *
    553552         * @param e the hyperlink event
    554          * @return the local fragment
     553         * @return the local fragment or <code>null</code>
    555554         */
    556555        protected String getUrlFragment(HyperlinkEvent e) {
Note: See TracChangeset for help on using the changeset viewer.