Skip to content

Commit 7bb50e7

Browse files
committed
use Vector as argument to draw(Horizontal|Vertical)Line
1 parent 9be5679 commit 7bb50e7

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import net.itarray.automotion.internal.geometry.ConnectedIntervals;
44
import net.itarray.automotion.internal.geometry.Interval;
55
import net.itarray.automotion.internal.geometry.Scalar;
6+
import net.itarray.automotion.internal.geometry.Vector;
67
import net.itarray.automotion.validation.ChunkUIElementValidator;
78
import net.itarray.automotion.validation.UISnapshot;
89
import net.itarray.automotion.validation.Units;
@@ -325,7 +326,8 @@ private void validateRightAlignedWithChunk(List<UIElement> elements) {
325326
element.validateRightAlignedWith(elementToCompare, errors);
326327
}
327328
if (errors.getMessages().size() != oldErrorsSize) {
328-
drawVerticalLine(elements.get(0).getCorner().getX());
329+
Vector onLine = elements.get(0).getCorner();
330+
drawVerticalLine(onLine);
329331
}
330332
}
331333

@@ -337,7 +339,7 @@ private void validateLeftAlignedWithChunk(List<UIElement> elements) {
337339
element.validateLeftAlignedWith(elementToCompare, errors);
338340
}
339341
if (errors.getMessages().size() != oldErrorsSize) {
340-
drawVerticalLine(elements.get(0).getOrigin().getX());
342+
drawVerticalLine(elements.get(0).getOrigin());
341343
}
342344
}
343345

@@ -349,7 +351,7 @@ private void validateTopAlignedWithChunk(List<UIElement> elements) {
349351
element.validateTopAlignedWith(elementToCompare, errors);
350352
}
351353
if (errors.getMessages().size() != oldErrorsSize) {
352-
drawHorizontalLine(elements.get(0).getOrigin().getY());
354+
drawHorizontalLine(elements.get(0).getOrigin());
353355
}
354356
}
355357

@@ -361,7 +363,7 @@ private void validateBottomAlignedWithChunk(List<UIElement> elements) {
361363
element.validateBottomAlignedWith(elementToCompare, this.errors);
362364
}
363365
if (errors.getMessages().size() != oldErrorsSize) {
364-
drawHorizontalLine(elements.get(0).getCorner().getY());
366+
drawHorizontalLine(elements.get(0).getCorner());
365367
}
366368
}
367369

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -231,15 +231,15 @@ public DrawingConfiguration getDrawingConfiguration() {
231231
return getReport().getDrawingConfiguration();
232232
}
233233

234-
protected void drawVerticalLine(Scalar x) {
234+
protected void drawHorizontalLine(Vector onLine) {
235235
if (isWithReport()) {
236-
drawableScreenshot.drawVerticalLine(x);
236+
drawableScreenshot.drawHorizontalLine(onLine.getY());
237237
}
238238
}
239239

240-
protected void drawHorizontalLine(Scalar y) {
240+
protected void drawVerticalLine(Vector onLine) {
241241
if (isWithReport()) {
242-
drawableScreenshot.drawHorizontalLine(y);
242+
drawableScreenshot.drawVerticalLine(onLine.getX());
243243
}
244244
}
245245

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -613,18 +613,18 @@ protected void drawRootElement() {
613613
}
614614

615615
private void drawLeftOffsetLine() {
616-
drawVerticalLine(rootElement.getX());
616+
drawVerticalLine(rootElement.getOrigin());
617617
}
618618

619619
private void drawRightOffsetLine() {
620-
drawVerticalLine(rootElement.getCorner().getX());
620+
drawVerticalLine(rootElement.getCorner());
621621
}
622622

623623
private void drawTopOffsetLine() {
624-
drawHorizontalLine(rootElement.getY());
624+
drawHorizontalLine(rootElement.getOrigin());
625625
}
626626

627627
private void drawBottomOffsetLine() {
628-
drawHorizontalLine(rootElement.getCorner().getY());
628+
drawHorizontalLine(rootElement.getCorner());
629629
}
630630
}

0 commit comments

Comments
 (0)