Changeset 8454 in josm for trunk/src/org

Timestamp:

2015-06-03T03:43:56+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #11493 - Wrong warning in validation of roundabouts (regression, partial revert of r8390)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/Highways.java (modified) (2 diffs)
• gui/MapView.java (modified) (2 diffs)
• gui/dialogs/relation/RelationEditor.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java

@@ -43 +43 @@
      * Classified highways in order of importance
      */
-    private static final Set<String> CLASSIFIED_HIGHWAYS = new HashSet<>(Arrays.asList(
+    private static final List<String> CLASSIFIED_HIGHWAYS = Arrays.asList(
             "motorway",  "motorway_link",
             "trunk",     "trunk_link",
@@ -51 +51 @@
             "unclassified",
             "residential",
-            "living_street"));
+            "living_street");
 
     private static final Set<String> KNOWN_SOURCE_MAXSPEED_CONTEXTS = new HashSet<>(Arrays.asList(

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -26 +26 @@
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.LinkedHashSet;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 
@@ -225 +224 @@
     public MouseEvent lastMEvent = new MouseEvent(this, 0, 0, 0, 0, 0, 0, false); // In case somebody reads it before first mouse move
 
-    private final transient Set<MapViewPaintable> temporaryLayers = new LinkedHashSet<>();
+    private final transient List<MapViewPaintable> temporaryLayers = new LinkedList<>();
 
     private transient BufferedImage nonChangedLayersBuffer;

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java

@@ -8 +8 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.Set;
+import java.util.List;
 
 import org.openstreetmap.josm.Main;
@@ -32 +32 @@
 
     /** the list of registered relation editor classes */
-    private static Set<Class<RelationEditor>> editors = new LinkedHashSet<>();
+    private static List<Class<RelationEditor>> editors = new ArrayList<>();
 
     /**