improved naming

Author: Torsten-Mumme

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

@@ -84,10 +84,14 @@ public ResponsiveUIChunkValidatorBase alignedAsGrid(int horizontalGridSize, int
 
     @Override
     public ChunkUIElementValidator areAlignedAsGridCells() {
-        if (rootElements.size() == 2) {
+        validateAlignedAsGridCells(rootElements);
+        return this;
+    }
+
+    public void validateAlignedAsGridCells(List<UIElement> rootElements) {
+        if (this.rootElements.size() == 2) {
             errors.add("banane");
         }
-        return this;
     }
 
     /**

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

@@ -2,7 +2,7 @@
 
 import net.itarray.automotion.internal.geometry.Direction;
 import net.itarray.automotion.internal.geometry.ExtendGiving;
-import net.itarray.automotion.internal.geometry.Group;
+import net.itarray.automotion.internal.geometry.GroupElement;
 import net.itarray.automotion.internal.geometry.Rectangle;
 import net.itarray.automotion.internal.geometry.Scalar;
 import net.itarray.automotion.internal.geometry.Vector;
@@ -91,7 +91,7 @@ public Scalar getEnd(Direction direction) {
         return direction.end(rectangle);
     }
 
-    public <V extends Group<V>> V getExtend(ExtendGiving<V> direction) {
+    public <V extends GroupElement<V>> V getExtend(ExtendGiving<V> direction) {
         return direction.extend(rectangle);
     }
 
@@ -147,7 +147,7 @@ public boolean hasEqualBottomOffsetAs(UIElement other) {
         return hasEqualBegin(UP, other);
     }
 
-    public <V extends Group<V>> boolean hasEqualExtendAs(ExtendGiving<V> direction, UIElement other) {
+    public <V extends GroupElement<V>> boolean hasEqualExtendAs(ExtendGiving<V> direction, UIElement other) {
         return direction.extend(rectangle).equals(direction.extend(other.rectangle));
     }
 
@@ -283,7 +283,7 @@ public void validateSameWidth(UIElement element, Errors errors) {
         validateSameExtend(RIGHT, element, errors);
     }
 
-    public <V extends Group<V>> void validateSameExtend(ExtendGiving<V> direction, UIElement element, Errors errors) {
+    public <V extends GroupElement<V>> void validateSameExtend(ExtendGiving<V> direction, UIElement element, Errors errors) {
         if (!hasEqualExtendAs(direction, element)) {
             errors.add(
                     String.format("Element %s has not the same %s as element %s. %s of %s is %s. %s of element is %s",
@@ -299,7 +299,7 @@ public <V extends Group<V>> void validateSameExtend(ExtendGiving<V> direction, U
         }
     }
 
-    public <V extends Group<V>> void validateNotSameExtend(ExtendGiving<V> direction, UIElement element, Errors errors) {
+    public <V extends GroupElement<V>> void validateNotSameExtend(ExtendGiving<V> direction, UIElement element, Errors errors) {
         if (hasEqualExtendAs(direction, element)) {
             errors.add(
                     String.format("Element %s has the same %s as element %s. %s of %s is %s. %s of element is %s",

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

@@ -1,6 +1,6 @@
 package net.itarray.automotion.internal.geometry;
 
-public interface ExtendGiving<V extends Group<V>> {
+public interface ExtendGiving<V extends GroupElement<V>> {
     String extendName();
     V begin(Rectangle rectangle);
     V end(Rectangle rectangle);

…/automotion/internal/geometry/Group.java …tion/internal/geometry/GroupElement.javasrc/main/java/net/itarray/automotion/internal/geometry/Group.java renamed to src/main/java/net/itarray/automotion/internal/geometry/GroupElement.java src/main/java/net/itarray/automotion/internal/geometry/Group.java renamed to src/main/java/net/itarray/automotion/internal/geometry/GroupElement.java

@@ -1,6 +1,6 @@
 package net.itarray.automotion.internal.geometry;
 
-public interface Group<V> {
+public interface GroupElement<V> {
     V plus(V addend);
     V minus(V subtrahend);
     String toStringWithUnits(String units);

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

@@ -4,7 +4,7 @@
 import net.itarray.automotion.validation.properties.Condition;
 import org.apache.commons.math3.fraction.Fraction;
 
-public class Scalar implements Group<Scalar>, Comparable<Scalar> {
+public class Scalar implements GroupElement<Scalar>, Comparable<Scalar> {
     private final Fraction fraction;
 
     public Scalar(int value) {

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

@@ -1,6 +1,6 @@
 package net.itarray.automotion.internal.geometry;
 
-public class Vector implements Group<Vector> {
+public class Vector implements GroupElement<Vector> {
     private final Scalar x;
     private final Scalar y;
 

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

@@ -1,8 +1,7 @@
 package net.itarray.automotion.internal.properties;
 
 import net.itarray.automotion.internal.geometry.Direction;
-import net.itarray.automotion.internal.geometry.Group;
-import net.itarray.automotion.internal.geometry.Scalar;
+import net.itarray.automotion.internal.geometry.GroupElement;
 import net.itarray.automotion.validation.properties.Condition;
 import net.itarray.automotion.validation.properties.Expression;
 
@@ -28,6 +27,6 @@ public String getDescription(Context context, Direction direction) {
                 toBeConditioned.getDescription(context, direction),
                 toBeApplied.getDescription(context, direction),
                 toBeConditioned.getRepeatedDescription(context, direction),
-                (t instanceof Group) ? ((Group) t).toStringWithUnits("px") : t);
+                (t instanceof GroupElement) ? ((GroupElement) t).toStringWithUnits("px") : t);
     }
 }

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

@@ -3,7 +3,7 @@
 import net.itarray.automotion.internal.UIElement;
 import net.itarray.automotion.internal.geometry.Direction;
 import net.itarray.automotion.internal.geometry.ExtendGiving;
-import net.itarray.automotion.internal.geometry.Group;
+import net.itarray.automotion.internal.geometry.GroupElement;
 import net.itarray.automotion.validation.properties.Expression;
 
 import java.util.function.Function;
@@ -18,7 +18,7 @@ private ElementPropertyExpression(UIElement element, Function<UIElement, T> prop
         this.property = new ElementProperty<>(property, descriptionFormat, name);
     }
 
-    public static <V extends Group<V>> ElementPropertyExpression<V> extend(ExtendGiving<V> direction, UIElement element) {
+    public static <V extends GroupElement<V>> ElementPropertyExpression<V> extend(ExtendGiving<V> direction, UIElement element) {
         return new ElementPropertyExpression<>(element, e -> e.getExtend(direction), direction.extendName() +
                     " of element %s", direction.extendName());
     }