Ignore:
Timestamp:
2009-11-24T10:45:04+01:00 (10 years ago)
Author:
stoecker
Message:

i18n updated, fixed files to reduce problems when applying patches, fix #4017

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

Legend:

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

    r2198 r2512  
    1414 *   {@see OsmPrimitive} from the dataset in another layer or the one retrieved from the server.</li>
    1515 * </ul>
    16  * 
     16 *
    1717 *
    1818 */
  • trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java

    r2381 r2512  
    1919 * <pre>
    2020 *    ConflictCollection conflictCollection = ....
    21  * 
     21 *
    2222 *    for(Conflict c : conflictCollection) {
    2323 *      // do something
     
    6868    /**
    6969     * Adds a conflict to the collection
    70      * 
     70     *
    7171     * @param conflict the conflict
    7272     * @exception IllegalStateException thrown, if this collection already includes a
     
    8383    /**
    8484     * Adds a conflict to the collection of conflicts.
    85      * 
     85     *
    8686     * @param conflict the conflict to to add. Must not be null.
    8787     * @throws IllegalArgumentException thrown, if conflict is null
    8888     * @throws IllegalStateException thrown if this collection already includes a conflict for conflict.getMy()
    89      * 
     89     *
    9090     */
    9191    public void add(Conflict<?> conflict) throws IllegalStateException, IllegalArgumentException {
     
    9898    /**
    9999     * Add the conflicts in <code>otherConflicts</code> to this collection of conflicts
    100      * 
     100     *
    101101     * @param otherConflicts the collection of conflicts. Does nothing is conflicts is null.
    102102     */
     
    112112     * Adds a conflict for the pair of {@see OsmPrimitive}s given by <code>my</code> and
    113113     * <code>their</code>.
    114      * 
     114     *
    115115     * @param my  my primitive
    116116     * @param their their primitive
     
    123123    /**
    124124     * removes a conflict from this collection
    125      * 
     125     *
    126126     * @param conflict the conflict
    127127     */
     
    133133    /**
    134134     * removes the conflict registered for {@see OsmPrimitive} <code>my</code> if any
    135      * 
     135     *
    136136     * @param my  the primitive
    137137     */
     
    149149     * Replies the conflict for the {@see OsmPrimitive} <code>my</code>, null
    150150     * if no such conflict exists.
    151      * 
     151     *
    152152     * @param my  my primitive
    153153     * @return the conflict for the {@see OsmPrimitive} <code>my</code>, null
     
    164164     * Replies the conflict for the {@see OsmPrimitive} <code>their</code>, null
    165165     * if no such conflict exists.
    166      * 
     166     *
    167167     * @param my  my primitive
    168168     * @return the conflict for the {@see OsmPrimitive} <code>their</code>, null
     
    179179    /**
    180180     * Replies true, if this collection includes a conflict for <code>my</code>.
    181      * 
     181     *
    182182     * @param my my primitive
    183183     * @return true, if this collection includes a conflict for <code>my</code>; false, otherwise
     
    189189    /**
    190190     * Replies true, if this collection includes a given conflict
    191      * 
     191     *
    192192     * @param c the conflict
    193193     * @return true, if this collection includes the conflict; false, otherwise
     
    199199    /**
    200200     * Replies true, if this collection includes a conflict for <code>their</code>.
    201      * 
     201     *
    202202     * @param their their primitive
    203203     * @return true, if this collection includes a conflict for <code>their</code>; false, otherwise
     
    209209    /**
    210210     * Removes any conflicts for the {@see OsmPrimitive} <code>my</code>.
    211      * 
     211     *
    212212     * @param my the primitive
    213213     */
     
    223223    /**
    224224     * Removes any conflicts for the {@see OsmPrimitive} <code>their</code>.
    225      * 
     225     *
    226226     * @param their the primitive
    227227     */
     
    237237    /**
    238238     * Replies the conflicts as list.
    239      * 
     239     *
    240240     * @return the list of conflicts
    241241     */
     
    246246    /**
    247247     * Replies the size of the collection
    248      * 
     248     *
    249249     * @return the size of the collection
    250250     */
     
    255255    /**
    256256     * Replies the conflict at position <code>idx</code>
    257      * 
     257     *
    258258     * @param idx  the index
    259259     * @return the conflict at position <code>idx</code>
     
    265265    /**
    266266     * Replies the iterator for this collection.
    267      * 
     267     *
    268268     * @return the iterator
    269269     */
     
    281281     * Replies the set of  {@see OsmPrimitive} which participate in the role
    282282     * of "my" in the conflicts managed by this collection.
    283      * 
     283     *
    284284     * @return the set of  {@see OsmPrimitive} which participate in the role
    285285     * of "my" in the conflicts managed by this collection.
     
    295295     * Replies the set of  {@see OsmPrimitive} which participate in the role
    296296     * of "their" in the conflicts managed by this collection.
    297      * 
     297     *
    298298     * @return the set of  {@see OsmPrimitive} which participate in the role
    299299     * of "their" in the conflicts managed by this collection.
     
    309309    /**
    310310     * Replies true if this collection is empty
    311      * 
     311     *
    312312     * @return true, if this collection is empty; false, otherwise
    313313     */
Note: See TracChangeset for help on using the changeset viewer.