Ignore:
Timestamp:
2009-07-26T22:52:23+02:00 (12 years ago)
Author:
Gubaer
Message:

replaced JOptionDialog.show... by OptionPaneUtil.show....
improved relation editor

File:
1 edited

Legend:

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

    r1750 r1857  
    6767    }
    6868
    69     protected void addConflict(Conflict<?> conflict) {
     69    /**
     70     * Adds a conflict to the collection
     71     *
     72     * @param conflict the conflict
     73     * @exception IllegalStateException thrown, if this collection already includes a
     74     * conflict for conflict.getMy()
     75     */
     76    protected void addConflict(Conflict<?> conflict) throws IllegalStateException {
    7077        if (hasConflictForMy(conflict.getMy()))
    7178            throw new IllegalStateException(tr("already registered a conflict for primitive ''{0}''", conflict.getMy().toString()));
Note: See TracChangeset for help on using the changeset viewer.