Changeset 13919 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java

Timestamp:

2018-06-11T20:52:44+02:00 (6 years ago)

Author:

Don-vip

Message:

rendering of IPrimitives

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java

@@ -8 +8 @@
 import java.util.Optional;
 
+import org.openstreetmap.josm.data.osm.INode;
 import org.openstreetmap.josm.data.osm.IPrimitive;
-import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.IWay;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
@@ -128 +129 @@
         the direction should be shown at all and not only because it's selected */
         boolean showOnlyHeadArrowOnly = showOrientation && !selected && paintSettings.isShowHeadArrowOnly();
-        Node lastN;
+        INode lastN;
 
         Color myDashedColor = dashesBackground;
@@ -155 +156 @@
         }
 
-        if (primitive instanceof Way) {
-            Way w = (Way) primitive;
+        if (primitive instanceof IWay) {
+            IWay<?> w = (IWay<?>) primitive;
             painter.drawWay(w, myColor, myLine, myDashLine, myDashedColor, offset, showOrientation,
                     showOnlyHeadArrowOnly, showOneway, onewayReversed);
@@ -164 +165 @@
                 int orderNumber = 0;
                 lastN = null;
-                for (Node n : w.getNodes()) {
+                for (INode n : w.getNodes()) {
                     if (lastN != null) {
                         orderNumber++;
@@ -245 +246 @@
 
     /**
-     * Creates a simple line with default widt.
+     * Creates a simple line with default width.
      * @param color The color to use
      * @param isAreaEdge If this is an edge for an area. Edges are drawn at lower Z-Index.
@@ -259 +260 @@
             c.put(Z_INDEX, -3f);
         }
-        Way w = new Way();
-        return createLine(new Environment(w, mc, "default", null));
+        return createLine(new Environment(new Way(), mc, "default", null));
     }