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 2010/04/27 10:50:21 UTC
svn commit: r938360 - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/internal/component/
example/test/src/main/java/org/apache/myfaces/tobago/example/test/
example/test/src/main/webapp/tc/gridLayout/
Author: lofwyr
Date: Tue Apr 27 08:50:21 2010
New Revision: 938360
URL: http://svn.apache.org/viewvc?rev=938360&view=rev
Log:
TOBAGO-606: layout manager
- rendered attribute for columns/rows with a pixel value
Added:
myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/rendered-combinations-3-images-fragment.xhtml
myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/rendered-combinations.xhtml
- copied, changed from r938110, myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/rendered-pixel-2x2-all-but-2.xhtml
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Filter.java
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java?rev=938360&r1=938359&r2=938360&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java Tue Apr 27 08:50:21 2010
@@ -125,7 +125,7 @@ public abstract class AbstractUIGridLayo
for (BankHead head : heads) {
LayoutToken token = head.getToken();
- if (token instanceof PixelLayoutToken) {
+ if (token instanceof PixelLayoutToken && head.isRendered()) {
int pixel = ((PixelLayoutToken) token).getPixel();
heads[i].setMeasure(Measure.valueOf(pixel)); // XXX refactor
}
Modified: myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Filter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Filter.java?rev=938360&r1=938359&r2=938360&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Filter.java (original)
+++ myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Filter.java Tue Apr 27 08:50:21 2010
@@ -44,6 +44,7 @@ public class Filter {
"/src/.*",
"/try/.*",
".*/\\.svn/.*",
+ ".*-fragment\\.xhtml",
"/index.html",
"/navigation.xhtml",
Added: myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/rendered-combinations-3-images-fragment.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/rendered-combinations-3-images-fragment.xhtml?rev=938360&view=auto
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/rendered-combinations-3-images-fragment.xhtml (added)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/rendered-combinations-3-images-fragment.xhtml Tue Apr 27 08:50:21 2010
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<ui:composition
+ xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+ <f:subview id="#{subid}">
+
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout rows="#{rows}" columns="20px"/>
+ </f:facet>
+ <tc:image id="image-1" value="pidgeon-point.jpg">
+ <tc:gridLayoutConstraint preferredHeight="100px"/>
+ </tc:image>
+ <tc:image id="image-2" value="pidgeon-point.jpg" rendered="false">
+ <tc:gridLayoutConstraint preferredHeight="100px"/>
+ </tc:image>
+ <tc:image id="image-3" value="pidgeon-point.jpg">
+ <tc:gridLayoutConstraint preferredHeight="100px"/>
+ </tc:image>
+ </tc:panel>
+
+ </f:subview>
+
+</ui:composition>
Copied: myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/rendered-combinations.xhtml (from r938110, myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/rendered-pixel-2x2-all-but-2.xhtml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/rendered-combinations.xhtml?p2=myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/rendered-combinations.xhtml&p1=myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/rendered-pixel-2x2-all-but-2.xhtml&r1=938110&r2=938360&rev=938360&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/rendered-pixel-2x2-all-but-2.xhtml (original)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/tc/gridLayout/rendered-combinations.xhtml Tue Apr 27 08:50:21 2010
@@ -8,20 +8,263 @@
xmlns:f="http://java.sun.com/jsf/core">
<tc:page id="page">
+ <tc:gridLayoutConstraint width="700px" height="310px"/>
<f:facet name="layout">
- <tc:gridLayout rows="400px;200px" columns="400px;200px"/>
+ <tc:gridLayout
+ columns="auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto"/>
</f:facet>
- <tc:image id="i-0" value="pidgeon-point.jpg" rendered="false"/>
- <tc:image id="i-1" value="pidgeon-point.jpg" rendered="false"/>
- <tc:image id="i-2" value="pidgeon-point.jpg"/>
- <tc:image id="i-3" value="pidgeon-point.jpg"/>
+ <!--
+ Any combination of "100px", "auto" and "*" in the rows attribute,
+ for 3 rows are 3 * 3 * 3 = 27 combinations.
+ The 2nd one is rendered = false.
+ -->
+
+ <ui:include src="rendered-combinations-3-images-fragment.xhtml">
+ <ui:param name="rows" value="100px;100px;100px"/>
+ <ui:param name="subid" value="sub-01"/>
+ </ui:include>
+
+ <ui:include src="rendered-combinations-3-images-fragment.xhtml">
+ <ui:param name="rows" value="100px;100px;auto"/>
+ <ui:param name="subid" value="sub-02"/>
+ </ui:include>
+
+ <ui:include src="rendered-combinations-3-images-fragment.xhtml">
+ <ui:param name="rows" value="100px;100px;*"/>
+ <ui:param name="subid" value="sub-03"/>
+ </ui:include>
+
+ <ui:include src="rendered-combinations-3-images-fragment.xhtml">
+ <ui:param name="rows" value="100px;auto;100px"/>
+ <ui:param name="subid" value="sub-04"/>
+ </ui:include>
+
+ <ui:include src="rendered-combinations-3-images-fragment.xhtml">
+ <ui:param name="rows" value="100px;auto;auto"/>
+ <ui:param name="subid" value="sub-05"/>
+ </ui:include>
+
+ <ui:include src="rendered-combinations-3-images-fragment.xhtml">
+ <ui:param name="rows" value="100px;auto;*"/>
+ <ui:param name="subid" value="sub-06"/>
+ </ui:include>
+
+ <ui:include src="rendered-combinations-3-images-fragment.xhtml">
+ <ui:param name="rows" value="100px;*;100px"/>
+ <ui:param name="subid" value="sub-07"/>
+ </ui:include>
+
+ <ui:include src="rendered-combinations-3-images-fragment.xhtml">
+ <ui:param name="rows" value="100px;*;auto"/>
+ <ui:param name="subid" value="sub-08"/>
+ </ui:include>
+
+ <ui:include src="rendered-combinations-3-images-fragment.xhtml">
+ <ui:param name="rows" value="100px;*;*"/>
+ <ui:param name="subid" value="sub-09"/>
+ </ui:include>
+
+ <ui:include src="rendered-combinations-3-images-fragment.xhtml">
+ <ui:param name="rows" value="auto;100px;100px"/>
+ <ui:param name="subid" value="sub-11"/>
+ </ui:include>
+
+ <ui:include src="rendered-combinations-3-images-fragment.xhtml">
+ <ui:param name="rows" value="auto;100px;auto"/>
+ <ui:param name="subid" value="sub-12"/>
+ </ui:include>
+
+ <ui:include src="rendered-combinations-3-images-fragment.xhtml">
+ <ui:param name="rows" value="auto;100px;*"/>
+ <ui:param name="subid" value="sub-13"/>
+ </ui:include>
+
+ <ui:include src="rendered-combinations-3-images-fragment.xhtml">
+ <ui:param name="rows" value="auto;auto;100px"/>
+ <ui:param name="subid" value="sub-14"/>
+ </ui:include>
+
+ <ui:include src="rendered-combinations-3-images-fragment.xhtml">
+ <ui:param name="rows" value="auto;auto;auto"/>
+ <ui:param name="subid" value="sub-15"/>
+ </ui:include>
+
+ <ui:include src="rendered-combinations-3-images-fragment.xhtml">
+ <ui:param name="rows" value="auto;auto;*"/>
+ <ui:param name="subid" value="sub-16"/>
+ </ui:include>
+
+ <ui:include src="rendered-combinations-3-images-fragment.xhtml">
+ <ui:param name="rows" value="auto;*;100px"/>
+ <ui:param name="subid" value="sub-17"/>
+ </ui:include>
+
+ <ui:include src="rendered-combinations-3-images-fragment.xhtml">
+ <ui:param name="rows" value="auto;*;auto"/>
+ <ui:param name="subid" value="sub-18"/>
+ </ui:include>
+
+ <ui:include src="rendered-combinations-3-images-fragment.xhtml">
+ <ui:param name="rows" value="auto;*;*"/>
+ <ui:param name="subid" value="sub-19"/>
+ </ui:include>
+
+ <ui:include src="rendered-combinations-3-images-fragment.xhtml">
+ <ui:param name="rows" value="*;100px;100px"/>
+ <ui:param name="subid" value="sub-21"/>
+ </ui:include>
+
+ <ui:include src="rendered-combinations-3-images-fragment.xhtml">
+ <ui:param name="rows" value="*;100px;auto"/>
+ <ui:param name="subid" value="sub-22"/>
+ </ui:include>
+
+ <ui:include src="rendered-combinations-3-images-fragment.xhtml">
+ <ui:param name="rows" value="*;100px;*"/>
+ <ui:param name="subid" value="sub-23"/>
+ </ui:include>
+
+ <ui:include src="rendered-combinations-3-images-fragment.xhtml">
+ <ui:param name="rows" value="*;auto;100px"/>
+ <ui:param name="subid" value="sub-24"/>
+ </ui:include>
+
+ <ui:include src="rendered-combinations-3-images-fragment.xhtml">
+ <ui:param name="rows" value="*;auto;auto"/>
+ <ui:param name="subid" value="sub-25"/>
+ </ui:include>
+
+ <ui:include src="rendered-combinations-3-images-fragment.xhtml">
+ <ui:param name="rows" value="*;auto;*"/>
+ <ui:param name="subid" value="sub-26"/>
+ </ui:include>
+
+ <ui:include src="rendered-combinations-3-images-fragment.xhtml">
+ <ui:param name="rows" value="*;*;100px"/>
+ <ui:param name="subid" value="sub-27"/>
+ </ui:include>
+
+ <ui:include src="rendered-combinations-3-images-fragment.xhtml">
+ <ui:param name="rows" value="*;*;auto"/>
+ <ui:param name="subid" value="sub-28"/>
+ </ui:include>
+
+ <ui:include src="rendered-combinations-3-images-fragment.xhtml">
+ <ui:param name="rows" value="*;*;*"/>
+ <ui:param name="subid" value="sub-29"/>
+ </ui:include>
+
<tc:script file="script/test-utils.js"/>
- <tc:script onload="checkAbsence('page:i-0');"/>
- <tc:script onload="checkAbsence('page:i-1');"/>
- <tc:script onload="checkLayout('page:i-2', 0, 0, 400, 200);"/>
- <tc:script onload="checkLayout('page:i-3', 405, 0, 200, 200);"/>
+
+ <tc:script onload="checkLayout('page:sub-01:image-1', 0, 0, 20, 100);"/>
+ <tc:script onload="checkAbsence('page:sub-01:image-2');"/>
+ <tc:script onload="checkLayout('page:sub-01:image-3', 0, 105, 20, 100);"/>
+
+ <tc:script onload="checkLayout('page:sub-02:image-1', 25, 0, 20, 100);"/>
+ <tc:script onload="checkAbsence('page:sub-02:image-2');"/>
+ <tc:script onload="checkLayout('page:sub-02:image-3', 25, 105, 20, 100);"/>
+
+ <tc:script onload="checkLayout('page:sub-03:image-1', 50, 0, 20, 100);"/>
+ <tc:script onload="checkAbsence('page:sub-03:image-2');"/>
+ <tc:script onload="checkLayout('page:sub-03:image-3', 50, 105, 20, 205);"/>
+
+ <tc:script onload="checkLayout('page:sub-04:image-1', 75, 0, 20, 100);"/>
+ <tc:script onload="checkAbsence('page:sub-04:image-2');"/>
+ <tc:script onload="checkLayout('page:sub-04:image-3', 75, 105, 20, 100);"/>
+
+ <tc:script onload="checkLayout('page:sub-05:image-1', 100, 0, 20, 100);"/>
+ <tc:script onload="checkAbsence('page:sub-05:image-2');"/>
+ <tc:script onload="checkLayout('page:sub-05:image-3', 100, 105, 20, 100);"/>
+
+ <tc:script onload="checkLayout('page:sub-06:image-1', 125, 0, 20, 100);"/>
+ <tc:script onload="checkAbsence('page:sub-06:image-2');"/>
+ <tc:script onload="checkLayout('page:sub-06:image-3', 125, 105, 20, 205);"/>
+
+ <tc:script onload="checkLayout('page:sub-07:image-1', 150, 0, 20, 100);"/>
+ <tc:script onload="checkAbsence('page:sub-07:image-2');"/>
+ <tc:script onload="checkLayout('page:sub-07:image-3', 150, 105, 20, 100);"/>
+
+ <tc:script onload="checkLayout('page:sub-08:image-1', 175, 0, 20, 100);"/>
+ <tc:script onload="checkAbsence('page:sub-08:image-2');"/>
+ <tc:script onload="checkLayout('page:sub-08:image-3', 175, 105, 20, 100);"/>
+
+ <tc:script onload="checkLayout('page:sub-09:image-1', 200, 0, 20, 100);"/>
+ <tc:script onload="checkAbsence('page:sub-09:image-2');"/>
+ <tc:script onload="checkLayout('page:sub-09:image-3', 200, 105, 20, 205);"/>
+
+ <tc:script onload="checkLayout('page:sub-11:image-1', 225, 0, 20, 100);"/>
+ <tc:script onload="checkAbsence('page:sub-11:image-2');"/>
+ <tc:script onload="checkLayout('page:sub-11:image-3', 225, 105, 20, 100);"/>
+
+ <tc:script onload="checkLayout('page:sub-12:image-1', 250, 0, 20, 100);"/>
+ <tc:script onload="checkAbsence('page:sub-12:image-2');"/>
+ <tc:script onload="checkLayout('page:sub-12:image-3', 250, 105, 20, 100);"/>
+
+ <tc:script onload="checkLayout('page:sub-13:image-1', 275, 0, 20, 100);"/>
+ <tc:script onload="checkAbsence('page:sub-13:image-2');"/>
+ <tc:script onload="checkLayout('page:sub-13:image-3', 275, 105, 20, 205);"/>
+
+ <tc:script onload="checkLayout('page:sub-14:image-1', 300, 0, 20, 100);"/>
+ <tc:script onload="checkAbsence('page:sub-14:image-2');"/>
+ <tc:script onload="checkLayout('page:sub-14:image-3', 300, 105, 20, 100);"/>
+
+ <tc:script onload="checkLayout('page:sub-15:image-1', 325, 0, 20, 100);"/>
+ <tc:script onload="checkAbsence('page:sub-15:image-2');"/>
+ <tc:script onload="checkLayout('page:sub-15:image-3', 325, 105, 20, 100);"/>
+
+ <tc:script onload="checkLayout('page:sub-16:image-1', 350, 0, 20, 100);"/>
+ <tc:script onload="checkAbsence('page:sub-16:image-2');"/>
+ <tc:script onload="checkLayout('page:sub-16:image-3', 350, 105, 20, 205);"/>
+
+ <tc:script onload="checkLayout('page:sub-17:image-1', 375, 0, 20, 100);"/>
+ <tc:script onload="checkAbsence('page:sub-17:image-2');"/>
+ <tc:script onload="checkLayout('page:sub-17:image-3', 375, 105, 20, 100);"/>
+
+ <tc:script onload="checkLayout('page:sub-18:image-1', 400, 0, 20, 100);"/>
+ <tc:script onload="checkAbsence('page:sub-18:image-2');"/>
+ <tc:script onload="checkLayout('page:sub-18:image-3', 400, 105, 20, 100);"/>
+
+ <tc:script onload="checkLayout('page:sub-19:image-1', 425, 0, 20, 100);"/>
+ <tc:script onload="checkAbsence('page:sub-19:image-2');"/>
+ <tc:script onload="checkLayout('page:sub-19:image-3', 425, 105, 20, 205);"/>
+
+ <tc:script onload="checkLayout('page:sub-21:image-1', 450, 0, 20, 205);"/>
+ <tc:script onload="checkAbsence('page:sub-21:image-2');"/>
+ <tc:script onload="checkLayout('page:sub-21:image-3', 450, 210, 20, 100);"/>
+
+ <tc:script onload="checkLayout('page:sub-22:image-1', 475, 0, 20, 205);"/>
+ <tc:script onload="checkAbsence('page:sub-22:image-2');"/>
+ <tc:script onload="checkLayout('page:sub-22:image-3', 475, 210, 20, 100);"/>
+
+ <tc:script onload="checkLayout('page:sub-23:image-1', 500, 0, 20, 152);"/>
+ <tc:script onload="checkAbsence('page:sub-23:image-2');"/>
+ <tc:script onload="checkLayout('page:sub-23:image-3', 500, 157, 20, 153);"/>
+
+ <tc:script onload="checkLayout('page:sub-24:image-1', 525, 0, 20, 205);"/>
+ <tc:script onload="checkAbsence('page:sub-24:image-2');"/>
+ <tc:script onload="checkLayout('page:sub-24:image-3', 525, 210, 20, 100);"/>
+
+ <tc:script onload="checkLayout('page:sub-25:image-1', 550, 0, 20, 205);"/>
+ <tc:script onload="checkAbsence('page:sub-25:image-2');"/>
+ <tc:script onload="checkLayout('page:sub-25:image-3', 550, 210, 20, 100);"/>
+
+ <tc:script onload="checkLayout('page:sub-26:image-1', 575, 0, 20, 152);"/>
+ <tc:script onload="checkAbsence('page:sub-26:image-2');"/>
+ <tc:script onload="checkLayout('page:sub-26:image-3', 575, 157, 20, 153);"/>
+
+ <tc:script onload="checkLayout('page:sub-27:image-1', 600, 0, 20, 205);"/>
+ <tc:script onload="checkAbsence('page:sub-27:image-2');"/>
+ <tc:script onload="checkLayout('page:sub-27:image-3', 600, 210, 20, 100);"/>
+
+ <tc:script onload="checkLayout('page:sub-28:image-1', 625, 0, 20, 205);"/>
+ <tc:script onload="checkAbsence('page:sub-28:image-2');"/>
+ <tc:script onload="checkLayout('page:sub-28:image-3', 625, 210, 20, 100);"/>
+
+ <tc:script onload="checkLayout('page:sub-29:image-1', 650, 0, 20, 152);"/>
+ <tc:script onload="checkAbsence('page:sub-29:image-2');"/>
+ <tc:script onload="checkLayout('page:sub-29:image-3', 650, 157, 20, 153);"/>
</tc:page>
</f:view>