Changeset 32842 in osm for applications/editors/josm/plugins/routes

Timestamp:

2016-08-19T22:56:53+02:00 (8 years ago)

Author:

donvip

Message:

fix #13392 - update to JOSM 10857

File:

• applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/paint/AbstractLinePainter.java (modified) (4 diffs)

applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/paint/AbstractLinePainter.java

@@ -3 +3 @@
 import java.awt.Graphics2D;
 import java.awt.Point;
-import java.awt.Rectangle;
 import java.awt.geom.GeneralPath;
 import java.awt.geom.Line2D;
@@ -9 +8 @@
 import java.util.List;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.visitor.paint.LineClip;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.NavigatableComponent;
@@ -146 +143 @@
 
     private void drawSegment(Graphics2D g, NavigatableComponent nc, GeneralPath path, Point2D p1, Point2D p2) {
-        boolean drawIt = false;
-        if (Main.isOpenjdk) {
-            /**
-             * Work around openjdk bug. It leads to drawing artefacts when zooming in a lot. (#4289, #4424)
-             * (It looks like int overflow when clipping.) We do custom clipping.
-             */
-            Rectangle bounds = g.getClipBounds();
-            bounds.grow(100, 100);                  // avoid arrow heads at the border
-            LineClip clip = new LineClip(p1, p2, bounds);
-            drawIt = clip.execute();
-            if (drawIt) {
-                p1 = clip.getP1();
-                p2 = clip.getP2();
-            }
-        } else {
-            drawIt = isSegmentVisible(nc, p1, p2);
-        }
+        boolean drawIt = isSegmentVisible(nc, p1, p2);
         if (drawIt) {
             /* draw segment line */
@@ -177 +158 @@
         return true;
     }
-
-
 }