Changeset 6473 in josm for trunk/src/org/openstreetmap

Timestamp:

2013-12-14T16:13:55+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #9428 - highlight: handle recursive relations

File:

• trunk/src/org/openstreetmap/josm/gui/util/HighlightHelper.java (modified) (10 diffs)

trunk/src/org/openstreetmap/josm/gui/util/HighlightHelper.java

@@ -7 +7 @@
 import java.util.Iterator;
 import java.util.Set;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -18 +19 @@
 public class HighlightHelper {
     Set<OsmPrimitive> highlightedPrimitives = new HashSet<OsmPrimitive>();
-    
+
     /**
      * Highlight and remember given primitives
@@ -26 +27 @@
         return highlight(prims, false);
     }
-    
+
     /**
      * Highlight and remember given primitives
@@ -51 +52 @@
         return needsRepaint;
     }
-    
+
     /**
      * Highlight and remember given primitives, forgetting previously highlighted by this instance
@@ -59 +60 @@
         return highlight(prims, true);
     }
-    
+
     /**
      * Highlight and remember given primitive, forgetting previously highlighted by this instance
@@ -67 +68 @@
         return highlight(Collections.singleton(p), true);
     }
-    
+
     /**
      * Highlight and remember given primitive
@@ -74 +75 @@
      */
     public boolean setHighlight(OsmPrimitive p, boolean flag) {
+        return setHighlight(p, flag, new HashSet<Relation>());
+    }
+
+    private boolean setHighlight(OsmPrimitive p, boolean flag, Set<Relation> seenRelations) {
         if (p instanceof Relation) {
+            Relation r = (Relation) p;
+            seenRelations.add(r);
             boolean needRepaint = false;
-            for (OsmPrimitive m: ((Relation) p).getMemberPrimitives()) {
-                needRepaint |= setHighlight(m, flag);
+            for (OsmPrimitive m : r.getMemberPrimitives()) {
+                if (!(m instanceof Relation) || !seenRelations.contains(m)) {
+                    needRepaint |= setHighlight(m, flag, seenRelations);
+                }
             }
             return needRepaint;
-        } else
-        if (flag) {
+        } else if (flag) {
             if (highlightedPrimitives.add(p)) {
                 p.setHighlighted(true);
@@ -94 +102 @@
         return false;
     }
-    
+
     /**
      * Clear highlighting of all remembered primitives
@@ -104 +112 @@
         highlightedPrimitives.clear();
     }
-    
+
     /**
      * Slow method to import all currently highlighted primitives into this instance
@@ -114 +122 @@
         }
     }
-    
+
     /**
      * Slow method to remove highlights from all primitives