composite directions

Author: Torsten-Mumme

src/main/java/net/itarray/automotion/internal/geometry/Rectangle.java

@@ -4,45 +4,14 @@
 import org.openqa.selenium.Point;
 import org.openqa.selenium.WebElement;
 
-import java.util.function.Function;
+import static net.itarray.automotion.internal.geometry.Direction.DOWN;
+import static net.itarray.automotion.internal.geometry.Direction.RIGHT;
 
 public class Rectangle {
     private final Vector origin;
     private final Vector corner;
 
-    public static final ExtendGiving<Vector> ORIGIN_CORNER = new ExtendGiving<Vector>() {
-        @Override
-        public String extendName() {
-            return "size";
-        }
-
-        @Override
-        public String beginName() {
-            return "top left";
-        }
-
-        @Override
-        public String endName() {
-            return "bottom right";
-        }
-
-        @Override
-        public Vector begin(Rectangle rectangle) {
-            return rectangle.getOrigin();
-        }
-
-        @Override
-        public Vector end(Rectangle rectangle) {
-            return rectangle.getCorner();
-        }
-
-        @Override
-        public Function<Vector, Vector> transform() {
-            return v -> v;
-        }
-    };
-
-
+    public static final ExtendGiving<Vector> ORIGIN_CORNER = new VectorExtendGiving(RIGHT, DOWN);
 
     public static Rectangle rectangle(WebElement webElement) {
         Point location = webElement.getLocation();
@@ -77,7 +46,7 @@ public boolean intersects(Direction direction, Rectangle other) {
     }
 
     public boolean intersects(Rectangle other) {
-        return intersects(Direction.RIGHT, other) && intersects(Direction.DOWN, other);
+        return intersects(RIGHT, other) && intersects(DOWN, other);
     }
 
     public boolean contains(Direction direction, Rectangle other) {
@@ -86,12 +55,13 @@ public boolean contains(Direction direction, Rectangle other) {
     }
 
     public boolean contains(Rectangle other) {
-        return contains(Direction.RIGHT, other) && contains(Direction.DOWN, other);
+        return contains(RIGHT, other) && contains(DOWN, other);
     }
 
     @Override
     public String toString() {
         Vector extend = corner.minus(origin);
         return String.format("[(%s,%s) - %sx%s]", origin.getX(), origin.getY(), extend.getX(), extend.getY());
     }
+
 }

src/main/java/net/itarray/automotion/internal/geometry/VectorExtendGiving.java

@@ -0,0 +1,46 @@
+package net.itarray.automotion.internal.geometry;
+
+import java.util.function.Function;
+
+import static java.lang.String.format;
+
+public class VectorExtendGiving implements ExtendGiving<Vector> {
+
+    private final Direction x;
+    private final Direction y;
+
+    public VectorExtendGiving(Direction x, Direction y) {
+        this.x = x;
+        this.y = y;
+    }
+
+    @Override
+    public String extendName() {
+        return "size";
+    }
+
+    @Override
+    public String beginName() {
+        return format("%s %s", x.beginName(), y.beginName());
+    }
+
+    @Override
+    public String endName() {
+        return format("%s %s", x.endName(), y.endName());
+    }
+
+    @Override
+    public Vector begin(Rectangle rectangle) {
+        return new Vector(x.begin(rectangle), y.begin(rectangle));
+    }
+
+    @Override
+    public Vector end(Rectangle rectangle) {
+        return new Vector(x.end(rectangle), y.end(rectangle));
+    }
+
+    @Override
+    public Function<Vector, Vector> transform() {
+        return v -> new Vector(x.transform().apply(v), y.transform().apply(v));
+    }
+}