Changeset 2181 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java
- Timestamp:
- 2009-09-22T15:34:19+02:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java
r2070 r2181 295 295 public void decideDeletedStateConflict(MergeDecisionType decision) throws IllegalArgumentException{ 296 296 if (decision == null) 297 throw new IllegalArgumentException(tr(" parameter ''{0}'' must not be null", "decision"));297 throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "decision")); 298 298 this.deletedMergeDecision = decision; 299 299 setChanged(); … … 310 310 public void decideVisibleStateConflict(MergeDecisionType decision) throws IllegalArgumentException { 311 311 if (decision == null) 312 throw new IllegalArgumentException(tr(" parameter ''{0}'' must not be null", "decision"));312 throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "decision")); 313 313 this.visibleMergeDecision = decision; 314 314 setChanged();
Note:
See TracChangeset
for help on using the changeset viewer.