[richfaces-svn-commits] JBoss Rich Faces SVN: r2271 - in trunk: samples/scrollable-grid-demo and 11 other directories.

Author: maksimkaszynski Date: 2007-08-15 11:29:15 -0400 (Wed, 15 Aug 2007) New Revision: 2271 Removed: trunk/ui/scrollable-grid/src/test/java/org/richfaces/component/html/HtmlScrollableGridColumnComponentTest.java trunk/ui/scrollable-grid/src/test/java/org/richfaces/taglib/ScrollableGridColumnTagTest.java Modified: trunk/framework/api/src/main/java/org/richfaces/component/Column.java trunk/samples/scrollable-grid-demo/pom.xml trunk/samples/scrollable-grid-demo/src/main/webapp/pages/columns.xhtml trunk/samples/scrollable-grid-demo/src/main/webapp/pages/scrollable-grid.xhtml trunk/ui/dataTable/src/main/config/component/column.xml trunk/ui/scrollable-grid/pom.xml trunk/ui/scrollable-grid/src/main/config/component/scrollable-grid.xml trunk/ui/scrollable-grid/src/main/java/org/richfaces/component/UIScrollableGrid.java trunk/ui/scrollable-grid/src/main/java/org/richfaces/event/sort/MultiColumnSortListener.java trunk/ui/scrollable-grid/src/main/java/org/richfaces/event/sort/SingleColumnSortListener.java trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ColumnIterator.java trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ColumnVisitor.java trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ColumnWalker.java trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ExtendedColumnVisitor.java trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/SortIconRenderer.java trunk/ui/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx trunk/ui/scrollable-grid/src/test/java/org/richfaces/renderkit/html/ScrollableGridRendererTest.java Log: http://jira.jboss.com/jira/browse/RF-588 Modified: trunk/framework/api/src/main/java/org/richfaces/component/Column.java =================================================================== --- trunk/framework/api/src/main/java/org/richfaces/component/Column.java 2007-08-15 14:55:07 UTC (rev 2270) +++ trunk/framework/api/src/main/java/org/richfaces/component/Column.java 2007-08-15 15:29:15 UTC (rev 2271) @@ -41,5 +41,20 @@ */ public abstract void setBreakBefore(boolean newBreakBefore); + + /** + * The column allows data sorting + * @return + */ + public abstract boolean isSortable(); + + public abstract void setSortable(boolean sortable); + /* + * name of sort field bound to this column + public abstract String getName(); + + public abstract void setName(String name); + + */ } Modified: trunk/samples/scrollable-grid-demo/pom.xml =================================================================== --- trunk/samples/scrollable-grid-demo/pom.xml 2007-08-15 14:55:07 UTC (rev 2270) +++ trunk/samples/scrollable-grid-demo/pom.xml 2007-08-15 15:29:15 UTC (rev 2271) @@ -28,6 +28,11 @@ <artifactId>core</artifactId> <version>3.1.0-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>dataTable</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> </dependencies> <build> Modified: trunk/samples/scrollable-grid-demo/src/main/webapp/pages/columns.xhtml =================================================================== --- trunk/samples/scrollable-grid-demo/src/main/webapp/pages/columns.xhtml 2007-08-15 14:55:07 UTC (rev 2270) +++ trunk/samples/scrollable-grid-demo/src/main/webapp/pages/columns.xhtml 2007-08-15 15:29:15 UTC (rev 2271) @@ -3,10 +3,11 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/scrollable-grid&qu... + xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/scrollable-grid" + xmlns:dt="http://labs.jboss.com/jbossrichfaces/ui/dataTable"> <ui:composition> - <sg:column width="200px"> + <dt:column width="200px"> <f:facet name="header"> <h:outputText value="header"></h:outputText> </f:facet> @@ -14,8 +15,8 @@ <f:facet name="footer"> <h:outputText value="footer"></h:outputText> </f:facet> - </sg:column> - <sg:column width="200px"> + </dt:column> + <dt:column width="200px"> <f:facet name="header"> <h:outputText value="header"></h:outputText> </f:facet> @@ -23,8 +24,8 @@ <f:facet name="footer"> <h:outputText value="footer"></h:outputText> </f:facet> - </sg:column> - <sg:column width="200px"> + </dt:column> + <dt:column width="200px"> <f:facet name="header"> <h:outputText value="header"></h:outputText> </f:facet> @@ -32,8 +33,8 @@ <f:facet name="footer"> <h:outputText value="footer"></h:outputText> </f:facet> - </sg:column> - <sg:column width="200px"> + </dt:column> + <dt:column width="200px"> <f:facet name="header"> <h:outputText value="header"></h:outputText> </f:facet> @@ -41,8 +42,8 @@ <f:facet name="footer"> <h:outputText value="footer"></h:outputText> </f:facet> - </sg:column> - <sg:column width="200px"> + </dt:column> + <dt:column width="200px"> <f:facet name="header"> <h:outputText value="header"></h:outputText> </f:facet> @@ -50,8 +51,8 @@ <f:facet name="footer"> <h:outputText value="footer"></h:outputText> </f:facet> - </sg:column> - <sg:column width="200px"> + </dt:column> + <dt:column width="200px"> <f:facet name="header"> <h:outputText value="header"></h:outputText> </f:facet> @@ -59,8 +60,8 @@ <f:facet name="footer"> <h:outputText value="footer"></h:outputText> </f:facet> - </sg:column> - <sg:column width="200px"> + </dt:column> + <dt:column width="200px"> <f:facet name="header"> <h:outputText value="header"></h:outputText> </f:facet> @@ -68,8 +69,8 @@ <f:facet name="footer"> <h:outputText value="footer"></h:outputText> </f:facet> - </sg:column> - <sg:column width="200px"> + </dt:column> + <dt:column width="200px"> <f:facet name="header"> <h:outputText value="header"></h:outputText> </f:facet> @@ -77,8 +78,8 @@ <f:facet name="footer"> <h:outputText value="footer"></h:outputText> </f:facet> - </sg:column> - <sg:column width="200px"> + </dt:column> + <dt:column width="200px"> <f:facet name="header"> <h:outputText value="header"></h:outputText> </f:facet> @@ -86,8 +87,8 @@ <f:facet name="footer"> <h:outputText value="footer"></h:outputText> </f:facet> - </sg:column> - <sg:column width="200px"> + </dt:column> + <dt:column width="200px"> <f:facet name="header"> <h:outputText value="header"></h:outputText> </f:facet> @@ -95,8 +96,8 @@ <f:facet name="footer"> <h:outputText value="footer"></h:outputText> </f:facet> - </sg:column> - <sg:column width="200px"> + </dt:column> + <dt:column width="200px"> <f:facet name="header"> <h:outputText value="header"></h:outputText> </f:facet> @@ -104,8 +105,8 @@ <f:facet name="footer"> <h:outputText value="footer"></h:outputText> </f:facet> - </sg:column> - <sg:column width="200px"> + </dt:column> + <dt:column width="200px"> <f:facet name="header"> <h:outputText value="header"></h:outputText> </f:facet> @@ -113,8 +114,8 @@ <f:facet name="footer"> <h:outputText value="footer"></h:outputText> </f:facet> - </sg:column> - <sg:column width="200px"> + </dt:column> + <dt:column width="200px"> <f:facet name="header"> <h:outputText value="header"></h:outputText> </f:facet> @@ -122,8 +123,8 @@ <f:facet name="footer"> <h:outputText value="footer"></h:outputText> </f:facet> - </sg:column> - <sg:column width="200px"> + </dt:column> + <dt:column width="200px"> <f:facet name="header"> <h:outputText value="header"></h:outputText> </f:facet> @@ -131,8 +132,8 @@ <f:facet name="footer"> <h:outputText value="footer"></h:outputText> </f:facet> - </sg:column> - <sg:column width="200px"> + </dt:column> + <dt:column width="200px"> <f:facet name="header"> <h:outputText value="header"></h:outputText> </f:facet> @@ -140,8 +141,8 @@ <f:facet name="footer"> <h:outputText value="footer"></h:outputText> </f:facet> - </sg:column> - <sg:column width="200px"> + </dt:column> + <dt:column width="200px"> <f:facet name="header"> <h:outputText value="header"></h:outputText> </f:facet> @@ -149,8 +150,8 @@ <f:facet name="footer"> <h:outputText value="footer"></h:outputText> </f:facet> - </sg:column> - <sg:column width="200px"> + </dt:column> + <dt:column width="200px"> <f:facet name="header"> <h:outputText value="header"></h:outputText> </f:facet> @@ -158,8 +159,8 @@ <f:facet name="footer"> <h:outputText value="footer"></h:outputText> </f:facet> - </sg:column> - <sg:column width="200px"> + </dt:column> + <dt:column width="200px"> <f:facet name="header"> <h:outputText value="header"></h:outputText> </f:facet> @@ -167,6 +168,6 @@ <f:facet name="footer"> <h:outputText value="footer"></h:outputText> </f:facet> - </sg:column> + </dt:column> </ui:composition> </jsp:root> Modified: trunk/samples/scrollable-grid-demo/src/main/webapp/pages/scrollable-grid.xhtml =================================================================== --- trunk/samples/scrollable-grid-demo/src/main/webapp/pages/scrollable-grid.xhtml 2007-08-15 14:55:07 UTC (rev 2270) +++ trunk/samples/scrollable-grid-demo/src/main/webapp/pages/scrollable-grid.xhtml 2007-08-15 15:29:15 UTC (rev 2271) @@ -1,10 +1,12 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core" + xmlns:c="http://java.sun.com/jstl/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/scrollable-grid" xmlns:a4j="https://ajax4jsf.dev.java.net/ajax" + xmlns:dt="http://labs.jboss.com/jbossrichfaces/ui/dataTable" <head> @@ -19,6 +21,11 @@ font-weight:normal; line-height:normal; } + + .rich-sgrid-row { + height: 30px; + } + </style> </head> @@ -30,17 +37,19 @@ <h:commandLink action="#{skinBean.change}" value="set skin" /> </h:form> <h:form> - + + <c:set var="renderFooter" value="#{true}"/> + <sg:scrollable-grid value="#{dataModel2}" var="issues" frozenColCount="3" first="0" rows="40" width="800px" - height="500px"> + height="500px" hideWhenScrolling="false"> - <sg:column width="100px" sortable="false"> + <dt:column width="100px" sortable="false"> <f:facet name="header"> <h:outputText value="Index"></h:outputText> @@ -48,13 +57,15 @@ <h:outputText value="#{issues.index}"></h:outputText> + <c:if test="#{renderFooter}"> <f:facet name="footer"> <h:outputText value="footer0"></h:outputText> </f:facet> + </c:if> - </sg:column> + </dt:column> - <sg:column width="200px"> + <dt:column width="200px"> <f:facet name="header"> <h:outputText value="Key"></h:outputText> @@ -62,14 +73,15 @@ <h:outputText value="#{issues.key.value}"></h:outputText> + <c:if test="#{renderFooter}"> <f:facet name="footer"> <h:outputText value="footer1"></h:outputText> </f:facet> - - </sg:column> + </c:if> + </dt:column> - <sg:column width="200px"> + <dt:column width="200px"> <f:facet name="header"> <h:outputText value="Summary"></h:outputText> @@ -77,13 +89,14 @@ <h:outputText value="#{issues.summary}"></h:outputText> + <c:if test="#{renderFooter}"> <f:facet name="footer"> <h:outputText value="footer2"></h:outputText> </f:facet> - - </sg:column> + </c:if> + </dt:column> - <sg:column width="200px"> + <dt:column width="200px"> <f:facet name="header"> <h:outputText value="Assignee"></h:outputText> @@ -91,13 +104,14 @@ <h:inputText value="#{issues.assignee}" converter="#{jiraUserConverter}" styleClass="inputStyle"></h:inputText> + <c:if test="#{renderFooter}"> <f:facet name="footer"> <h:outputText value="footer3"></h:outputText> </f:facet> - - </sg:column> + </c:if> + </dt:column> - <sg:column width="200px"> + <dt:column width="200px"> <f:facet name="header"> <h:outputText value="Status"></h:outputText> @@ -111,13 +125,14 @@ <f:selectItem itemValue="#{status_reopened}" itemLabel="Reopened"/> </h:selectOneMenu> + <c:if test="#{renderFooter}"> <f:facet name="footer"> <h:outputText value="footer4"></h:outputText> </f:facet> - - </sg:column> + </c:if> + </dt:column> - <sg:column width="200px"> + <dt:column width="200px"> <f:facet name="header"> <h:outputText value="Reporter"></h:outputText> @@ -125,13 +140,14 @@ <h:outputText value="#{issues.reporter.username}"></h:outputText> + <c:if test="#{renderFooter}"> <f:facet name="footer"> <h:outputText value="footer5"></h:outputText> </f:facet> - - </sg:column> + </c:if> + </dt:column> - <sg:column width="200px"> + <dt:column width="200px"> <f:facet name="header"> <h:outputText value="Priority"></h:outputText> @@ -145,13 +161,14 @@ <f:selectItem itemValue="#{priority_cosmetic}" itemLabel="Cosmetic"/> </h:selectOneMenu> + <c:if test="#{renderFooter}"> <f:facet name="footer"> <h:outputText value="footer6"></h:outputText> </f:facet> - - </sg:column> + </c:if> + </dt:column> - <sg:column width="200px"> + <dt:column width="200px"> <f:facet name="header"> <h:outputText value="Resolution"></h:outputText> @@ -159,15 +176,20 @@ <h:inputText value="#{issues.resolution}" styleClass="inputStyle"></h:inputText> + <c:if test="#{renderFooter}"> <f:facet name="footer"> <h:outputText value="footer8"></h:outputText> </f:facet> - - </sg:column> + </c:if> + </dt:column> </sg:scrollable-grid> <h:commandButton value="submit"></h:commandButton> <h:messages showDetail="true"/> </h:form> + + <h:outputLink target="_blank" value="resource:///org/ajax4jsf/javascript/jsshell.html">Console</h:outputLink> + + </f:view> </body> </html> \ No newline at end of file Modified: trunk/ui/dataTable/src/main/config/component/column.xml =================================================================== --- trunk/ui/dataTable/src/main/config/component/column.xml 2007-08-15 14:55:07 UTC (rev 2270) +++ trunk/ui/dataTable/src/main/config/component/column.xml 2007-08-15 15:29:15 UTC (rev 2271) @@ -60,6 +60,19 @@ <classname>java.lang.String</classname> <description>Space-separated list of CSS style class(es) that are be applied to any footer generated for this table</description> </property> + <property> + <name>width</name> + <classname>java.lang.String</classname> + <description></description> + <defaultvalue>"100px"</defaultvalue> + </property> + + <property> + <name>sortable</name> + <classname>boolean</classname> + <description></description> + <defaultvalue>true</defaultvalue> + </property> <!-- <property> <name>param</name> Modified: trunk/ui/scrollable-grid/pom.xml =================================================================== --- trunk/ui/scrollable-grid/pom.xml 2007-08-15 14:55:07 UTC (rev 2270) +++ trunk/ui/scrollable-grid/pom.xml 2007-08-15 15:29:15 UTC (rev 2271) @@ -67,5 +67,10 @@ <artifactId>richfaces-impl</artifactId> <version>3.1.0-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>dataTable</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/ui/scrollable-grid/src/main/config/component/scrollable-grid.xml =================================================================== --- trunk/ui/scrollable-grid/src/main/config/component/scrollable-grid.xml 2007-08-15 14:55:07 UTC (rev 2270) +++ trunk/ui/scrollable-grid/src/main/config/component/scrollable-grid.xml 2007-08-15 15:29:15 UTC (rev 2271) @@ -124,76 +124,6 @@ &ui_component_attributes; </component> - <component> - <name>org.richfaces.component.ScrollableGridColumn</name> - <family>org.richfaces.component.ScrollableGrid</family> - <classname> - org.richfaces.component.html.HtmlScrollableGridColumn - </classname> - <superclass>org.richfaces.component.UIScrollableGridColumn</superclass> - <!-- - <test> - <classname> org.richfaces.component.html.HtmlScrollableGridColumnTest</classname> - <superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname> - </test> --> - <tag> - <name>column</name> - <classname>org.richfaces.taglib.ScrollableGridColumnTag</classname> - <superclass> - org.ajax4jsf.webapp.taglib.HtmlComponentTagBase - </superclass> - <!-- - <test> - <classname>org.richfaces.taglib.ScrollableGridColumnTagTest</classname> - <superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname> - </test> --> - <description> - <![CDATA[ Scrollable Grid custom column impl]]> - </description> - </tag> - <property> - <name>width</name> - <classname>java.lang.String</classname> - <description></description> - <defaultvalue>"100px"</defaultvalue> - </property> - - <property> - <name>sortable</name> - <classname>boolean</classname> - <description></description> - <defaultvalue>true</defaultvalue> - </property> - - <property> - <name>footerClass</name> - <classname>java.lang.String</classname> - </property> - - <property> - <name>headerClass</name> - <classname>java.lang.String</classname> - </property> - - <property> - <name>styleClass</name> - <classname>java.lang.String</classname> - </property> - - <property> - <name>cellStyle</name> - <classname>java.lang.String</classname> - </property> - - <property> - <name>cellClass </name> - <classname>java.lang.String</classname> - </property> - - &ui_component_attributes; - &html_style_attributes; - </component> - <renderer generate="true"> <template>org/richfaces/scrollable-grid-cell.jspx</template> </renderer> Modified: trunk/ui/scrollable-grid/src/main/java/org/richfaces/component/UIScrollableGrid.java =================================================================== --- trunk/ui/scrollable-grid/src/main/java/org/richfaces/component/UIScrollableGrid.java 2007-08-15 14:55:07 UTC (rev 2270) +++ trunk/ui/scrollable-grid/src/main/java/org/richfaces/component/UIScrollableGrid.java 2007-08-15 15:29:15 UTC (rev 2271) @@ -246,9 +246,8 @@ chain.addIterator(getFacets().values().iterator()); for (Iterator i = getChildren().iterator(); i.hasNext(); ) { UIComponent kid = (UIComponent)i.next(); - if (kid instanceof UIScrollableGridColumn) { - UIScrollableGridColumn column = (UIScrollableGridColumn) kid; - chain.addIterator(column.getChildIterator()); + if (kid instanceof Column) { + chain.addIterator(kid.getChildren().iterator()); } } @@ -260,9 +259,8 @@ IteratorChain chain = new IteratorChain(getFacets().values().iterator()); for (Iterator i = getChildren().iterator(); i.hasNext(); ) { UIComponent kid = (UIComponent)i.next(); - if (kid instanceof UIScrollableGridColumn) { - UIScrollableGridColumn column = (UIScrollableGridColumn) kid; - chain.addIterator(column.getFacetIterator()); + if (kid instanceof Column) { + chain.addIterator(kid.getFacets().values().iterator()); } } Modified: trunk/ui/scrollable-grid/src/main/java/org/richfaces/event/sort/MultiColumnSortListener.java =================================================================== --- trunk/ui/scrollable-grid/src/main/java/org/richfaces/event/sort/MultiColumnSortListener.java 2007-08-15 14:55:07 UTC (rev 2270) +++ trunk/ui/scrollable-grid/src/main/java/org/richfaces/event/sort/MultiColumnSortListener.java 2007-08-15 15:29:15 UTC (rev 2271) @@ -8,10 +8,11 @@ import java.util.LinkedList; import java.util.List; +import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; +import org.richfaces.component.Column; import org.richfaces.component.UIScrollableGrid; -import org.richfaces.component.UIScrollableGridColumn; import org.richfaces.model.SortField; import org.richfaces.model.SortOrder; @@ -32,10 +33,13 @@ public void processSort(SortEvent e) { UIScrollableGrid grid = (UIScrollableGrid) e.getComponent(); int columnIndex = e.getSortColumn(); - UIScrollableGridColumn column = - (UIScrollableGridColumn) grid.getChildren().get(columnIndex); - String name = column.getName(); + + UIComponent column = + (UIComponent) grid.getChildren().get(columnIndex); + //TODO: replace with getName? + String name = column.getId(); + SortOrder sortOrder = grid.getSortOrder(); if (sortOrder == null) { sortOrder = new SortOrder(); Modified: trunk/ui/scrollable-grid/src/main/java/org/richfaces/event/sort/SingleColumnSortListener.java =================================================================== --- trunk/ui/scrollable-grid/src/main/java/org/richfaces/event/sort/SingleColumnSortListener.java 2007-08-15 14:55:07 UTC (rev 2270) +++ trunk/ui/scrollable-grid/src/main/java/org/richfaces/event/sort/SingleColumnSortListener.java 2007-08-15 15:29:15 UTC (rev 2271) @@ -3,10 +3,12 @@ */ package org.richfaces.event.sort; +import javax.faces.component.UIColumn; +import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; +import org.richfaces.component.Column; import org.richfaces.component.UIScrollableGrid; -import org.richfaces.component.UIScrollableGridColumn; import org.richfaces.model.SortField; import org.richfaces.model.SortOrder; @@ -27,10 +29,12 @@ public void processSort(SortEvent e) { UIScrollableGrid grid = (UIScrollableGrid) e.getComponent(); int columnIndex = e.getSortColumn(); - UIScrollableGridColumn column = - (UIScrollableGridColumn) grid.getChildren().get(columnIndex); - String name = column.getName(); + UIComponent column = + (UIComponent) grid.getChildren().get(columnIndex); + //TODO: replace with getName? + String name = column.getId(); + SortOrder sortOrder = grid.getSortOrder(); if (sortOrder == null) { sortOrder = new SortOrder(); Modified: trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ColumnIterator.java =================================================================== --- trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ColumnIterator.java 2007-08-15 14:55:07 UTC (rev 2270) +++ trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ColumnIterator.java 2007-08-15 15:29:15 UTC (rev 2271) @@ -6,8 +6,8 @@ import java.util.Iterator; import java.util.List; +import org.richfaces.component.Column; import org.richfaces.component.UIScrollableGrid; -import org.richfaces.component.UIScrollableGridColumn; /** * @author Maksim Kaszynski @@ -65,8 +65,8 @@ return o; } - public UIScrollableGridColumn nextColumn() { - return (UIScrollableGridColumn) next(); + public Column nextColumn() { + return (Column) next(); } public void remove() { Modified: trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ColumnVisitor.java =================================================================== --- trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ColumnVisitor.java 2007-08-15 14:55:07 UTC (rev 2270) +++ trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ColumnVisitor.java 2007-08-15 15:29:15 UTC (rev 2271) @@ -5,16 +5,15 @@ import java.io.IOException; +import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import org.richfaces.component.UIScrollableGridColumn; - /** * @author Anton Belevich * */ public interface ColumnVisitor { - public int visit(FacesContext context, UIScrollableGridColumn column, ResponseWriter writer, GridRendererState state) throws IOException; + public int visit(FacesContext context, UIComponent column, ResponseWriter writer, GridRendererState state) throws IOException; } Modified: trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ColumnWalker.java =================================================================== --- trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ColumnWalker.java 2007-08-15 14:55:07 UTC (rev 2270) +++ trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ColumnWalker.java 2007-08-15 15:29:15 UTC (rev 2271) @@ -10,8 +10,8 @@ import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; +import org.richfaces.component.Column; import org.richfaces.component.UIScrollableGrid; -import org.richfaces.component.UIScrollableGridColumn; /** * @author Anton Belevich @@ -44,9 +44,8 @@ for (Iterator iter = component.getChildren().iterator(); iter.hasNext(); ) { UIComponent kid = (UIComponent) iter.next(); if (kid.isRendered()) { - if (kid instanceof UIScrollableGridColumn){ - UIScrollableGridColumn column = (UIScrollableGridColumn)kid; - columnsCount += visitor.visit(context, column, writer, state); + if (kid instanceof Column){ + columnsCount += visitor.visit(context, kid, writer, state); state.nextCell(); } } Modified: trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ExtendedColumnVisitor.java =================================================================== --- trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ExtendedColumnVisitor.java 2007-08-15 14:55:07 UTC (rev 2270) +++ trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ExtendedColumnVisitor.java 2007-08-15 15:29:15 UTC (rev 2271) @@ -5,11 +5,10 @@ import java.io.IOException; +import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import org.richfaces.component.UIScrollableGridColumn; - /** * @author Anton Belevich * @@ -19,7 +18,7 @@ /* (non-Javadoc) * @see org.richfaces.renderkit.html.ColumnVisitor#visit(javax.faces.context.FacesContext, org.richfaces.component.UIScrollableGridColumn, javax.faces.context.ResponseWriter, org.richfaces.renderkit.html.GridRendererState) */ - public int visit(FacesContext context, UIScrollableGridColumn column, + public int visit(FacesContext context, UIComponent column, ResponseWriter writer, GridRendererState state) throws IOException { if(state.isFrozenColumn()){ @@ -35,5 +34,5 @@ return 1; }; - abstract public void renderContent(FacesContext context, UIScrollableGridColumn column,ResponseWriter writer, GridRendererState state) throws IOException; + abstract public void renderContent(FacesContext context, UIComponent column,ResponseWriter writer, GridRendererState state) throws IOException; } Modified: trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java =================================================================== --- trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java 2007-08-15 14:55:07 UTC (rev 2270) +++ trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java 2007-08-15 15:29:15 UTC (rev 2271) @@ -20,8 +20,8 @@ import org.ajax4jsf.renderkit.RendererUtils.HTML; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.richfaces.component.Column; import org.richfaces.component.UIScrollableGrid; -import org.richfaces.component.UIScrollableGridColumn; import org.richfaces.event.scroll.ScrollEvent; import org.richfaces.event.sort.SortEvent; import org.richfaces.model.SortField; @@ -63,7 +63,7 @@ private final ColumnVisitor columnsWidthCounter = new ColumnVisitor(){ - public int visit(FacesContext context, UIScrollableGridColumn column, ResponseWriter writer, GridRendererState state) throws IOException { + public int visit(FacesContext context, UIComponent column, ResponseWriter writer, GridRendererState state) throws IOException { int prevWidth = 0; int width = 0; @@ -83,7 +83,7 @@ private final ColumnVisitor colsRenderer = new ExtendedColumnVisitor(){ - public void renderContent(FacesContext context, UIScrollableGridColumn column, ResponseWriter writer, GridRendererState state) throws IOException { + public void renderContent(FacesContext context, UIComponent column, ResponseWriter writer, GridRendererState state) throws IOException { writer.startElement("col", column); getUtils().writeAttribute(writer, "width", column.getAttributes().get("width")); getUtils().writeAttribute(writer, "style", column.getAttributes().get("style")); @@ -97,7 +97,7 @@ private final ColumnVisitor headerCellRenderer = new ExtendedColumnVisitor(){ - public void renderContent(FacesContext context, UIScrollableGridColumn column, ResponseWriter writer, GridRendererState state) throws IOException { + public void renderContent(FacesContext context, UIComponent column, ResponseWriter writer, GridRendererState state) throws IOException { int cell_index = state.getCellIndex(); @@ -132,7 +132,7 @@ private final ColumnVisitor headerRenderer = new ColumnVisitor() { - public int visit(FacesContext context, UIScrollableGridColumn column, + public int visit(FacesContext context, UIComponent column, ResponseWriter writer, GridRendererState state) throws IOException { @@ -170,9 +170,12 @@ Boolean sorting = null; - UIScrollableGridColumn column = - (UIScrollableGridColumn) grid.getChildren().get(columnIndex); - String name = column.getName(); + UIComponent column = + (UIComponent) grid.getChildren().get(columnIndex); + + //TODO: replace with getName? + String name = column.getId(); + SortOrder sortOrder = grid.getSortOrder(); if (sortOrder != null) { @@ -197,7 +200,7 @@ private final ColumnVisitor footerCellRenderer = new ExtendedColumnVisitor(){ - public void renderContent(FacesContext context, UIScrollableGridColumn column, ResponseWriter writer, GridRendererState state) throws IOException { + public void renderContent(FacesContext context, UIComponent column, ResponseWriter writer, GridRendererState state) throws IOException { int cell_index = state.getCellIndex(); String client_id = state.getClientId(); @@ -220,7 +223,7 @@ private final ColumnVisitor cellRenderer = new ExtendedColumnVisitor(){ - public void renderContent(FacesContext context, UIScrollableGridColumn column, ResponseWriter writer, GridRendererState state) throws IOException { + public void renderContent(FacesContext context, UIComponent column, ResponseWriter writer, GridRendererState state) throws IOException { String cell_id = state.getRowIndex()+ "_" + state.getCellIndex(); if (log.isTraceEnabled()) { @@ -325,8 +328,9 @@ if (kid.isRendered()) { - if (kid instanceof UIScrollableGridColumn){ + if (kid instanceof Column){ String baseClientId = grid.getBaseClientId(context); + if(state.isFrozenColumn() && !frozenTRRendered){ state.setFrozenPart(true); @@ -355,8 +359,7 @@ } - UIScrollableGridColumn column = (UIScrollableGridColumn)kid; - columnsCount += cellRenderer.visit(context, column, writer, state); + columnsCount += cellRenderer.visit(context, kid, writer, state); // columnsCount += cellRenderer.visit(context, column, writer, state); @@ -568,7 +571,7 @@ int sortDataIndex = Integer.parseInt((String)parameters.get(clientId + ":sortIndex")); Integer sortStartRow = Integer.valueOf((String)parameters.get(clientId + ":sortStartRow")); - UIScrollableGridColumn column = (UIScrollableGridColumn)grid.getChildren().get(sortColumn); + Column column = (Column)grid.getChildren().get(sortColumn); if(column.isSortable()){ Modified: trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/SortIconRenderer.java =================================================================== --- trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/SortIconRenderer.java 2007-08-15 14:55:07 UTC (rev 2270) +++ trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/SortIconRenderer.java 2007-08-15 15:29:15 UTC (rev 2271) @@ -11,7 +11,6 @@ import org.ajax4jsf.renderkit.RendererBase; import org.ajax4jsf.renderkit.RendererUtils.HTML; -import org.richfaces.component.UIScrollableGridColumn; /** * @author Maksim Kaszynski @@ -21,11 +20,11 @@ public void renderAscIcon(FacesContext context, UIComponent component) throws IOException{ - renderFacetOrIcon(context, component, UIScrollableGridColumn.ASC_ICON, "dr-sgrid-sort-asc"); + renderFacetOrIcon(context, component, "ascIcon", "dr-sgrid-sort-asc"); } public void renderDescIcon(FacesContext context, UIComponent component) throws IOException{ - renderFacetOrIcon(context, component, UIScrollableGridColumn.DESC_ICON, "dr-sgrid-sort-desc"); + renderFacetOrIcon(context, component, "descIcon", "dr-sgrid-sort-desc"); } private void renderFacetOrIcon(FacesContext context, UIComponent component, String facetName, String clazz) throws IOException{ Modified: trunk/ui/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx =================================================================== --- trunk/ui/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx 2007-08-15 14:55:07 UTC (rev 2270) +++ trunk/ui/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx 2007-08-15 15:29:15 UTC (rev 2271) @@ -11,7 +11,7 @@ baseclass="org.richfaces.renderkit.html.ScrollableGridBaseRenderer" component="org.richfaces.component.UIScrollableGrid" - <jsp:directive.page import="javax.faces.component.UIComponent, java.util.List, java.util.Iterator, org.richfaces.component.UIScrollableGridColumn"/> + <jsp:directive.page import="javax.faces.component.UIComponent,javax.faces.component.UIColumn, java.util.List, java.util.Iterator, org.richfaces.component.Column"/> <h:styles> /org/richfaces/renderkit/html/css/grid.xcss </h:styles> @@ -36,9 +36,9 @@ for (Iterator iterator = children.iterator(); iterator.hasNext();) { UIComponent column = (UIComponent) iterator.next(); - if(column instanceof UIScrollableGridColumn){ - UIComponent hFacet = column.getFacet(HEADER_PART); - UIComponent fFacet = column.getFacet(FOOTER_PART); + if(column instanceof UIColumn){ + UIComponent hFacet = ((UIColumn) column).getHeader(); + UIComponent fFacet = ((UIColumn) column).getFooter(); if(hFacet != null){ if(!header) header = true; Deleted: trunk/ui/scrollable-grid/src/test/java/org/richfaces/component/html/HtmlScrollableGridColumnComponentTest.java =================================================================== --- trunk/ui/scrollable-grid/src/test/java/org/richfaces/component/html/HtmlScrollableGridColumnComponentTest.java 2007-08-15 14:55:07 UTC (rev 2270) +++ trunk/ui/scrollable-grid/src/test/java/org/richfaces/component/html/HtmlScrollableGridColumnComponentTest.java 2007-08-15 15:29:15 UTC (rev 2271) @@ -1,132 +0,0 @@ -/** - * GENERATED FILE - DO NOT EDIT - * - */ - -package org.richfaces.component.html; - -import javax.faces.component.UIForm; -import javax.faces.component.html.HtmlForm; - -import org.ajax4jsf.tests.MockValueBinding; - -//import org.richfaces.component.html.HtmlScrollableGridColumn; - -public class HtmlScrollableGridColumnComponentTest extends org.ajax4jsf.tests.AbstractAjax4JsfTestCase { - -// public static final String COMPONENT_TYPE = "org.richfaces.component.ScrollableGridColumn"; - - - private boolean _breakBeforeSet = false; - private boolean _sortableSet = false; - - private HtmlScrollableGridColumn component; - private UIForm form; -// private FacesContext context; - - /** - * Constructor to init default renderers - */ - public HtmlScrollableGridColumnComponentTest (String name){ - super(name); - } - - /* - * setup the tets - */ - public void setUp() throws Exception { - super.setUp(); - component = new HtmlScrollableGridColumn(); - form = new HtmlForm(); - form.setId("form"); - facesContext.getViewRoot().getChildren().add(form); - - component.setId("component"); - component.setWidth("width" ); - component.setHeaderClass("headerClass" ); - component.setFooterClass("footerClass" ); - component.setStyleClass("styleClass" ); - //component.setBreakBefore(true ); - component.setStyle("style" ); - component.setSortable(true ); - - form.getChildren().add(component); - - } - - /* - * setup the tets - */ - public void tearDown() throws Exception{ - super.tearDown(); - component = null; - form = null; - } - - public void testComponent() throws Exception { - - } - - public void testContext(){ - - Object state = component.saveState(facesContext); - testRestoreState(state); - } - - public void testGetters() { - HtmlScrollableGridColumn component = new HtmlScrollableGridColumn(); - - component.setValueBinding("width", new MockValueBinding("width", java.lang.String.class)); - assertEquals("width", component.getWidth()); - component.setWidth("width_width" ); - assertEquals("width_width", component.getWidth()); - component.setValueBinding("headerClass", new MockValueBinding("headerClass", java.lang.String.class)); - assertEquals("headerClass", component.getHeaderClass()); - component.setHeaderClass("headerClass_headerClass" ); - assertEquals("headerClass_headerClass", component.getHeaderClass()); - component.setValueBinding("footerClass", new MockValueBinding("footerClass", java.lang.String.class)); - assertEquals("footerClass", component.getFooterClass()); - component.setFooterClass("footerClass_footerClass" ); - assertEquals("footerClass_footerClass", component.getFooterClass()); - component.setValueBinding("styleClass", new MockValueBinding("styleClass", java.lang.String.class)); - assertEquals("styleClass", component.getStyleClass()); - component.setStyleClass("styleClass_styleClass" ); - assertEquals("styleClass_styleClass", component.getStyleClass()); - component.setValueBinding("breakBefore", new MockValueBinding(new Boolean(true), java.lang.Boolean.class)); - //assertEquals(true, component.isBreakBefore()); - //component.setBreakBefore(false ); - //assertEquals(false, component.isBreakBefore()); - component.setValueBinding("style", new MockValueBinding("style", java.lang.String.class)); - assertEquals("style", component.getStyle()); - component.setStyle("style_style" ); - assertEquals("style_style", component.getStyle()); - component.setValueBinding("sortable", new MockValueBinding(new Boolean(true), java.lang.Boolean.class)); - assertEquals(true, component.isSortable()); - component.setSortable(false ); - assertEquals(false, component.isSortable()); - - - } - - private void testRestoreState(Object state){ - HtmlScrollableGridColumn restoredComponent = new HtmlScrollableGridColumn(); - restoredComponent.restoreState(facesContext, state); - - assertEquals(component.getWidth(), restoredComponent.getWidth()); - assertEquals(component.getHeaderClass(), restoredComponent.getHeaderClass()); - assertEquals(component.getFooterClass(), restoredComponent.getFooterClass()); - assertEquals(component.getStyleClass(), restoredComponent.getStyleClass()); - //assertEquals(component.isBreakBefore(), restoredComponent.isBreakBefore()); - assertEquals(component.getStyle(), restoredComponent.getStyle()); - assertEquals(component.isSortable(), restoredComponent.isSortable()); - - } - - private void assertEquals(double d1, double d2) { - assertEquals(d1, d2, 0); - } - - private void assertEquals(float d1, float d2) { - assertEquals(d1, d2, 0); - } -} Modified: trunk/ui/scrollable-grid/src/test/java/org/richfaces/renderkit/html/ScrollableGridRendererTest.java =================================================================== --- trunk/ui/scrollable-grid/src/test/java/org/richfaces/renderkit/html/ScrollableGridRendererTest.java 2007-08-15 14:55:07 UTC (rev 2270) +++ trunk/ui/scrollable-grid/src/test/java/org/richfaces/renderkit/html/ScrollableGridRendererTest.java 2007-08-15 15:29:15 UTC (rev 2271) @@ -5,6 +5,7 @@ import java.util.List; import java.util.Set; +import javax.faces.component.UIColumn; import javax.faces.component.UIOutput; import javax.faces.component.html.HtmlOutputText; @@ -12,21 +13,19 @@ import org.ajax4jsf.javascript.PrototypeScript; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.commons.lang.StringUtils; -import org.richfaces.component.UIScrollableGridColumn; -import org.richfaces.component.html.HtmlScrollableGrid; -import org.richfaces.component.html.HtmlScrollableGridColumn; import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.html.HtmlScript; +import org.richfaces.component.UIScrollableGrid; /** * @author Anton Belevich * */ public class ScrollableGridRendererTest extends AbstractAjax4JsfTestCase{ - HtmlScrollableGrid grid; + UIScrollableGrid grid; int columns = 7; private static Set javaScripts = new HashSet(); @@ -45,17 +44,19 @@ super.setUp(); // create grid - grid = (HtmlScrollableGrid)application.createComponent("org.richfaces.component.ScrollableGrid"); + grid = (UIScrollableGrid)application.createComponent("org.richfaces.component.ScrollableGrid"); grid.setId("grid"); - grid.setFrozenColCount(3); + grid.getAttributes().put("frozenColCount", new Integer(3)); // add columns for (int i = 0; i < columns; i++) { - UIScrollableGridColumn column = (UIScrollableGridColumn) createComponent( - HtmlScrollableGridColumn.COMPONENT_TYPE, - HtmlScrollableGridColumn.class.getName(), + UIColumn column = (UIColumn) createComponent( + "org.richfaces.Column", + "org.richfaces.component.Column", null, null, null); + + UIOutput outputText = (UIOutput) createComponent( HtmlOutputText.COMPONENT_TYPE, HtmlOutputText.class.getName(), null, null, null); Deleted: trunk/ui/scrollable-grid/src/test/java/org/richfaces/taglib/ScrollableGridColumnTagTest.java =================================================================== --- trunk/ui/scrollable-grid/src/test/java/org/richfaces/taglib/ScrollableGridColumnTagTest.java 2007-08-15 14:55:07 UTC (rev 2270) +++ trunk/ui/scrollable-grid/src/test/java/org/richfaces/taglib/ScrollableGridColumnTagTest.java 2007-08-15 15:29:15 UTC (rev 2271) @@ -1,116 +0,0 @@ -/** - * GENERATED FILE - DO NOT EDIT - * - */ -package org.richfaces.taglib; - -import java.lang.String ; -import org.ajax4jsf.tests.AbstractAjax4JsfTestCase ; -import javax.faces.component.UIComponent ; -import javax.faces.component.UIComponent; -import javax.faces.webapp.UIComponentTag; -import org.richfaces.component.html.HtmlScrollableGridColumn; -import javax.faces.application.Application; -import javax.faces.el.ValueBinding; -import javax.servlet.Servlet; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpSession; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.el.ExpressionEvaluator; -import javax.servlet.jsp.el.VariableResolver; -import javax.servlet.jsp.tagext.Tag; -import java.io.IOException; -import java.util.Enumeration; - - - -/** - * @author shura (latest modification by $Author: alexsmirnov $) - * @version $Revision: 1.1.2.2 $ $Date: 2007/01/03 21:05:14 $ - * - */ -public class ScrollableGridColumnTagTest extends org.ajax4jsf.tests.AbstractAjax4JsfTestCase { - - - private ScrollableGridColumnTag tag; - - /** - * Constructor to init default renderers - */ - public ScrollableGridColumnTagTest (String name){ - super(name); - } - - - public void setUp() throws Exception { - super.setUp(); - tag = new ScrollableGridColumnTag(); - tag.setParent(new UIComponentTag(){ - - public String getComponentType() { - // TODO Auto-generated method stub - return null; - } - - public String getRendererType() { - // TODO Auto-generated method stub - return null; - } - - public int doStartTag() throws JspException { - // TODO Auto-generated method stub - return Tag.EVAL_BODY_INCLUDE; - } - - public int doEndTag() throws JspException { - // TODO Auto-generated method stub - return Tag.EVAL_BODY_INCLUDE; - } - - }); - - } - - public void tearDown() throws Exception { - super.tearDown(); - tag = null; - } - - - public void testSetPropertiesUIComponent() { - HtmlScrollableGridColumn component = new HtmlScrollableGridColumn(); - // create binding - Application application = null; - ValueBinding binding = null; - - - tag.setProperties(component); - -/* - // TODO - setup properties for other cases. - // name footer with type javax.faces.component.UIComponent - setStringProperty(component, "width",this._width); - // TODO - setup properties for other cases. - // name header with type javax.faces.component.UIComponent - setStringProperty(component, "headerClass",this._headerClass); - setStringProperty(component, "footerClass",this._footerClass); - // Simple type - boolean - setBooleanProperty(component, "breakBefore",this._breakBefore); - // Simple type - boolean - setBooleanProperty(component, "sortable",this._sortable); - */ - } - - public void testGetComponentType(){ - assertNotNull(tag.getComponentType()); - } - - -}