Skip to content

Commit 7d1879f

Browse files
committed
pushed getContext down to make it available for chunk validation
1 parent ceba215 commit 7d1879f

File tree

2 files changed

+21
-18
lines changed

2 files changed

+21
-18
lines changed

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package net.itarray.automotion.internal;
22

3+
import net.itarray.automotion.internal.geometry.Rectangle;
34
import net.itarray.automotion.internal.geometry.Scalar;
45
import net.itarray.automotion.internal.geometry.Vector;
6+
import net.itarray.automotion.internal.properties.Context;
57
import net.itarray.automotion.tools.helpers.Helper;
68
import net.itarray.automotion.validation.ResponsiveUIValidator;
79
import net.itarray.automotion.validation.UISnapshot;
@@ -97,6 +99,25 @@ public boolean validate() {
9799
return !errors.hasMessages();
98100
}
99101

102+
protected boolean isPixels() {
103+
return getUnits().equals(Units.PX);
104+
}
105+
106+
protected Context getContext() {
107+
return new Context() {
108+
@Override
109+
public Rectangle getPageRectangle() {
110+
return page.getRectangle();
111+
}
112+
113+
@Override
114+
public boolean isPixels() {
115+
return ResponsiveUIValidatorBase.this.isPixels();
116+
}
117+
};
118+
}
119+
120+
100121
protected abstract String getNameOfToBeValidated();
101122

102123
private void compileValidationReport() {

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -115,24 +115,6 @@ private Condition<Scalar> betweenCondition(int minMargin, int maxMargin) {
115115
return Condition.between(scalarExpression(minMargin)).and(scalarExpression(maxMargin));
116116
}
117117

118-
private boolean isPixels() {
119-
return getUnits().equals(Units.PX);
120-
}
121-
122-
private Context getContext() {
123-
return new Context() {
124-
@Override
125-
public Rectangle getPageRectangle() {
126-
return page.getRectangle();
127-
}
128-
129-
@Override
130-
public boolean isPixels() {
131-
return UIValidatorBase.this.isPixels();
132-
}
133-
};
134-
}
135-
136118
/**
137119
* Verify that element which located top to is correct
138120
*

0 commit comments

Comments
 (0)