Changeset 1857 in josm for trunk/src/org/openstreetmap/josm/data/conflict

Timestamp:

2009-07-26T22:52:23+02:00 (16 years ago)

Author:

Gubaer

Message:

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

File:

• trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java

@@ -67 +67 @@
     }
 
-    protected void addConflict(Conflict<?> conflict) {
+    /**
+     * Adds a conflict to the collection
+     * 
+     * @param conflict the conflict
+     * @exception IllegalStateException thrown, if this collection already includes a
+     * conflict for conflict.getMy()
+     */
+    protected void addConflict(Conflict<?> conflict) throws IllegalStateException {
         if (hasConflictForMy(conflict.getMy()))
             throw new IllegalStateException(tr("already registered a conflict for primitive ''{0}''", conflict.getMy().toString()));