You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2016/08/05 11:23:11 UTC
svn commit: r1755290 - in /myfaces/tobago/trunk/tobago-core/src:
main/java/org/apache/myfaces/tobago/layout/
test/java/org/apache/myfaces/tobago/layout/
Author: lofwyr
Date: Fri Aug 5 11:23:11 2016
New Revision: 1755290
URL: http://svn.apache.org/viewvc?rev=1755290&view=rev
Log:
TOBAGO-1511: Generalization of Measure class: support for other units like ex, em, mm, cm, in, percent
- cleanup
Removed:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PercentLayoutToken.java
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutTokens.java
myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/layout/LayoutTokensUnitTest.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutTokens.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutTokens.java?rev=1755290&r1=1755289&r2=1755290&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutTokens.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/LayoutTokens.java Fri Aug 5 11:23:11 2016
@@ -111,8 +111,6 @@ public final class LayoutTokens implemen
return AutoLayoutToken.INSTANCE;
} else if ("minimum".equals(token)) {
return new MinimumLayoutToken();
- } else if (isPercentToken(token)) {
- return new PercentLayoutToken(Integer.parseInt(removeSuffix(token, PercentLayoutToken.SUFFIX)));
} else if (isRelativeToken(token)) {
return new RelativeLayoutToken(Integer.parseInt(removeSuffix(token, RelativeLayoutToken.SUFFIX)));
} else {
@@ -124,10 +122,6 @@ public final class LayoutTokens implemen
}
}
- static boolean isPercentToken(final String token) {
- return isNumberAndSuffix(token, PercentLayoutToken.SUFFIX);
- }
-
static boolean isRelativeToken(final String token) {
return isNumberAndSuffix(token, RelativeLayoutToken.SUFFIX);
}
Modified: myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/layout/LayoutTokensUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/layout/LayoutTokensUnitTest.java?rev=1755290&r1=1755289&r2=1755290&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/layout/LayoutTokensUnitTest.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/layout/LayoutTokensUnitTest.java Fri Aug 5 11:23:11 2016
@@ -25,11 +25,6 @@ import org.junit.Test;
public class LayoutTokensUnitTest {
@Test
- public void testIsPercentToken() {
- Assert.assertTrue(LayoutTokens.isPercentToken("50%"));
- }
-
- @Test
public void testIsRelativeToken() {
Assert.assertTrue(LayoutTokens.isRelativeToken("3*"));
}
@@ -46,7 +41,7 @@ public class LayoutTokensUnitTest {
Assert.assertEquals(AutoLayoutToken.INSTANCE, LayoutTokens.parseToken(null));
Assert.assertEquals(RelativeLayoutToken.DEFAULT_INSTANCE, LayoutTokens.parseToken("*"));
Assert.assertEquals(new RelativeLayoutToken(3), LayoutTokens.parseToken("3*"));
- Assert.assertEquals(new PercentLayoutToken(33), LayoutTokens.parseToken("33%"));
+ Assert.assertEquals(new MeasureLayoutToken("33%"), LayoutTokens.parseToken("33%"));
Assert.assertEquals(new MeasureLayoutToken("120px"), LayoutTokens.parseToken("120px"));
Assert.assertEquals(new MeasureLayoutToken("0px"), LayoutTokens.parseToken("0px"));
}