Changeset 2181 in josm for trunk/src/org/openstreetmap/josm/data/conflict
- Timestamp:
- 2009-09-22T15:34:19+02:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java
r2017 r2181 76 76 protected void addConflict(Conflict<?> conflict) throws IllegalStateException { 77 77 if (hasConflictForMy(conflict.getMy())) 78 throw new IllegalStateException(tr(" already registered a conflict for primitive ''{0}''", conflict.getMy().toString()));78 throw new IllegalStateException(tr("Already registered a conflict for primitive ''{0}''.", conflict.getMy().toString())); 79 79 if (!conflicts.contains(conflict)) { 80 80 conflicts.add(conflict); … … 92 92 public void add(Conflict<?> conflict) throws IllegalStateException, IllegalArgumentException { 93 93 if (conflict == null) 94 throw new IllegalArgumentException(tr(" parameter ''{0}'' must not be null", "conflict"));94 throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "conflict")); 95 95 addConflict(conflict); 96 96 fireConflictAdded();
Note:
See TracChangeset
for help on using the changeset viewer.