more privacy and change of algorithm for chunk alignment: compare with first element.

Author: Torsten-Mumme

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

@@ -320,51 +320,65 @@ private void validateGridAlignment(List<UIElement> elements, int columns, int ro
     }
 
     private void validateRightAlignedWithChunk(List<UIElement> elements) {
-        int oldErrorsSize = errors.getMessages().size();
-        for (int i = 0; i < elements.size() - 1; i++) {
-            UIElement element = elements.get(i);
-            UIElement elementToCompare = elements.get(i + 1);
-            element.validateRightAlignedWith(elementToCompare, errors);
-        }
-        if (errors.getMessages().size() != oldErrorsSize) {
-            Vector onLine = elements.get(0).getCorner();
-            drawVerticalLine(onLine);
+        if (!elements.isEmpty()) {
+            int oldErrorsSize = errors.getMessages().size();
+            int pickedIndex = 0;
+            UIElement element = elements.get(pickedIndex);
+            for (int i = 0; i < elements.size(); i++) {
+                if (i != pickedIndex) {
+                    UIElement elementToCompare = elements.get(i);
+                    element.validateRightAlignedWith(elementToCompare, errors);
+                }
+            }
+            if (errors.getMessages().size() != oldErrorsSize) {
+                Vector onLine = elements.get(pickedIndex).getCorner();
+                drawVerticalLine(onLine);
+            }
         }
     }
 
     private void validateLeftAlignedWithChunk(List<UIElement> elements) {
-        int oldErrorsSize = errors.getMessages().size();
-        for (int i = 0; i < elements.size() - 1; i++) {
-            UIElement element = elements.get(i);
-            UIElement elementToCompare = elements.get(i + 1);
-            element.validateLeftAlignedWith(elementToCompare, errors);
-        }
-        if (errors.getMessages().size() != oldErrorsSize) {
-            drawVerticalLine(elements.get(0).getOrigin());
+        if (!elements.isEmpty()) {
+            int oldErrorsSize = errors.getMessages().size();
+            int pickedIndex = 0;
+            UIElement element = elements.get(pickedIndex);
+            for (int i = 0; i < elements.size(); i++) {
+                UIElement elementToCompare = elements.get(i);
+                element.validateLeftAlignedWith(elementToCompare, errors);
+            }
+            if (errors.getMessages().size() != oldErrorsSize) {
+                drawVerticalLine(elements.get(pickedIndex).getOrigin());
+            }
         }
     }
 
     private void validateTopAlignedWithChunk(List<UIElement> elements) {
-        int oldErrorsSize = errors.getMessages().size();
-        for (int i = 0; i < elements.size() - 1; i++) {
-            UIElement element = elements.get(i);
-            UIElement elementToCompare = elements.get(i + 1);
-            element.validateTopAlignedWith(elementToCompare, errors);
-        }
-        if (errors.getMessages().size() != oldErrorsSize) {
-            drawHorizontalLine(elements.get(0).getOrigin());
+        if (!elements.isEmpty()) {
+            int oldErrorsSize = errors.getMessages().size();
+            int pickedIndex = 0;
+            UIElement element = elements.get(pickedIndex);
+            for (int i = 0; i < elements.size(); i++) {
+                UIElement elementToCompare = elements.get(i);
+                element.validateTopAlignedWith(elementToCompare, errors);
+            }
+            if (errors.getMessages().size() != oldErrorsSize) {
+                drawHorizontalLine(elements.get(pickedIndex).getOrigin());
+            }
         }
     }
 
     private void validateBottomAlignedWithChunk(List<UIElement> elements) {
-        int oldErrorsSize = errors.getMessages().size();
-        for (int i = 0; i < elements.size() - 1; i++) {
-            UIElement element = elements.get(i);
-            UIElement elementToCompare = elements.get(i + 1);
-            element.validateBottomAlignedWith(elementToCompare, this.errors);
-        }
-        if (errors.getMessages().size() != oldErrorsSize) {
-            drawHorizontalLine(elements.get(0).getCorner());
+        if (!elements.isEmpty()) {
+            int oldErrorsSize = errors.getMessages().size();
+            int pickedIndex = 0;
+            UIElement element = elements.get(pickedIndex);
+            for (int i = 0; i < elements.size(); i++) {
+                UIElement elementToCompare = elements.get(i);
+                element.validateBottomAlignedWith(elementToCompare, this.errors);
+            }
+            if (errors.getMessages().size() != oldErrorsSize) {
+                drawHorizontalLine(elements.get(pickedIndex).getCorner());
+            }
         }
     }
 

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

@@ -171,19 +171,19 @@ public boolean overlaps(UIElement other, Context context) {
                 Condition.lessThan(getBottom()).isSatisfiedOn(other.getTop(), context, DOWN);
     }
 
-    public Scalar getOffset(Direction direction, UIElement page) {
+    private Scalar getOffset(Direction direction, UIElement page) {
         return direction.signedDistance(getEnd(direction), page.getEnd(direction));
     }
 
-    public boolean hasEqualOppositeOffsets(Direction direction, UIElement page, Context context) {
+    private boolean hasEqualOppositeOffsets(Direction direction, UIElement page, Context context) {
         return getOffset(direction, page).equals(getOffset(direction.opposite(), page));
     }
 
-    public boolean hasSuccessor(Direction direction, UIElement possibleSuccessor) {
+    private boolean hasSuccessor(Direction direction, UIElement possibleSuccessor) {
         return signedDistanceToSuccessor(direction, possibleSuccessor).isGreaterOrEqualTo(scalar(0));
     }
 
-    public Scalar signedDistanceToSuccessor(Direction direction, UIElement successor) {
+    private Scalar signedDistanceToSuccessor(Direction direction, UIElement successor) {
         return direction.signedDistance(direction.end(rectangle), direction.begin(successor.rectangle));
     }
 
@@ -195,7 +195,7 @@ public boolean hasBelowElement(UIElement bottomElement) {
         return hasSuccessor(DOWN, bottomElement);
     }
 
-    public String getCssValue(String cssProperty) {
+    private String getCssValue(String cssProperty) {
         return cssSource.getCssValue(cssProperty);
     }