Author: maksimkaszynski Date: 2007-07-09 11:13:40 -0400 (Mon, 09 Jul 2007) New Revision: 1551 Added: branches/3.0.2/sandbox-samples/scrollable-grid-demo/src/main/resources/org/ajax4jsf/framework/ branches/3.0.2/sandbox-samples/scrollable-grid-demo/src/main/resources/org/ajax4jsf/framework/ajax/ branches/3.0.2/sandbox-samples/scrollable-grid-demo/src/main/resources/org/ajax4jsf/framework/ajax/xmlfilter/ branches/3.0.2/sandbox-samples/scrollable-grid-demo/src/main/resources/org/ajax4jsf/framework/ajax/xmlfilter/tidy/ branches/3.0.2/sandbox-samples/scrollable-grid-demo/src/main/resources/org/ajax4jsf/framework/ajax/xmlfilter/tidy/tidy.properties Modified: branches/3.0.2/sandbox-samples/scrollable-grid-demo/pom.xml branches/3.0.2/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/benchmark/RequestBenchMarkFilter.java branches/3.0.2/sandbox-samples/scrollable-grid-demo/src/main/webapp/WEB-INF/web.xml branches/3.0.2/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx branches/3.0.2/sandbox/scrollable-grid/src/test/java/org/richfaces/renderkit/html/ScrollableGridRendererTest.java Log: added support for fast filter Modified: branches/3.0.2/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx =================================================================== --- branches/3.0.2/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx 2007-07-09 14:27:42 UTC (rev 1550) +++ branches/3.0.2/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx 2007-07-09 15:13:40 UTC (rev 1551) @@ -69,7 +69,7 @@ <div id="#{clientId}" style="width: #{component.attributes['width']};height: #{component.attributes['height']};" class="ClientUI_Grid #{component.attributes['styleClass']}" > <div id="#{clientId}:cs" class="ClientUI_Grid_HSplit" /> <div id="#{clientId}_GridHeaderTemplate" class="ClientUI_InlineBox" style="#{hStyle}; width: #{component.attributes['width']};"> - <iframe id="#{clientId}:hs" class="ClientUI_HRFrm ClientUI_Substrate" src="" scrolling="no" frameborder="0" /> + <iframe id="#{clientId}:hs" class="ClientUI_HRFrm ClientUI_Substrate" src="" scrolling="no" frameborder="0" > <br/> </iframe> <div style="display: block; left: 0px; top: 0px; width: #{sumWidth}px;"> <span class="ClientUI_TmplBox ClientUI_FrozenBox" id="#{clientId}:header:FrozenBox"> <table cellpadding="0" cellspacing="0" style="border-collapse:collapse; table-layout:fixed"> @@ -120,7 +120,7 @@ <div id="#{clientId}_GridBodyTemplate" class="ClientUI_InlineBox" style="overflow: auto; width: #{component.attributes['width']}; height: #{component.attributes['height']};"> <div id="#{clientId}:scb" style="position: absolute; z-index: 0;"> - <div id="#{clientId}:sb" style="position: absolute;" /> + <div id="#{clientId}:sb" style="position: absolute;" ><br/> </div> </div> <div id="#{clientId}:bc" style="display: block; width: #{sumWidth}px;"> <span class="ClientUI_TmplBox ClientUI_FrozenBox" id="#{clientId}:body:FrozenBox"> @@ -139,7 +139,7 @@ </jsp:scriptlet> </tbody> </table> - <span class="ClientUI_Grid_HO" id="#{clientId}:fho" /> + <span class="ClientUI_Grid_HO" id="#{clientId}:fho" ><br/></span> </span> <span class="ClientUI_TmplBox ClientUI_NormalBox" id="#{clientId}:body:NormalBox"> <table id="#{clientId}:n" cellpadding="0" cellspacing="0" style="border-collapse:collapse; table-layout:fixed"> @@ -158,13 +158,13 @@ </jsp:scriptlet> </tbody> </table> - <span class="ClientUI_Grid_HO" id="#{clientId}:nho" /> + <span class="ClientUI_Grid_HO" id="#{clientId}:nho" ><br/></span> </span> </div> </div> <div id="#{clientId}_GridFooterTemplate" class="ClientUI_InlineBox" style="#{fStyle}; width: #{component.attributes['width']};"> - <iframe id="#{clientId}:fs" class="ClientUI_FRFrm ClientUI_Substrate" src="" scrolling="no" frameborder="0" /> + <iframe id="#{clientId}:fs" class="ClientUI_FRFrm ClientUI_Substrate" src="" scrolling="no" frameborder="0" > <br/></iframe> <div style="display: block; width: width: #{sumWidth}px;"> <span class="ClientUI_TmplBox ClientUI_FrozenBox" id="#{clientId}:footer:FrozenBox"> <table cellpadding="0" cellspacing="0" style="border-collapse:collapse; table-layout:fixed"> Modified: branches/3.0.2/sandbox/scrollable-grid/src/test/java/org/richfaces/renderkit/html/ScrollableGridRendererTest.java =================================================================== --- branches/3.0.2/sandbox/scrollable-grid/src/test/java/org/richfaces/renderkit/html/ScrollableGridRendererTest.java 2007-07-09 14:27:42 UTC (rev 1550) +++ branches/3.0.2/sandbox/scrollable-grid/src/test/java/org/richfaces/renderkit/html/ScrollableGridRendererTest.java 2007-07-09 15:13:40 UTC (rev 1551) @@ -187,14 +187,19 @@ if(element.getNodeName().equals("span")){ res = true; - }else{ - if(element.getNodeName().equals("div")){ - String divId = element.getAttributeValue("id"); - assertEquals(id + ":sb", divId); - res = true; - } + }else if(element.getNodeName().equals("div")){ + String divId = element.getAttributeValue("id"); + assertEquals(id + ":sb", divId); + res = true; + } else if (element.getNodeName().equals("br")) { + res = true; } + if(!res) { + System.out + .println("ScrollableGridRendererTest.testRenderingFrozenNormalColumns()"); + } + assertTrue(res); elemClassAttr = element.getAttributeValue("class"); assertNotNull(elemClassAttr); Modified: branches/3.0.2/sandbox-samples/scrollable-grid-demo/pom.xml =================================================================== --- branches/3.0.2/sandbox-samples/scrollable-grid-demo/pom.xml 2007-07-09 14:27:42 UTC (rev 1550) +++ branches/3.0.2/sandbox-samples/scrollable-grid-demo/pom.xml 2007-07-09 15:13:40 UTC (rev 1551) @@ -32,55 +32,67 @@ <scope>runtime</scope> </dependency> - + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.2_04</version> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>1.2_04</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>1.1.11</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>el-impl</groupId> + <artifactId>el-impl</artifactId> + <version>1.0</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.0</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>nekohtml</groupId> + <artifactId>nekohtml</artifactId> + <version>0.9.5</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.6.2</version> + <scope>runtime</scope> + </dependency> </dependencies> - <profiles> - <profile> - <id>jsf1_2</id> - <activation> - <activeByDefault></activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_03</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.2_03</version> - <scope>runtime</scope> - </dependency> - </dependencies> - </profile> - </profiles> + <build> <finalName>scrollable-grid-demo</finalName> <plugins> Modified: branches/3.0.2/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/benchmark/RequestBenchMarkFilter.java =================================================================== --- branches/3.0.2/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/benchmark/RequestBenchMarkFilter.java 2007-07-09 14:27:42 UTC (rev 1550) +++ branches/3.0.2/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/benchmark/RequestBenchMarkFilter.java 2007-07-09 15:13:40 UTC (rev 1551) @@ -40,15 +40,15 @@ long startTime = System.currentTimeMillis(); - log.debug("Request started " + ((HttpServletRequest) request).getRequestURL()); + log.info("Request started " + ((HttpServletRequest) request).getRequestURL()); chain.doFilter(request, response); long endTime = System.currentTimeMillis(); - log.debug("Request ended " + ((HttpServletRequest) request).getRequestURL()); + log.info("Request ended " + ((HttpServletRequest) request).getRequestURL()); - log.debug(requestType() + + log.info(requestType() + ((HttpServletRequest) request).getRequestURL() + " took " + (endTime - startTime) + Added: branches/3.0.2/sandbox-samples/scrollable-grid-demo/src/main/resources/org/ajax4jsf/framework/ajax/xmlfilter/tidy/tidy.properties =================================================================== --- branches/3.0.2/sandbox-samples/scrollable-grid-demo/src/main/resources/org/ajax4jsf/framework/ajax/xmlfilter/tidy/tidy.properties (rev 0) +++ branches/3.0.2/sandbox-samples/scrollable-grid-demo/src/main/resources/org/ajax4jsf/framework/ajax/xmlfilter/tidy/tidy.properties 2007-07-09 15:13:40 UTC (rev 1551) @@ -0,0 +1,55 @@ +add-xml-decl=false +doctype=ignore +#add-xml-space= +#alt-text= +#assume-xml-procins= +break-before-br=false +#char-encoding=1 +#clean= +#drop-empty-paras= +#drop-font-tags= +#enclose-block-text= +#enclose-text= +#error-file= +#fix-bad-comments= +hide-endtags=false +indent-attributes=false +#indent-spaces=2 +#indent= +#input-xml= +#keep-time= +#literal-attributes= +#logical-emphasis= +#markup= +#new-blocklevel-tags= +#new-empty-tags= +#new-inline-tags= +#new-pre-tags= +numeric-entities=true +#output-html=true +#output-xml=true +quiet=true +#quote-ampersand=true +#quote-marks= +#quote-nbsp= +#raw= +show-warnings=true +#slide-style= +#split= +#tab-size=4 +tidy-mark=false +uppercase-attributes=false +uppercase-tags=false +#word-2000= +#wrap-asp= +#wrap-jste= +#wrap-php= +#wrap-script-literals=false +#wrap-sections= +wrap=0 +#write-back= +join-classes=true +join-styles=true +#literal-attributes=true +smart-indent=false +trim-empty-elements=false \ No newline at end of file Modified: branches/3.0.2/sandbox-samples/scrollable-grid-demo/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/3.0.2/sandbox-samples/scrollable-grid-demo/src/main/webapp/WEB-INF/web.xml 2007-07-09 14:27:42 UTC (rev 1550) +++ branches/3.0.2/sandbox-samples/scrollable-grid-demo/src/main/webapp/WEB-INF/web.xml 2007-07-09 15:13:40 UTC (rev 1551) @@ -28,7 +28,7 @@ <filter> <display-name>Ajax4jsf Filter</display-name> <filter-name>ajax4jsf</filter-name> - <filter-class>org.ajax4jsf.Filter</filter-class> + <filter-class>org.ajax4jsf.FastFilter</filter-class> </filter> <filter> <display-name>Request Metrics</display-name>