[richfaces-svn-commits] JBoss Rich Faces SVN: r5024 - in trunk/test-applications/facelets/src/main: java/columns and 4 other directories.

Author: ayanul Date: 2007-12-27 02:28:20 -0500 (Thu, 27 Dec 2007) New Revision: 5024 Added: trunk/test-applications/facelets/src/main/java/columns/ trunk/test-applications/facelets/src/main/java/columns/Columns.java trunk/test-applications/facelets/src/main/webapp/Columns/ trunk/test-applications/facelets/src/main/webapp/Columns/Columns.xhtml trunk/test-applications/facelets/src/main/webapp/Columns/ColumnsProperty.xhtml trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Columns.xml Modified: trunk/test-applications/facelets/src/main/java/rich/RichBean.java trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml Log: add columns (facelets) Added: trunk/test-applications/facelets/src/main/java/columns/Columns.java =================================================================== --- trunk/test-applications/facelets/src/main/java/columns/Columns.java (rev 0) +++ trunk/test-applications/facelets/src/main/java/columns/Columns.java 2007-12-27 07:28:20 UTC (rev 5024) @@ -0,0 +1,189 @@ +package columns; + +import java.util.ArrayList; + +import util.data.Data; + +public class Columns { + private String[] statusIcon = { "/pics/error.gif", "/pics/fatal.gif", + "/pics/info.gif", "/pics/passed.gif", "/pics/warn.gif" }; + private ArrayList<Data> data1; + private ArrayList<Data> data2; + private int length1; + private int length2; + private String columns; + private String begin; + private String end; + private String width; + private String title; + private int colspan; + private int rowspan; + private boolean breakBefore; + private boolean sortable; + private boolean dataTableRendered; + private boolean testColumns; + + public boolean isTestColumns() { + return testColumns; + } + + public void setTestColumns(boolean testColumns) { + this.testColumns = testColumns; + } + + public Columns() { + this.columns = "3"; + this.begin = "0"; + this.end = "10"; + this.width = "100"; + this.title = "Title columns"; + this.colspan = 5; + this.rowspan = 5; + this.breakBefore = true; + this.sortable = true; + this.dataTableRendered = true; + this.testColumns = true; + this.length1 = 5; + this.length2 = 5; + this.data1 = new ArrayList<Data>(); + this.data2 = new ArrayList<Data>(); + for (int i = 0; i < length1; i++) { + data1.add(new Data(i, "data 1 [" + i + "]", "Button " + i, "Link " + i, "select" + (i % 5))); + data2.add(new Data(i, "data 2 [" + i + "]", "Button " + i, "Link " + i, statusIcon[i % 5])); + } + } + + public String getColumns() { + return columns; + } + + public void setColumns(String columns) { + this.columns = columns; + } + + public String getBegin() { + return begin; + } + + public void setBegin(String begin) { + this.begin = begin; + } + + public String getEnd() { + return end; + } + + public void setEnd(String end) { + this.end = end; + } + + public String getWidth() { + return width; + } + + public void setWidth(String width) { + this.width = width; + } + + public int getColspan() { + return colspan; + } + + public void setColspan(int colspan) { + this.colspan = colspan; + } + + public int getRowspan() { + return rowspan; + } + + public void setRowspan(int rowspan) { + this.rowspan = rowspan; + } + + public boolean isBreakBefore() { + return breakBefore; + } + + public void setBreakBefore(boolean breakBefore) { + this.breakBefore = breakBefore; + } + + public boolean isSortable() { + return sortable; + } + + public void setSortable(boolean sortable) { + this.sortable = sortable; + } + + public void addNewItem1() { + if (length1 < 0) + length1 = 0; + if (data1.size() > length1) + for (int i = length1; i < data1.size();) + data1.remove(i); + else + for (int i = data1.size() + 1; i <= length1; i++) + data1.add(new Data(i, "data 1 [" + i + "]", "Button " + i, "Link " + i, "select" + (i % 5))); + } + + public void addNewItem2() { + if (length2 < 0) + length2 = 0; + if (data2.size() > length2) + for (int i = length2; i < data2.size();) + data2.remove(i); + else + for (int i = data1.size() + 1; i <= length2; i++) + data2.add(new Data(i, "data 1 [" + i + "]", "Button " + i, "Link " + i, "select" + (i % 5))); + } + + public ArrayList<Data> getData2() { + return data2; + } + + public void setData2(ArrayList<Data> data2) { + this.data2 = data2; + } + + public ArrayList<Data> getData1() { + return data1; + } + + public void setData1(ArrayList<Data> data1) { + this.data1 = data1; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public int getLength1() { + return length1; + } + + public void setLength1(int length1) { + this.length1 = length1; + } + + public int getLength2() { + return length2; + } + + public void setLength2(int length2) { + this.length2 = length2; + } + + public boolean isDataTableRendered() { + return dataTableRendered; + } + + public void setDataTableRendered(boolean dataTableRendered) { + this.dataTableRendered = dataTableRendered; + } +} Modified: trunk/test-applications/facelets/src/main/java/rich/RichBean.java =================================================================== --- trunk/test-applications/facelets/src/main/java/rich/RichBean.java 2007-12-26 18:52:07 UTC (rev 5023) +++ trunk/test-applications/facelets/src/main/java/rich/RichBean.java 2007-12-27 07:28:20 UTC (rev 5024) @@ -5,6 +5,7 @@ import org.richfaces.VersionBean; public class RichBean { + private static final String EXT = ".xhtml"; private String version = VersionBean.SCM_REVISION; private String src; private MapComponent map; @@ -57,6 +58,7 @@ map.add("ContextMenu", add("/ContextMenu/ContextMenu", new boolean [] {true, false})); map.add("ListShuttle", add("/ListShuttle/ListShuttle", new boolean [] {true, true})); map.add("ComponentControl", add("/ComponentControl/ComponentControl", new boolean [] {false, false})); + map.add("Columns", add("/Columns/Columns", new boolean [] {true, false})); } public String getSrc() { @@ -81,9 +83,9 @@ private ArrayList<String> add(String path, boolean [] arr){ ArrayList<String> list = new ArrayList<String>(); - list.add(path + ".xhtml"); - if(arr[0]) list.add(path + "Property.xhtml"); else list.add("/pages/Blank/BlankProperty.xhtml"); - if(arr[1]) list.add(path + "Straightforward.xhtml"); else list.add("/pages/Blank/BlankStraightforward.xhtml"); + list.add(path + EXT); + if(arr[0]) list.add(path + "Property" + EXT); else list.add("/pages/Blank/BlankProperty" + EXT); + if(arr[1]) list.add(path + "Straightforward" + EXT); else list.add("/pages/Blank/BlankStraightforward" + EXT); return list; } Added: trunk/test-applications/facelets/src/main/webapp/Columns/Columns.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Columns/Columns.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/Columns/Columns.xhtml 2007-12-27 07:28:20 UTC (rev 5024) @@ -0,0 +1,70 @@ +<f:subview id="columnsSubviewID" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.org/rich" + xmlns:ui="http://java.sun.com/jsf/facelets"> + <h:selectBooleanCheckbox value="#{columns.dataTableRendered}"> + <a4j:support event="onchange" reRender="richGridID"></a4j:support> + </h:selectBooleanCheckbox> + <h:outputText value="rich:dataTable:" rendered="#{columns.dataTableRendered}"></h:outputText> + <h:outputText value="h:dataTable:" rendered="#{!columns.dataTableRendered}"></h:outputText> + + <rich:dataTable id="richColumnsID" value="#{columns.data1}" var="d1" rendered="#{columns.dataTableRendered}"> + <h:column> + <h:outputText value="h: #{d1.int0}"></h:outputText> + </h:column> + + <rich:column> + <h:outputText value="rich: #{d1.int0}"></h:outputText> + </rich:column> + + <rich:columns value="#{columns.data2}" var="d2" breakBefore="#{columns.breakBefore}" colspan="#{columns.colspan}" + columns="#{columns.columns}" index="index" rowspan="#{columns.rowspan}" sortable="#{columns.sortable}" title="#{columns.title}" + begin="#{columns.begin}" end="100" width="#{columns.width}"> + <f:facet name="header"> + <h:outputText value="header #{d2.int0}"></h:outputText> + </f:facet> + <h:outputText value="#{index}. "></h:outputText> + <h:outputText value="#{d1.str0}, "></h:outputText> + <h:outputText value="#{d2.str0}"></h:outputText> + <f:facet name="footer"> + <h:outputText value="footer #{d2.int0}"></h:outputText> + </f:facet> + </rich:columns> + </rich:dataTable> + + <h:dataTable id="hColumnsID" value="#{columns.data1}" var="d1" rendered="#{!columns.dataTableRendered}" border="1"> + <h:column> + <h:outputText value="h: #{d1.int0}"></h:outputText> + </h:column> + + <rich:column> + <h:outputText value="rich: #{d1.int0}"></h:outputText> + </rich:column> + + <rich:columns value="#{columns.data2}" var="d2" breakBefore="#{columns.breakBefore}" colspan="#{columns.colspan}" + columns="#{columns.columns}" index="index" rowspan="#{columns.rowspan}" sortable="#{columns.sortable}" title="#{columns.title}" + begin="#{columns.begin}" end="100" width="#{columns.width}"> + <f:facet name="header"> + <h:outputText value="header #{d2.int0}"></h:outputText> + </f:facet> + <h:outputText value="#{index}. "></h:outputText> + <h:outputText value="#{d1.str0}, "></h:outputText> + <h:outputText value="#{d2.str0}"></h:outputText> + <f:facet name="footer"> + <h:outputText value="footer #{d2.int0}"></h:outputText> + </f:facet> + </rich:columns> + </h:dataTable> + + <f:verbatim><br/></f:verbatim> + <h:outputText value="test columns (*) "></h:outputText> + <h:selectBooleanCheckbox value="#{columns.testColumns}"></h:selectBooleanCheckbox> + + <rich:dataTable value="#{columns.data1}" var="data" rendered="#{columns.testColumns}"> + <rich:columns columns="#{columns.columns}"> + <h:outputText value="#{data.str0}"></h:outputText> + </rich:columns> + </rich:dataTable> +</f:subview> \ No newline at end of file Added: trunk/test-applications/facelets/src/main/webapp/Columns/ColumnsProperty.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Columns/ColumnsProperty.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/Columns/ColumnsProperty.xhtml 2007-12-27 07:28:20 UTC (rev 5024) @@ -0,0 +1,61 @@ +<f:subview id="columnsPropertyID" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.org/rich" + xmlns:ui="http://java.sun.com/jsf/facelets"> + <h:commandButton action="submit();" value="submit"></h:commandButton> + <a4j:commandButton value="submit [a4j]" reRender="columnsID"></a4j:commandButton> + <h:panelGrid columns="2"> + <f:facet name="header"> + <h:outputText value="columns"></h:outputText> + </f:facet> + <h:outputText value="Enter quantity of lines [data 1]" /> + <h:panelGroup> + <h:inputText value="#{columns.length1}" /> + <h:commandButton action="#{columns.addNewItem1}" value="ok" onclick="submit();"></h:commandButton> + </h:panelGroup> + + <h:outputText value="Enter quantity of lines [data 2]" /> + <h:panelGroup> + <h:inputText value="#{columns.length2}" /> + <h:commandButton action="#{columns.addNewItem2}" value="ok" onclick="submit();"></h:commandButton> + </h:panelGroup> + + <h:outputText value="title:"></h:outputText> + <h:inputText value="#{columns.title}" onchange="submit();"> + </h:inputText> + + <h:outputText value="columns (*):"></h:outputText> + <h:inputText value="#{columns.columns}" onchange="submit();"> + </h:inputText> + + <h:outputText value="rowspan:"></h:outputText> + <h:inputText value="#{columns.rowspan}" onchange="submit();"> + </h:inputText> + + <h:outputText value="colspan:"></h:outputText> + <h:inputText value="#{columns.colspan}" onchange="submit();"> + </h:inputText> + + <h:outputText value="begin:"></h:outputText> + <h:inputText value="#{columns.begin}" onchange="submit();"> + </h:inputText> + + <h:outputText value="end:"></h:outputText> + <h:inputText value="#{columns.end}" onchange="submit();"> + </h:inputText> + + <h:outputText value="width:"></h:outputText> + <h:inputText value="#{columns.width}" onchange="submit();"> + </h:inputText> + + <h:outputText value="sortable"></h:outputText> + <h:selectBooleanCheckbox value="#{columns.sortable}" onchange="submit();"> + </h:selectBooleanCheckbox> + + <h:outputText value="breakBefore:"></h:outputText> + <h:selectBooleanCheckbox value="#{columns.breakBefore}" onchange="submit();"> + </h:selectBooleanCheckbox> + </h:panelGrid> +</f:subview> \ No newline at end of file Added: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Columns.xml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Columns.xml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Columns.xml 2007-12-27 07:28:20 UTC (rev 5024) @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN" + "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"> +<faces-config> + <managed-bean> + <managed-bean-name>columns</managed-bean-name> + <managed-bean-class>columns.Columns</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> +</faces-config> Modified: trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2007-12-26 18:52:07 UTC (rev 5023) +++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2007-12-27 07:28:20 UTC (rev 5024) @@ -33,20 +33,21 @@ </context-param> <context-param> <param-name>javax.faces.CONFIG_FILES</param-name> - <param-value>/WEB-INF/faces-config-RichPanelsBean.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml, - /WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml, - /WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml, - /WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml, - /WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml, - /WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml, - /WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml, - /WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml, - /WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml, - /WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml, - /WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml, - /WEB-INF/faces-config-RichTest.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml, - /WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml, - /WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml,/WEB-INF/faces-config-ComponentControl.xml</param-value> + <param-value>/WEB-INF/faces-config-RichPanelsBean.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml, + /WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml, + /WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml, + /WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml, + /WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml, + /WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml, + /WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml, + /WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml, + /WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml, + /WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml, + /WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml, + /WEB-INF/faces-config-RichTest.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml, + /WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml, + /WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml, + /WEB-INF/faces-config-ComponentControl.xml, /WEB-INF/faces-config-Columns.xml</param-value> </context-param> <context-param> <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name>