- Timestamp:
- 2011-07-13T15:14:13+02:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java
r4051 r4234 7 7 import java.util.Collection; 8 8 import java.util.HashSet; 9 import java.util.LinkedHashSet; 9 10 import java.util.LinkedList; 10 import java.util.LinkedHashSet;11 11 import java.util.List; 12 12 import java.util.Map; 13 import java.util.Vector; 14 15 import org.openstreetmap.josm.Main; 13 16 14 import org.openstreetmap.josm.command.ChangeCommand; 17 15 import org.openstreetmap.josm.command.Command; … … 25 23 import org.openstreetmap.josm.data.osm.RelationMember; 26 24 import org.openstreetmap.josm.data.osm.Way; 27 import org.openstreetmap.josm.gui.progress.ProgressMonitor;28 25 import org.openstreetmap.josm.data.validation.Severity; 29 26 import org.openstreetmap.josm.data.validation.Test; 30 27 import org.openstreetmap.josm.data.validation.TestError; 28 import org.openstreetmap.josm.gui.progress.ProgressMonitor; 31 29 import org.openstreetmap.josm.tools.MultiMap; 32 30 /** … … 138 136 public DuplicateRelation() 139 137 { 140 super(tr("Duplicated relations ")+".",141 tr("This test checks that there are no relations with same tags and same members with same roles.")); 138 super(tr("Duplicated relations."), 139 tr("This test checks that there are no relations with same tags and same members with same roles.")); 142 140 } 143 141 … … 146 144 public void startTest(ProgressMonitor monitor) 147 145 { 148 146 super.startTest(monitor); 149 147 relations = new MultiMap<RelationPair, OsmPrimitive>(1000); 150 148 relations_nokeys = new MultiMap<List<RelationMember>, OsmPrimitive>(1000); … … 154 152 public void endTest() 155 153 { 156 154 super.endTest(); 157 155 for(LinkedHashSet<OsmPrimitive> duplicated : relations.values() ) 158 156 { … … 199 197 200 198 for (OsmPrimitive osm : sel) 201 if (osm instanceof Relation) 199 if (osm instanceof Relation) { 202 200 rel_fix.add((Relation)osm); 201 } 203 202 204 203 if( rel_fix.size() < 2 ) … … 266 265 267 266 for (OsmPrimitive osm : sel) 268 if (osm instanceof Relation) 267 if (osm instanceof Relation) { 269 268 relations.add((Relation)osm); 269 } 270 270 271 271 if (relations.size() < 2)
Note:
See TracChangeset
for help on using the changeset viewer.