Index: trunk/src/org/openstreetmap/josm/command/ChangePropertyKeyCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/ChangePropertyKeyCommand.java (revision 4806) +++ trunk/src/org/openstreetmap/josm/command/ChangePropertyKeyCommand.java (revision 4806) @@ -0,0 +1,107 @@ +// License: GPL. See LICENSE file for details. +package org.openstreetmap.josm.command; + +import static org.openstreetmap.josm.tools.I18n.tr; +import static org.openstreetmap.josm.tools.I18n.trn; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; + +import javax.swing.JLabel; + +import org.openstreetmap.josm.command.Command; +import org.openstreetmap.josm.command.PseudoCommand; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.validation.util.NameVisitor; +import org.openstreetmap.josm.tools.ImageProvider; + +/** + * Command that replaces the key of several objects + * + */ +public class ChangePropertyKeyCommand extends Command { + /** + * All primitives, that are affected with this command. + */ + private final List objects; + /** + * The key that is subject to change. + */ + private final String key; + /** + * The mew key. + */ + private final String newKey; + + /** + * Constructor + * + * @param objects all objects subject to change replacement + * @param key The key to replace + * @param newKey the new value of the key + */ + public ChangePropertyKeyCommand(Collection objects, String key, String newKey) { + this.objects = new LinkedList(objects); + this.key = key; + this.newKey = newKey; + } + + @Override + public boolean executeCommand() { + if (!super.executeCommand()) + return false; // save old + for (OsmPrimitive osm : objects) { + if (osm.hasKeys()) { + osm.setModified(true); + String oldValue = osm.get(key); + osm.put(newKey, oldValue); + osm.remove(key); + } + } + return true; + } + + @Override + public void fillModifiedData(Collection modified, Collection deleted, Collection added) { + modified.addAll(objects); + } + + @Override + public JLabel getDescription() { + String text = tr( "Replace \"{0}\" by \"{1}\" for", key, newKey); + if (objects.size() == 1) { + NameVisitor v = new NameVisitor(); + objects.iterator().next().visit(v); + text += " "+tr(v.className)+" "+v.name; + } else { + text += " "+objects.size()+" "+trn("object","objects",objects.size()); + } + return new JLabel(text, ImageProvider.get("data", "key"), JLabel.HORIZONTAL); + } + + @Override + public Collection getChildren() { + if (objects.size() == 1) + return null; + List children = new ArrayList(); + + final NameVisitor v = new NameVisitor(); + for (final OsmPrimitive osm : objects) { + osm.visit(v); + children.add(new PseudoCommand() { + @Override + public JLabel getDescription() { + return v.toLabel(); + } + @Override + public Collection getParticipatingPrimitives() { + return Collections.singleton(osm); + } + }); + } + return children; + } +} Index: trunk/src/org/openstreetmap/josm/data/validation/tests/BuildingInBuilding.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/BuildingInBuilding.java (revision 4805) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/BuildingInBuilding.java (revision 4806) @@ -29,5 +29,5 @@ public BuildingInBuilding() { - super(tr("Building inside building")); + super(tr("Building inside building"), tr("Checks for building areas inside of buildings.")); } Index: trunk/src/org/openstreetmap/josm/data/validation/tests/ChangePropertyKeyCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/ChangePropertyKeyCommand.java (revision 4805) +++ (revision ) @@ -1,107 +1,0 @@ -// License: GPL. See LICENSE file for details. -package org.openstreetmap.josm.data.validation.tests; - -import static org.openstreetmap.josm.tools.I18n.tr; -import static org.openstreetmap.josm.tools.I18n.trn; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; - -import javax.swing.JLabel; - -import org.openstreetmap.josm.command.Command; -import org.openstreetmap.josm.command.PseudoCommand; -import org.openstreetmap.josm.data.osm.OsmPrimitive; -import org.openstreetmap.josm.data.validation.util.NameVisitor; -import org.openstreetmap.josm.tools.ImageProvider; - -/** - * Command that replaces the key of several objects - * - */ -public class ChangePropertyKeyCommand extends Command { - /** - * All primitives, that are affected with this command. - */ - private final List objects; - /** - * The key that is subject to change. - */ - private final String key; - /** - * The mew key. - */ - private final String newKey; - - /** - * Constructor - * - * @param objects all objects subject to change replacement - * @param key The key to replace - * @param newKey the new value of the key - */ - public ChangePropertyKeyCommand(Collection objects, String key, String newKey) { - this.objects = new LinkedList(objects); - this.key = key; - this.newKey = newKey; - } - - @Override - public boolean executeCommand() { - if (!super.executeCommand()) - return false; // save old - for (OsmPrimitive osm : objects) { - if (osm.hasKeys()) { - osm.setModified(true); - String oldValue = osm.get(key); - osm.put(newKey, oldValue); - osm.remove(key); - } - } - return true; - } - - @Override - public void fillModifiedData(Collection modified, Collection deleted, Collection added) { - modified.addAll(objects); - } - - @Override - public JLabel getDescription() { - String text = tr( "Replace \"{0}\" by \"{1}\" for", key, newKey); - if (objects.size() == 1) { - NameVisitor v = new NameVisitor(); - objects.iterator().next().visit(v); - text += " "+tr(v.className)+" "+v.name; - } else { - text += " "+objects.size()+" "+trn("object","objects",objects.size()); - } - return new JLabel(text, ImageProvider.get("data", "key"), JLabel.HORIZONTAL); - } - - @Override - public Collection getChildren() { - if (objects.size() == 1) - return null; - List children = new ArrayList(); - - final NameVisitor v = new NameVisitor(); - for (final OsmPrimitive osm : objects) { - osm.visit(v); - children.add(new PseudoCommand() { - @Override - public JLabel getDescription() { - return v.toLabel(); - } - @Override - public Collection getParticipatingPrimitives() { - return Collections.singleton(osm); - } - }); - } - return children; - } -} Index: trunk/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java (revision 4805) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java (revision 4806) @@ -43,5 +43,5 @@ */ public Coastlines() { - super(tr("Coastlines."), + super(tr("Coastlines"), tr("This test checks that coastlines are correct.")); } Index: trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java (revision 4805) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java (revision 4806) @@ -42,5 +42,5 @@ */ public CrossingWays() { - super(tr("Crossing ways."), + super(tr("Crossing ways"), tr("This test checks if two roads, railways, waterways or buildings crosses in the same layer, but are not connected by a node.")); } Index: trunk/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java (revision 4805) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java (revision 4806) @@ -24,5 +24,5 @@ public DeprecatedTags() { - super(tr("Deprecated Tags"), tr("Checks and corrects deprecated tags")); + super(tr("Deprecated Tags"), tr("Checks and corrects deprecated tags.")); checks.add(new DeprecationCheck(2101). testAndRemove("barrier", "wire_fence"). Index: trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java (revision 4805) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java (revision 4806) @@ -107,5 +107,5 @@ */ public DuplicateNode() { - super(tr("Duplicated nodes."), + super(tr("Duplicated nodes"), tr("This test checks that there are no nodes at the very same location.")); } Index: trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java (revision 4805) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java (revision 4806) @@ -136,5 +136,5 @@ public DuplicateRelation() { - super(tr("Duplicated relations."), + super(tr("Duplicated relations"), tr("This test checks that there are no relations with same tags and same members with same roles.")); } Index: trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java (revision 4805) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java (revision 4806) @@ -86,5 +86,5 @@ */ public DuplicateWay() { - super(tr("Duplicated ways."), + super(tr("Duplicated ways"), tr("This test checks that there are no ways with same node coordinates and optionally also same tags.")); } Index: trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicatedWayNodes.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicatedWayNodes.java (revision 4805) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicatedWayNodes.java (revision 4806) @@ -21,5 +21,5 @@ public DuplicatedWayNodes() { - super(tr("Duplicated way nodes."), + super(tr("Duplicated way nodes"), tr("Checks for ways with identical consecutive nodes.")); } Index: trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java (revision 4805) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java (revision 4806) @@ -51,5 +51,5 @@ public MultipolygonTest() { super(tr("Multipolygon"), - tr("This test checks if multipolygons are valid")); + tr("This test checks if multipolygons are valid.")); } Index: trunk/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java (revision 4805) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java (revision 4806) @@ -34,5 +34,5 @@ public NameMismatch() { - super(tr("Missing name:* translation."), + super(tr("Missing name:* translation"), tr("This test finds multilingual objects whose ''name'' attribute is not equal to some ''name:*'' attribute and not a composition of ''name:*'' attributes, e.g., Italia - Italien - Italy.")); } Index: trunk/src/org/openstreetmap/josm/data/validation/tests/OverlappingAreas.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/OverlappingAreas.java (revision 4805) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/OverlappingAreas.java (revision 4806) @@ -21,5 +21,5 @@ public OverlappingAreas() { - super(tr("Overlapping Areas")); + super(tr("Overlapping Areas"), tr("This test checks if areas overlap.")); } Index: trunk/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java (revision 4805) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java (revision 4806) @@ -43,5 +43,5 @@ /** Constructor */ public OverlappingWays() { - super(tr("Overlapping ways."), + super(tr("Overlapping ways"), tr("This test checks that a connection between two nodes " + "is not used by more than one way.")); Index: trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java (revision 4805) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java (revision 4806) @@ -41,5 +41,5 @@ */ public RelationChecker() { - super(tr("Relation checker :"), + super(tr("Relation checker"), tr("This plugin checks for errors in relations.")); } Index: trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java (revision 4805) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java (revision 4806) @@ -39,5 +39,5 @@ */ public SimilarNamedWays() { - super(tr("Similarly named ways."), + super(tr("Similarly named ways"), tr("This test checks for ways with similar names that may have been misspelled.")); } Index: trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (revision 4805) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (revision 4806) @@ -40,4 +40,5 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.command.ChangePropertyCommand; +import org.openstreetmap.josm.command.ChangePropertyKeyCommand; import org.openstreetmap.josm.command.Command; import org.openstreetmap.josm.command.SequenceCommand; Index: trunk/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java (revision 4805) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java (revision 4806) @@ -37,5 +37,5 @@ public TurnrestrictionTest() { - super(tr("Turnrestriction"), tr("This test checks if turnrestrictions are valid")); + super(tr("Turnrestrictions"), tr("This test checks if turnrestrictions are valid")); } Index: trunk/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java (revision 4805) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java (revision 4806) @@ -28,5 +28,5 @@ */ public UnclosedWays() { - super(tr("Unclosed Ways."), tr("This tests if ways which should be circular are closed.")); + super(tr("Unclosed Ways"), tr("This tests if ways which should be circular are closed.")); } Index: trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java (revision 4805) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java (revision 4806) @@ -59,5 +59,5 @@ */ public UnconnectedWays() { - super(tr("Unconnected ways."), + super(tr("Unconnected ways"), tr("This test checks if a way has an endpoint very near to another way.")); } Index: trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java (revision 4805) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java (revision 4806) @@ -37,5 +37,5 @@ */ public UntaggedNode() { - super(tr("Untagged and unconnected nodes."), + super(tr("Untagged and unconnected nodes"), tr("This test checks for untagged nodes that are not part of any way.")); } Index: trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java (revision 4805) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java (revision 4806) @@ -58,5 +58,5 @@ */ public UntaggedWay() { - super(tr("Untagged, empty and one node ways."), + super(tr("Untagged, empty and one node ways"), tr("This test checks for untagged, empty and one node ways.")); } Index: trunk/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java (revision 4805) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java (revision 4806) @@ -16,5 +16,5 @@ public WayConnectedToArea() { - super(tr("Way connected to Area")); + super(tr("Way connected to Area"), tr("Checks for ways connected to areas.")); } Index: trunk/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java (revision 4805) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java (revision 4806) @@ -27,5 +27,5 @@ */ public WronglyOrderedWays() { - super(tr("Wrongly Ordered Ways."), + super(tr("Wrongly Ordered Ways"), tr("This test checks the direction of water, land and coastline ways.")); }