Skip to content

Commit 9be5679

Browse files
committed
draw alignment of first element in case of errors
1 parent c5b6558 commit 9be5679

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

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

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
public class ResponsiveUIChunkValidatorBase extends ResponsiveUIValidatorBase implements ChunkUIElementValidator {
2424

2525
private final List<UIElement> rootElements;
26-
//private final OffsetLineCommands offsetLineCommands = new OffsetLineCommands();
2726

2827
public ResponsiveUIChunkValidatorBase(UISnapshot snapshot, List<WebElement> webElements, boolean allowEmpty) {
2928
super(snapshot);
@@ -202,7 +201,6 @@ public ResponsiveUIChunkValidatorBase haveDifferentHeights() {
202201
@Override
203202
public ResponsiveUIChunkValidatorBase areRightAligned() {
204203
validateRightAlignedWithChunk(asNumberedList(rootElements));
205-
//offsetLineCommands.drawRightOffsetLine();
206204
return this;
207205
}
208206

@@ -214,7 +212,6 @@ public ResponsiveUIChunkValidatorBase areRightAligned() {
214212
@Override
215213
public ResponsiveUIChunkValidatorBase areLeftAligned() {
216214
validateLeftAlignedWithChunk(asNumberedList(rootElements));
217-
//offsetLineCommands.drawLeftOffsetLine();
218215
return this;
219216
}
220217

@@ -226,7 +223,6 @@ public ResponsiveUIChunkValidatorBase areLeftAligned() {
226223
@Override
227224
public ResponsiveUIChunkValidatorBase areTopAligned() {
228225
validateTopAlignedWithChunk(asNumberedList(rootElements));
229-
//offsetLineCommands.drawTopOffsetLine();
230226
return this;
231227
}
232228

@@ -238,7 +234,6 @@ public ResponsiveUIChunkValidatorBase areTopAligned() {
238234
@Override
239235
public ResponsiveUIChunkValidatorBase areBottomAligned() {
240236
validateBottomAlignedWithChunk(asNumberedList(rootElements));
241-
//offsetLineCommands.drawBottomOffsetLine();
242237
return this;
243238
}
244239

@@ -323,35 +318,51 @@ private void validateGridAlignment(List<UIElement> elements, int columns, int ro
323318
}
324319

325320
private void validateRightAlignedWithChunk(List<UIElement> elements) {
321+
int oldErrorsSize = errors.getMessages().size();
326322
for (int i = 0; i < elements.size() - 1; i++) {
327323
UIElement element = elements.get(i);
328324
UIElement elementToCompare = elements.get(i + 1);
329325
element.validateRightAlignedWith(elementToCompare, errors);
330326
}
327+
if (errors.getMessages().size() != oldErrorsSize) {
328+
drawVerticalLine(elements.get(0).getCorner().getX());
329+
}
331330
}
332331

333332
private void validateLeftAlignedWithChunk(List<UIElement> elements) {
333+
int oldErrorsSize = errors.getMessages().size();
334334
for (int i = 0; i < elements.size() - 1; i++) {
335335
UIElement element = elements.get(i);
336336
UIElement elementToCompare = elements.get(i + 1);
337337
element.validateLeftAlignedWith(elementToCompare, errors);
338338
}
339+
if (errors.getMessages().size() != oldErrorsSize) {
340+
drawVerticalLine(elements.get(0).getOrigin().getX());
341+
}
339342
}
340343

341344
private void validateTopAlignedWithChunk(List<UIElement> elements) {
345+
int oldErrorsSize = errors.getMessages().size();
342346
for (int i = 0; i < elements.size() - 1; i++) {
343347
UIElement element = elements.get(i);
344348
UIElement elementToCompare = elements.get(i + 1);
345349
element.validateTopAlignedWith(elementToCompare, errors);
346350
}
351+
if (errors.getMessages().size() != oldErrorsSize) {
352+
drawHorizontalLine(elements.get(0).getOrigin().getY());
353+
}
347354
}
348355

349356
private void validateBottomAlignedWithChunk(List<UIElement> elements) {
357+
int oldErrorsSize = errors.getMessages().size();
350358
for (int i = 0; i < elements.size() - 1; i++) {
351359
UIElement element = elements.get(i);
352360
UIElement elementToCompare = elements.get(i + 1);
353361
element.validateBottomAlignedWith(elementToCompare, this.errors);
354362
}
363+
if (errors.getMessages().size() != oldErrorsSize) {
364+
drawHorizontalLine(elements.get(0).getCorner().getY());
365+
}
355366
}
356367

357368
private void validateSameWidth(List<UIElement> elements) {

0 commit comments

Comments
 (0)