December 2007 - richfaces-svn-commits

JBoss Rich Faces SVN: r5016 - in trunk/sandbox/samples: progressBarDemo and 17 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: andrei_exadel Date: 2007-12-26 12:01:15 -0500 (Wed, 26 Dec 2007) New Revision: 5016 Added: trunk/sandbox/samples/progressBarDemo/ trunk/sandbox/samples/progressBarDemo/pom.xml trunk/sandbox/samples/progressBarDemo/src/ trunk/sandbox/samples/progressBarDemo/src/main/ trunk/sandbox/samples/progressBarDemo/src/main/java/ trunk/sandbox/samples/progressBarDemo/src/main/java/org/ trunk/sandbox/samples/progressBarDemo/src/main/java/org/richfaces/ trunk/sandbox/samples/progressBarDemo/src/main/java/org/richfaces/sandbox/ trunk/sandbox/samples/progressBarDemo/src/main/java/org/richfaces/sandbox/samples/ trunk/sandbox/samples/progressBarDemo/src/main/java/org/richfaces/sandbox/samples/Bean.java trunk/sandbox/samples/progressBarDemo/src/main/resources/ trunk/sandbox/samples/progressBarDemo/src/main/webapp/ trunk/sandbox/samples/progressBarDemo/src/main/webapp/META-INF/ trunk/sandbox/samples/progressBarDemo/src/main/webapp/META-INF/MANIFEST.MF trunk/sandbox/samples/progressBarDemo/src/main/webapp/WEB-INF/ trunk/sandbox/samples/progressBarDemo/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia trunk/sandbox/samples/progressBarDemo/src/main/webapp/WEB-INF/faces-config.xml trunk/sandbox/samples/progressBarDemo/src/main/webapp/WEB-INF/web.xml trunk/sandbox/samples/progressBarDemo/src/main/webapp/index.jsp trunk/sandbox/samples/progressBarDemo/src/main/webapp/pages/ trunk/sandbox/samples/progressBarDemo/src/main/webapp/pages/index.jsp trunk/sandbox/samples/progressBarDemo/src/main/webapp/pages/index.xhtml trunk/sandbox/samples/progressBarDemo/src/test/ trunk/sandbox/samples/progressBarDemo/src/test/java/ trunk/sandbox/samples/progressBarDemo/src/test/java/org/ trunk/sandbox/samples/progressBarDemo/src/test/java/org/richfaces/ trunk/sandbox/samples/progressBarDemo/src/test/java/org/richfaces/sandbox/ trunk/sandbox/samples/progressBarDemo/src/test/java/org/richfaces/sandbox/samples/ trunk/sandbox/samples/progressBarDemo/src/test/java/org/richfaces/sandbox/samples/BeanTest.java Log: RF-1698 Added: trunk/sandbox/samples/progressBarDemo/pom.xml =================================================================== --- trunk/sandbox/samples/progressBarDemo/pom.xml (rev 0) +++ trunk/sandbox/samples/progressBarDemo/pom.xml 2007-12-26 17:01:15 UTC (rev 5016) @@ -0,0 +1,33 @@ +<?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.samples</groupId> + <artifactId>progressBarDemo</artifactId> + <packaging>war</packaging> + <name>progressBarDemo Maven Webapp</name> + <version>3.2.0-SNAPSHOT</version> + <build> + <finalName>progressBarDemo</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.sandbox.ui</groupId> + <artifactId>progressBar</artifactId> + <version>3.2.0-SNAPSHOT</version> + </dependency> + </dependencies> +</project> \ No newline at end of file Added: trunk/sandbox/samples/progressBarDemo/src/main/java/org/richfaces/sandbox/samples/Bean.java =================================================================== --- trunk/sandbox/samples/progressBarDemo/src/main/java/org/richfaces/sandbox/samples/Bean.java (rev 0) +++ trunk/sandbox/samples/progressBarDemo/src/main/java/org/richfaces/sandbox/samples/Bean.java 2007-12-26 17:01:15 UTC (rev 5016) @@ -0,0 +1,79 @@ +/** + * 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.samples; + + +import java.util.Date; + +import javax.faces.event.ActionEvent; + +/** + * @author $Autor$ + * + */ +public class Bean { + + private Boolean enabled = false; + + private Integer value = 0; + + public String start() { + this.enabled = true; + return null; + } + + public String getDate() { + Date date = new Date(); + return date.toLocaleString(); + } + + /** + * @return the value + */ + public Integer getValue() { + return value ++; + } + + /** + * @param value the value to set + */ + public void setValue(Integer value) { + this.value = value; + } + + /** + * @return the enabled + */ + public Boolean getEnabled() { + return enabled; + } + + /** + * @param enabled the enabled to set + */ + public void setEnabled(Boolean enabled) { + this.enabled = enabled; + } + + + +} \ No newline at end of file Added: trunk/sandbox/samples/progressBarDemo/src/main/webapp/META-INF/MANIFEST.MF =================================================================== --- trunk/sandbox/samples/progressBarDemo/src/main/webapp/META-INF/MANIFEST.MF (rev 0) +++ trunk/sandbox/samples/progressBarDemo/src/main/webapp/META-INF/MANIFEST.MF 2007-12-26 17:01:15 UTC (rev 5016) @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 + Added: trunk/sandbox/samples/progressBarDemo/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia =================================================================== --- trunk/sandbox/samples/progressBarDemo/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia (rev 0) +++ trunk/sandbox/samples/progressBarDemo/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia 2007-12-26 17:01:15 UTC (rev 5016) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<PROCESS ENTITY="JSFProcess"> + <PROCESS-ITEM ENTITY="JSFProcessGroup" NAME="rules:" SHAPE="32,17,0,0"> + <PROCESS-ITEM ENTITY="JSFProcessItem" ID="rules::0" NAME="item"> + <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput" + ID="xhtml::#faces#pages#index.xhtml" NAME="output" + PATH="/faces/pages/index.xhtml" + TARGET="rules:#faces#pages#index.xhtml" TITLE="xhtml"/> + <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput" + ID="jsp::#faces#pages#index.jsp" NAME="output1" + PATH="/faces/pages/index.jsp" TARGET="rules:#faces#pages#index.jsp" TITLE="jsp"/> + </PROCESS-ITEM> + </PROCESS-ITEM> + <PROCESS-ITEM ENTITY="JSFProcessGroup" + NAME="rules:#faces#pages#index.jsp" PATH="/faces/pages/index.jsp" SHAPE="256,177,0,0"/> + <PROCESS-ITEM ENTITY="JSFProcessGroup" + NAME="rules:#faces#pages#index.xhtml" PATH="/faces/pages/index.xhtml" SHAPE="256,33,0,0"/> +</PROCESS> Added: trunk/sandbox/samples/progressBarDemo/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/sandbox/samples/progressBarDemo/src/main/webapp/WEB-INF/faces-config.xml (rev 0) +++ trunk/sandbox/samples/progressBarDemo/src/main/webapp/WEB-INF/faces-config.xml 2007-12-26 17:01:15 UTC (rev 5016) @@ -0,0 +1,21 @@ +<?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.samples.Bean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + <navigation-rule> + <display-name>xhtml</display-name> + <navigation-case> + <from-outcome>xhtml</from-outcome> + <to-view-id>/faces/pages/index.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>jsp</from-outcome> + <to-view-id>/faces/pages/index.jsp</to-view-id> + </navigation-case> + </navigation-rule> +</faces-config> Added: trunk/sandbox/samples/progressBarDemo/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/sandbox/samples/progressBarDemo/src/main/webapp/WEB-INF/web.xml (rev 0) +++ trunk/sandbox/samples/progressBarDemo/src/main/webapp/WEB-INF/web.xml 2007-12-26 17:01:15 UTC (rev 5016) @@ -0,0 +1,61 @@ +<?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> +  + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.jsp</param-value> + </context-param> + +  + <context-param> + <param-name>facelets.VIEW_MAPPINGS</param-name> + <param-value>*xhtml</param-value> + </context-param> + + <context-param> + <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name> + <param-value>com.sun.facelets.FaceletViewHandler</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> + </servlet> + +  + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>/faces/*</url-pattern> + </servlet-mapping> + + + <login-config> + <auth-method>BASIC</auth-method> + </login-config> +</web-app> Added: trunk/sandbox/samples/progressBarDemo/src/main/webapp/index.jsp =================================================================== --- trunk/sandbox/samples/progressBarDemo/src/main/webapp/index.jsp (rev 0) +++ trunk/sandbox/samples/progressBarDemo/src/main/webapp/index.jsp 2007-12-26 17:01:15 UTC (rev 5016) @@ -0,0 +1,12 @@ +<!doctype html public "-//w3c//dtd html 4.0 transitional//en"> + +<html> + +<head></head> + + <body> + <a href="faces/pages/index.jsp">JSP</a><br/> + <a href="faces/pages/index.xhtml">XHTML</a> + </body> + +</html> \ No newline at end of file Added: trunk/sandbox/samples/progressBarDemo/src/main/webapp/pages/index.jsp =================================================================== --- trunk/sandbox/samples/progressBarDemo/src/main/webapp/pages/index.jsp (rev 0) +++ trunk/sandbox/samples/progressBarDemo/src/main/webapp/pages/index.jsp 2007-12-26 17:01:15 UTC (rev 5016) @@ -0,0 +1,52 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/ui/progressBar" prefix="progressBar" %> +<html> + <head> + <title></title> + <style> + .complete { + background-color: green; + font-size: 9px; + } + .remain { + background-color: #FCBBCD; + } + </style> + </head> + <body> + <f:view> + + + <h:form> + <progressBar:progressBar value="#{bean.value}" enabled="#{bean.enabled}" id="progrs" + interval="500" + style="width: 500px; height: 15px;" + determined="true" + completeClass="complete" + reRender="per1" + reRenderAfterComplete="per2"> + <f:facet name="initial"> + <h:outputText value="Process not started"></h:outputText> + </f:facet> + <f:facet name="completed"> + <h:outputText value="Process completed"></h:outputText> + </f:facet> + </progressBar:progressBar> + <br clear="all"/> + <table><tr> + <td>ReRender:</td><td><h:outputText value="#{bean.date}" id="per1"></h:outputText></td></tr><tr> + <td>ReRender after complete:</td><td><h:outputText value="#{bean.date}" id="per2"></h:outputText></td> + </tr></table></h:form> + + <h:form> + Enabled: <h:selectBooleanCheckbox value="#{bean.enabled}" id="flag"> + <a4j:support event="onclick" reRender="progrs"></a4j:support> + </h:selectBooleanCheckbox> + </h:form> + + + </f:view> + </body> +</html> Added: trunk/sandbox/samples/progressBarDemo/src/main/webapp/pages/index.xhtml =================================================================== --- trunk/sandbox/samples/progressBarDemo/src/main/webapp/pages/index.xhtml (rev 0) +++ trunk/sandbox/samples/progressBarDemo/src/main/webapp/pages/index.xhtml 2007-12-26 17:01:15 UTC (rev 5016) @@ -0,0 +1,37 @@ +<!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" + xmlns:progressBar="http://labs.jboss.com/jbossrichfaces/ui/ui/progressBar" + > + + <f:view> + + <h:form> + <progressBar:progressBar value="#{bean.value}" enabled="#{bean.enabled}" id="progrs" + interval="500" + style="width: 300px; height: 15px;" + determined="true" + reRender="per1" + permanent="true" + reRenderAfterComplete="per2"> + <f:facet name="initial"> + <h:commandButton value="Start" action="#{bean.start}"></h:commandButton> + </f:facet> + <f:facet name="completed"> + <h:outputText value="Process completed"></h:outputText> + </f:facet> + </progressBar:progressBar> + <br clear="all"/> + <table><tr> + <td>ReRender:</td><td><h:outputText value="#{bean.date}" id="per1"></h:outputText></td></tr><tr> + <td>ReRender after complete:</td><td><h:outputText value="#{bean.date}" id="per2"></h:outputText></td> + </tr></table> + </h:form> + + </f:view> + +</html> \ No newline at end of file Added: trunk/sandbox/samples/progressBarDemo/src/test/java/org/richfaces/sandbox/samples/BeanTest.java =================================================================== --- trunk/sandbox/samples/progressBarDemo/src/test/java/org/richfaces/sandbox/samples/BeanTest.java (rev 0) +++ trunk/sandbox/samples/progressBarDemo/src/test/java/org/richfaces/sandbox/samples/BeanTest.java 2007-12-26 17:01:15 UTC (rev 5016) @@ -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.samples; + +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 { + + } +}

16 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r5015 - trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts.

by richfaces-svn-commits＠lists.jboss.org

Author: sergeyhalipov Date: 2007-12-26 11:58:53 -0500 (Wed, 26 Dec 2007) New Revision: 5015 Modified: trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js Log: http://jira.jboss.com/jira/browse/RF-1625 Modified: trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js =================================================================== --- trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js 2007-12-26 16:42:59 UTC (rev 5014) +++ trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js 2007-12-26 16:58:53 UTC (rev 5015) @@ -1,13 +1,8 @@ DragIndicator = { init: function(event) { - DragIndicator.isIE = (RichFaces.MSIE == RichFaces.navigatorType()); - if (DragIndicator.isIE) { - var ieVersion = RichFaces.getIEVersion(); - if (ieVersion && ieVersion < 7) { - DragIndicator.isIE6 = true; - } - } + var ieVersion = RichFaces.getIEVersion(); + DragIndicator.isIE6 = (ieVersion && ieVersion < 7); }, setContent: function(name, single, params) { @@ -47,9 +42,10 @@ }, show: function() { - if (DragIndicator.isIE && !this.floatedToBody) { + if (!this.floatedToBody) { if (!this.realParent) { this.realParent = this.parentNode; + this._nextSibling = this.nextSibling; } this.realParent.removeChild(this); document.body.appendChild(this); @@ -64,9 +60,13 @@ this.style.position = ''; this.offsets = undefined; this.leave(); - if (DragIndicator.isIE && this.floatedToBody && this.realParent) { + if (this.floatedToBody && this.realParent) { document.body.removeChild(this); - this.realParent.appendChild(this); + if (this._nextSibling) { + this.realParent.insertBefore(this, this._nextSibling); + } else { + this.realParent.appendChild(this); + } this.floatedToBody = false; } }, @@ -75,16 +75,8 @@ if (!this.offsets) { Element.show(this); this.style.position = 'absolute'; - - if (!DragIndicator.isIE) { - this.offsets = Position.cumulativeOffset(this); - this.offsets[0] -= this.offsetLeft || 0; - this.offsets[1] -= this.offsetTop || 0; - } else { - this.offsets = [0, 0]; - } } - Element.setStyle(this, {"left": - this.offsets[0] + x + "px", "top": - this.offsets[1] + y + "px"}); + Element.setStyle(this, {"left": x + "px", "top": y + "px"}); }, accept: function() {

16 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r5014 - in trunk/sandbox/ui: progressBAR and 24 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: andrei_exadel Date: 2007-12-26 11:42:59 -0500 (Wed, 26 Dec 2007) New Revision: 5014 Added: trunk/sandbox/ui/progressBAR/ trunk/sandbox/ui/progressBAR/pom.xml trunk/sandbox/ui/progressBAR/src/ trunk/sandbox/ui/progressBAR/src/main/ trunk/sandbox/ui/progressBAR/src/main/config/ trunk/sandbox/ui/progressBAR/src/main/config/component/ trunk/sandbox/ui/progressBAR/src/main/config/component/README trunk/sandbox/ui/progressBAR/src/main/config/component/progressBar.xml trunk/sandbox/ui/progressBAR/src/main/java/ trunk/sandbox/ui/progressBAR/src/main/java/org/ trunk/sandbox/ui/progressBAR/src/main/java/org/richfaces/ trunk/sandbox/ui/progressBAR/src/main/java/org/richfaces/component/ trunk/sandbox/ui/progressBAR/src/main/java/org/richfaces/component/UIProgressBar.java trunk/sandbox/ui/progressBAR/src/main/java/org/richfaces/renderkit/ trunk/sandbox/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java trunk/sandbox/ui/progressBAR/src/main/resources/ trunk/sandbox/ui/progressBAR/src/main/resources/org/ trunk/sandbox/ui/progressBAR/src/main/resources/org/richfaces/ trunk/sandbox/ui/progressBAR/src/main/resources/org/richfaces/renderkit/ trunk/sandbox/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/ trunk/sandbox/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/css/ trunk/sandbox/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/css/progressBar.xcss trunk/sandbox/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/images/ trunk/sandbox/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/images/bg_ProgressBar.png trunk/sandbox/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/images/bg_ProgressBar_perm.gif trunk/sandbox/ui/progressBAR/src/main/templates/ trunk/sandbox/ui/progressBAR/src/main/templates/README trunk/sandbox/ui/progressBAR/src/main/templates/org/ trunk/sandbox/ui/progressBAR/src/main/templates/org/richfaces/ trunk/sandbox/ui/progressBAR/src/main/templates/org/richfaces/progressBar.jspx trunk/sandbox/ui/progressBAR/src/test/ trunk/sandbox/ui/progressBAR/src/test/java/ trunk/sandbox/ui/progressBAR/src/test/java/org/ trunk/sandbox/ui/progressBAR/src/test/java/org/richfaces/ trunk/sandbox/ui/progressBAR/src/test/java/org/richfaces/sandbox/ trunk/sandbox/ui/progressBAR/src/test/java/org/richfaces/sandbox/ProgressBarComponentTest.java Log: RF-1686 Added: trunk/sandbox/ui/progressBAR/pom.xml =================================================================== --- trunk/sandbox/ui/progressBAR/pom.xml (rev 0) +++ trunk/sandbox/ui/progressBAR/pom.xml 2007-12-26 16:42:59 UTC (rev 5014) @@ -0,0 +1,55 @@ +<?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>progressBar</artifactId> + <name>progressBar</name> + <version>3.2.0-SNAPSHOT</version> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.2.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces.sandbox.ui</prefix> + <taglib> + <shortName>progressBar</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <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.ui</groupId> + <artifactId>core</artifactId> + <version>3.2.0-SNAPSHOT</version> + </dependency> + </dependencies> +</project> \ No newline at end of file Added: trunk/sandbox/ui/progressBAR/src/main/config/component/README =================================================================== Added: trunk/sandbox/ui/progressBAR/src/main/config/component/progressBar.xml =================================================================== --- trunk/sandbox/ui/progressBAR/src/main/config/component/progressBar.xml (rev 0) +++ trunk/sandbox/ui/progressBAR/src/main/config/component/progressBar.xml 2007-12-26 16:42:59 UTC (rev 5014) @@ -0,0 +1,107 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "https://ajax4jsf.dev.java.net/nonav/dtds/component-config.dtd" > +<components> + <component> + <name>org.richfaces.ProgressBar</name> + <family>org.richfaces.ProgressBar</family> + <classname>org.richfaces.component.html.HtmlProgressBar</classname> + <superclass>org.richfaces.component.UIProgressBar</superclass> + <description> + <![CDATA[ + ]]> + </description> + <renderer generate="true" override="true"> + <name>org.richfaces.renderkit.ProgressBarRenderer</name> + <template>org/richfaces/progressBar.jspx</template> + </renderer> + <tag> + <name>progressBar</name> + <classname>org.richfaces.taglib.ProgressBarTag</classname> + <superclass> + org.ajax4jsf.webapp.taglib.HtmlComponentTagBase + </superclass> + <test/> + </tag> + <taghandler generate="false"> + <classname>org.ajax4jsf.webapp.taglib.AjaxComponentHandler</classname> + </taghandler> + &ui_component_attributes; + &html_universal_attributes; + &html_events; + <property> + <name>completeClass</name> + <classname>java.lang.String</classname> + <description>CSS class that defines style for progress line rendering</description> + </property> + <property> + <name>remainClass</name> + <classname>java.lang.String</classname> + <description>CSS class that defines style for remained part of progress bar</description> + </property> + <property> + <name>determined</name> + <classname>java.lang.String</classname> + <description>Attribute defines if component should render percent value</description> + </property> + <property> + <name>permanent</name> + <classname>java.lang.String</classname> + <description>Attribute defines background should be permanent</description> + </property> + <property> + <name>reRenderAfterComplete</name> + <classname>java.lang.String</classname> + <description>Set of componets to rerender after completion</description> + </property> + <property hidden="true"> + <name>actionExpression</name> + </property> + <property> + <name>onsubmit</name> + <classname>java.lang.String</classname> + <description> + JavaScript code for call before submission of ajax + event + </description> + </property> + <property> + <name>interval</name> + <classname>int</classname> + <description> + Interval (in ms) for call poll requests. Default value + 1000 (1 sec) + </description> + <defaultvalue>1000</defaultvalue> + </property> + <property> + <name>enabled</name> + <classname>boolean</classname> + <description> + <![CDATA[Enable/disable polling]]> + </description> + <defaultvalue>true</defaultvalue> + </property> + <property> + <name>value</name> + <classname>java.lang.Object</classname> + </property> + <property hidden="true"> + <name>submitted</name> + <classname>boolean</classname> + </property> + <property hidden="true"> + <name>requestDelay</name> + <classname>int</classname> + </property> + <property> + <name>ignoreDupResponses</name> + <classname>boolean</classname> + <description> +Attribute allows to ignore an Ajax Response produced by a request if the newest 'similar' request is +in a queue already. ignoreDupResponses="true" does not cancel the request while it is processed on the server, +but just allows to avoid unnecessary updates on the client side if the response isn't actual now + </description> + </property> + </component> + +</components> Added: trunk/sandbox/ui/progressBAR/src/main/java/org/richfaces/component/UIProgressBar.java =================================================================== --- trunk/sandbox/ui/progressBAR/src/main/java/org/richfaces/component/UIProgressBar.java (rev 0) +++ trunk/sandbox/ui/progressBAR/src/main/java/org/richfaces/component/UIProgressBar.java 2007-12-26 16:42:59 UTC (rev 5014) @@ -0,0 +1,26 @@ +/* + * UIProgressBar.java Date created: 19.12.2007 + * Last modified by: $Author$ + * $Revision$ $Date$ + */ + +package org.richfaces.component; + +import javax.faces.context.FacesContext; + +import org.ajax4jsf.component.UIPoll; +import org.ajax4jsf.context.AjaxContext; + +/** + * TODO Class description goes here. + * + * @author "Andrey Markavtsov" + * + */ +public abstract class UIProgressBar extends UIPoll { + + public static final String COMPONENT_TYPE = "org.richfaces.ProgressBar"; + + public static final String COMPONENT_FAMILY = "org.richfaces.ProgressBar"; + +} Added: trunk/sandbox/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java =================================================================== --- trunk/sandbox/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java (rev 0) +++ trunk/sandbox/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java 2007-12-26 16:42:59 UTC (rev 5014) @@ -0,0 +1,192 @@ +/* + * AbstractProgressBarRenderer.java Date created: 20.12.2007 + * Last modified by: $Author$ + * $Revision$ $Date$ + */ + +package org.richfaces.renderkit; + +import java.io.IOException; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; + +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; + +import org.ajax4jsf.context.AjaxContext; +import org.ajax4jsf.javascript.JSFunction; +import org.ajax4jsf.javascript.JSFunctionDefinition; +import org.ajax4jsf.renderkit.AjaxCommandRendererBase; +import org.ajax4jsf.renderkit.AjaxRendererUtils; +import org.ajax4jsf.renderkit.ComponentVariables; +import org.ajax4jsf.renderkit.ComponentsVariableResolver; +import org.ajax4jsf.renderkit.RendererUtils.HTML; +import org.richfaces.component.UIProgressBar; + +/** + * Abstract progress bar renderer + * + * @author "Andrey Markavtsov" + * + */ +public class AbstractProgressBarRenderer extends AjaxCommandRendererBase { + + /** AJAX polling function name */ + private static final String AJAX_POLL_FUNCTION = "A4J.AJAX.Poll"; + + /** + * Methods encodes AJAX script for polling + * + * @param context - + * faces context + * @param component - + * component instance + * @throws IOException - + * IOException + */ + public void encodePollScript(FacesContext context, UIComponent component) + throws IOException { + + ResponseWriter writer = context.getResponseWriter(); + UIProgressBar progressBar = (UIProgressBar) component; + writer.startElement(HTML.SPAN_ELEM, component); + writer.writeAttribute(HTML.style_ATTRIBUTE, "display:none;", null); + writer.startElement(HTML.SCRIPT_ELEM, component); + writer.writeAttribute(HTML.TYPE_ATTR, "text/javascript", null); + StringBuffer script = new StringBuffer("\n"); + if (progressBar.isEnabled()) { + JSFunction function = AjaxRendererUtils.buildAjaxFunction( // encode + // script + // if + // polling + // enable + component, context, AJAX_POLL_FUNCTION); + Map options = AjaxRendererUtils.buildEventOptions(context, + component); + Integer interval = new Integer(progressBar.getInterval()); + options.put("pollinterval", interval); + options.put("pollId", component.getClientId(context)); + Object onsubmit = component.getAttributes().get("onsubmit"); + if (null != onsubmit) { + JSFunctionDefinition onsubmitFunction = new JSFunctionDefinition(); + onsubmitFunction.addToBody(onsubmit); + options.put("onsubmit", onsubmitFunction); + } + + function.addParameter(options); + function.appendScript(script); + } else { + script.append("A4J.AJAX.StopPoll('").append( + component.getClientId(context)).append("')"); + } + script.append(";\n"); + writer.writeText(script.toString(), null); + writer.endElement(HTML.SCRIPT_ELEM); + writer.endElement(HTML.SPAN_ELEM); + } + + public void encodePersent(FacesContext context, UIComponent component) + throws IOException { + ResponseWriter writer = context.getResponseWriter(); + String determinedAttr = (String)component.getAttributes().get("determined"); + if (determinedAttr != null && "true".equals(determinedAttr)) { + ComponentVariables variables = ComponentsVariableResolver + .getVariables(this, component); + Integer percent = (Integer) variables.getVariable("percent"); + if (percent != null) { + writer.write(percent.toString() + "%"); + } + } + + } + + /** + * Methods encodes start facet of progress bar component + * + * @param context - + * faces context + * @param component - + * component instance + * @throws IOException - + * IOException + */ + public void encodeInitialState(FacesContext context, UIComponent component) + throws IOException { + String clientId = component.getClientId(context); + ResponseWriter writer = context.getResponseWriter(); + writer.startElement(HTML.DIV_ELEM, component); + writer.writeAttribute(HTML.id_ATTRIBUTE, clientId, null); + UIComponent initial = component.getFacet("initial"); + if (initial != null) { + renderChild(context, initial); + } + encodePollScript(context, component); + writer.endElement(HTML.DIV_ELEM); + + } + + /** + * Methods encodes finish facet of progress bar component + * + * @param context - + * faces context + * @param component - + * component instance + * @throws IOException - + * IOException + */ + public void encodeCompletedState(FacesContext context, UIComponent component) + throws IOException { + + Object rerenderAfterComplete = component.getAttributes().get( + "reRenderAfterComplete"); + Set ajaxRegions = AjaxRendererUtils.asSet(rerenderAfterComplete); + + if (ajaxRegions != null) { + for (Iterator iter = ajaxRegions.iterator(); iter.hasNext();) { + String id = iter.next().toString(); + AjaxContext ajaxContext = AjaxContext + .getCurrentInstance(context); + ajaxContext.addComponentToAjaxRender(component, id); + } + } + + String clientId = component.getClientId(context); + ResponseWriter writer = context.getResponseWriter(); + writer.startElement(HTML.DIV_ELEM, component); + writer.writeAttribute(HTML.id_ATTRIBUTE, clientId, null); + UIComponent completed = component.getFacet("completed"); + if (completed != null) { + renderChild(context, completed); + } + writer.endElement(HTML.DIV_ELEM); + + } + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.renderkit.RendererBase#getComponentClass() + */ + protected Class getComponentClass() { + // only poll component is allowed. + return UIProgressBar.class; + } + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.renderkit.AjaxCommandRendererBase#isSubmitted(javax.faces.context.FacesContext, + * javax.faces.component.UIComponent) + */ + protected boolean isSubmitted(FacesContext facesContext, + UIComponent uiComponent) { + boolean submitted = super.isSubmitted(facesContext, uiComponent); + UIProgressBar poll = (UIProgressBar) uiComponent; + poll.setSubmitted(submitted); + return submitted; + } + +} Added: trunk/sandbox/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/css/progressBar.xcss =================================================================== --- trunk/sandbox/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/css/progressBar.xcss (rev 0) +++ trunk/sandbox/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/css/progressBar.xcss 2007-12-26 16:42:59 UTC (rev 5014) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:template + xmlns:f="http://jsf.exadel.com/template" + xmlns:u="http://jsf.exadel.com/template/util" + xmlns="http://www.w3.org/1999/xhtml" + component="org.richfaces.component.UIProgressBar"> + + <f:verbatim> + +*{font-family : verdana; font-size : 11px} +.rich-progress-bar-uploaded{overflow : hidden; position : absolute; border : 0px solid #cccccc; height : 16px;} +.rich-progress-bar{position : relative; margin-bottom : 2px; height : 16px; width : 200px} +.rich-progress-bar-base{text-align : center; position : absolute; height : 16px; width : 200px; font-weight : bold;} +.rich-progress-bar-remained{background : #F1F1F1; border : 1px solid #cccccc; color : #000000;} +.rich-progress-bar-completed{background : #FF9409; color : #FFFFFF;; background-repeat : repeat-x; repeat-y;} +.rich-progress-bar-permanent{background : #FF9409; color : #FFFFFF;; background-repeat : repeat-x; repeat-y;} + + </f:verbatim> + + <u:selector name=".rich-progress-bar-completed"> + <u:style name="background-image"> + <f:resource f:key="/org/richfaces/renderkit/html/images/bg_ProgressBar.png" /> + </u:style> + </u:selector> + + <u:selector name=".rich-progress-bar-permanent"> + <u:style name="background-image"> + <f:resource f:key="/org/richfaces/renderkit/html/images/bg_ProgressBar_perm.gif" /> + </u:style> + </u:selector> + + +</f:template> \ No newline at end of file Added: trunk/sandbox/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/images/bg_ProgressBar.png =================================================================== (Binary files differ) Property changes on: trunk/sandbox/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/images/bg_ProgressBar.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/sandbox/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/images/bg_ProgressBar_perm.gif =================================================================== (Binary files differ) Property changes on: trunk/sandbox/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/images/bg_ProgressBar_perm.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/sandbox/ui/progressBAR/src/main/templates/README =================================================================== Added: trunk/sandbox/ui/progressBAR/src/main/templates/org/richfaces/progressBar.jspx =================================================================== --- trunk/sandbox/ui/progressBAR/src/main/templates/org/richfaces/progressBar.jspx (rev 0) +++ trunk/sandbox/ui/progressBAR/src/main/templates/org/richfaces/progressBar.jspx 2007-12-26 16:42:59 UTC (rev 5014) @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:root + xmlns:f="http://ajax4jsf.org/cdk/template" + xmlns:h=" http://ajax4jsf.org/cdk/headers" + class="org.richfaces.renderkit.ProgressBarRenderer" + baseclass="org.richfaces.renderkit.AbstractProgressBarRenderer" + component="org.richfaces.component.UIProgressBar" + > + +<h:styles>/org/richfaces/renderkit/html/css/progressBar.xcss</h:styles> + +<h:scripts> + new org.ajax4jsf.javascript.PrototypeScript(), + new org.ajax4jsf.javascript.AjaxScript(), +</h:scripts> + +<f:clientId var="clientId" /> + +<jsp:scriptlet> +<![CDATA[ + Integer percent = (Integer)component.getAttributes().get("value"); + + variables.setVariable("percent",percent); + variables.setVariable("style",(String)component.getAttributes().get("style")); + + String permanent = (String)component.getAttributes().get("permanent"); + + variables.setVariable("completeClass",(component.getAttributes().get("completeClass") != null) ? + (String)component.getAttributes().get("completeClass") : + ((permanent != null && "true".equals(permanent)) ? + "rich-progress-bar-permanent" : "rich-progress-bar-completed")); + + variables.setVariable("remainClass",(component.getAttributes().get("remainClass") != null) ? + (String)component.getAttributes().get("remainClass"): "rich-progress-bar-remained" ); + + + ]]> +</jsp:scriptlet> + +<jsp:scriptlet> +<![CDATA[ +if (percent <= 0) { + encodeInitialState(context, component); +} else if (percent >= 100) { + encodeCompletedState(context, component); +} else { + ]]> +</jsp:scriptlet> +<div class="rich-progress-bar" style="#{style}" id="#{clientId}"> + <div class="#{remainClass} rich-progress-bar-base" style="#{style}"> + <f:call name="encodePersent"/> + </div> + <div class="rich-progress-bar-uploaded" style="#{style}; width: #{percent}%;"> + <div class="#{completeClass} rich-progress-bar-base" style="#{style}"> + <f:call name="encodePersent"/> + </div> + </div> +<f:call name="encodePollScript"/> +</div> + +<jsp:scriptlet> +<![CDATA[ +} +]]> +</jsp:scriptlet> + +</f:root> \ No newline at end of file Added: trunk/sandbox/ui/progressBAR/src/test/java/org/richfaces/sandbox/ProgressBarComponentTest.java =================================================================== --- trunk/sandbox/ui/progressBAR/src/test/java/org/richfaces/sandbox/ProgressBarComponentTest.java (rev 0) +++ trunk/sandbox/ui/progressBAR/src/test/java/org/richfaces/sandbox/ProgressBarComponentTest.java 2007-12-26 16:42:59 UTC (rev 5014) @@ -0,0 +1,102 @@ +package org.richfaces.sandbox; + +import javax.faces.component.UIForm; +import javax.faces.component.html.HtmlForm; + +import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; +import org.richfaces.component.UIProgressBar; + +import com.gargoylesoftware.htmlunit.html.DomText; +import com.gargoylesoftware.htmlunit.html.HtmlElement; +import com.gargoylesoftware.htmlunit.html.HtmlPage; + +/** + * Unit test for Progress bar component. + */ +public class ProgressBarComponentTest extends AbstractAjax4JsfTestCase { + + /** Form component */ + private UIForm form = null; + + /** Progress bar component */ + private UIProgressBar progressBar = null; + + /** + * TODO Description goes here. + * + * @param name + */ + public ProgressBarComponentTest(String name) { + super(name); + // TODO Auto-generated constructor stub + } + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#setUp() + */ + @Override + public void setUp() throws Exception { + // TODO Auto-generated method stub + super.setUp(); + form = new HtmlForm(); + form.setId("form"); + facesContext.getViewRoot().getChildren().add(form); + + progressBar = (UIProgressBar) application + .createComponent("org.richfaces.ProgressBar"); + progressBar.setId("prgs"); + progressBar.setValue(50); + progressBar.setInterval(1000); + progressBar.getAttributes().put("determined", "true"); + + form.getChildren().add(progressBar); + + } + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#tearDown() + */ + @Override + public void tearDown() throws Exception { + // TODO Auto-generated method stub + super.tearDown(); + } + + /** + * Method tests progress bar component + * @throws Exception + */ + public void testProgressBar() throws Exception { + HtmlPage page = renderView(); + assertNotNull(page); + + HtmlElement progress = page.getHtmlElementById(progressBar + .getClientId(facesContext)); + assertNotNull(progress); + assertEquals("div", progress.getNodeName()); + + String classAttr = progress.getAttributeValue("class"); + assertTrue(classAttr.contains("rich-progress-bar")); + + HtmlElement node = (HtmlElement)progress.getFirstChild(); + assertTrue(node.getAttributeValue("class").contains("rich-progress-bar-base")); + assertTrue("50%".equals(node.asText())); + + node = (HtmlElement) progress.getLastChild(); + assertTrue("span".equalsIgnoreCase(node.getTagName())); + + node = (HtmlElement) node.getLastChild(); + assertTrue("script".equalsIgnoreCase(node.getTagName())); + + DomText text = (DomText) node.getFirstChild(); + assertTrue(text.getData().contains("A4J.AJAX.Poll")); + assertTrue(text.getData().contains("1000")); + + + } + +}

16 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r5013 - management/design/fileUpload/markup.

by richfaces-svn-commits＠lists.jboss.org

Author: admitriev Date: 2007-12-26 11:37:46 -0500 (Wed, 26 Dec 2007) New Revision: 5013 Modified: management/design/fileUpload/markup/file_upload.html Log: http://jira.jboss.com/jira/browse/RF-1208 Modified: management/design/fileUpload/markup/file_upload.html =================================================================== --- management/design/fileUpload/markup/file_upload.html 2007-12-26 16:26:09 UTC (rev 5012) +++ management/design/fileUpload/markup/file_upload.html 2007-12-26 16:37:46 UTC (rev 5013) @@ -1,6 +1,6 @@ <html> <head> -<title>1</title> +<title>1</title> <meta http-equiv="Content-Type" content="text/html; charset=windows-1251"> <style>

16 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r5012 - management/design/comboBox/markup.

by richfaces-svn-commits＠lists.jboss.org

Author: admitriev Date: 2007-12-26 11:26:09 -0500 (Wed, 26 Dec 2007) New Revision: 5012 Modified: management/design/comboBox/markup/comboBox.html Log: http://jira.jboss.com/jira/browse/RF-1217 Modified: management/design/comboBox/markup/comboBox.html =================================================================== --- management/design/comboBox/markup/comboBox.html 2007-12-26 16:20:38 UTC (rev 5011) +++ management/design/comboBox/markup/comboBox.html 2007-12-26 16:26:09 UTC (rev 5012) @@ -1,7 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> -<head> +<head> <title>Untitled</title> <style> .cb_width{ width : 150px; }

16 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r5011 - trunk/sandbox/ui.

by richfaces-svn-commits＠lists.jboss.org

Author: andrei_exadel Date: 2007-12-26 11:20:38 -0500 (Wed, 26 Dec 2007) New Revision: 5011 Removed: trunk/sandbox/ui/progressBar/ Log: Removed file/folder

16 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r5010 - management/design/fileUpload/markup.

by richfaces-svn-commits＠lists.jboss.org

Author: admitriev Date: 2007-12-26 11:15:09 -0500 (Wed, 26 Dec 2007) New Revision: 5010 Modified: management/design/fileUpload/markup/file_upload.html Log: Modified: management/design/fileUpload/markup/file_upload.html =================================================================== --- management/design/fileUpload/markup/file_upload.html 2007-12-26 16:12:54 UTC (rev 5009) +++ management/design/fileUpload/markup/file_upload.html 2007-12-26 16:15:09 UTC (rev 5010) @@ -5,62 +5,96 @@ <style> body{margin : 20px} -*{font-family : verdana; font-size : 11px} -.file_item{ white-space : nowrap;} -.file_delete_button{border : 1px solid #CCCCCC; padding : 1px; width : 12px; cursor : pointer; float : left; margin : 1px 2px 1px 7px;} -.file_field{float : left; width : 200; height : 18; margin-bottom : 5px;} -.file_bar_height{height : 16px} -.file_bar_width{width : 200px} -.file_bar_uploaded{width : 99px; overflow : hidden; position : absolute; border : 1px solid #cccccc;} -.file_bar_shell{position : relative; margin-bottom : 2px;float : left;} -.file_bar_track{background : #F1F1F1; text-align : center; border : 1px solid #cccccc; color : #000000; font-weight : bold; position : absolute;} -.file_bar_ststusline{background : #FF9409; text-align : center; color : #FFFFFF;; font-weight : bold; background-image : url(images/bg_uploaded.png);background-repeat : repeat-x; position : absolute;} -.file_stop_button{background : url(images/bg_button.png);border : 1px solid #CCCCCC; padding : 0px 5px 0px 5px;cursor : pointer; float : left; margin : 0px 0px 0px 2px;} + +.upload_font{font-family : verdana; font-size : 11px} + +#upload_table{width : 100%} +#upload_table td{border-bottom:1px solid #c0c0c0;white-space : nowrap; padding : 4 0 4 0;} + +#upload_footer{width : 100%} +#upload_footer td{white-space : nowrap; padding : 5 0 5 0;} + +.upload_list_width{ width:350px;} +.upload_list_decor{ border:1px solid #c0c0c0; background : #FFFFFF;} +.upload_list_overflow{height : 200px; overflow-y : auto; overflow-x : hidden;} +.upload_icon{ width : 30; text-align : center;} +.upload_name{ width : 140; overflow : hidden} +.upload_size{ width : 100; text-align : right;} +.upload_itemdel{ width : 80; text-align : center;} +.upload_anc{ color : #a00000; text-decoration : none} + +.upload_footer_decor{ background : #224986; border-top:1px solid #c0c0c0;} +.upload_footer_firstcol{ width : 100%} +.upload_footer_total{ width : 100; text-align : right; color : #ffffff;} + +.upload_btn_over{ + display : inline; + background : url(images/bg_button.png) repeat-x #C7D7EC; /*from generalBackgroundColor to tabBackgroundColor*/ + padding: 0px; + text-align : center; + border : 1px solid #c0c0c0; /*panelBorderColor*/ + cursor : pointer; +} +.upload_btn_press{ + display : inline; + background : url(images/bg_press.png) repeat-x bottom #C7D7EC; /*from tabBackgroundColor to generalBackgroundColor*/ + padding: 0px; + text-align : center; + border : 1px solid #c0c0c0; /*panelBorderColor*/ + cursor : pointer; +} + + </style> </head> <body> -<div class="file_item"> - <input type="File" class="file_field"> - <div class="file_delete_button"><img src="images/ico_delete.gif" width="12" height="12" alt="" border="0"></div> -</div> -<br clear="all"> -<div class="file_item"> - <input type="File" class="file_field"> - <div class="file_delete_button"><img src="images/ico_delete.gif" width="12" height="12" alt="" border="0"></div> -</div> -<br clear="all"> -<div class="file_item"> - <input type="File" class="file_field" > - <div class="file_delete_button"><img src="images/ico_delete.gif" width="12" height="12" alt="" border="0"></div> -</div> -<br clear="all"> -<div class="file_item"> - <input type="File" class="file_field"> +<div class="upload_list_width upload_list_decor"> + <div class="upload_list_width upload_list_overflow"> + <table border="0" cellpadding="0" cellspacing="0" id="upload_table"> + <tr> + <td> + <div class="upload_font upload_icon"><img src="images/ico_file.gif" width="16" height="16" alt="" border="0"></div> + </td> + <td> + <div class="upload_font upload_name"> + file_upload.html + </div> + + </td> + <td> + <div class="upload_font upload_size">3KB</div> + </td> + <td> + <div class="upload_font upload_itemdel"><a href="#" class="upload_anc">x</a></div> + </td> + </tr> + </table> + </div> + + <div class="upload_list_width upload_footer_decor"> + <table border="0" cellpadding="0" cellspacing="0" id="upload_footer"> + <tr> + <td class="upload_footer_firstcol"> + <input style="margin-left : 5" value="Add..." type="Button" class="upload_btn_over upload_font" onmouseover="this.className='upload_btn_over upload_font'" onmouseout="this.className='upload_btn_over upload_font'" onmousedown="this.className='upload_btn_press upload_font'"> + <input style="padding-left : 10; padding-right : 10; font-weight : bold" value="Upload" type="Button" class="upload_btn_over upload_font" onmouseover="this.className='upload_btn_over upload_font'" onmouseout="this.className='upload_btn_over upload_font'" onmousedown="this.className='upload_btn_press upload_font'"> + </td> + <td> + <div class="upload_font upload_footer_total">Total : <b>33KB</b></div> + </td> + <td> + <div class="upload_font upload_itemdel"> + <input value="Clear" type="Button" class="upload_btn_over upload_font" onmouseover="this.className='upload_btn_over upload_font'" onmouseout="this.className='upload_btn_over upload_font'" onmousedown="this.className='upload_btn_press upload_font'"> + </div> + </td> + </tr> + </table> + </div> + </div> -<br clear="all"> -<div class="file_stop_button file_bar_height">Upload</div> -<br><br><br><br> - -<div class="file_item"> -<div class="file_bar_height file_bar_width file_bar_shell"> - <div class="file_bar_height file_bar_width file_bar_track"> - 50% - </div> - <div class="file_bar_height file_bar_uploaded"> - <div class="file_bar_height file_bar_width file_bar_ststusline"> - 50% - </div> - </div> -</div> -<div class="file_stop_button file_bar_height">Stop</div> -</div><br clear="all"> -Uploaded 200Kb from 500Kb - -</div> </body> </html> \ No newline at end of file

16 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r5009 - in trunk/sandbox/ui: progressBar and 12 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: andrei_exadel Date: 2007-12-26 11:12:54 -0500 (Wed, 26 Dec 2007) New Revision: 5009 Added: trunk/sandbox/ui/progressBar/ trunk/sandbox/ui/progressBar/pom.xml trunk/sandbox/ui/progressBar/src/ trunk/sandbox/ui/progressBar/src/main/ trunk/sandbox/ui/progressBar/src/main/java/ trunk/sandbox/ui/progressBar/src/main/java/org/ trunk/sandbox/ui/progressBar/src/main/java/org/richfaces/ trunk/sandbox/ui/progressBar/src/main/java/org/richfaces/component/ trunk/sandbox/ui/progressBar/src/main/java/org/richfaces/component/UIProgressBar.java trunk/sandbox/ui/progressBar/src/main/java/org/richfaces/renderkit/ trunk/sandbox/ui/progressBar/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java trunk/sandbox/ui/progressBar/src/test/ trunk/sandbox/ui/progressBar/src/test/java/ trunk/sandbox/ui/progressBar/src/test/java/org/ trunk/sandbox/ui/progressBar/src/test/java/org/richfaces/ trunk/sandbox/ui/progressBar/src/test/java/org/richfaces/sandbox/ trunk/sandbox/ui/progressBar/src/test/java/org/richfaces/sandbox/ProgressBarComponentTest.java Modified: trunk/sandbox/ui/pom.xml Log: RF-1686 (Progress Bar Component) Modified: trunk/sandbox/ui/pom.xml =================================================================== --- trunk/sandbox/ui/pom.xml 2007-12-26 15:25:59 UTC (rev 5008) +++ trunk/sandbox/ui/pom.xml 2007-12-26 16:12:54 UTC (rev 5009) @@ -22,5 +22,6 @@  <module>fileUpload</module> <module>combobox</module> + <module>progressBar</module> </modules> </project> \ No newline at end of file Added: trunk/sandbox/ui/progressBar/pom.xml =================================================================== --- trunk/sandbox/ui/progressBar/pom.xml (rev 0) +++ trunk/sandbox/ui/progressBar/pom.xml 2007-12-26 16:12:54 UTC (rev 5009) @@ -0,0 +1,55 @@ +<?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>progressBar</artifactId> + <name>progressBar</name> + <version>3.2.0-SNAPSHOT</version> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.2.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces.sandbox.ui</prefix> + <taglib> + <shortName>progressBar</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <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.ui</groupId> + <artifactId>core</artifactId> + <version>3.2.0-SNAPSHOT</version> + </dependency> + </dependencies> +</project> \ No newline at end of file Added: trunk/sandbox/ui/progressBar/src/main/java/org/richfaces/component/UIProgressBar.java =================================================================== --- trunk/sandbox/ui/progressBar/src/main/java/org/richfaces/component/UIProgressBar.java (rev 0) +++ trunk/sandbox/ui/progressBar/src/main/java/org/richfaces/component/UIProgressBar.java 2007-12-26 16:12:54 UTC (rev 5009) @@ -0,0 +1,26 @@ +/* + * UIProgressBar.java Date created: 19.12.2007 + * Last modified by: $Author$ + * $Revision$ $Date$ + */ + +package org.richfaces.component; + +import javax.faces.context.FacesContext; + +import org.ajax4jsf.component.UIPoll; +import org.ajax4jsf.context.AjaxContext; + +/** + * TODO Class description goes here. + * + * @author "Andrey Markavtsov" + * + */ +public abstract class UIProgressBar extends UIPoll { + + public static final String COMPONENT_TYPE = "org.richfaces.ProgressBar"; + + public static final String COMPONENT_FAMILY = "org.richfaces.ProgressBar"; + +} Added: trunk/sandbox/ui/progressBar/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java =================================================================== --- trunk/sandbox/ui/progressBar/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java (rev 0) +++ trunk/sandbox/ui/progressBar/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java 2007-12-26 16:12:54 UTC (rev 5009) @@ -0,0 +1,192 @@ +/* + * AbstractProgressBarRenderer.java Date created: 20.12.2007 + * Last modified by: $Author$ + * $Revision$ $Date$ + */ + +package org.richfaces.renderkit; + +import java.io.IOException; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; + +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; + +import org.ajax4jsf.context.AjaxContext; +import org.ajax4jsf.javascript.JSFunction; +import org.ajax4jsf.javascript.JSFunctionDefinition; +import org.ajax4jsf.renderkit.AjaxCommandRendererBase; +import org.ajax4jsf.renderkit.AjaxRendererUtils; +import org.ajax4jsf.renderkit.ComponentVariables; +import org.ajax4jsf.renderkit.ComponentsVariableResolver; +import org.ajax4jsf.renderkit.RendererUtils.HTML; +import org.richfaces.component.UIProgressBar; + +/** + * Abstract progress bar renderer + * + * @author "Andrey Markavtsov" + * + */ +public class AbstractProgressBarRenderer extends AjaxCommandRendererBase { + + /** AJAX polling function name */ + private static final String AJAX_POLL_FUNCTION = "A4J.AJAX.Poll"; + + /** + * Methods encodes AJAX script for polling + * + * @param context - + * faces context + * @param component - + * component instance + * @throws IOException - + * IOException + */ + public void encodePollScript(FacesContext context, UIComponent component) + throws IOException { + + ResponseWriter writer = context.getResponseWriter(); + UIProgressBar progressBar = (UIProgressBar) component; + writer.startElement(HTML.SPAN_ELEM, component); + writer.writeAttribute(HTML.style_ATTRIBUTE, "display:none;", null); + writer.startElement(HTML.SCRIPT_ELEM, component); + writer.writeAttribute(HTML.TYPE_ATTR, "text/javascript", null); + StringBuffer script = new StringBuffer("\n"); + if (progressBar.isEnabled()) { + JSFunction function = AjaxRendererUtils.buildAjaxFunction( // encode + // script + // if + // polling + // enable + component, context, AJAX_POLL_FUNCTION); + Map options = AjaxRendererUtils.buildEventOptions(context, + component); + Integer interval = new Integer(progressBar.getInterval()); + options.put("pollinterval", interval); + options.put("pollId", component.getClientId(context)); + Object onsubmit = component.getAttributes().get("onsubmit"); + if (null != onsubmit) { + JSFunctionDefinition onsubmitFunction = new JSFunctionDefinition(); + onsubmitFunction.addToBody(onsubmit); + options.put("onsubmit", onsubmitFunction); + } + + function.addParameter(options); + function.appendScript(script); + } else { + script.append("A4J.AJAX.StopPoll('").append( + component.getClientId(context)).append("')"); + } + script.append(";\n"); + writer.writeText(script.toString(), null); + writer.endElement(HTML.SCRIPT_ELEM); + writer.endElement(HTML.SPAN_ELEM); + } + + public void encodePersent(FacesContext context, UIComponent component) + throws IOException { + ResponseWriter writer = context.getResponseWriter(); + String determinedAttr = (String)component.getAttributes().get("determined"); + if (determinedAttr != null && "true".equals(determinedAttr)) { + ComponentVariables variables = ComponentsVariableResolver + .getVariables(this, component); + Integer percent = (Integer) variables.getVariable("percent"); + if (percent != null) { + writer.write(percent.toString() + "%"); + } + } + + } + + /** + * Methods encodes start facet of progress bar component + * + * @param context - + * faces context + * @param component - + * component instance + * @throws IOException - + * IOException + */ + public void encodeInitialState(FacesContext context, UIComponent component) + throws IOException { + String clientId = component.getClientId(context); + ResponseWriter writer = context.getResponseWriter(); + writer.startElement(HTML.DIV_ELEM, component); + writer.writeAttribute(HTML.id_ATTRIBUTE, clientId, null); + UIComponent initial = component.getFacet("initial"); + if (initial != null) { + renderChild(context, initial); + } + encodePollScript(context, component); + writer.endElement(HTML.DIV_ELEM); + + } + + /** + * Methods encodes finish facet of progress bar component + * + * @param context - + * faces context + * @param component - + * component instance + * @throws IOException - + * IOException + */ + public void encodeCompletedState(FacesContext context, UIComponent component) + throws IOException { + + Object rerenderAfterComplete = component.getAttributes().get( + "reRenderAfterComplete"); + Set ajaxRegions = AjaxRendererUtils.asSet(rerenderAfterComplete); + + if (ajaxRegions != null) { + for (Iterator iter = ajaxRegions.iterator(); iter.hasNext();) { + String id = iter.next().toString(); + AjaxContext ajaxContext = AjaxContext + .getCurrentInstance(context); + ajaxContext.addComponentToAjaxRender(component, id); + } + } + + String clientId = component.getClientId(context); + ResponseWriter writer = context.getResponseWriter(); + writer.startElement(HTML.DIV_ELEM, component); + writer.writeAttribute(HTML.id_ATTRIBUTE, clientId, null); + UIComponent completed = component.getFacet("completed"); + if (completed != null) { + renderChild(context, completed); + } + writer.endElement(HTML.DIV_ELEM); + + } + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.renderkit.RendererBase#getComponentClass() + */ + protected Class getComponentClass() { + // only poll component is allowed. + return UIProgressBar.class; + } + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.renderkit.AjaxCommandRendererBase#isSubmitted(javax.faces.context.FacesContext, + * javax.faces.component.UIComponent) + */ + protected boolean isSubmitted(FacesContext facesContext, + UIComponent uiComponent) { + boolean submitted = super.isSubmitted(facesContext, uiComponent); + UIProgressBar poll = (UIProgressBar) uiComponent; + poll.setSubmitted(submitted); + return submitted; + } + +} Added: trunk/sandbox/ui/progressBar/src/test/java/org/richfaces/sandbox/ProgressBarComponentTest.java =================================================================== --- trunk/sandbox/ui/progressBar/src/test/java/org/richfaces/sandbox/ProgressBarComponentTest.java (rev 0) +++ trunk/sandbox/ui/progressBar/src/test/java/org/richfaces/sandbox/ProgressBarComponentTest.java 2007-12-26 16:12:54 UTC (rev 5009) @@ -0,0 +1,102 @@ +package org.richfaces.sandbox; + +import javax.faces.component.UIForm; +import javax.faces.component.html.HtmlForm; + +import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; +import org.richfaces.component.UIProgressBar; + +import com.gargoylesoftware.htmlunit.html.DomText; +import com.gargoylesoftware.htmlunit.html.HtmlElement; +import com.gargoylesoftware.htmlunit.html.HtmlPage; + +/** + * Unit test for Progress bar component. + */ +public class ProgressBarComponentTest extends AbstractAjax4JsfTestCase { + + /** Form component */ + private UIForm form = null; + + /** Progress bar component */ + private UIProgressBar progressBar = null; + + /** + * TODO Description goes here. + * + * @param name + */ + public ProgressBarComponentTest(String name) { + super(name); + // TODO Auto-generated constructor stub + } + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#setUp() + */ + @Override + public void setUp() throws Exception { + // TODO Auto-generated method stub + super.setUp(); + form = new HtmlForm(); + form.setId("form"); + facesContext.getViewRoot().getChildren().add(form); + + progressBar = (UIProgressBar) application + .createComponent("org.richfaces.ProgressBar"); + progressBar.setId("prgs"); + progressBar.setValue(50); + progressBar.setInterval(1000); + progressBar.getAttributes().put("determined", "true"); + + form.getChildren().add(progressBar); + + } + + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#tearDown() + */ + @Override + public void tearDown() throws Exception { + // TODO Auto-generated method stub + super.tearDown(); + } + + /** + * Method tests progress bar component + * @throws Exception + */ + public void testProgressBar() throws Exception { + HtmlPage page = renderView(); + assertNotNull(page); + + HtmlElement progress = page.getHtmlElementById(progressBar + .getClientId(facesContext)); + assertNotNull(progress); + assertEquals("div", progress.getNodeName()); + + String classAttr = progress.getAttributeValue("class"); + assertTrue(classAttr.contains("rich-progress-bar")); + + HtmlElement node = (HtmlElement)progress.getFirstChild(); + assertTrue(node.getAttributeValue("class").contains("rich-progress-bar-base")); + assertTrue("50%".equals(node.asText())); + + node = (HtmlElement) progress.getLastChild(); + assertTrue("span".equalsIgnoreCase(node.getTagName())); + + node = (HtmlElement) node.getLastChild(); + assertTrue("script".equalsIgnoreCase(node.getTagName())); + + DomText text = (DomText) node.getFirstChild(); + assertTrue(text.getData().contains("A4J.AJAX.Poll")); + assertTrue(text.getData().contains("1000")); + + + } + +}

16 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r5008 - trunk/docs/xslt/en/src/main/xslt.

by richfaces-svn-commits＠lists.jboss.org

Author: artdaw Date: 2007-12-26 10:25:59 -0500 (Wed, 26 Dec 2007) New Revision: 5008 Modified: trunk/docs/xslt/en/src/main/xslt/html.xsl trunk/docs/xslt/en/src/main/xslt/html_chunk.xsl Log: http://jira.jboss.com/jira/browse/RF-1770 - add <xsl:param name="ignore.image.scaling" select="1"/> for restriction image scaling in HTML versions Modified: trunk/docs/xslt/en/src/main/xslt/html.xsl =================================================================== --- trunk/docs/xslt/en/src/main/xslt/html.xsl 2007-12-26 15:24:19 UTC (rev 5007) +++ trunk/docs/xslt/en/src/main/xslt/html.xsl 2007-12-26 15:25:59 UTC (rev 5008) @@ -84,5 +84,8 @@ </xsl:param> <xsl:template match="section[@role = 'NotInToc']//*" mode="toc" /> <xsl:template match="chapter[@role = 'NotInToc']//section//*" mode="toc" /> - + +  + <xsl:param name="ignore.image.scaling" select="1"/> + </xsl:stylesheet> Modified: trunk/docs/xslt/en/src/main/xslt/html_chunk.xsl =================================================================== --- trunk/docs/xslt/en/src/main/xslt/html_chunk.xsl 2007-12-26 15:24:19 UTC (rev 5007) +++ trunk/docs/xslt/en/src/main/xslt/html_chunk.xsl 2007-12-26 15:25:59 UTC (rev 5008) @@ -90,7 +90,10 @@ <xsl:template match="section[@role = 'NotInToc']//*" mode="toc" /> <xsl:template match="chapter[@role = 'NotInToc']//section//*" mode="toc" /> <xsl:template match="book" mode="object.title.markup"/> - + +  + <xsl:param name="ignore.image.scaling" select="1"/> +

16 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r5007 - trunk/docs/userguide/en/src/main/docbook/included.

by richfaces-svn-commits＠lists.jboss.org

Author: artdaw Date: 2007-12-26 10:24:19 -0500 (Wed, 26 Dec 2007) New Revision: 5007 Modified: trunk/docs/userguide/en/src/main/docbook/included/listShuttle.xml Log: http://jira.jboss.com/jira/browse/RF-1770 - add 'scale' attribute in order to resize screenshot for Definition of Custom Style Classes Modified: trunk/docs/userguide/en/src/main/docbook/included/listShuttle.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/listShuttle.xml 2007-12-26 13:53:48 UTC (rev 5006) +++ trunk/docs/userguide/en/src/main/docbook/included/listShuttle.xml 2007-12-26 15:24:19 UTC (rev 5007) @@ -803,12 +803,12 @@ <mediaobject> <imageobject> - <imagedata fileref="images/listShuttle_classes_s.png" /> + <imagedata fileref="images/listShuttle_classes_s.png" scale="80" /> </imageobject> </mediaobject> <mediaobject> <imageobject> - <imagedata fileref="images/listShuttle_classes_t.png" /> + <imagedata fileref="images/listShuttle_classes_t.png" scale="80"/> </imageobject> </mediaobject> </figure>

16 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits December 2007