some offset cleanup

Author: Torsten-Mumme

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

@@ -178,18 +178,10 @@ public boolean notOverlaps(UIElement other, Context context) {
                 Condition.greaterOrEqualTo(getBottom()).isSatisfiedOn(other.getTop(), context, DOWN);
     }
 
-    private <V extends MetricSpace<V>> V getOffset(ExtendGiving<V> direction, UIElement page, Context context) {
-        return offset(page, direction).evaluateIn(context, direction);
-    }
-
     private <V extends MetricSpace<V>> Expression<V> offset(UIElement page, ExtendGiving<V> direction) {
         return Expression.signedDistance(end(direction), page.end(direction), direction);
     }
 
-    private Expression<Boolean> equalOppositeOffsets(Direction direction, UIElement page) {
-        return equalTo(offset(page, direction), offset(page, direction.opposite()));
-    }
-
     private boolean hasSuccessor(Direction direction, UIElement possibleSuccessor) {
         return signedDistanceToSuccessor(direction, possibleSuccessor).isGreaterOrEqualTo(scalar(0));
     }
@@ -380,14 +372,15 @@ public void validateBottomOffset(Condition condition, UIElement page, Context co
     }
 
     public void validateOffset(Direction direction, Condition condition, UIElement page, Context context) {
-        if (!getOffset(direction, page, context).satisfies(condition, context, direction)) {
+        Expression<Scalar> offset = offset(page, direction);
+        if (!offset.evaluateIn(context, direction).satisfies(condition, context, direction)) {
             context.add(
                     String.format("Expected %s offset of element %s to be %s. Actual %s offset is: %s",
                             direction.endName(),
                             getQuotedName(),
                             condition.getDescription(context, direction),
                             direction.endName(),
-                            getOffset(direction, page, context).toStringWithUnits(PIXELS)));
+                            offset.evaluateIn(context, direction).toStringWithUnits(PIXELS)));
         }
     }
 
@@ -401,16 +394,18 @@ public void validateCenteredOnHorizontally(UIElement page, Context context) {
 
     private void validateCentered(Direction direction, UIElement page, Context context) {
         Direction opposite = direction.opposite();
-        Expression<Boolean> expression = equalOppositeOffsets(direction, page);
+        Expression<Scalar> offset = offset(page, direction);
+        Expression<Scalar> oppositeOffset = offset(page, opposite);
+        Expression<Boolean> expression = equalTo(offset, oppositeOffset);
         if (!expression.evaluateIn(context, direction)) {
             context.add(String.format("Element %s has not equal %s and %s offset. %s offset is %s, %s is %s",
                                 getQuotedName(),
                                 opposite.endName(),
                                 direction.endName(),
                                 capitalize(opposite.endName()),
-                                getOffset(opposite, page, context).toStringWithUnits(PIXELS),
+                                oppositeOffset.evaluateIn(context, opposite).toStringWithUnits(PIXELS),
                                 direction.endName(),
-                                getOffset(direction, page, context).toStringWithUnits(PIXELS)));
+                                offset.evaluateIn(context, direction).toStringWithUnits(PIXELS)));
             context.draw(this);
         }
     }