myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ckor...@apache.org
Subject svn commit: r925231 - in /myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main: java/org/apache/myfaces/trinidaddemo/components/table/column/ java/org/apache/myfaces/trinidaddemo/components/table/table/ webap...
Date Fri, 19 Mar 2010 14:20:11 GMT
Author: ckormos
Date: Fri Mar 19 14:20:10 2010
New Revision: 925231

URL: http://svn.apache.org/viewvc?rev=925231&view=rev
Log:
new variant for table demo (show/hide details).
small refactorings on column and table demos.

Added:
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tableShowHide.xhtml
Removed:
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/table/column/Monarch.java
Modified:
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/table/column/TableColumnBean.java
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/table/table/TableDemo.java
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/WEB-INF/faces-config.xml
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/showDetail/showDetail/showDetail.xhtml
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/column.xhtml
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/columnCenter.xhtml
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/columnEnd.xhtml
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/columnLeft.xhtml
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/columnRight.xhtml
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/table.xhtml
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tableMultipleRowSelection.xhtml
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tableNoGridLines.xhtml
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tablePaginated.xhtml
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tableSingleRowSelection.xhtml
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/treeTable/treeTablePathStamp.xhtml

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/table/column/TableColumnBean.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/table/column/TableColumnBean.java?rev=925231&r1=925230&r2=925231&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/table/column/TableColumnBean.java
(original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/table/column/TableColumnBean.java
Fri Mar 19 14:20:10 2010
@@ -18,55 +18,88 @@
  */
 package org.apache.myfaces.trinidaddemo.components.table.column;
 
+import java.util.ArrayList;
+
 /**
  *
  */
 public class TableColumnBean implements java.io.Serializable {
-    static private int count = 0;
-    static private Monarch monarchs;
-    private int rowNo;
-    private String monarchName;
-    private String monarchBirth;
-    private String monarchDeath;
 
-    public TableColumnBean() {
-        monarchs = new Monarch();
-        monarchName = monarchs.getName(count);
-        monarchBirth = monarchs.getBirth(count);
-        monarchDeath = monarchs.getDeath(count);
-        rowNo=(count++)+1;
-    }
-
-    public int getRowNo() {
-        return rowNo;
-    }
-
-    public String getMonarchName() {
-        return monarchName;
-    }
-
-    public String getMonarchBirth() {
-        return monarchBirth;
-    }
+    private static final long serialVersionUID = 6955236745608138415L;
+    private ArrayList<Monarch> monarchs;
 
-    public String getMonarchDeath() {
-        return monarchDeath;
-    }
-
-    public static void setCount(int count) {
-        TableColumnBean.count = count;
-    }
-
-    public void setMonarchName(String monarchName) {
-        this.monarchName = monarchName;
-    }
-
-    public void setMonarchBirth(String monarchBirth) {
-        this.monarchBirth = monarchBirth;
+    public TableColumnBean() {
+        monarchs = new ArrayList<Monarch>();
+        monarchs.add(new Monarch("1","Charles II","29 May 1630","6 February 1685","King of
England, Scotland, and Ireland. Charles II's father King Charles I was executed at Whitehall
on 30 January 1649, at the climax of the English Civil War."));
+        monarchs.add(new Monarch("2","James II","14 October 1633","16 September 1701","King
of England and Ireland as James II, and Scotland as James VII. He was the last Catholic monarch
to reign over the Kingdoms of England, Scotland, and Ireland."));
+        monarchs.add(new Monarch("3","Mary II","30 April 1662","28 December 1694","Queen
of England, Scotland, and Ireland from 1689 until her death. Mary, a Protestant, came to the
thrones following the Glorious Revolution, which resulted in the deposition of her Roman Catholic
father, James II and VII."));
+        monarchs.add(new Monarch("4","William III","4 November 1650","8 March 1702","Prince
of Orange by birth. From 1672 he governed as Stadtholder William III of Orange over Holland,
Zeeland, Utrecht, Guelders, and Overijssel of the Dutch Republic."));
+        monarchs.add(new Monarch("5","Anne","6 February 1665","1 August 1714","Queen of England,
Scotland and Ireland on 8 March 1702, succeeding her brother-in-law, William III of England
and II of Scotland."));
+    }
+
+    public ArrayList<Monarch> getMonarchs(){
+        return monarchs;
+    }
+
+    public void setMonarchs(ArrayList<Monarch> monarchs){
+        this.monarchs = monarchs;    
+    }
+
+    public class Monarch {
+        private String id;
+        private String name;
+        private String birth;
+        private String death;
+        private String details;
+
+        public Monarch(String id, String name, String birth, String death, String details)
{
+            this.id = id;
+            this.name = name;
+            this.birth = birth;
+            this.death = death;
+            this.details = details;
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id){
+            this.id = id;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getBirth() {
+            return birth;
+        }
+
+        public void setBirth(String birth) {
+            this.birth = birth;
+        }
+
+        public String getDeath() {
+            return death;
+        }
+
+        public void setDeath(String death) {
+            this.death = death;
+        }
+
+        public String getDetails() {
+            return details;
+        }
+
+        public void setDetails(String details) {
+            this.details = details;
+        }
     }
 
-    public void setMonarchDeath(String monarchDeath) {
-        this.monarchDeath = monarchDeath;
-    }
 }
 

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/table/table/TableDemo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/table/table/TableDemo.java?rev=925231&r1=925230&r2=925231&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/table/table/TableDemo.java
(original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/components/table/table/TableDemo.java
Fri Mar 19 14:20:10 2010
@@ -34,6 +34,7 @@ public class TableDemo extends AbstractC
 		NoGridLines,
         SingleRowSelection,
         MultipleRowSelection,
+        ShowHide,
         Pagination
 	}
 
@@ -49,22 +50,27 @@ public class TableDemo extends AbstractC
         addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.NoGridLines, "No grid
lines", this,
                 new String[]{
                         "/components/table/table/tableNoGridLines.xhtml"
-                }, getSummaryResourcePath()));
+                }, getSummaryResourcePath(), getBackingBeanResourcePath()));
 
         addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.SingleRowSelection,
"Single Row Selection", this,
                 new String[]{
                         "/components/table/table/tableSingleRowSelection.xhtml"
-                }, getSummaryResourcePath()));
+                }, getSummaryResourcePath(), getBackingBeanResourcePath()));
 
         addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.MultipleRowSelection,
"Multiple Row Selection", this,
                 new String[]{
                         "/components/table/table/tableMultipleRowSelection.xhtml"
-                }, getSummaryResourcePath()));
+                }, getSummaryResourcePath(), getBackingBeanResourcePath()));
+
+        addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.ShowHide, "Show / Hide",
this,
+                new String[]{
+                        "/components/table/table/tableShowHide.xhtml"
+                }, getSummaryResourcePath(), getBackingBeanResourcePath()));
 
         addComponentDemoVariant(new ComponentVariantDemoImpl(VARIANTS.Pagination, this,
                 new String[]{
                         "/components/table/table/tablePaginated.xhtml"
-                }, getSummaryResourcePath()));
+                }, getSummaryResourcePath(), getBackingBeanResourcePath()));
 	}
 
     public String getSummaryResourcePath() {

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/WEB-INF/faces-config.xml?rev=925231&r1=925230&r2=925231&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/WEB-INF/faces-config.xml
(original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/WEB-INF/faces-config.xml
Fri Mar 19 14:20:10 2010
@@ -118,33 +118,12 @@
         <managed-bean-scope>none</managed-bean-scope>
     </managed-bean>
 
-
     <managed-bean>
         <managed-bean-name>tableColumn</managed-bean-name>
         <managed-bean-class>
-            java.util.ArrayList
-        </managed-bean-class>
-        <managed-bean-scope>
-            application
-        </managed-bean-scope>
-        <list-entries>
-            <value-class>
-                org.apache.myfaces.trinidaddemo.components.table.column.TableColumnBean
-            </value-class>
-            <value>#{tableColumnRowBean}</value>
-            <value>#{tableColumnRowBean}</value>
-            <value>#{tableColumnRowBean}</value>
-            <value>#{tableColumnRowBean}</value>
-            <value>#{tableColumnRowBean}</value>
-        </list-entries>
-    </managed-bean>
-
-    <managed-bean>
-        <managed-bean-name>tableColumnRowBean</managed-bean-name>
-        <managed-bean-class>
             org.apache.myfaces.trinidaddemo.components.table.column.TableColumnBean
         </managed-bean-class>
-        <managed-bean-scope>none</managed-bean-scope>
+        <managed-bean-scope>request</managed-bean-scope>
     </managed-bean>
 
     <managed-bean>
@@ -218,7 +197,6 @@
             <renderer-type>org.apache.myfaces.trinidad.OutputSource</renderer-type>
             <renderer-class>org.apache.myfaces.trinidaddemo.support.jsf.OutputSourceRenderer</renderer-class>
         </renderer>
-
     </render-kit>
 
     <navigation-rule>

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/showDetail/showDetail/showDetail.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/showDetail/showDetail/showDetail.xhtml?rev=925231&r1=925230&r2=925231&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/showDetail/showDetail/showDetail.xhtml
(original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/showDetail/showDetail/showDetail.xhtml
Fri Mar 19 14:20:10 2010
@@ -27,30 +27,30 @@
 
         <tr:showDetail id="showDetail1">
             <tr:spacer height="10"/>
-            <tr:table width="100%" emptyText="No data available." value="#{tableColumn}"
var="row">
+            <tr:table width="100%" emptyText="No data available." value="#{tableColumn.monarchs}"
var="row">
                 <tr:column >
-                    <tr:outputText value="#{row.rowNo}"/>
+                    <tr:outputText value="#{row.id}"/>
                 </tr:column>
 
                 <tr:column>
                     <f:facet name="header">
                         <tr:outputText value="Name"/>
                     </f:facet>
-                    <tr:outputText value="#{row.monarchName}"/>
+                    <tr:outputText value="#{row.name}"/>
                 </tr:column>
 
                 <tr:column>
                     <f:facet name="header">
                         <tr:outputText value="Birth"/>
                     </f:facet>
-                    <tr:outputText value="#{row.monarchBirth}"/>
+                    <tr:outputText value="#{row.birth}"/>
                 </tr:column>
 
                 <tr:column>
                     <f:facet name="header">
                         <tr:outputText value="Death"/>
                     </f:facet>
-                    <tr:outputText value="#{row.monarchDeath}"/>
+                    <tr:outputText value="#{row.death}"/>
                 </tr:column>
             </tr:table>
         </tr:showDetail>

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/column.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/column.xhtml?rev=925231&r1=925230&r2=925231&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/column.xhtml
(original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/column.xhtml
Fri Mar 19 14:20:10 2010
@@ -27,27 +27,30 @@
 
         <tr:outputText value="The monarchs of England, from House of Stuart(restored)
are:"/>
         <tr:spacer height="15px"/>
-        <tr:table width="100%" emptyText="No data available." value="#{tableColumn}" var="row">
+        <tr:table width="100%" emptyText="No data available." value="#{tableColumn.monarchs}"
var="row">
             <tr:column >
-                <tr:outputText value="#{row.rowNo}"/>
+                <f:facet name="header">
+                    <tr:outputText value="Id"/>
+                </f:facet>
+                <tr:outputText value="#{row.id}"/>
             </tr:column>
             <tr:column>
                 <f:facet name="header">
                     <tr:outputText value="Name"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchName}"/>
+                <tr:outputText value="#{row.name}"/>
             </tr:column>
             <tr:column>
                 <f:facet name="header">
                     <tr:outputText value="Birth"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchBirth}"/>
+                <tr:outputText value="#{row.birth}"/>
             </tr:column>
             <tr:column>
                 <f:facet name="header">
                     <tr:outputText value="Death"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchDeath}"/>
+                <tr:outputText value="#{row.death}"/>
             </tr:column>
         </tr:table>
 

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/columnCenter.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/columnCenter.xhtml?rev=925231&r1=925230&r2=925231&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/columnCenter.xhtml
(original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/columnCenter.xhtml
Fri Mar 19 14:20:10 2010
@@ -27,27 +27,30 @@
 
         <tr:outputText value="The monarchs of England, from House of Stuart(restored)
are:"/>
         <tr:spacer height="15px"/>
-        <tr:table width="100%" emptyText="No data available." value="#{tableColumn}" var="row">
+        <tr:table width="100%" emptyText="No data available." value="#{tableColumn.monarchs}"
var="row">
             <tr:column align="center">
-                <tr:outputText value="#{row.rowNo}"/>
+                <f:facet name="header">
+                    <tr:outputText value="Id"/>
+                </f:facet>
+                <tr:outputText value="#{row.id}"/>
             </tr:column>
             <tr:column align="center">
                 <f:facet name="header">
                     <tr:outputText value="Name"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchName}"/>
+                <tr:outputText value="#{row.name}"/>
             </tr:column>
             <tr:column align="center">
                 <f:facet name="header">
                     <tr:outputText value="Birth"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchBirth}"/>
+                <tr:outputText value="#{row.birth}"/>
             </tr:column>
             <tr:column align="center">
                 <f:facet name="header">
                     <tr:outputText value="Death"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchDeath}"/>
+                <tr:outputText value="#{row.death}"/>
             </tr:column>
         </tr:table>
 

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/columnEnd.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/columnEnd.xhtml?rev=925231&r1=925230&r2=925231&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/columnEnd.xhtml
(original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/columnEnd.xhtml
Fri Mar 19 14:20:10 2010
@@ -27,30 +27,30 @@
 
         <tr:outputText value="The monarchs of England, from House of Stuart(restored)
are:"/>
         <tr:spacer height="15px"/>
-        <tr:table width="100%" emptyText="No data available." value="#{tableColumn}" var="row">
+        <tr:table width="100%" emptyText="No data available." value="#{tableColumn.monarchs}"
var="row">
             <tr:column align="end">
-                <tr:outputText value="#{row.rowNo}"/>
+                <f:facet name="header">
+                    <tr:outputText value="Id"/>
+                </f:facet>
+                <tr:outputText value="#{row.id}"/>
             </tr:column>
-
             <tr:column align="end">
                 <f:facet name="header">
                     <tr:outputText value="Name"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchName}"/>
+                <tr:outputText value="#{row.name}"/>
             </tr:column>
-
             <tr:column align="end">
                 <f:facet name="header">
                     <tr:outputText value="Birth"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchBirth}"/>
+                <tr:outputText value="#{row.birth}"/>
             </tr:column>
-
             <tr:column align="end">
                 <f:facet name="header">
                     <tr:outputText value="Death"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchDeath}"/>
+                <tr:outputText value="#{row.death}"/>
             </tr:column>
         </tr:table>
 

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/columnLeft.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/columnLeft.xhtml?rev=925231&r1=925230&r2=925231&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/columnLeft.xhtml
(original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/columnLeft.xhtml
Fri Mar 19 14:20:10 2010
@@ -27,30 +27,30 @@
 
         <tr:outputText value="The monarchs of England, from House of Stuart(restored)
are:"/>
         <tr:spacer height="15px"/>
-        <tr:table width="100%" emptyText="No data available." value="#{tableColumn}" var="row">
+        <tr:table width="100%" emptyText="No data available." value="#{tableColumn.monarchs}"
var="row">
             <tr:column align="left">
-                <tr:outputText value="#{row.rowNo}"/>
+                <f:facet name="header">
+                    <tr:outputText value="Id"/>
+                </f:facet>
+                <tr:outputText value="#{row.id}"/>
             </tr:column>
-
             <tr:column align="left">
                 <f:facet name="header">
                     <tr:outputText value="Name"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchName}"/>
+                <tr:outputText value="#{row.name}"/>
             </tr:column>
-
             <tr:column align="left">
                 <f:facet name="header">
                     <tr:outputText value="Birth"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchBirth}"/>
+                <tr:outputText value="#{row.birth}"/>
             </tr:column>
-
             <tr:column align="left">
                 <f:facet name="header">
                     <tr:outputText value="Death"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchDeath}"/>
+                <tr:outputText value="#{row.death}"/>
             </tr:column>
         </tr:table>
 

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/columnRight.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/columnRight.xhtml?rev=925231&r1=925230&r2=925231&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/columnRight.xhtml
(original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/column/columnRight.xhtml
Fri Mar 19 14:20:10 2010
@@ -27,30 +27,30 @@
 
         <tr:outputText value="The monarchs of England, from House of Stuart(restored)
are:"/>
         <tr:spacer height="15px"/>
-        <tr:table width="100%" emptyText="No data available." value="#{tableColumn}" var="row">
+        <tr:table width="100%" emptyText="No data available." value="#{tableColumn.monarchs}"
var="row">
             <tr:column align="right">
-                <tr:outputText value="#{row.rowNo}"/>
+                <f:facet name="header">
+                    <tr:outputText value="Id"/>
+                </f:facet>
+                <tr:outputText value="#{row.id}"/>
             </tr:column>
-
             <tr:column align="right">
                 <f:facet name="header">
                     <tr:outputText value="Name"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchName}"/>
+                <tr:outputText value="#{row.name}"/>
             </tr:column>
-
             <tr:column align="right">
                 <f:facet name="header">
                     <tr:outputText value="Birth"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchBirth}"/>
+                <tr:outputText value="#{row.birth}"/>
             </tr:column>
-
             <tr:column align="right">
                 <f:facet name="header">
                     <tr:outputText value="Death"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchDeath}"/>
+                <tr:outputText value="#{row.death}"/>
             </tr:column>
         </tr:table>
 

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/table.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/table.xhtml?rev=925231&r1=925230&r2=925231&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/table.xhtml
(original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/table.xhtml
Fri Mar 19 14:20:10 2010
@@ -27,30 +27,30 @@
 
         <tr:outputText value="The monarchs of England, from House of Stuart(restored)
are:"/>
         <tr:spacer height="15px"/>
-        <tr:table width="100%" emptyText="No data available." value="#{tableColumn}" var="row">
-            <tr:column >
+        <tr:table width="100%" emptyText="No data available." value="#{tableColumn.monarchs}"
var="row">
+            <tr:column>
                 <f:facet name="header">
                     <tr:outputText value="Id"/>
                 </f:facet>
-                <tr:outputText value="#{row.rowNo}"/>
+                <tr:outputText value="#{row.id}"/>
             </tr:column>
             <tr:column>
                 <f:facet name="header">
                     <tr:outputText value="Name"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchName}"/>
+                <tr:outputText value="#{row.name}"/>
             </tr:column>
             <tr:column>
                 <f:facet name="header">
                     <tr:outputText value="Birth"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchBirth}"/>
+                <tr:outputText value="#{row.birth}"/>
             </tr:column>
             <tr:column>
                 <f:facet name="header">
                     <tr:outputText value="Death"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchDeath}"/>
+                <tr:outputText value="#{row.death}"/>
             </tr:column>
         </tr:table>
 

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tableMultipleRowSelection.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tableMultipleRowSelection.xhtml?rev=925231&r1=925230&r2=925231&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tableMultipleRowSelection.xhtml
(original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tableMultipleRowSelection.xhtml
Fri Mar 19 14:20:10 2010
@@ -28,30 +28,30 @@
         <tr:outputText value="The monarchs of England, from House of Stuart(restored)
are:"/>
         <tr:spacer height="15px"/>
         <tr:table width="100%" rowSelection="multiple" emptyText="No data available."
-                  value="#{tableColumn}" var="row">
+                  value="#{tableColumn.monarchs}" var="row">
             <tr:column >
                 <f:facet name="header">
                     <tr:outputText value="Id"/>
                 </f:facet>
-                <tr:outputText value="#{row.rowNo}"/>
+                <tr:outputText value="#{row.id}"/>
             </tr:column>
             <tr:column>
                 <f:facet name="header">
                     <tr:outputText value="Name"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchName}"/>
+                <tr:outputText value="#{row.name}"/>
             </tr:column>
             <tr:column>
                 <f:facet name="header">
                     <tr:outputText value="Birth"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchBirth}"/>
+                <tr:outputText value="#{row.birth}"/>
             </tr:column>
             <tr:column>
                 <f:facet name="header">
                     <tr:outputText value="Death"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchDeath}"/>
+                <tr:outputText value="#{row.death}"/>
             </tr:column>
         </tr:table>
 

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tableNoGridLines.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tableNoGridLines.xhtml?rev=925231&r1=925230&r2=925231&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tableNoGridLines.xhtml
(original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tableNoGridLines.xhtml
Fri Mar 19 14:20:10 2010
@@ -27,31 +27,31 @@
 
         <tr:outputText value="The monarchs of England, from House of Stuart(restored)
are:"/>
         <tr:spacer height="15px"/>
-        <tr:table width="100%" emptyText="No data available." value="#{tableColumn}" var="row"
+        <tr:table width="100%" emptyText="No data available." value="#{tableColumn.monarchs}"
var="row"
                 horizontalGridVisible="false" verticalGridVisible="false">
             <tr:column >
                 <f:facet name="header">
                     <tr:outputText value="Id"/>
-                </f:facet>                
-                <tr:outputText value="#{row.rowNo}"/>
+                </f:facet>
+                <tr:outputText value="#{row.id}"/>
             </tr:column>
             <tr:column>
                 <f:facet name="header">
                     <tr:outputText value="Name"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchName}"/>
+                <tr:outputText value="#{row.name}"/>
             </tr:column>
             <tr:column>
                 <f:facet name="header">
                     <tr:outputText value="Birth"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchBirth}"/>
+                <tr:outputText value="#{row.birth}"/>
             </tr:column>
             <tr:column>
                 <f:facet name="header">
                     <tr:outputText value="Death"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchDeath}"/>
+                <tr:outputText value="#{row.death}"/>
             </tr:column>
         </tr:table>
 

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tablePaginated.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tablePaginated.xhtml?rev=925231&r1=925230&r2=925231&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tablePaginated.xhtml
(original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tablePaginated.xhtml
Fri Mar 19 14:20:10 2010
@@ -27,32 +27,32 @@
 
         <tr:outputText value="The monarchs of England, from House of Stuart(restored)
are:"/>
         <tr:spacer height="15px"/>
-        <tr:table width="100%" emptyText="No data available." value="#{tableColumn}" var="row"
+        <tr:table width="100%" emptyText="No data available." value="#{tableColumn.monarchs}"
var="row"
                 verticalGridVisible="false" horizontalGridVisible="false"
                 rows="2">
             <tr:column >
                 <f:facet name="header">
                     <tr:outputText value="Id"/>
-                </f:facet>                
-                <tr:outputText value="#{row.rowNo}"/>
+                </f:facet>
+                <tr:outputText value="#{row.id}"/>
             </tr:column>
             <tr:column>
                 <f:facet name="header">
                     <tr:outputText value="Name"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchName}"/>
+                <tr:outputText value="#{row.name}"/>
             </tr:column>
             <tr:column>
                 <f:facet name="header">
                     <tr:outputText value="Birth"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchBirth}"/>
+                <tr:outputText value="#{row.birth}"/>
             </tr:column>
             <tr:column>
                 <f:facet name="header">
                     <tr:outputText value="Death"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchDeath}"/>
+                <tr:outputText value="#{row.death}"/>
             </tr:column>
         </tr:table>
 

Added: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tableShowHide.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tableShowHide.xhtml?rev=925231&view=auto
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tableShowHide.xhtml
(added)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tableShowHide.xhtml
Fri Mar 19 14:20:10 2010
@@ -0,0 +1,63 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:tr="http://myfaces.apache.org/trinidad"
+                template="/pages/componentDemo.xhtml">
+
+    <ui:define name="demoContent">
+
+        <tr:outputText value="The monarchs of England, from House of Stuart(restored)
are:"/>
+        <tr:spacer height="15px"/>
+        <tr:table width="100%" emptyText="No data available." value="#{tableColumn.monarchs}"
var="row">
+            <f:facet name="detailStamp">
+                <tr:panelHorizontalLayout>
+                    <tr:spacer width="55" height="5"/>
+                    <tr:outputText value="#{row.details}" inlineStyle="color:#A49B90"/>
+                </tr:panelHorizontalLayout>
+            </f:facet>
+            <tr:column >
+                <f:facet name="header">
+                    <tr:outputText value="Id"/>
+                </f:facet>
+                <tr:outputText value="#{row.id}"/>
+            </tr:column>
+            <tr:column>
+                <f:facet name="header">
+                    <tr:outputText value="Name"/>
+                </f:facet>
+                <tr:outputText value="#{row.name}"/>
+            </tr:column>
+            <tr:column>
+                <f:facet name="header">
+                    <tr:outputText value="Birth"/>
+                </f:facet>
+                <tr:outputText value="#{row.birth}"/>
+            </tr:column>
+            <tr:column>
+                <f:facet name="header">
+                    <tr:outputText value="Death"/>
+                </f:facet>
+                <tr:outputText value="#{row.death}"/>
+            </tr:column>
+        </tr:table>
+    </ui:define>
+</ui:composition>

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tableSingleRowSelection.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tableSingleRowSelection.xhtml?rev=925231&r1=925230&r2=925231&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tableSingleRowSelection.xhtml
(original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/table/tableSingleRowSelection.xhtml
Fri Mar 19 14:20:10 2010
@@ -27,30 +27,30 @@
 
         <tr:outputText value="The monarchs of England, from House of Stuart(restored)
are:"/>
         <tr:spacer height="15px"/>
-        <tr:table width="100%" rowSelection="single" emptyText="No data available." value="#{tableColumn}"
var="row">
+        <tr:table width="100%" rowSelection="single" emptyText="No data available." value="#{tableColumn.monarchs}"
var="row">
             <tr:column >
                 <f:facet name="header">
                     <tr:outputText value="Id"/>
                 </f:facet>
-                <tr:outputText value="#{row.rowNo}"/>
+                <tr:outputText value="#{row.id}"/>
             </tr:column>
             <tr:column>
                 <f:facet name="header">
                     <tr:outputText value="Name"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchName}"/>
+                <tr:outputText value="#{row.name}"/>
             </tr:column>
             <tr:column>
                 <f:facet name="header">
                     <tr:outputText value="Birth"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchBirth}"/>
+                <tr:outputText value="#{row.birth}"/>
             </tr:column>
             <tr:column>
                 <f:facet name="header">
                     <tr:outputText value="Death"/>
                 </f:facet>
-                <tr:outputText value="#{row.monarchDeath}"/>
+                <tr:outputText value="#{row.death}"/>
             </tr:column>
         </tr:table>
 

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/treeTable/treeTablePathStamp.xhtml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/treeTable/treeTablePathStamp.xhtml?rev=925231&r1=925230&r2=925231&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/treeTable/treeTablePathStamp.xhtml
(original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-examples/trinidad-components-showcase/src/main/webapp/components/table/treeTable/treeTablePathStamp.xhtml
Fri Mar 19 14:20:10 2010
@@ -1,3 +1,22 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:h="http://java.sun.com/jsf/html"



Mime
View raw message