diff options
Diffstat (limited to 'libjava/classpath/java/awt/geom/Line2D.java')
-rw-r--r-- | libjava/classpath/java/awt/geom/Line2D.java | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/libjava/classpath/java/awt/geom/Line2D.java b/libjava/classpath/java/awt/geom/Line2D.java index e15e7cfe3f5..c92aab004b3 100644 --- a/libjava/classpath/java/awt/geom/Line2D.java +++ b/libjava/classpath/java/awt/geom/Line2D.java @@ -238,55 +238,55 @@ public abstract class Line2D implements Shape, Cloneable /** * Computes twice the (signed) area of the triangle defined by the three * points. This method is used for intersection testing. - * + * * @param x1 the x-coordinate of the first point. * @param y1 the y-coordinate of the first point. * @param x2 the x-coordinate of the second point. * @param y2 the y-coordinate of the second point. * @param x3 the x-coordinate of the third point. * @param y3 the y-coordinate of the third point. - * + * * @return Twice the area. */ private static double area2(double x1, double y1, double x2, double y2, - double x3, double y3) + double x3, double y3) { - return (x2 - x1) * (y3 - y1) - (x3 - x1) * (y2 - y1); + return (x2 - x1) * (y3 - y1) - (x3 - x1) * (y2 - y1); } /** * Returns <code>true</code> if (x3, y3) lies between (x1, y1) and (x2, y2), - * and false otherwise, This test assumes that the three points are + * and false otherwise, This test assumes that the three points are * collinear, and is used for intersection testing. - * + * * @param x1 the x-coordinate of the first point. * @param y1 the y-coordinate of the first point. * @param x2 the x-coordinate of the second point. * @param y2 the y-coordinate of the second point. * @param x3 the x-coordinate of the third point. * @param y3 the y-coordinate of the third point. - * + * * @return A boolean. */ - private static boolean between(double x1, double y1, - double x2, double y2, - double x3, double y3) + private static boolean between(double x1, double y1, + double x2, double y2, + double x3, double y3) { if (x1 != x2) { - return (x1 <= x3 && x3 <= x2) || (x1 >= x3 && x3 >= x2); + return (x1 <= x3 && x3 <= x2) || (x1 >= x3 && x3 >= x2); } else { - return (y1 <= y3 && y3 <= y2) || (y1 >= y3 && y3 >= y2); + return (y1 <= y3 && y3 <= y2) || (y1 >= y3 && y3 >= y2); } } /** - * Test if the line segment (x1,y1)->(x2,y2) intersects the line segment + * Test if the line segment (x1,y1)->(x2,y2) intersects the line segment * (x3,y3)->(x4,y4). * * @param x1 the first x coordinate of the first segment - * @param y1 the first y coordinate of the first segment + * @param y1 the first y coordinate of the first segment * @param x2 the second x coordinate of the first segment * @param y2 the second y coordinate of the first segment * @param x3 the first x coordinate of the second segment @@ -301,21 +301,21 @@ public abstract class Line2D implements Shape, Cloneable double x4, double y4) { double a1, a2, a3, a4; - + // deal with special cases - if ((a1 = area2(x1, y1, x2, y2, x3, y3)) == 0.0) + if ((a1 = area2(x1, y1, x2, y2, x3, y3)) == 0.0) { // check if p3 is between p1 and p2 OR // p4 is collinear also AND either between p1 and p2 OR at opposite ends - if (between(x1, y1, x2, y2, x3, y3)) + if (between(x1, y1, x2, y2, x3, y3)) { return true; } - else + else { - if (area2(x1, y1, x2, y2, x4, y4) == 0.0) + if (area2(x1, y1, x2, y2, x4, y4) == 0.0) { - return between(x3, y3, x4, y4, x1, y1) + return between(x3, y3, x4, y4, x1, y1) || between (x3, y3, x4, y4, x2, y2); } else { @@ -323,13 +323,13 @@ public abstract class Line2D implements Shape, Cloneable } } } - else if ((a2 = area2(x1, y1, x2, y2, x4, y4)) == 0.0) + else if ((a2 = area2(x1, y1, x2, y2, x4, y4)) == 0.0) { // check if p4 is between p1 and p2 (we already know p3 is not // collinear) return between(x1, y1, x2, y2, x4, y4); } - + if ((a3 = area2(x3, y3, x4, y4, x1, y1)) == 0.0) { // check if p1 is between p3 and p4 OR // p2 is collinear also AND either between p1 and p2 OR at opposite ends @@ -338,7 +338,7 @@ public abstract class Line2D implements Shape, Cloneable } else { if (area2(x3, y3, x4, y4, x2, y2) == 0.0) { - return between(x1, y1, x2, y2, x3, y3) + return between(x1, y1, x2, y2, x3, y3) || between (x1, y1, x2, y2, x4, y4); } else { @@ -353,7 +353,7 @@ public abstract class Line2D implements Shape, Cloneable } else { // test for regular intersection return ((a1 > 0.0) ^ (a2 > 0.0)) && ((a3 > 0.0) ^ (a4 > 0.0)); - } + } } /** |