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

Timestamp:

2009-01-17T14:04:38+01:00 (16 years ago)

Author:

ulfl

Message:

minor refactoring

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java

@@ -414 +414 @@
                 /* nodes drawn on second call */
                 if(!(m.member instanceof Node))
-                    drawSelected(m.member, styles != null ? styles.get(m.member)
+                    drawSelectedMember(m.member, styles != null ? styles.get(m.member)
                     : null, true, true);
             }
@@ -420 +420 @@
     }
 
-    public void drawSelected(OsmPrimitive osm, ElemStyle style, Boolean area,
+    public void drawSelectedMember(OsmPrimitive osm, ElemStyle style, Boolean area,
     Boolean areaselected)
     {
@@ -459 +459 @@
         // draw multipolygon relations including their ways
         // other relations are only drawn when selected
+        
+        // we are in the "draw selected" phase
+        // TODO: is it necessary to check for r.selected?
         if(r.selected && selectedCall)
         {
@@ -466 +469 @@
                 && m.member instanceof Node)
                 {
-                    drawSelected(m.member, styles != null ? styles.get(m.member) : null, true, true);
+                    drawSelectedMember(m.member, styles != null ? styles.get(m.member) : null, true, true);
                 }
             }
             return;
         }
-        if (!drawMultipolygon || r.keys == null || !"multipolygon".equals(r.keys.get("type")))
-        {
-            if(r.selected)
-                drawSelectedRelation(r);
+        
+        if (drawMultipolygon && r.keys != null && "multipolygon".equals(r.keys.get("type")))
+        {
+            drawMultipolygon(r);
             return;
         }
-
+        
+        if(r.selected)
+            drawSelectedRelation(r);
+    }
+
+    public void drawMultipolygon(Relation r) {
         Collection<Way> inner = new LinkedList<Way>();
         Collection<Way> outer = new LinkedList<Way>();
@@ -516 +524 @@
                             outer.add(w);
                         else if(r.selected)
-                            drawSelected(m.member, styles != null ? styles.get(m.member) : null, true, true);
+                            drawSelectedMember(m.member, styles != null ? styles.get(m.member) : null, true, true);
                     }
                 }
@@ -703 +711 @@
                     if(r.selected)
                     {
-                        drawSelected(wInner, innerStyle,
+                        drawSelectedMember(wInner, innerStyle,
                         !wayStyle.equals(innerStyle), wInner.selected);
                     }
@@ -738 +746 @@
                     if(r.selected)
                     {
-                        drawSelected(wOuter, outerStyle, false, false);
+                        drawSelectedMember(wOuter, outerStyle, false, false);
                     }
                     else if(outerStyle instanceof AreaElemStyle)
@@ -1056 +1064 @@
         /*** DISPLAY CACHED SEGMENTS (WAYS) NOW ***/
         displaySegments();
-        /*if(profiler)
-        {
-            System.out.format("DS       : %4dms\n", (java.lang.System.currentTimeMillis()-profilerLast));
-            profilerLast = java.lang.System.currentTimeMillis();
-        }*/
 
         /*** NODES ***/
@@ -1101 +1104 @@
 
             displaySegments(null);
-            /*if(profiler)
-            {
-                System.out.format("VirtualDS: %4dms\n", (java.lang.System.currentTimeMillis()-profilerLast));
-                profilerLast = java.lang.System.currentTimeMillis();
-            }*/
         }