Author: maksimkaszynski Date: 2007-12-28 10:58:20 -0500 (Fri, 28 Dec 2007) New Revision: 5083 Added: trunk/sandbox/samples/sortingFilteringDemo/ trunk/sandbox/samples/sortingFilteringDemo/pom.xml trunk/sandbox/samples/sortingFilteringDemo/src/ trunk/sandbox/samples/sortingFilteringDemo/src/main/ trunk/sandbox/samples/sortingFilteringDemo/src/main/java/ trunk/sandbox/samples/sortingFilteringDemo/src/main/java/org/ trunk/sandbox/samples/sortingFilteringDemo/src/main/java/org/richfaces/ trunk/sandbox/samples/sortingFilteringDemo/src/main/java/org/richfaces/sandbox/ trunk/sandbox/samples/sortingFilteringDemo/src/main/java/org/richfaces/sandbox/Bean.java trunk/sandbox/samples/sortingFilteringDemo/src/main/resources/ trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/ trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/ trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/faces-config.xml trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/web.xml trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/index.jsp trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/ trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/index.jsp trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/index.xhtml trunk/sandbox/samples/sortingFilteringDemo/src/test/ trunk/sandbox/samples/sortingFilteringDemo/src/test/java/ trunk/sandbox/samples/sortingFilteringDemo/src/test/java/org/ trunk/sandbox/samples/sortingFilteringDemo/src/test/java/org/richfaces/ trunk/sandbox/samples/sortingFilteringDemo/src/test/java/org/richfaces/sandbox/ trunk/sandbox/samples/sortingFilteringDemo/src/test/java/org/richfaces/sandbox/BeanTest.java trunk/sandbox/ui/sortableHeader/pom.xml trunk/sandbox/ui/sortableHeader/src/ trunk/sandbox/ui/sortableHeader/src/main/ trunk/sandbox/ui/sortableHeader/src/main/java/ Modified: trunk/samples/pom.xml trunk/samples/scrollableDataTableDemo/src/main/java/org/richfaces/demo/datagrid/model/Channel.java trunk/samples/scrollableDataTableDemo/src/main/webapp/pages/scrollable-grid.xhtml trunk/sandbox/api/pom.xml trunk/sandbox/impl/pom.xml trunk/sandbox/samples/combobox-sample/ trunk/sandbox/samples/pickList-sample/ trunk/sandbox/samples/pom.xml trunk/sandbox/samples/progressBarDemo/ trunk/sandbox/ui/combobox/ trunk/sandbox/ui/pickList/ trunk/sandbox/ui/pom.xml trunk/sandbox/ui/progressBAR/ trunk/sandbox/ui/sortableHeader/ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java trunk/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss Log: Initial check in of sorting and filtering Modified: trunk/samples/pom.xml =================================================================== --- trunk/samples/pom.xml 2007-12-28 15:45:44 UTC (rev 5082) +++ trunk/samples/pom.xml 2007-12-28 15:58:20 UTC (rev 5083) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> @@ -29,8 +27,7 @@ <configuration> <scanIntervalSeconds>10</scanIntervalSeconds> <connectors> - <connector - implementation="org.mortbay.jetty.nio.SelectChannelConnector"> + <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> <port>8080</port> <maxIdleTime>60000</maxIdleTime> </connector> @@ -364,7 +361,7 @@ <tomahawk>1.1.5</tomahawk> </properties> <build> - <plugins /> + <plugins/> </build> <dependencies> <dependency> @@ -454,8 +451,8 @@ --> <module>panelmenu-sample</module> <module>rich-message-demo</module> + <module>scrollableDataTableDemo</module> <!-- - <module>scrollableDataTableDemo</module> <module>richfaces-ear-demo</module> --> @@ -463,5 +460,5 @@ <module>orderingListDemo</module> <module>listShuttleDemo</module> <module>columnsDemo</module> - </modules> + </modules> </project> \ No newline at end of file Modified: trunk/samples/scrollableDataTableDemo/src/main/java/org/richfaces/demo/datagrid/model/Channel.java =================================================================== --- trunk/samples/scrollableDataTableDemo/src/main/java/org/richfaces/demo/datagrid/model/Channel.java 2007-12-28 15:45:44 UTC (rev 5082) +++ trunk/samples/scrollableDataTableDemo/src/main/java/org/richfaces/demo/datagrid/model/Channel.java 2007-12-28 15:58:20 UTC (rev 5083) @@ -235,9 +235,9 @@ } public void addIssue(Issue issue) { - /*if (issues.size() > 5) { + if (issues.size() > 5) { return; - }*/ + } issues.add(issue); index.put(issue.getIndex(), issue); } Modified: trunk/samples/scrollableDataTableDemo/src/main/webapp/pages/scrollable-grid.xhtml =================================================================== --- trunk/samples/scrollableDataTableDemo/src/main/webapp/pages/scrollable-grid.xhtml 2007-12-28 15:45:44 UTC (rev 5082) +++ trunk/samples/scrollableDataTableDemo/src/main/webapp/pages/scrollable-grid.xhtml 2007-12-28 15:58:20 UTC (rev 5083) @@ -30,6 +30,9 @@ color: red; } + + + </style> </head> Modified: trunk/sandbox/api/pom.xml =================================================================== --- trunk/sandbox/api/pom.xml 2007-12-28 15:45:44 UTC (rev 5082) +++ trunk/sandbox/api/pom.xml 2007-12-28 15:58:20 UTC (rev 5083) @@ -15,12 +15,6 @@ <artifactId>richfaces-api</artifactId> <version>3.2.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_03</version> - <scope>provided</scope> - </dependency> </dependencies> Modified: trunk/sandbox/impl/pom.xml =================================================================== --- trunk/sandbox/impl/pom.xml 2007-12-28 15:45:44 UTC (rev 5082) +++ trunk/sandbox/impl/pom.xml 2007-12-28 15:58:20 UTC (rev 5083) @@ -25,12 +25,7 @@ <artifactId>richfaces-test</artifactId> <version>3.2.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_03</version> - <scope>provided</scope> - </dependency> + </dependencies> Property changes on: trunk/sandbox/samples/combobox-sample ___________________________________________________________________ Name: svn:ignore + .classpath .project .settings target Property changes on: trunk/sandbox/samples/pickList-sample ___________________________________________________________________ Name: svn:ignore + .classpath .project .settings target Modified: trunk/sandbox/samples/pom.xml =================================================================== --- trunk/sandbox/samples/pom.xml 2007-12-28 15:45:44 UTC (rev 5082) +++ trunk/sandbox/samples/pom.xml 2007-12-28 15:58:20 UTC (rev 5083) @@ -21,5 +21,6 @@ <module>combobox-sample</module> <module>progressBarDemo</module> <module>pickList-sample</module> + <module>sortingFilteringDemo</module> </modules> </project> \ No newline at end of file Property changes on: trunk/sandbox/samples/progressBarDemo ___________________________________________________________________ Name: svn:ignore + .classpath .settings .project target Property changes on: trunk/sandbox/samples/sortingFilteringDemo ___________________________________________________________________ Name: svn:ignore + .settings target .classpath .project Added: trunk/sandbox/samples/sortingFilteringDemo/pom.xml =================================================================== --- trunk/sandbox/samples/sortingFilteringDemo/pom.xml (rev 0) +++ trunk/sandbox/samples/sortingFilteringDemo/pom.xml 2007-12-28 15:58:20 UTC (rev 5083) @@ -0,0 +1,23 @@ +<?xml version="1.0"?><project> + <parent> + <artifactId>samples</artifactId> + <groupId>org.richfaces.sandbox</groupId> + <version>3.2.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.sandbox</groupId> + <artifactId>sortingFilteringDemo</artifactId> + <packaging>war</packaging> + <name>sortingFilteringDemo Maven Webapp</name> + <version>3.2.0-SNAPSHOT</version> + <build> + <finalName>sortingFilteringDemo</finalName> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.sandbox.ui</groupId> + <artifactId>sortableHeader</artifactId> + <version>3.2.0-SNAPSHOT</version> + </dependency> + </dependencies> +</project> \ No newline at end of file Added: trunk/sandbox/samples/sortingFilteringDemo/src/main/java/org/richfaces/sandbox/Bean.java =================================================================== --- trunk/sandbox/samples/sortingFilteringDemo/src/main/java/org/richfaces/sandbox/Bean.java (rev 0) +++ trunk/sandbox/samples/sortingFilteringDemo/src/main/java/org/richfaces/sandbox/Bean.java 2007-12-28 15:58:20 UTC (rev 5083) @@ -0,0 +1,29 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.sandbox; +/** + * @author $Autor$ + * + */ +public class Bean { + +} \ No newline at end of file Added: trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/faces-config.xml (rev 0) +++ trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/faces-config.xml 2007-12-28 15:58:20 UTC (rev 5083) @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN" + "http://java.sun.com/dtd/web-facesconfig_1_1.dtd"> +<faces-config> + <managed-bean> + <managed-bean-name>bean</managed-bean-name> + <managed-bean-class>org.richfaces.sandbox.Bean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> +</faces-config> Added: trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/web.xml (rev 0) +++ trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/web.xml 2007-12-28 15:58:20 UTC (rev 5083) @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + <display-name>Archetype Created Web Application</display-name> + <context-param> + <param-name>javax.faces.CONFIG_FILES</param-name> + <param-value>/WEB-INF/faces-config.xml</param-value> + </context-param> + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>server</param-value> + </context-param> + <!-- + --> + <filter> + <display-name>Ajax4jsf Filter</display-name> + <filter-name>ajax4jsf</filter-name> + <filter-class>org.ajax4jsf.Filter</filter-class> + </filter> + <filter-mapping> + <filter-name>ajax4jsf</filter-name> + <servlet-name>Faces Servlet</servlet-name> + <dispatcher>REQUEST</dispatcher> + <dispatcher>FORWARD</dispatcher> + <dispatcher>INCLUDE</dispatcher> + <dispatcher>ERROR</dispatcher> + </filter-mapping> + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>/faces/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + <login-config> + <auth-method>BASIC</auth-method> + </login-config> +</web-app> Added: trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/index.jsp =================================================================== --- trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/index.jsp (rev 0) +++ trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/index.jsp 2007-12-28 15:58:20 UTC (rev 5083) @@ -0,0 +1,11 @@ +<!doctype html public "-//w3c//dtd html 4.0 transitional//en"> + +<html> + +<head></head> + + <body> + <jsp:forward page="/pages/index.jsf" /> + </body> + +</html> \ No newline at end of file Added: trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/index.jsp =================================================================== --- trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/index.jsp (rev 0) +++ trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/index.jsp 2007-12-28 15:58:20 UTC (rev 5083) @@ -0,0 +1,12 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<html> + <head> + <title></title> + </head> + <body> + <f:view> + + </f:view> + </body> +</html> Added: trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/index.xhtml =================================================================== --- trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/index.xhtml (rev 0) +++ trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/index.xhtml 2007-12-28 15:58:20 UTC (rev 5083) @@ -0,0 +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:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="https://ajax4jsf.dev.java.net/ajax" + xmlns:c="http://java.sun.com/jsp/jstl/core" + > + <f:view> + + </f:view> +</html> \ No newline at end of file Added: trunk/sandbox/samples/sortingFilteringDemo/src/test/java/org/richfaces/sandbox/BeanTest.java =================================================================== --- trunk/sandbox/samples/sortingFilteringDemo/src/test/java/org/richfaces/sandbox/BeanTest.java (rev 0) +++ trunk/sandbox/samples/sortingFilteringDemo/src/test/java/org/richfaces/sandbox/BeanTest.java 2007-12-28 15:58:20 UTC (rev 5083) @@ -0,0 +1,46 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.sandbox; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** +*/ +public class BeanTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public BeanTest( String testName ) + { + super( testName ); + } + + public void testStub() throws Exception { + + } +} Property changes on: trunk/sandbox/ui/combobox ___________________________________________________________________ Name: svn:ignore - target + target .classpath .project .settings Property changes on: trunk/sandbox/ui/pickList ___________________________________________________________________ Name: svn:ignore - target + target .classpath .project .settings Modified: trunk/sandbox/ui/pom.xml =================================================================== --- trunk/sandbox/ui/pom.xml 2007-12-28 15:45:44 UTC (rev 5082) +++ trunk/sandbox/ui/pom.xml 2007-12-28 15:58:20 UTC (rev 5083) @@ -18,7 +18,7 @@ <module>rex-resizable</module> <module>rex-messageBox</module> <!--module>rex-button</module--> - <!--module>contextMenu</module--> + <module>sortableHeader</module> <module>fileUpload</module> <module>combobox</module> <module>progressBar</module> Property changes on: trunk/sandbox/ui/progressBAR ___________________________________________________________________ Name: svn:ignore - target + target .classpath .project .settings Property changes on: trunk/sandbox/ui/sortableHeader ___________________________________________________________________ Name: svn:ignore + .settings target .classpath .project Added: trunk/sandbox/ui/sortableHeader/pom.xml =================================================================== --- trunk/sandbox/ui/sortableHeader/pom.xml (rev 0) +++ trunk/sandbox/ui/sortableHeader/pom.xml 2007-12-28 15:58:20 UTC (rev 5083) @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?><project> + <parent> + <artifactId>ui</artifactId> + <groupId>org.richfaces.sandbox</groupId> + <version>3.2.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.sandbox.ui</groupId> + <artifactId>sortableHeader</artifactId> + <name>sortableHeader</name> + <version>3.2.0-SNAPSHOT</version> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>3.2.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.sandbox</groupId> + <artifactId>richfaces-sandbox-api</artifactId> + <version>3.2.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.sandbox</groupId> + <artifactId>richfaces-sandbox-impl</artifactId> + <version>3.2.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>3.2.0-SNAPSHOT</version> + </dependency> + </dependencies> +</project> \ No newline at end of file Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java =================================================================== --- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2007-12-28 15:45:44 UTC (rev 5082) +++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2007-12-28 15:58:20 UTC (rev 5083) @@ -263,6 +263,7 @@ if(grid.isRowAvailable() || state.isFake()){ String row_id; + String fakeClass = state.isFake() ? "fake " : ""; int index = state.getRowIndex(); @@ -280,7 +281,8 @@ writer.startElement(HTML.TR_ELEMENT, grid); state.setFrozenColumnCount(ScrollableDataTableUtils.getFrozenColumnsCount(grid)); getUtils().writeAttribute(writer, "id",row_id); - getUtils().writeAttribute(writer, "class","dr-sdt-rb rich-sdt-row " + state.getRowClass(index)); + + getUtils().writeAttribute(writer, "class","dr-sdt-rb rich-sdt-row " + fakeClass + state.getRowClass(index)); addRowJavascriptEvents(writer, grid); if (log.isDebugEnabled()) { log.debug("rowIndex : " + index); Modified: trunk/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss =================================================================== --- trunk/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss 2007-12-28 15:45:44 UTC (rev 5082) +++ trunk/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss 2007-12-28 15:58:20 UTC (rev 5083) @@ -237,6 +237,8 @@ display: block; overflow: hidden; } + + </f:verbatim> <u:selector name=".dr-sdt">