Changeset 7040 in josm for trunk/src

Timestamp:

2014-05-02T00:04:06+02:00 (11 years ago)

Author:

Don-vip

Message:

tests/build update:

• update Jacoco to version 0.7.0
• compile performance tests even if not run by ant task
• do not create empty package-info.class files in javac task
• move RemoteControl test to unit tests to get coverage information
• fix NPEs seen in tests in headless mode
• proper test failures when properties files can not be loaded

Location:

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint

Files:

• LineClip.java (modified) (3 diffs)
• StyledMapRenderer.java (modified) (1 diff)

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

@@ -18 +18 @@
     private final Rectangle clipBounds;
 
+    /**
+     * Constructs a new {@code LineClip}.
+     * @param p1 start point of the clipped line
+     * @param p2 end point of the clipped line
+     * @param clipBounds Clip bounds
+     */
     public LineClip(Point p1, Point p2, Rectangle clipBounds) {
         this.p1 = p1;
@@ -29 +35 @@
      */
     public boolean execute() {
+        if (clipBounds == null) {
+            return false;
+        }
         return cohenSutherland(p1.x, p1.y, p2.x, p2.y, clipBounds.x , clipBounds.y, clipBounds.x + clipBounds.width, clipBounds.y + clipBounds.height);
     }
@@ -35 +44 @@
      * @return start point of the clipped line
      */
-    public Point getP1()
-    {
+    public Point getP1() {
         return p1;
     }

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

@@ -1175 +1175 @@
         GeneralPath onewayArrowsCasing = showOneway ? new GeneralPath() : null;
         Rectangle bounds = g.getClipBounds();
-        bounds.grow(100, 100);                  // avoid arrow heads at the border
+        if (bounds != null) {
+            // avoid arrow heads at the border
+            bounds.grow(100, 100);
+        }
 
         double wayLength = 0;