Index: /trunk/src/org/openstreetmap/josm/gui/conflict/ListMerger.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/ListMerger.java (revision 1654) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/ListMerger.java (revision 1655) @@ -53,5 +53,4 @@ protected ListMergeModel model; - private CopyStartLeftAction copyStartLeftAction; private CopyBeforeCurrentLeftAction copyBeforeCurrentLeftAction; @@ -880,5 +879,5 @@ protected void setParticipatingInSynchronizedScrolling(Adjustable adjustable, boolean isParticipating) { if (adjustable == null) - throw new IllegalArgumentException(tr("argument \"adjustable\" must not be null")); + throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "adjustable")); if (! synchronizedAdjustables.contains(adjustable)) @@ -921,7 +920,7 @@ protected void adapt(final JCheckBox view, final Adjustable adjustable) throws IllegalArgumentException, IllegalStateException { if (adjustable == null) - throw new IllegalArgumentException(tr("argument \"adjustable\" must not be null")); + throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "adjustable")); if (view == null) - throw new IllegalArgumentException(tr("argument \"view\" must not be null")); + throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "view")); if (! synchronizedAdjustables.contains(adjustable)) { Index: /trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java (revision 1654) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java (revision 1655) @@ -31,7 +31,7 @@ public void populate(Way my, Way their) { if (my == null) - throw new IllegalArgumentException(tr("parameter \"way\" must not be null")); + throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "my")); if (their == null) - throw new IllegalArgumentException(tr("parameter \"their\" must not be null")); + throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "their")); getMergedEntries().clear(); getMyEntries().clear(); @@ -65,7 +65,7 @@ public WayNodesConflictResolverCommand buildResolveCommand(Way my, Way their) { if (my == null) - throw new IllegalArgumentException(tr("parameter \"my\" most not be null")); + throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "my")); if (their == null) - throw new IllegalArgumentException(tr("parameter \"my\" most not be null")); + throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "their")); if (! isFrozen()) throw new IllegalArgumentException(tr("Merged nodes not frozen yet. Can't build resolution command")); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java (revision 1654) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java (revision 1655) @@ -72,7 +72,7 @@ public void populate(Relation my, Relation their) { if (my == null) - throw new IllegalArgumentException(tr("parameter way must not be null")); + throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "my")); if (their == null) - throw new IllegalArgumentException(tr("parameter their must not be null")); + throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "their")); getMergedEntries().clear(); @@ -118,7 +118,7 @@ public RelationMemberConflictResolverCommand buildResolveCommand(Relation my, Relation their) { if (my == null) - throw new IllegalArgumentException(tr("parameter my most not be null")); + throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "my")); if (their == null) - throw new IllegalArgumentException(tr("parameter my most not be null")); + throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "their")); if (! isFrozen()) throw new IllegalArgumentException(tr("merged nodes not frozen yet. Can't build resolution command")); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java (revision 1654) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java (revision 1655) @@ -10,29 +10,28 @@ /** - * TagMergeItem represents an individual merge action for a specific pair of key/value. - * + * TagMergeItem represents an individual merge action for a specific pair of key/value. + * * A TagMergeItem manages the values of the two key/value-pairs and keeps track of the applied - * merge decision. + * merge decision. * */ public class TagMergeItem { - + private String key = null; private String myTagValue = null; private String theirTagValue = null; private MergeDecisionType mergeDecision = MergeDecisionType.UNDECIDED; - - + /** * constructor - * + * * @param key the common tag key. Must not be null. - * @param myTagValue the value for this key known in the local dataset - * @param theirTagValue the value for this key known in the dataset on the server + * @param myTagValue the value for this key known in the local dataset + * @param theirTagValue the value for this key known in the dataset on the server * @throws IllegalArgumentException if key is null */ public TagMergeItem(String key, String myTagValue, String theirTagValue) { if (key == null) { - throw new IllegalArgumentException(tr("parameter 'key' must not be null")); + throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "key")); } this.key = key; @@ -41,10 +40,10 @@ this.mergeDecision = MergeDecisionType.UNDECIDED; } - + /** * constructor - * + * * @param key the tag key common to the merged OSM primitives. Must not be null. - * @param my my version of the OSM primitive (i.e. the version known in the local dataset). Must not be null. + * @param my my version of the OSM primitive (i.e. the version known in the local dataset). Must not be null. * @param their their version of the OSM primitive (i.e. the version known on the server). Must not be null. * @throws IllegalArgumentException thrown if key is null @@ -53,12 +52,12 @@ */ public TagMergeItem(String key, OsmPrimitive my, OsmPrimitive their) { - if (key == null) throw new IllegalArgumentException(tr("parameter 'key' must not be null")); - if (my == null) throw new IllegalArgumentException(tr("parameter 'my' must not be null")); - if (their == null) throw new IllegalArgumentException(tr("parameter 'their' must not be null")); + if (key == null) throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "key")); + if (my == null) throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "my")); + if (their == null) throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "their")); this.key = key; myTagValue = null; if (my.keys != null && my.keys.containsKey(key)) { myTagValue = my.keys.get(key); - } + } theirTagValue = null; if (their.keys != null && their.keys.containsKey(key)) { @@ -66,15 +65,14 @@ } } - - + /** - * applies a merge decision to this merge item - * + * applies a merge decision to this merge item + * * @param decision the merge decision. Must not be null. * @exception IllegalArgumentException thrown if decision is null - * + * */ public void decide(MergeDecisionType decision) throws IllegalArgumentException { - if (decision == null) throw new IllegalArgumentException(tr("argument 'decision' must not be null")); + if (decision == null) throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "decision")); this.mergeDecision = decision; } @@ -95,10 +93,10 @@ return mergeDecision; } - + /** * applies the current merge decisions to the tag set of an OSM primitive. The * OSM primitive has the role of primitive in the local dataset ('my' primitive, - * not 'their' primitive) - * + * not 'their' primitive) + * * @param primitive the OSM primitive. Must not be null. * @exception IllegalArgumentException thrown, if primitive is null @@ -106,5 +104,5 @@ */ public void applyToMyPrimitive(OsmPrimitive primitive) throws IllegalArgumentException, IllegalStateException { - if (primitive == null) throw new IllegalArgumentException(tr("parameter 'primitive' must not be null")); + if (primitive == null) throw new IllegalArgumentException(tr("parameter '{0}' must not be null", "primitive")); if (mergeDecision == MergeDecisionType.UNDECIDED) { throw new IllegalStateException(tr("cannot apply undecided tag merge item")); @@ -126,9 +124,8 @@ } primitive.keys.put(key, myTagValue); - } + } } else { // should not happen } } - }