Changeset 7345 in josm for trunk/src

Timestamp:

2014-07-28T20:43:39+02:00 (10 years ago)

Author:

akks

Message:

see #10269: avoid null color values in GpxLayer for sure

File:

• trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java

@@ -201 +201 @@
            g.setStroke(new BasicStroke(lineWidth,BasicStroke.CAP_ROUND,BasicStroke.JOIN_ROUND));
         }
+        fixColors(visibleSegments);
         drawLines(g, mv, visibleSegments);
         drawArrows(g, mv, visibleSegments);
@@ -503 +504 @@
     }
 
+    private void fixColors(List<WayPoint> visibleSegments) {
+        for (WayPoint trkPnt : visibleSegments) {
+            if (trkPnt.customColoring == null) {
+                trkPnt.customColoring = neutralColor;
+            }
+        }
+    }
+
     /**
      * Check cache validity set necessary flags