Index: trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 14836)
+++ trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 14837)
@@ -1517,6 +1517,6 @@
             maxWaySegLenSq *= maxWaySegLenSq;
 
-            Point2D wp1 = getPoint2D(ws.way.getNode(ws.lowerIndex));
-            Point2D wp2 = getPoint2D(ws.way.getNode(ws.lowerIndex+1));
+            Point2D wp1 = getPoint2D(ws.getFirstNode());
+            Point2D wp2 = getPoint2D(ws.getSecondNode());
 
             // is wayseg shorter than maxWaySegLenSq and
Index: trunk/src/org/openstreetmap/josm/gui/layer/validation/PaintVisitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/validation/PaintVisitor.java	(revision 14836)
+++ trunk/src/org/openstreetmap/josm/gui/layer/validation/PaintVisitor.java	(revision 14837)
@@ -209,7 +209,5 @@
         if (ws.lowerIndex < 0 || ws.lowerIndex + 1 >= ws.way.getNodesCount())
             return;
-        Node a = ws.way.getNodes().get(ws.lowerIndex);
-        Node b = ws.way.getNodes().get(ws.lowerIndex + 1);
-        drawSegment(a, b, color);
+        drawSegment(ws.getFirstNode(), ws.getSecondNode(), color);
     }