Changeset 2846 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java
- Timestamp:
- 2010-01-13T20:12:10+01:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java
r2569 r2846 14 14 import org.openstreetmap.josm.gui.conflict.pair.ListMergeModel; 15 15 import org.openstreetmap.josm.gui.conflict.pair.ListRole; 16 import org.openstreetmap.josm.tools.CheckParameterUtil; 16 17 /** 17 18 * The model for merging two lists of relation members … … 64 65 */ 65 66 public void populate(Relation my, Relation their) { 66 if (my == null) 67 throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "my")); 68 if (their == null) 69 throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "their")); 67 CheckParameterUtil.ensureParameterNotNull(my, "my"); 68 CheckParameterUtil.ensureParameterNotNull(their, "their"); 70 69 71 70 getMergedEntries().clear(); … … 107 106 */ 108 107 public RelationMemberConflictResolverCommand buildResolveCommand(Relation my, Relation their) { 109 if (my == null) 110 throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "my")); 111 if (their == null) 112 throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "their")); 108 CheckParameterUtil.ensureParameterNotNull(my, "my"); 109 CheckParameterUtil.ensureParameterNotNull(their, "their"); 113 110 if (! isFrozen()) 114 throw new IllegalArgumentException(tr("Merged nodes not frozen yet. Can 't build resolution command"));111 throw new IllegalArgumentException(tr("Merged nodes not frozen yet. Cannot build resolution command")); 115 112 ArrayList<RelationMember> entries = getMergedEntries(); 116 113 return new RelationMemberConflictResolverCommand(my, their, entries);
Note:
See TracChangeset
for help on using the changeset viewer.