### Eclipse Workspace Patch 1.0 #P JOSM Index: src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java =================================================================== --- src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java (revision 4229) +++ src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java (working copy) @@ -6,13 +6,11 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; -import java.util.LinkedList; import java.util.LinkedHashSet; +import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Vector; -import org.openstreetmap.josm.Main; import org.openstreetmap.josm.command.ChangeCommand; import org.openstreetmap.josm.command.Command; import org.openstreetmap.josm.command.DeleteCommand; @@ -24,10 +22,10 @@ import org.openstreetmap.josm.data.osm.Relation; import org.openstreetmap.josm.data.osm.RelationMember; import org.openstreetmap.josm.data.osm.Way; -import org.openstreetmap.josm.gui.progress.ProgressMonitor; import org.openstreetmap.josm.data.validation.Severity; import org.openstreetmap.josm.data.validation.Test; import org.openstreetmap.josm.data.validation.TestError; +import org.openstreetmap.josm.gui.progress.ProgressMonitor; import org.openstreetmap.josm.tools.MultiMap; /** * Tests if there are duplicate relations @@ -137,15 +135,15 @@ */ public DuplicateRelation() { - super(tr("Duplicated relations")+".", - tr("This test checks that there are no relations with same tags and same members with same roles.")); + super(tr("Duplicated relations."), + tr("This test checks that there are no relations with same tags and same members with same roles.")); } @Override public void startTest(ProgressMonitor monitor) { - super.startTest(monitor); + super.startTest(monitor); relations = new MultiMap(1000); relations_nokeys = new MultiMap, OsmPrimitive>(1000); } @@ -153,7 +151,7 @@ @Override public void endTest() { - super.endTest(); + super.endTest(); for(LinkedHashSet duplicated : relations.values() ) { if( duplicated.size() > 1) @@ -198,8 +196,9 @@ HashSet rel_fix = new HashSet(); for (OsmPrimitive osm : sel) - if (osm instanceof Relation) + if (osm instanceof Relation) { rel_fix.add((Relation)osm); + } if( rel_fix.size() < 2 ) return null; @@ -265,8 +264,9 @@ HashSet relations = new HashSet(); for (OsmPrimitive osm : sel) - if (osm instanceof Relation) + if (osm instanceof Relation) { relations.add((Relation)osm); + } if (relations.size() < 2) return false;