Changeset 3860 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2011-02-06T10:19:47+01:00 (14 years ago)

Author:

bastiK

Message:

LineElemStyle refactoring (more caching and additional properties)

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java

@@ -100 +100 @@
     }
 
-    public void drawWay(Way way, Color color, float width, float dashed[], float dashesOffset, Color dashedColor, boolean showDirection,
+    public void drawWay(Way way, Color color, BasicStroke line, BasicStroke dashes, Color dashedColor, boolean showDirection,
             boolean reversedDirection, boolean showHeadArrowOnly) {
 
@@ -156 +156 @@
             lastPoint = p;
         }
-        displaySegments(path, arrows, color, width, dashed, dashesOffset, dashedColor);
-    }
-
-    private void displaySegments(GeneralPath path, GeneralPath arrows, Color color, float width, float dashed[], float dashesOffset, Color dashedColor) {
+        displaySegments(path, arrows, color, line, dashes, dashedColor);
+    }
+
+    private void displaySegments(GeneralPath path, GeneralPath arrows, Color color, BasicStroke line, BasicStroke dashes, Color dashedColor) {
         g.setColor(inactive ? inactiveColor : color);
         if (useStrokes) {
-            if (dashed != null && dashed.length > 0) {
-                g.setStroke(new BasicStroke(width,BasicStroke.CAP_BUTT,BasicStroke.JOIN_ROUND,0,dashed,dashesOffset));
-            } else {
-                g.setStroke(new BasicStroke(width,BasicStroke.CAP_ROUND,BasicStroke.JOIN_ROUND));
-            }
+            g.setStroke(line);
         }
         g.draw(path);
         g.draw(arrows);
 
-        if(!inactive && useStrokes && dashedColor != null) {
+        if(!inactive && useStrokes && dashes != null) {
             g.setColor(dashedColor);
-            if (dashed != null && dashed.length > 0) {
-                float[] dashedOffset = new float[dashed.length];
-                System.arraycopy(dashed, 0, dashedOffset, 1, dashed.length - 1);
-                dashedOffset[0] = dashed[dashed.length-1];
-                float offset = dashedOffset[0] + dashesOffset;
-                g.setStroke(new BasicStroke(width,BasicStroke.CAP_BUTT,BasicStroke.JOIN_ROUND,0,dashedOffset, offset));
-            } else {
-                g.setStroke(new BasicStroke(width,BasicStroke.CAP_ROUND,BasicStroke.JOIN_ROUND));
-            }
+            g.setStroke(dashes);
             g.draw(path);
             g.draw(arrows);