made ExtendGiving (and therefor VectorExtendGiving) implement beforeAndAfterName to unify all ExtendGiving

Author: Torsten-Mumme

src/main/java/net/itarray/automotion/internal/UIElement.java

@@ -335,8 +335,8 @@ public void validateIsAbove(UIElement element, Condition<Scalar> condition, Cont
         validateSuccessor(DOWN, element, condition, context);
     }
 
-    public void validateSuccessor(Direction direction, UIElement toBeValidatedSuccessor, Condition<Scalar> condition, Context context) {
-        Expression<Scalar> signedDistance = Expression.signedDistance(end(direction), toBeValidatedSuccessor.begin(direction), direction);
+    public <V extends MetricSpace<V>> void validateSuccessor(ExtendGiving<V> direction, UIElement toBeValidatedSuccessor, Condition<V> condition, Context context) {
+        Expression<V> signedDistance = Expression.signedDistance(end(direction), toBeValidatedSuccessor.begin(direction), direction);
         Expression<Boolean> assertion = condition.applyTo(signedDistance, new SuccessorConditionedExpressionDescription<>(signedDistance, condition, direction));
         if (!assertion.evaluateIn(context, direction)) {
             context.add(assertion.getDescription(context, direction));

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

@@ -5,6 +5,8 @@
 public interface ExtendGiving<V extends MetricSpace<V>> {
     String beginName();
     String endName();
+    String beforeName();
+    String afterName();
     String extendName();
 
     V begin(Rectangle rectangle);

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

@@ -29,6 +29,13 @@ public String endName() {
         return format("%s %s", x.endName(), y.endName());
     }
 
+    public String beforeName() {
+        return format("%s and %s", x.beforeName(), y.beforeName().toLowerCase());
+    }
+    public String afterName() {
+        return format("%s or %s", x.afterName(), y.afterName().toLowerCase());
+    }
+
     @Override
     public Vector begin(Rectangle rectangle) {
         return new Vector(x.begin(rectangle), y.begin(rectangle));

src/main/java/net/itarray/automotion/internal/properties/SuccessorConditionedExpressionDescription.java

@@ -1,15 +1,14 @@
 package net.itarray.automotion.internal.properties;
 
-import net.itarray.automotion.internal.geometry.Direction;
 import net.itarray.automotion.internal.geometry.ExtendGiving;
 import net.itarray.automotion.internal.geometry.MetricSpace;
 import net.itarray.automotion.validation.properties.Condition;
 import net.itarray.automotion.validation.properties.Expression;
 
-public class SuccessorConditionedExpressionDescription<T> extends ConditionedExpressionDescription<T> {
-    private final Direction direction;
+public class SuccessorConditionedExpressionDescription<T, V extends MetricSpace<V>> extends ConditionedExpressionDescription<T> {
+    private final ExtendGiving<V> direction;
 
-    public SuccessorConditionedExpressionDescription(Expression<T> toBeConditioned, Condition<T> toBeApplied, Direction direction) {
+    public SuccessorConditionedExpressionDescription(Expression<T> toBeConditioned, Condition<T> toBeApplied, ExtendGiving<V> direction) {
         super(toBeConditioned, toBeApplied);
         this.direction = direction;
     }