Ignore:
Timestamp:
2012-06-03T16:41:25+02:00 (8 years ago)
Author:
bastiK
Message:

fixed majority of javadoc warnings by replacing "{@see" by "{@link"

Location:
trunk/src/org/openstreetmap/josm/data/conflict
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java

    r3530 r5266  
    66
    77/**
    8  * Represents a conflict between two {@see OsmPrimitive}s. It is represented as
    9  * a pair of {@see OsmPrimitive}s where one element of the pair has the role <em>my</em>
     8 * Represents a conflict between two {@link OsmPrimitive}s. It is represented as
     9 * a pair of {@link OsmPrimitive}s where one element of the pair has the role <em>my</em>
    1010 * and the other has the role <em>their</em>.
    1111 * <ul>
    12  *   <li><code>my</code> is the {@see OsmPrimitive} in the local dataset</li>
    13  *   <li><code>their</code> is the {@see OsmPrimitive} which caused the conflict when it
     12 *   <li><code>my</code> is the {@link OsmPrimitive} in the local dataset</li>
     13 *   <li><code>their</code> is the {@link OsmPrimitive} which caused the conflict when it
    1414 *   it was tried to merge it onto <code>my</code>. <code>their</code> is usually the
    15  *   {@see OsmPrimitive} from the dataset in another layer or the one retrieved from the server.</li>
     15 *   {@link OsmPrimitive} from the dataset in another layer or the one retrieved from the server.</li>
    1616 * </ul>
    1717 *
  • trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java

    r3083 r5266  
    1616
    1717/**
    18  * This is a collection of {@see Conflict}s. This collection is {@see Iterable}, i.e.
     18 * This is a collection of {@link Conflict}s. This collection is {@link Iterable}, i.e.
    1919 * it can be used in <code>for</code>-loops as follows:
    2020 * <pre>
     
    2929 * and unregister for these events using:
    3030 * <ul>
    31  *   <li>{@see #addConflictListener(IConflictListener)}</li>
    32  *   <li>{@see #removeConflictListener(IConflictListener)}</li>
     31 *   <li>{@link #addConflictListener(IConflictListener)}</li>
     32 *   <li>{@link #removeConflictListener(IConflictListener)}</li>
    3333 * </ul>
    3434 */
     
    108108
    109109    /**
    110      * Adds a conflict for the pair of {@see OsmPrimitive}s given by <code>my</code> and
     110     * Adds a conflict for the pair of {@link OsmPrimitive}s given by <code>my</code> and
    111111     * <code>their</code>.
    112112     *
     
    130130
    131131    /**
    132      * removes the conflict registered for {@see OsmPrimitive} <code>my</code> if any
     132     * removes the conflict registered for {@link OsmPrimitive} <code>my</code> if any
    133133     *
    134134     * @param my  the primitive
     
    145145
    146146    /**
    147      * Replies the conflict for the {@see OsmPrimitive} <code>my</code>, null
     147     * Replies the conflict for the {@link OsmPrimitive} <code>my</code>, null
    148148     * if no such conflict exists.
    149149     *
    150150     * @param my  my primitive
    151      * @return the conflict for the {@see OsmPrimitive} <code>my</code>, null
     151     * @return the conflict for the {@link OsmPrimitive} <code>my</code>, null
    152152     * if no such conflict exists.
    153153     */
     
    160160    }
    161161    /**
    162      * Replies the conflict for the {@see OsmPrimitive} <code>their</code>, null
     162     * Replies the conflict for the {@link OsmPrimitive} <code>their</code>, null
    163163     * if no such conflict exists.
    164164     *
    165165     * @param my  my primitive
    166      * @return the conflict for the {@see OsmPrimitive} <code>their</code>, null
     166     * @return the conflict for the {@link OsmPrimitive} <code>their</code>, null
    167167     * if no such conflict exists.
    168168     */
     
    206206
    207207    /**
    208      * Removes any conflicts for the {@see OsmPrimitive} <code>my</code>.
     208     * Removes any conflicts for the {@link OsmPrimitive} <code>my</code>.
    209209     *
    210210     * @param my the primitive
     
    220220
    221221    /**
    222      * Removes any conflicts for the {@see OsmPrimitive} <code>their</code>.
     222     * Removes any conflicts for the {@link OsmPrimitive} <code>their</code>.
    223223     *
    224224     * @param their the primitive
     
    277277
    278278    /**
    279      * Replies the set of  {@see OsmPrimitive} which participate in the role
     279     * Replies the set of  {@link OsmPrimitive} which participate in the role
    280280     * of "my" in the conflicts managed by this collection.
    281281     *
    282      * @return the set of  {@see OsmPrimitive} which participate in the role
     282     * @return the set of  {@link OsmPrimitive} which participate in the role
    283283     * of "my" in the conflicts managed by this collection.
    284284     */
     
    291291    }
    292292    /**
    293      * Replies the set of  {@see OsmPrimitive} which participate in the role
     293     * Replies the set of  {@link OsmPrimitive} which participate in the role
    294294     * of "their" in the conflicts managed by this collection.
    295295     *
    296      * @return the set of  {@see OsmPrimitive} which participate in the role
     296     * @return the set of  {@link OsmPrimitive} which participate in the role
    297297     * of "their" in the conflicts managed by this collection.
    298298     */
Note: See TracChangeset for help on using the changeset viewer.