February 2009 - richfaces-svn-commits

JBoss Rich Faces SVN: r12723 - in trunk/sandbox/samples/layout-sample/src/main/webapp: META-INF and 1 other directories.

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

Author: SergeySmirnov Date: 2009-02-23 19:16:55 -0500 (Mon, 23 Feb 2009) New Revision: 12723 Added: trunk/sandbox/samples/layout-sample/src/main/webapp/META-INF/ trunk/sandbox/samples/layout-sample/src/main/webapp/META-INF/MANIFEST.MF trunk/sandbox/samples/layout-sample/src/main/webapp/pages/ trunk/sandbox/samples/layout-sample/src/main/webapp/pages/index.jsp trunk/sandbox/samples/layout-sample/src/main/webapp/pages/index.xhtml Log: Added: trunk/sandbox/samples/layout-sample/src/main/webapp/META-INF/MANIFEST.MF =================================================================== --- trunk/sandbox/samples/layout-sample/src/main/webapp/META-INF/MANIFEST.MF (rev 0) +++ trunk/sandbox/samples/layout-sample/src/main/webapp/META-INF/MANIFEST.MF 2009-02-24 00:16:55 UTC (rev 12723) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: trunk/sandbox/samples/layout-sample/src/main/webapp/META-INF/MANIFEST.MF ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: trunk/sandbox/samples/layout-sample/src/main/webapp/pages/index.jsp =================================================================== --- trunk/sandbox/samples/layout-sample/src/main/webapp/pages/index.jsp (rev 0) +++ trunk/sandbox/samples/layout-sample/src/main/webapp/pages/index.jsp 2009-02-24 00:16:55 UTC (rev 12723) @@ -0,0 +1,20 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/ui/layout" prefix="layout"%> +<html> + <head> + <title>layout sample page</title> + </head> + <body> + <f:view> + <layout:layoutPanel type="gd"> + <layout:layoutPanel type="u first"> + <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna.</p> + </layout:layoutPanel> + <layout:layoutPanel type="u"> + <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna.</p> + </layout:layoutPanel> + </layout:layoutPanel> + </f:view> + </body> +</html> Property changes on: trunk/sandbox/samples/layout-sample/src/main/webapp/pages/index.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: trunk/sandbox/samples/layout-sample/src/main/webapp/pages/index.xhtml =================================================================== (Binary files differ) Property changes on: trunk/sandbox/samples/layout-sample/src/main/webapp/pages/index.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r12722 - in trunk/sandbox/samples: colorPicker and 4 other directories.

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

Author: SergeySmirnov Date: 2009-02-23 19:15:50 -0500 (Mon, 23 Feb 2009) New Revision: 12722 Added: trunk/sandbox/samples/layout-sample/ trunk/sandbox/samples/layout-sample/pom.xml trunk/sandbox/samples/layout-sample/src/ trunk/sandbox/samples/layout-sample/src/main/ trunk/sandbox/samples/layout-sample/src/main/java/ trunk/sandbox/samples/layout-sample/src/main/resources/ trunk/sandbox/samples/layout-sample/src/main/webapp/ trunk/sandbox/samples/layout-sample/src/main/webapp/index.jsp Modified: trunk/sandbox/samples/colorPicker/ Log: Property changes on: trunk/sandbox/samples/colorPicker ___________________________________________________________________ Name: svn:ignore + target Added: trunk/sandbox/samples/layout-sample/pom.xml =================================================================== --- trunk/sandbox/samples/layout-sample/pom.xml (rev 0) +++ trunk/sandbox/samples/layout-sample/pom.xml 2009-02-24 00:15:50 UTC (rev 12722) @@ -0,0 +1,48 @@ +<?xml version="1.0"?><project> + <parent> + <artifactId>samples</artifactId> + <groupId>org.richfaces.sandbox</groupId> + <version>3.3.1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.sandbox.samples</groupId> + <artifactId>layout-sample</artifactId> + <packaging>war</packaging> + <name>layout Maven Webapp</name> + <version>3.3.1-SNAPSHOT</version> + <build> + <finalName>layout-sample</finalName> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </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.ui</groupId> + <artifactId>richfaces-ui</artifactId> + <version>3.3.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>3.3.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>layout</artifactId> + <version>3.3.1-SNAPSHOT</version> + </dependency> + </dependencies> +</project> Property changes on: trunk/sandbox/samples/layout-sample/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Added: trunk/sandbox/samples/layout-sample/src/main/webapp/index.jsp =================================================================== --- trunk/sandbox/samples/layout-sample/src/main/webapp/index.jsp (rev 0) +++ trunk/sandbox/samples/layout-sample/src/main/webapp/index.jsp 2009-02-24 00:15:50 UTC (rev 12722) @@ -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 Property changes on: trunk/sandbox/samples/layout-sample/src/main/webapp/index.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r12721 - in trunk/sandbox/ui: layout/src/main/config/component and 1 other directories.

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

Author: SergeySmirnov Date: 2009-02-23 19:15:10 -0500 (Mon, 23 Feb 2009) New Revision: 12721 Modified: trunk/sandbox/ui/colorPicker/ trunk/sandbox/ui/layout/src/main/config/component/layoutPanel.xml trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlLayoutPanel.jspx Log: Property changes on: trunk/sandbox/ui/colorPicker ___________________________________________________________________ Name: svn:ignore + target Modified: trunk/sandbox/ui/layout/src/main/config/component/layoutPanel.xml =================================================================== --- trunk/sandbox/ui/layout/src/main/config/component/layoutPanel.xml 2009-02-23 23:13:39 UTC (rev 12720) +++ trunk/sandbox/ui/layout/src/main/config/component/layoutPanel.xml 2009-02-24 00:15:10 UTC (rev 12721) @@ -28,14 +28,14 @@ </taghandler> --> &ui_component_attributes; -  + </component> </components> Modified: trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlLayoutPanel.jspx =================================================================== --- trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlLayoutPanel.jspx 2009-02-23 23:13:39 UTC (rev 12720) +++ trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlLayoutPanel.jspx 2009-02-24 00:15:10 UTC (rev 12721) @@ -4,14 +4,22 @@ xmlns:c=" http://java.sun.com/jsf/core" xmlns:ui=" http://ajax4jsf.org/cdk/ui" xmlns:u=" http://ajax4jsf.org/cdk/u" + xmlns:h="http://jsf.exadel.com/header" + xmlns:vcp=" http://jsf.exadel.com/vcp" xmlns:x=" http://ajax4jsf.org/cdk/x" class="org.richfaces.renderkit.html.LayoutPanelRenderer" baseclass="org.ajax4jsf.renderkit.AjaxComponentRendererBase" component="org.richfaces.component.UILayoutPanel" > <f:clientid var="clientId"/> - <div id="#{clientId}" - x:passThruWithExclusions="value,name,type,id" + <h:styles>/org/richfaces/ui/renderkit/html/css/grids.css</h:styles> + <c:set var="styleClass" value="#{component.attributes['styleClass']}"/> + <c:set var="yuiClass" value="#{component.attributes['type']}"/> + <div id="#{clientId}" class="#{styleClass} yui-#{yuiClass}" + x:passThruWithExclusions="type,id, styleClass" > + <vcp:body> + <f:call name="renderChildren" /> + </vcp:body> </div> </f:root> \ No newline at end of file

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r12720 - in trunk: sandbox/samples and 1 other directory.

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

Author: SergeySmirnov Date: 2009-02-23 18:13:39 -0500 (Mon, 23 Feb 2009) New Revision: 12720 Removed: trunk/sandbox/samples/layout/ Modified: trunk/samples/pom.xml Log: sample with wrong name is removed Modified: trunk/samples/pom.xml =================================================================== --- trunk/samples/pom.xml 2009-02-23 22:45:54 UTC (rev 12719) +++ trunk/samples/pom.xml 2009-02-23 23:13:39 UTC (rev 12720) @@ -27,7 +27,7 @@ <scanIntervalSeconds>10</scanIntervalSeconds> <connectors> <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> - <port>8080</port> + <port>80</port> <maxIdleTime>60000</maxIdleTime> </connector> </connectors>

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r12719 - in trunk/sandbox/ui/layout: src and 15 other directories.

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

Author: alexsmirnov Date: 2009-02-23 17:45:54 -0500 (Mon, 23 Feb 2009) New Revision: 12719 Added: trunk/sandbox/ui/layout/pom.xml trunk/sandbox/ui/layout/src/ trunk/sandbox/ui/layout/src/main/ trunk/sandbox/ui/layout/src/main/config/ trunk/sandbox/ui/layout/src/main/config/component/ trunk/sandbox/ui/layout/src/main/config/component/layoutPanel.xml trunk/sandbox/ui/layout/src/main/config/component/page.xml trunk/sandbox/ui/layout/src/main/java/ trunk/sandbox/ui/layout/src/main/java/org/ trunk/sandbox/ui/layout/src/main/java/org/richfaces/ trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/ trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UILayoutPanel.java trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UIPage.java trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/ trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/ trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/HtmlPageRenderer.java trunk/sandbox/ui/layout/src/main/resources/ trunk/sandbox/ui/layout/src/main/templates/ trunk/sandbox/ui/layout/src/main/templates/org/ trunk/sandbox/ui/layout/src/main/templates/org/richfaces/ trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlLayoutPanel.jspx trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx trunk/sandbox/ui/layout/src/test/ trunk/sandbox/ui/layout/src/test/java/ trunk/sandbox/ui/layout/src/test/java/org/ trunk/sandbox/ui/layout/src/test/java/org/richfaces/ Removed: trunk/sandbox/ui/layout/src/main/ trunk/sandbox/ui/layout/src/main/config/ trunk/sandbox/ui/layout/src/main/config/component/ trunk/sandbox/ui/layout/src/main/config/component/layoutPanel.xml trunk/sandbox/ui/layout/src/main/config/component/page.xml trunk/sandbox/ui/layout/src/main/java/ trunk/sandbox/ui/layout/src/main/java/org/ trunk/sandbox/ui/layout/src/main/java/org/richfaces/ trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/ trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UILayoutPanel.java trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UIPage.java trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/ trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/ trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/HtmlPageRenderer.java trunk/sandbox/ui/layout/src/main/resources/ trunk/sandbox/ui/layout/src/main/templates/ trunk/sandbox/ui/layout/src/main/templates/org/ trunk/sandbox/ui/layout/src/main/templates/org/richfaces/ trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlLayoutPanel.jspx trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx trunk/sandbox/ui/layout/src/test/ trunk/sandbox/ui/layout/src/test/java/ trunk/sandbox/ui/layout/src/test/java/org/ trunk/sandbox/ui/layout/src/test/java/org/richfaces/ Log: restore deleted files Copied: trunk/sandbox/ui/layout/pom.xml (from rev 12717, trunk/sandbox/ui/layout/pom.xml) =================================================================== --- trunk/sandbox/ui/layout/pom.xml (rev 0) +++ trunk/sandbox/ui/layout/pom.xml 2009-02-23 22:45:54 UTC (rev 12719) @@ -0,0 +1,58 @@ +<?xml version="1.0"?> +<project> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>ui</artifactId> + <groupId>org.richfaces.sandbox</groupId> + <version>3.3.1-SNAPSHOT</version> + </parent> + <groupId>org.richfaces.ui</groupId> + <artifactId>layout</artifactId> + <version>3.3.1-SNAPSHOT</version> + <name>layout</name> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>3.3.1-SNAPSHOT</version> + <executions> + <execution> + <id>generate-sources</id> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.richfaces</prefix> + <taglib> + <shortName>layout</shortName> + </taglib> + </library> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>3.3.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>3.3.1-SNAPSHOT</version> + </dependency> + </dependencies> +</project> Copied: trunk/sandbox/ui/layout/src (from rev 12717, trunk/sandbox/ui/layout/src) Copied: trunk/sandbox/ui/layout/src/main (from rev 12717, trunk/sandbox/ui/layout/src/main) Copied: trunk/sandbox/ui/layout/src/main/config (from rev 12717, trunk/sandbox/ui/layout/src/main/config) Copied: trunk/sandbox/ui/layout/src/main/config/component (from rev 12717, trunk/sandbox/ui/layout/src/main/config/component) Deleted: trunk/sandbox/ui/layout/src/main/config/component/layoutPanel.xml =================================================================== --- trunk/sandbox/ui/layout/src/main/config/component/layoutPanel.xml 2009-02-23 20:17:47 UTC (rev 12717) +++ trunk/sandbox/ui/layout/src/main/config/component/layoutPanel.xml 2009-02-23 22:45:54 UTC (rev 12719) @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd"> - -<components> - <component> - <name>org.richfaces.LayoutPanel</name> - <family>org.richfaces.LayoutPanel</family> - <classname>org.richfaces.component.html.HtmlLayoutPanel</classname> - <superclass>org.richfaces.component.UILayoutPanel</superclass> - <description> - <![CDATA[ - ]]> - </description> - <renderer generate="true" override="true"> - <name>org.richfaces.LayoutPanelRenderer</name> - <template>org/richfaces/htmlLayoutPanel.jspx</template> - </renderer> - <tag> - <name>layoutPanel</name> - <classname>org.richfaces.taglib.LayoutPanelTag</classname> - <superclass> - org.ajax4jsf.webapp.taglib.HtmlComponentTagBase - </superclass> - </tag> -  - &ui_component_attributes; -  - </component> -</components> Copied: trunk/sandbox/ui/layout/src/main/config/component/layoutPanel.xml (from rev 12717, trunk/sandbox/ui/layout/src/main/config/component/layoutPanel.xml) =================================================================== --- trunk/sandbox/ui/layout/src/main/config/component/layoutPanel.xml (rev 0) +++ trunk/sandbox/ui/layout/src/main/config/component/layoutPanel.xml 2009-02-23 22:45:54 UTC (rev 12719) @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd"> + +<components> + <component> + <name>org.richfaces.LayoutPanel</name> + <family>org.richfaces.LayoutPanel</family> + <classname>org.richfaces.component.html.HtmlLayoutPanel</classname> + <superclass>org.richfaces.component.UILayoutPanel</superclass> + <description> + <![CDATA[ + ]]> + </description> + <renderer generate="true" override="true"> + <name>org.richfaces.LayoutPanelRenderer</name> + <template>org/richfaces/htmlLayoutPanel.jspx</template> + </renderer> + <tag> + <name>layoutPanel</name> + <classname>org.richfaces.taglib.LayoutPanelTag</classname> + <superclass> + org.ajax4jsf.webapp.taglib.HtmlComponentTagBase + </superclass> + </tag> +  + &ui_component_attributes; +  + </component> +</components> Deleted: trunk/sandbox/ui/layout/src/main/config/component/page.xml =================================================================== --- trunk/sandbox/ui/layout/src/main/config/component/page.xml 2009-02-23 20:17:47 UTC (rev 12717) +++ trunk/sandbox/ui/layout/src/main/config/component/page.xml 2009-02-23 22:45:54 UTC (rev 12719) @@ -1,98 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd"> - -<components> - <component> - <name>org.richfaces.Page</name> - <family>org.richfaces.Page</family> - <classname>org.richfaces.component.html.HtmlPage</classname> - <superclass>org.richfaces.component.UIPage</superclass> - <description> - <![CDATA[ - ]]> - </description> - <renderer generate="true" override="true"> - <name>org.richfaces.PageRenderer</name> - <template>org/richfaces/htmlPage.jspx</template> - </renderer> - <tag> - <name>page</name> - <classname>org.richfaces.taglib.PageTag</classname> - <superclass> - org.ajax4jsf.webapp.taglib.HtmlComponentTagBase - </superclass> - </tag> -  - &ui_component_attributes; - &ajax_region_attributes; - &html_universal_attributes; - <property hidden="true" existintag="true"> - <name>renderRegionOnly</name> - <classname>boolean</classname> - <description> - Flag to disable rendering in AJAX responses content - outside of active region. If this attribute set to - "true" , no one of the components outside of region will - be included to AJAX response. If set to "false", search - for components to include in response will be performed - on all tree. Default value is "true". - </description> - <defaultvalue>true</defaultvalue> - </property> - <property> - <name>pageTitle</name> - <classname>java.lang.String</classname> - <description> - String for output as a page title. - </description> - </property> - <property> - <name>onload</name> - <classname>java.lang.String</classname> - <description> - JavaScript code to execute on a page load. - </description> - </property> - <property> - <name>onunload</name> - <classname>java.lang.String</classname> - <description> - JavaScript code to execute on a page unload. - </description> - </property> - <property> - <name>format</name> - <classname>java.lang.String</classname> - <description> - <![CDATA[Page layout format ( html, xhtml, html-transitional, html-3.2 ) for encoding DOCTYPE, namespace and Content-Type definitions]]> - </description> - </property> - <property> - <name>contentType</name> - <classname>java.lang.String</classname> - <description> - <![CDATA[Set custom mime content type to response]]> - </description> - </property> - <property> - <name>namespace</name> - <classname>java.lang.String</classname> - <description> - <![CDATA[Set html element default namespace]]> - </description> - </property> -  - </component> -</components> Copied: trunk/sandbox/ui/layout/src/main/config/component/page.xml (from rev 12717, trunk/sandbox/ui/layout/src/main/config/component/page.xml) =================================================================== --- trunk/sandbox/ui/layout/src/main/config/component/page.xml (rev 0) +++ trunk/sandbox/ui/layout/src/main/config/component/page.xml 2009-02-23 22:45:54 UTC (rev 12719) @@ -0,0 +1,98 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd"> + +<components> + <component> + <name>org.richfaces.Page</name> + <family>org.richfaces.Page</family> + <classname>org.richfaces.component.html.HtmlPage</classname> + <superclass>org.richfaces.component.UIPage</superclass> + <description> + <![CDATA[ + ]]> + </description> + <renderer generate="true" override="true"> + <name>org.richfaces.PageRenderer</name> + <template>org/richfaces/htmlPage.jspx</template> + </renderer> + <tag> + <name>page</name> + <classname>org.richfaces.taglib.PageTag</classname> + <superclass> + org.ajax4jsf.webapp.taglib.HtmlComponentTagBase + </superclass> + </tag> +  + &ui_component_attributes; + &ajax_region_attributes; + &html_universal_attributes; + <property hidden="true" existintag="true"> + <name>renderRegionOnly</name> + <classname>boolean</classname> + <description> + Flag to disable rendering in AJAX responses content + outside of active region. If this attribute set to + "true" , no one of the components outside of region will + be included to AJAX response. If set to "false", search + for components to include in response will be performed + on all tree. Default value is "true". + </description> + <defaultvalue>true</defaultvalue> + </property> + <property> + <name>pageTitle</name> + <classname>java.lang.String</classname> + <description> + String for output as a page title. + </description> + </property> + <property> + <name>onload</name> + <classname>java.lang.String</classname> + <description> + JavaScript code to execute on a page load. + </description> + </property> + <property> + <name>onunload</name> + <classname>java.lang.String</classname> + <description> + JavaScript code to execute on a page unload. + </description> + </property> + <property> + <name>format</name> + <classname>java.lang.String</classname> + <description> + <![CDATA[Page layout format ( html, xhtml, html-transitional, html-3.2 ) for encoding DOCTYPE, namespace and Content-Type definitions]]> + </description> + </property> + <property> + <name>contentType</name> + <classname>java.lang.String</classname> + <description> + <![CDATA[Set custom mime content type to response]]> + </description> + </property> + <property> + <name>namespace</name> + <classname>java.lang.String</classname> + <description> + <![CDATA[Set html element default namespace]]> + </description> + </property> +  + </component> +</components> Copied: trunk/sandbox/ui/layout/src/main/java (from rev 12717, trunk/sandbox/ui/layout/src/main/java) Copied: trunk/sandbox/ui/layout/src/main/java/org (from rev 12717, trunk/sandbox/ui/layout/src/main/java/org) Copied: trunk/sandbox/ui/layout/src/main/java/org/richfaces (from rev 12717, trunk/sandbox/ui/layout/src/main/java/org/richfaces) Copied: trunk/sandbox/ui/layout/src/main/java/org/richfaces/component (from rev 12717, trunk/sandbox/ui/layout/src/main/java/org/richfaces/component) Deleted: trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UILayoutPanel.java =================================================================== --- trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UILayoutPanel.java 2009-02-23 20:17:47 UTC (rev 12717) +++ trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UILayoutPanel.java 2009-02-23 22:45:54 UTC (rev 12719) @@ -1,19 +0,0 @@ -/** - * - */ - -package org.richfaces.component; - -import javax.faces.component.UIComponentBase; - -/** - * JSF component class - * - */ -public abstract class UILayoutPanel extends UIComponentBase { - - public static final String COMPONENT_TYPE = "org.richfaces.LayoutPanel"; - - public static final String COMPONENT_FAMILY = "org.richfaces.LayoutPanel"; - -} Copied: trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UILayoutPanel.java (from rev 12717, trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UILayoutPanel.java) =================================================================== --- trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UILayoutPanel.java (rev 0) +++ trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UILayoutPanel.java 2009-02-23 22:45:54 UTC (rev 12719) @@ -0,0 +1,19 @@ +/** + * + */ + +package org.richfaces.component; + +import javax.faces.component.UIComponentBase; + +/** + * JSF component class + * + */ +public abstract class UILayoutPanel extends UIComponentBase { + + public static final String COMPONENT_TYPE = "org.richfaces.LayoutPanel"; + + public static final String COMPONENT_FAMILY = "org.richfaces.LayoutPanel"; + +} Deleted: trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UIPage.java =================================================================== --- trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UIPage.java 2009-02-23 20:17:47 UTC (rev 12717) +++ trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UIPage.java 2009-02-23 22:45:54 UTC (rev 12719) @@ -1,23 +0,0 @@ -/** - * - */ - -package org.richfaces.component; - -import javax.faces.component.UIComponentBase; - -import org.ajax4jsf.component.UIAjaxRegion; - -/** - * JSF component class - * - */ -public abstract class UIPage extends UIAjaxRegion { - - public static final String COMPONENT_TYPE = "org.richfaces.Page"; - - public static final String COMPONENT_FAMILY = "org.richfaces.Page"; - - - -} Copied: trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UIPage.java (from rev 12717, trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UIPage.java) =================================================================== --- trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UIPage.java (rev 0) +++ trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UIPage.java 2009-02-23 22:45:54 UTC (rev 12719) @@ -0,0 +1,23 @@ +/** + * + */ + +package org.richfaces.component; + +import javax.faces.component.UIComponentBase; + +import org.ajax4jsf.component.UIAjaxRegion; + +/** + * JSF component class + * + */ +public abstract class UIPage extends UIAjaxRegion { + + public static final String COMPONENT_TYPE = "org.richfaces.Page"; + + public static final String COMPONENT_FAMILY = "org.richfaces.Page"; + + + +} Copied: trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit (from rev 12717, trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit) Copied: trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html (from rev 12717, trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html) Deleted: trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/HtmlPageRenderer.java =================================================================== --- trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/HtmlPageRenderer.java 2009-02-23 20:17:47 UTC (rev 12717) +++ trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/HtmlPageRenderer.java 2009-02-23 22:45:54 UTC (rev 12719) @@ -1,43 +0,0 @@ -/** - * - */ -package org.richfaces.renderkit.html; - -import java.io.IOException; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; - -import org.ajax4jsf.renderkit.html.AjaxPageRenderer; - -/** - * @author asmirnov - * - */ -public class HtmlPageRenderer extends AjaxPageRenderer { - - - @Override - public void doEncodeBegin(ResponseWriter out, FacesContext context, - UIComponent component) throws IOException { - // generate page lead with header, up to body tag. - super.doEncodeBegin(out, context, component); - // header facet. - // start content body. - // menu facet. - // content placeholder. - } - - - @Override - public void doEncodeEnd(ResponseWriter out, FacesContext context, - UIComponent component) throws IOException { - // close content . - // footer facet. - // Close page body. - // generate page trailer closing tags. - super.doEncodeEnd(out, context, component); - } - -} Copied: trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/HtmlPageRenderer.java (from rev 12717, trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/HtmlPageRenderer.java) =================================================================== --- trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/HtmlPageRenderer.java (rev 0) +++ trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/HtmlPageRenderer.java 2009-02-23 22:45:54 UTC (rev 12719) @@ -0,0 +1,43 @@ +/** + * + */ +package org.richfaces.renderkit.html; + +import java.io.IOException; + +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; + +import org.ajax4jsf.renderkit.html.AjaxPageRenderer; + +/** + * @author asmirnov + * + */ +public class HtmlPageRenderer extends AjaxPageRenderer { + + + @Override + public void doEncodeBegin(ResponseWriter out, FacesContext context, + UIComponent component) throws IOException { + // generate page lead with header, up to body tag. + super.doEncodeBegin(out, context, component); + // header facet. + // start content body. + // menu facet. + // content placeholder. + } + + + @Override + public void doEncodeEnd(ResponseWriter out, FacesContext context, + UIComponent component) throws IOException { + // close content . + // footer facet. + // Close page body. + // generate page trailer closing tags. + super.doEncodeEnd(out, context, component); + } + +} Copied: trunk/sandbox/ui/layout/src/main/resources (from rev 12717, trunk/sandbox/ui/layout/src/main/resources) Copied: trunk/sandbox/ui/layout/src/main/templates (from rev 12717, trunk/sandbox/ui/layout/src/main/templates) Copied: trunk/sandbox/ui/layout/src/main/templates/org (from rev 12717, trunk/sandbox/ui/layout/src/main/templates/org) Copied: trunk/sandbox/ui/layout/src/main/templates/org/richfaces (from rev 12717, trunk/sandbox/ui/layout/src/main/templates/org/richfaces) Deleted: trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlLayoutPanel.jspx =================================================================== --- trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlLayoutPanel.jspx 2009-02-23 20:17:47 UTC (rev 12717) +++ trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlLayoutPanel.jspx 2009-02-23 22:45:54 UTC (rev 12719) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:root - xmlns:f="http://ajax4jsf.org/cdk/template" - xmlns:c=" http://java.sun.com/jsf/core" - xmlns:ui=" http://ajax4jsf.org/cdk/ui" - xmlns:u=" http://ajax4jsf.org/cdk/u" - xmlns:x=" http://ajax4jsf.org/cdk/x" - class="org.richfaces.renderkit.html.LayoutPanelRenderer" - baseclass="org.ajax4jsf.renderkit.AjaxComponentRendererBase" - component="org.richfaces.component.UILayoutPanel" - > - <f:clientid var="clientId"/> - <div id="#{clientId}" - x:passThruWithExclusions="value,name,type,id" - > - </div> -</f:root> \ No newline at end of file Copied: trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlLayoutPanel.jspx (from rev 12717, trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlLayoutPanel.jspx) =================================================================== --- trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlLayoutPanel.jspx (rev 0) +++ trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlLayoutPanel.jspx 2009-02-23 22:45:54 UTC (rev 12719) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:root + xmlns:f="http://ajax4jsf.org/cdk/template" + xmlns:c=" http://java.sun.com/jsf/core" + xmlns:ui=" http://ajax4jsf.org/cdk/ui" + xmlns:u=" http://ajax4jsf.org/cdk/u" + xmlns:x=" http://ajax4jsf.org/cdk/x" + class="org.richfaces.renderkit.html.LayoutPanelRenderer" + baseclass="org.ajax4jsf.renderkit.AjaxComponentRendererBase" + component="org.richfaces.component.UILayoutPanel" + > + <f:clientid var="clientId"/> + <div id="#{clientId}" + x:passThruWithExclusions="value,name,type,id" + > + </div> +</f:root> \ No newline at end of file Deleted: trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx =================================================================== --- trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx 2009-02-23 20:17:47 UTC (rev 12717) +++ trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx 2009-02-23 22:45:54 UTC (rev 12719) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<f:root - xmlns:f="http://ajax4jsf.org/cdk/template" - xmlns:c=" http://java.sun.com/jsf/core" - xmlns:ui=" http://ajax4jsf.org/cdk/ui" - xmlns:u=" http://ajax4jsf.org/cdk/u" - xmlns:x=" http://ajax4jsf.org/cdk/x" - class="org.richfaces.renderkit.html.PageRenderer" - baseclass="org.ajax4jsf.renderkit.AjaxComponentRendererBase" - component="org.richfaces.component.UIPage" - > - <f:clientid var="clientId"/> - <div id="#{clientId}" - x:passThruWithExclusions="value,name,type,id" - > - </div> -</f:root> \ No newline at end of file Copied: trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx (from rev 12717, trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx) =================================================================== --- trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx (rev 0) +++ trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx 2009-02-23 22:45:54 UTC (rev 12719) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<f:root + xmlns:f="http://ajax4jsf.org/cdk/template" + xmlns:c=" http://java.sun.com/jsf/core" + xmlns:ui=" http://ajax4jsf.org/cdk/ui" + xmlns:u=" http://ajax4jsf.org/cdk/u" + xmlns:x=" http://ajax4jsf.org/cdk/x" + class="org.richfaces.renderkit.html.PageRenderer" + baseclass="org.ajax4jsf.renderkit.AjaxComponentRendererBase" + component="org.richfaces.component.UIPage" + > + <f:clientid var="clientId"/> + <div id="#{clientId}" + x:passThruWithExclusions="value,name,type,id" + > + </div> +</f:root> \ No newline at end of file Copied: trunk/sandbox/ui/layout/src/test (from rev 12717, trunk/sandbox/ui/layout/src/test) Copied: trunk/sandbox/ui/layout/src/test/java (from rev 12717, trunk/sandbox/ui/layout/src/test/java) Copied: trunk/sandbox/ui/layout/src/test/java/org (from rev 12717, trunk/sandbox/ui/layout/src/test/java/org) Copied: trunk/sandbox/ui/layout/src/test/java/org/richfaces (from rev 12717, trunk/sandbox/ui/layout/src/test/java/org/richfaces)

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r12718 - trunk/sandbox/ui/layout.

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

Author: SergeySmirnov Date: 2009-02-23 15:22:33 -0500 (Mon, 23 Feb 2009) New Revision: 12718 Removed: trunk/sandbox/ui/layout/pom.xml trunk/sandbox/ui/layout/src/ Log: wrong name Deleted: trunk/sandbox/ui/layout/pom.xml =================================================================== --- trunk/sandbox/ui/layout/pom.xml 2009-02-23 20:17:47 UTC (rev 12717) +++ trunk/sandbox/ui/layout/pom.xml 2009-02-23 20:22:33 UTC (rev 12718) @@ -1,58 +0,0 @@ -<?xml version="1.0"?> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>ui</artifactId> - <groupId>org.richfaces.sandbox</groupId> - <version>3.3.1-SNAPSHOT</version> - </parent> - <groupId>org.richfaces.ui</groupId> - <artifactId>layout</artifactId> - <version>3.3.1-SNAPSHOT</version> - <name>layout</name> - <build> - <plugins> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>3.3.1-SNAPSHOT</version> - <executions> - <execution> - <id>generate-sources</id> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-test-sources</id> - <phase>generate-test-sources</phase> - <goals> - <goal>generate-tests</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.richfaces</prefix> - <taglib> - <shortName>layout</shortName> - </taglib> - </library> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <version>3.3.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>core</artifactId> - <version>3.3.1-SNAPSHOT</version> - </dependency> - </dependencies> -</project>

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r12717 - in trunk/sandbox/samples: layout and 4 other directories.

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

Author: SergeySmirnov Date: 2009-02-23 15:17:47 -0500 (Mon, 23 Feb 2009) New Revision: 12717 Added: trunk/sandbox/samples/layout/ trunk/sandbox/samples/layout/pom.xml trunk/sandbox/samples/layout/src/ trunk/sandbox/samples/layout/src/main/ trunk/sandbox/samples/layout/src/main/java/ trunk/sandbox/samples/layout/src/main/resources/ trunk/sandbox/samples/layout/src/main/webapp/ trunk/sandbox/samples/layout/src/main/webapp/index.jsp trunk/sandbox/samples/layout/src/main/webapp/pages/ trunk/sandbox/samples/layout/src/main/webapp/pages/index.jsp trunk/sandbox/samples/layout/src/main/webapp/pages/index.xhtml Log: init commit Added: trunk/sandbox/samples/layout/pom.xml =================================================================== --- trunk/sandbox/samples/layout/pom.xml (rev 0) +++ trunk/sandbox/samples/layout/pom.xml 2009-02-23 20:17:47 UTC (rev 12717) @@ -0,0 +1,48 @@ +<?xml version="1.0"?><project> + <parent> + <artifactId>samples</artifactId> + <groupId>org.richfaces.sandbox</groupId> + <version>3.3.1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.sandbox.samples</groupId> + <artifactId>layout</artifactId> + <packaging>war</packaging> + <name>layout Maven Webapp</name> + <version>3.3.1-SNAPSHOT</version> + <build> + <finalName>layout</finalName> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </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.ui</groupId> + <artifactId>richfaces-ui</artifactId> + <version>3.3.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>3.3.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>layout</artifactId> + <version>3.3.1-SNAPSHOT</version> + </dependency> + </dependencies> +</project> Property changes on: trunk/sandbox/samples/layout/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Added: trunk/sandbox/samples/layout/src/main/webapp/index.jsp =================================================================== --- trunk/sandbox/samples/layout/src/main/webapp/index.jsp (rev 0) +++ trunk/sandbox/samples/layout/src/main/webapp/index.jsp 2009-02-23 20:17:47 UTC (rev 12717) @@ -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 Property changes on: trunk/sandbox/samples/layout/src/main/webapp/index.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/sandbox/samples/layout/src/main/webapp/pages/index.jsp =================================================================== --- trunk/sandbox/samples/layout/src/main/webapp/pages/index.jsp (rev 0) +++ trunk/sandbox/samples/layout/src/main/webapp/pages/index.jsp 2009-02-23 20:17:47 UTC (rev 12717) @@ -0,0 +1,12 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/ui/layout" prefix="layout"%> +<html> + <head> + <title>layout sample page</title> + </head> + <body> + <f:view> + </f:view> + </body> +</html> Property changes on: trunk/sandbox/samples/layout/src/main/webapp/pages/index.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: trunk/sandbox/samples/layout/src/main/webapp/pages/index.xhtml =================================================================== (Binary files differ) Property changes on: trunk/sandbox/samples/layout/src/main/webapp/pages/index.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r12716 - in trunk/test-applications/realworld/web/src/main: java/org/richfaces/realworld/search and 6 other directories.

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

Author: andrei_exadel Date: 2009-02-23 14:31:40 -0500 (Mon, 23 Feb 2009) New Revision: 12716 Added: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/search/ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/search/ISearchOption.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java trunk/test-applications/realworld/web/src/main/webapp/includes/search/ trunk/test-applications/realworld/web/src/main/webapp/includes/search/searchByAlbumTemplate.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/search/searchByImageTemplate.xhtml trunk/test-applications/realworld/web/src/main/webapp/includes/search/searchOptions.xhtml trunk/test-applications/realworld/web/src/main/webapp/layout/menu.xhtml Modified: trunk/test-applications/realworld/web/src/main/webapp/index.xhtml trunk/test-applications/realworld/web/src/main/webapp/scripts/realworld.js trunk/test-applications/realworld/web/src/main/webapp/stylesheet/realworld.css Log: Search menu Added: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/search/ISearchOption.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/search/ISearchOption.java (rev 0) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/search/ISearchOption.java 2009-02-23 19:31:40 UTC (rev 12716) @@ -0,0 +1,31 @@ +/** + * + */ +package org.richfaces.realworld.search; + +/** + * @author Andrey Markavtsov + * + */ +public abstract class ISearchOption { + + private boolean selected; + + public abstract String getName(); + + public abstract String getTemplate(); + + public boolean getSelected() { + return selected; + } + + public void setSelected(boolean selected) { + this.selected = selected; + } + + @Override + public String toString() { + return getName(); + } +} + Added: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java (rev 0) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java 2009-02-23 19:31:40 UTC (rev 12716) @@ -0,0 +1,82 @@ +package org.richfaces.realworld.search; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import javax.faces.event.ActionEvent; + +import org.hibernate.validator.NotNull; +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Out; +import org.jboss.seam.annotations.Scope; + +@Name("searchImageHelper") +(a)Scope(ScopeType.CONVERSATION) +public class ImageSearchHelper implements Serializable { + + private static final long serialVersionUID = -304368268896942902L; + + ISearchOption selectedOption; + + List<ISearchOption> options; + + public ImageSearchHelper() { + options = new ArrayList<ISearchOption>(); + options.add(new SearchOptionByAlbum()); + options.add(new SearchOptionByImage()); + } + + boolean isOptionSelected() { + return selectedOption != null; + } + + public void processSelection(ActionEvent event) { + Iterator<ISearchOption> it = options.iterator(); + while (it.hasNext()) { + ISearchOption option = it.next(); + if (option.getSelected()) { + selectedOption = option; + break; + } + } + } + + public void back(ActionEvent event) { + Iterator<ISearchOption> it = options.iterator(); + while (it.hasNext()) { + it.next().setSelected(false); + } + selectedOption = null; + } + + @Out + public String getTemplate() { + return (isOptionSelected()) ? selectedOption.getTemplate() : "/includes/search/searchOptions.xhtml"; + } + + + public ISearchOption getSelectedOption() { + return selectedOption; + } + + + public void setSelectedOption(ISearchOption selectedOption) { + this.selectedOption = selectedOption; + } + + @Out + public List<ISearchOption> getOptions() { + return options; + } + + public void setOptions(List<ISearchOption> options) { + this.options = options; + } + + + + +} Added: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java (rev 0) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java 2009-02-23 19:31:40 UTC (rev 12716) @@ -0,0 +1,37 @@ +package org.richfaces.realworld.search; + +public class SearchOptionByAlbum extends ISearchOption { + + String albumName; + + String ownerName; + + @Override + public String getName() { + return "Search By Album"; + } + + @Override + public String getTemplate() { + return "/includes/search/searchByAlbumTemplate.xhtml"; + } + + public String getAlbumName() { + return albumName; + } + + public void setAlbumName(String albumName) { + this.albumName = albumName; + } + + public String getOwnerName() { + return ownerName; + } + + public void setOwnerName(String ownerName) { + this.ownerName = ownerName; + } + + + +} Added: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java (rev 0) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java 2009-02-23 19:31:40 UTC (rev 12716) @@ -0,0 +1,66 @@ +/** + * + */ +package org.richfaces.realworld.search; + +import java.util.Date; + +/** + * @author Andrey Markavtsov + * + */ +public class SearchOptionByImage extends ISearchOption { + + String fileName; + + Integer fileSize; + + Date uploadedDate; + + /* (non-Javadoc) + * @see org.richfaces.realworld.search.ISearchOption#getName() + */ + public String getName() { + return "Search By Image"; + } + + + /* (non-Javadoc) + * @see org.richfaces.realworld.search.ISearchOption#getTemplate() + */ + public String getTemplate() { + return "/includes/search/searchByImageTemplate.xhtml"; + } + + + public String getFileName() { + return fileName; + } + + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + + public Integer getFileSize() { + return fileSize; + } + + + public void setFileSize(Integer fileSize) { + this.fileSize = fileSize; + } + + + public Date getUploadedDate() { + return uploadedDate; + } + + + public void setUploadedDate(Date uploadedDate) { + this.uploadedDate = uploadedDate; + } + + +} Added: trunk/test-applications/realworld/web/src/main/webapp/includes/search/searchByAlbumTemplate.xhtml =================================================================== --- trunk/test-applications/realworld/web/src/main/webapp/includes/search/searchByAlbumTemplate.xhtml (rev 0) +++ trunk/test-applications/realworld/web/src/main/webapp/includes/search/searchByAlbumTemplate.xhtml 2009-02-23 19:31:40 UTC (rev 12716) @@ -0,0 +1,14 @@ +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + + <h:outputText value="Album name"></h:outputText> + <h:inputText value="#{searchImageHelper.selectedOption.albumName}" /><br/> + <h:outputText value="Owner Name"></h:outputText> + <h:inputText value="#{searchImageHelper.selectedOption.ownerName}" /><br/> + + +</ui:composition> \ No newline at end of file Added: trunk/test-applications/realworld/web/src/main/webapp/includes/search/searchByImageTemplate.xhtml =================================================================== --- trunk/test-applications/realworld/web/src/main/webapp/includes/search/searchByImageTemplate.xhtml (rev 0) +++ trunk/test-applications/realworld/web/src/main/webapp/includes/search/searchByImageTemplate.xhtml 2009-02-23 19:31:40 UTC (rev 12716) @@ -0,0 +1,14 @@ +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + + <h:outputText value="Image name"></h:outputText> + <h:inputText value="#{searchImageHelper.selectedOption.fileName}" /><br/> + <h:outputText value="Image size"></h:outputText> + <h:inputText value="#{searchImageHelper.selectedOption.fileSize}" /><br/> + <h:outputText value="Uploaded Date"></h:outputText> + <rich:calendar value="#{searchImageHelper.selectedOption.uploadedDate}"></rich:calendar> +</ui:composition> \ No newline at end of file Added: trunk/test-applications/realworld/web/src/main/webapp/includes/search/searchOptions.xhtml =================================================================== --- trunk/test-applications/realworld/web/src/main/webapp/includes/search/searchOptions.xhtml (rev 0) +++ trunk/test-applications/realworld/web/src/main/webapp/includes/search/searchOptions.xhtml 2009-02-23 19:31:40 UTC (rev 12716) @@ -0,0 +1,15 @@ +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:c="http://java.sun.com/jsp/jstl/core" + xmlns:rich="http://richfaces.org/rich"> + <a4j:repeat value="#{searchImageHelper.options}" var="option"> + <h:outputText value="#{option.name}"></h:outputText> + <h:selectBooleanCheckbox value="#{option.selected}"> + <a4j:support event="onchange" actionListener="#{searchImageHelper.processSelection}" reRender="searchOptions"></a4j:support> + </h:selectBooleanCheckbox><br/> + </a4j:repeat> + +</ui:composition> \ No newline at end of file Modified: trunk/test-applications/realworld/web/src/main/webapp/index.xhtml =================================================================== (Binary files differ) Added: trunk/test-applications/realworld/web/src/main/webapp/layout/menu.xhtml =================================================================== --- trunk/test-applications/realworld/web/src/main/webapp/layout/menu.xhtml (rev 0) +++ trunk/test-applications/realworld/web/src/main/webapp/layout/menu.xhtml 2009-02-23 19:31:40 UTC (rev 12716) @@ -0,0 +1,29 @@ +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.org/rich" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:c="http://java.sun.com/jsp/jstl/core" + xmlns:richx="http://richfaces.org/richx"> + <div style="position: relative"> + <rich:effect name="hideSearch" type="Fade" for="searchPanel" params="duration: 0.5"></rich:effect> + <rich:effect name="showSearch" type="Appear" for="searchPanel" params="duration: 0.5"></rich:effect> + <rich:toolBar onmouseover="showSearch();" style="height: 100%; width: 50px; border: 0px; border-top: 5px solid #FF7D2A; margin-left: 265px; vertical-align: bottom"> + <rich:toolBarGroup> + <h:outputText value="Search" style="color: white" ></h:outputText> + </rich:toolBarGroup> + </rich:toolBar> + <rich:panel id="searchPanel" onmouseout="onSearchPanelMouseOut(event, this)" style="width: 150px; display: none; position: absolute; z-index: 5; left: 265px; top: 37px;"> + <h:form> + <h:outputText value="Search:" style=""></h:outputText> + <hr/> + <a4j:include id="searchOptions" viewId="#{searchImageHelper.template}"></a4j:include> + <a4j:commandButton value="Search"></a4j:commandButton> + <a4j:commandButton reRender="searchOptions" value="Back" actionListener="#{searchImageHelper.back}" ></a4j:commandButton> + </h:form> + </rich:panel> + </div> + +</ui:composition> \ No newline at end of file Modified: trunk/test-applications/realworld/web/src/main/webapp/scripts/realworld.js =================================================================== --- trunk/test-applications/realworld/web/src/main/webapp/scripts/realworld.js 2009-02-23 17:48:07 UTC (rev 12715) +++ trunk/test-applications/realworld/web/src/main/webapp/scripts/realworld.js 2009-02-23 19:31:40 UTC (rev 12716) @@ -39,4 +39,11 @@ } } +} + +function onSearchPanelMouseOut(e, elt) { + var relTarg = e.relatedTarget || e.toElement; + if (relTarg == elt) { + hideSearch(); + } } \ No newline at end of file Modified: trunk/test-applications/realworld/web/src/main/webapp/stylesheet/realworld.css =================================================================== --- trunk/test-applications/realworld/web/src/main/webapp/stylesheet/realworld.css 2009-02-23 17:48:07 UTC (rev 12715) +++ trunk/test-applications/realworld/web/src/main/webapp/stylesheet/realworld.css 2009-02-23 19:31:40 UTC (rev 12716) @@ -58,7 +58,6 @@ border: none; padding: 0px; background: url(../img/shell/general_panelbar_bg.gif) repeat-x #A84807; - overflow-y: hidden; } .main-menu-panel-body {

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r12715 - in trunk/test-applications/seleniumTest/richfaces/src: main/webapp/pages/inputNumberSlider and 1 other directories.

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

Author: dsvyatobatsko Date: 2009-02-23 12:48:07 -0500 (Mon, 23 Feb 2009) New Revision: 12715 Added: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/inputNumberSlider/inputNumberSliderAutoTest.xhtml Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/InputNumberSliderBean.java trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/InputNumberSliderTest.java Log: RF-5855, RF-5865, RF-5866 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/InputNumberSliderBean.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/InputNumberSliderBean.java 2009-02-23 16:08:24 UTC (rev 12714) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/InputNumberSliderBean.java 2009-02-23 17:48:07 UTC (rev 12715) @@ -17,7 +17,7 @@ * 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.ajax4jsf.bean; import javax.faces.application.FacesMessage; @@ -26,30 +26,38 @@ import javax.faces.validator.ValidatorException; public class InputNumberSliderBean { - private int value; - - public InputNumberSliderBean() { - value = 40; - } - - public void validate(FacesContext context, UIComponent component, - Object value) throws ValidatorException { - if (((Integer)value).intValue() > 90) { - throw new ValidatorException(new FacesMessage("Fake validation. Value is more than 90.")); - } - } - - public String action() { - this.value += 10; - return null; - } - public int getValue() { - return value; - } + private Integer value = 40; - public void setValue(int value) { - this.value = value; - } - + public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException { + if (((Integer) value).intValue() > 90) { + throw new ValidatorException(new FacesMessage("Fake validation. Value is more than 90.")); + } + } + + public String action() { + this.value += 10; + return null; + } + + /** + * Gets value of value field. + * @return value of value field + */ + public Integer getValue() { + return value; + } + + /** + * Set a new value for value field. + * @param value a new value for value field + */ + public void setValue(Integer value) { + this.value = value; + } + + public void reset() { + this.value = 40; + } + } Added: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/inputNumberSlider/inputNumberSliderAutoTest.xhtml =================================================================== (Binary files differ) Property changes on: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/inputNumberSlider/inputNumberSliderAutoTest.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/InputNumberSliderTest.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/InputNumberSliderTest.java 2009-02-23 16:08:24 UTC (rev 12714) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/InputNumberSliderTest.java 2009-02-23 17:48:07 UTC (rev 12715) @@ -21,6 +21,7 @@ package org.richfaces.testng; import org.ajax4jsf.template.Template; +import org.richfaces.AutoTester; import org.richfaces.SeleniumTestBase; import org.testng.Assert; import org.testng.annotations.Test; @@ -29,9 +30,13 @@ private static final int BAR_SCALE = 10; + private final static String RESET_METHOD = "#{sliderBean.reset}"; + + private final static String FORM_ID = "autoTestForm:"; + @Test public void testInputNumberSlider(Template template) { - renderPage(template); + renderPage(template, RESET_METHOD); String parentId = getParentId() + "_form:"; String slider = parentId + "slider"; @@ -45,15 +50,15 @@ String output = parentId + "output"; writeStatus("Checking initial rendering"); - Assert.assertFalse(isVisibleById(tip)); + AssertNotVisible(tip); checkSliderVisualState(slider, 40); AssertTextEquals(output, "40"); writeStatus("Checking if tip is visible during click"); selenium.mouseDownAt("id=" + track, "800,1"); - Assert.assertTrue(isVisibleById(tip)); + AssertVisible(tip); selenium.mouseUpAt("id=" + track, "800,1"); - Assert.assertFalse(isVisibleById(tip)); + AssertNotVisible(tip); writeStatus("Checking if value is changed with previous click"); checkSliderVisualState(slider, 80); @@ -104,7 +109,55 @@ "Handle position is not syncronized with slider value!"); } + @Test + public void testValueChangeEventFiredAndModelUpdatedOnSubmit(Template template) { + AutoTester tester = getAutoTester(this); + tester.renderPage(template, RESET_METHOD); + String submittedValueId = tester.getClientId("submittedValue"); + + writeStatus("Check ValueChangeListeners invoked on submit and model binding is updated on value changed"); + Assert.assertEquals(getSliderValue(), "40"); + tester.testSubmit(); + AssertTextEquals(submittedValueId, "50", "Model binding is not updated on value changed"); + } + + @Test + public void testRenderedAttribute(Template template) { + AutoTester tester = getAutoTester(this); + tester.renderPage(template, RESET_METHOD); + writeStatus("Test component with rendered = false is not present on the page"); + tester.testRendered(); + } + + @Test + public void testImmediate(Template template) { + AutoTester tester = getAutoTester(this); + tester.renderPage(template, RESET_METHOD); + writeStatus("Test immediate attribute"); + tester.testSubmitImmediate(); + } + + private String getSliderValue() { + return selenium.getValue("name=" + getParentId() + FORM_ID + "componentId"); + } + + private void setSliderValue(String value) { + selenium.type("name=" + getParentId() + FORM_ID + "componentId", value); + } + + @Override + public void changeValue() { + setSliderValue("50"); + } + + @Override public String getTestUrl() { return "pages/inputNumberSlider/inputNumberSliderTest.xhtml"; } + + @Override + public String getAutoTestUrl() { + return "pages/inputNumberSlider/inputNumberSliderAutoTest.xhtml"; + } + }

15 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r12714 - in trunk: test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree and 3 other directories.

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

Author: Alex.Kolonitsky Date: 2009-02-23 11:08:24 -0500 (Mon, 23 Feb 2009) New Revision: 12714 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/A4JCommandTestBean.java trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/Bean.java trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/CalendarDataModel.java trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/NavigateBean.java trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ObjectNotFoundException.java trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/RichPanelTestBean.java trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeTestBean.java trunk/ui/componentControl/src/main/config/component/componentControl.xml trunk/ui/componentControl/src/main/java/org/richfaces/component/UIComponentControl.java trunk/ui/componentControl/src/main/java/org/richfaces/renderkit/ComponentControlRendererBase.java Log: set default value for disableDefault attribute true if event="onContextMenu" in componentControl https://jira.jboss.org/jira/browse/RF-6275 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/A4JCommandTestBean.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/A4JCommandTestBean.java 2009-02-23 15:07:20 UTC (rev 12713) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/A4JCommandTestBean.java 2009-02-23 16:08:24 UTC (rev 12714) @@ -20,7 +20,6 @@ */ package org.ajax4jsf.bean; -import java.util.Date; import java.util.HashMap; import java.util.Map; Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/Bean.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/Bean.java 2009-02-23 15:07:20 UTC (rev 12713) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/Bean.java 2009-02-23 16:08:24 UTC (rev 12714) @@ -20,7 +20,6 @@ */ package org.ajax4jsf.bean; -import java.text.DateFormat; import java.util.Date; import javax.faces.application.FacesMessage; Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/CalendarDataModel.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/CalendarDataModel.java 2009-02-23 15:07:20 UTC (rev 12713) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/CalendarDataModel.java 2009-02-23 16:08:24 UTC (rev 12714) @@ -22,8 +22,6 @@ import java.util.Calendar; import java.util.Date; -import java.util.HashMap; -import java.util.Map; import org.richfaces.model.CalendarDataModelItem; Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/NavigateBean.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/NavigateBean.java 2009-02-23 15:07:20 UTC (rev 12713) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/NavigateBean.java 2009-02-23 16:08:24 UTC (rev 12714) @@ -25,9 +25,11 @@ import org.ajax4jsf.component.UIInclude; public class NavigateBean implements Serializable { + + private static final long serialVersionUID = 1L; + + private String viewId="/pages/hello.jsp"; - private String viewId="/pages/hello.jsp"; - transient private UIInclude include; public String navigateOne() { Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ObjectNotFoundException.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ObjectNotFoundException.java 2009-02-23 15:07:20 UTC (rev 12713) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ObjectNotFoundException.java 2009-02-23 16:08:24 UTC (rev 12714) @@ -26,4 +26,6 @@ */ public class ObjectNotFoundException extends Exception { + private static final long serialVersionUID = -7631465346193651806L; + } Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/RichPanelTestBean.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/RichPanelTestBean.java 2009-02-23 15:07:20 UTC (rev 12713) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/RichPanelTestBean.java 2009-02-23 16:08:24 UTC (rev 12714) @@ -25,7 +25,6 @@ import java.util.Map; import javax.faces.application.FacesMessage; -import javax.faces.application.FacesMessage.Severity; import javax.faces.context.FacesContext; import javax.faces.event.ActionEvent; Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeTestBean.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeTestBean.java 2009-02-23 15:07:20 UTC (rev 12713) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeTestBean.java 2009-02-23 16:08:24 UTC (rev 12714) @@ -41,8 +41,6 @@ private String nodeTitle; - private static final String DATA_PATH = "/simple-tree-data.properties"; - private TreeNode<Object> richRootNode = null; public synchronized TreeNode<Object> getRichTreeNode() { Modified: trunk/ui/componentControl/src/main/config/component/componentControl.xml =================================================================== --- trunk/ui/componentControl/src/main/config/component/componentControl.xml 2009-02-23 15:07:20 UTC (rev 12713) +++ trunk/ui/componentControl/src/main/config/component/componentControl.xml 2009-02-23 16:08:24 UTC (rev 12714) @@ -31,12 +31,13 @@ </taghandler> --> &ui_component_attributes; - <property> + <property > <name>disableDefault</name> <classname>boolean</classname> <description> Disable default action for target event ( append "return false;" to JavaScript ) </description> + <defaultvalue><![CDATA[getEvent().equalsIgnoreCase("onContextMenu")]]></defaultvalue> </property> <property> <name>event</name> Modified: trunk/ui/componentControl/src/main/java/org/richfaces/component/UIComponentControl.java =================================================================== --- trunk/ui/componentControl/src/main/java/org/richfaces/component/UIComponentControl.java 2009-02-23 15:07:20 UTC (rev 12713) +++ trunk/ui/componentControl/src/main/java/org/richfaces/component/UIComponentControl.java 2009-02-23 16:08:24 UTC (rev 12714) @@ -21,9 +21,9 @@ package org.richfaces.component; -import java.util.Iterator; - +import javax.el.ELException; import javax.el.ValueExpression; +import javax.faces.FacesException; import javax.faces.component.UIComponent; import javax.faces.component.UIComponentBase; import javax.faces.component.UIParameter; @@ -42,149 +42,199 @@ /** * JSF component class - * + * */ -public abstract class UIComponentControl extends UIComponentBase implements AjaxSupport { +public abstract class UIComponentControl extends UIComponentBase implements + AjaxSupport { + + public static final String COMPONENT_TYPE = "org.richfaces.ComponentControl"; + + public static final String COMPONENT_FAMILY = "org.richfaces.ComponentControl"; + + private static final Log log = LogFactory.getLog(UIComponentControl.class); + + /* + * Disable default action for target event ( append "return false;" to + * JavaScript ) + */ + public static final String DISABLE_DEFAULT = "disableDefault"; - public static final String COMPONENT_TYPE = "org.richfaces.ComponentControl"; + private boolean disableDefault = false; + + private boolean disableDefaultSet = false; + + public static final String ON_CONTEXT_MENU = "onContextMenu"; - public static final String COMPONENT_FAMILY = "org.richfaces.ComponentControl"; - private static final Log log = LogFactory.getLog(UIComponentControl.class); + /** + * @return JavaScript eventString. Rebuild on every call, since can be in + * loop ( as in dataTable ) with different parameters. + */ + public String getEventString() { + String targetId = HtmlUtil.idsToIdSelector(getFor()); + + targetId = HtmlUtil.expandIdSelector(targetId, this, FacesContext + .getCurrentInstance()); + + JSFunction invocation = new JSFunction("Richfaces.componentControl.performOperation"); + invocation.addParameter(new JSReference("event")); + invocation.addParameter(targetId); + invocation.addParameter(getOperation()); + invocation.addParameter(new JSReference("{" + getEncodedParametersMap() + "}")); + invocation.addParameter(Boolean.valueOf(isDisableDefault())); + + return invocation.toScript(); + } + + public String getEncodedParametersMap() { + StringBuilder result = new StringBuilder(); + + boolean shouldClose = false; + + String params = this.getParams(); + if (params != null && params.trim().length() != 0) { + result.append(params); + shouldClose = true; + } + + for (UIComponent child : this.getChildren()) { + if (!(child instanceof UIParameter)) { + continue; + } + + String name = ((UIParameter) child).getName(); + Object value = ((UIParameter) child).getValue(); + if (null == name) { + FacesContext context = FacesContext.getCurrentInstance(); + throw new IllegalArgumentException(Messages.getMessage( + Messages.UNNAMED_PARAMETER_ERROR, this + .getClientId(context))); + } + + boolean escape = true; + if (child instanceof JavaScriptParameter) { + JavaScriptParameter actionParam = (JavaScriptParameter) child; + escape = !actionParam.isNoEscape(); + } + + if (shouldClose) { + result.append(", "); + } + + ScriptUtils.addEncodedString(result, name); + result.append(": "); + result.append(ScriptUtils.toScript(escape ? value + : new JSReference(value.toString()))); + + shouldClose = true; + } + + return result.toString(); + } + + public abstract String getEvent(); + + public abstract void setEvent(String event); + + public abstract String getFor(); + + public abstract void setFor(String value); + + public abstract String getParams(); + + public abstract void setParams(String value); + + public abstract String getOperation(); + + public abstract void setOperation(String value); + + public abstract String getAttachTo(); + + public abstract void setAttachTo(String value); + + protected String replaceClientIds(FacesContext context, + UIComponent component, String selector) { + return HtmlUtil.expandIdSelector(selector, component, context); + } + + /** + * After nornal setting <code>parent</code> property in case of created + * component set Ajax properties for parent. + * + * @see javax.faces.component.UIComponentBase#setParent(javax.faces.component.UIComponent) + */ + public void setParent(UIComponent parent) { + super.setParent(parent); + if (parent != null && parent.getFamily() != null) { + if (log.isDebugEnabled()) { + log.debug(Messages.getMessage(Messages.CALLED_SET_PARENT, + parent.getClass().getName())); + } + + // TODO If this comopnent configured, set properties for parent + // component. + // NEW created component have parent, restored view - null in My + // faces. + // and SUN RI not call at restore saved view. + // In other case - set in restoreState method. + // if (parent.getParent() != null) + if (log.isDebugEnabled()) { + log.debug(Messages + .getMessage(Messages.DETECT_NEW_COMPONENT)); + } + setParentProperties(parent); + } + } + + public void setParentProperties(UIComponent parent) { + String event = getEvent(); + if (event == null || event.length() == 0) { + return; + } + + String attachTo = getAttachTo(); + if (attachTo == null || attachTo.length() == 0) { + parent.setValueExpression(event, new EventValueExpression(this)); + } else { + ValueExpression vb = parent.getValueExpression(event); + if (vb instanceof EventValueExpression) { - - /** - * @return JavaScript eventString. Rebuild on every call, since - * can be in loop ( as in dataTable ) with different parameters. - */ - public String getEventString() { - String targetId = HtmlUtil.idsToIdSelector(getFor()); - - targetId = HtmlUtil.expandIdSelector(targetId, this, FacesContext.getCurrentInstance()); - - JSFunction invocation = new JSFunction("Richfaces.componentControl.performOperation"); - invocation.addParameter(new JSReference("event")); - invocation.addParameter(targetId); - invocation.addParameter(getOperation()); - invocation.addParameter(new JSReference("{" + getEncodedParametersMap() + "}")); - invocation.addParameter(Boolean.valueOf(isDisableDefault())); - - return invocation.toScript(); - } - - public String getEncodedParametersMap() { - StringBuilder result = new StringBuilder(); - - boolean shouldClose = false; - - String params = this.getParams(); - if (params != null && params.trim().length() != 0) { - result.append(params); - shouldClose = true; - } - - for (Iterator<UIComponent> it = this.getChildren().iterator(); it.hasNext();) { - UIComponent child = (UIComponent) it.next(); - if (child instanceof UIParameter) { - String name = ((UIParameter) child).getName(); - Object value = ((UIParameter) child).getValue(); - if (null == name) { - FacesContext context = FacesContext.getCurrentInstance(); - throw new IllegalArgumentException(Messages.getMessage( - Messages.UNNAMED_PARAMETER_ERROR, this - .getClientId(context))); - } - - boolean escape = true; - if (child instanceof JavaScriptParameter) { - JavaScriptParameter actionParam = (JavaScriptParameter) child; - escape = !actionParam.isNoEscape(); - } - - if (shouldClose) { - result.append(", "); - } - - ScriptUtils.addEncodedString(result, name); - result.append(": "); - result.append(ScriptUtils.toScript(escape ? value : new JSReference(value.toString()))); - - shouldClose = true; - } - } - - return result.toString(); - } - - public abstract String getEvent(); - public abstract void setEvent(String event); - - public abstract String getFor(); - public abstract void setFor(String value); - - public abstract String getParams(); - public abstract void setParams(String value); - - public abstract String getOperation(); - public abstract void setOperation(String value); - - public abstract String getAttachTo(); - public abstract void setAttachTo(String value); - - protected String replaceClientIds(FacesContext context, UIComponent component, String selector) { - return HtmlUtil.expandIdSelector(selector, component, context); - } - - - /** - * After nornal setting <code>parent</code> property in case of - * created component set Ajax properties for parent. - * @see javax.faces.component.UIComponentBase#setParent(javax.faces.component.UIComponent) - */ - public void setParent(UIComponent parent) - { - super.setParent(parent); - if (null != parent && parent.getFamily() != null ) { - if (log.isDebugEnabled()) { - log.debug(Messages.getMessage(Messages.CALLED_SET_PARENT, parent.getClass().getName())); - } - // TODO If this comopnent configured, set properties for parent component. - // NEW created component have parent, restored view - null in My faces. - // and SUN RI not call at restore saved view. - // In other case - set in restoreState method. - // if (parent.getParent() != null) - { - if (log.isDebugEnabled()) { - log.debug(Messages.getMessage(Messages.DETECT_NEW_COMPONENT)); - } - setParentProperties(parent); - - } - } - } - - - public void setParentProperties(UIComponent parent){ - String event = getEvent(); - String attachTo = getAttachTo(); - - if (event != null && event.length() != 0) { - if (attachTo == null || attachTo.length() == 0) { - parent.setValueExpression(event, new EventValueExpression(this)); - } else { - ValueExpression vb = parent.getValueExpression(event); - if (vb instanceof EventValueExpression) { - //TODO check if that's EventValueBinding for us - parent.setValueExpression(event, null); - } - } - } - } - - public abstract void setName(String name); - public abstract String getName(); - - public abstract void setAttachTiming( String attachTiming); - public abstract String getAttachTiming(); - + // TODO check if that's EventValueBinding for us + parent.setValueExpression(event, null); + } + } + } + + public abstract void setName(String name); + + public abstract String getName(); + + public abstract void setAttachTiming(String attachTiming); + + public abstract String getAttachTiming(); + + public boolean isDisableDefault() { + if (this.disableDefaultSet) { + return getEvent().equalsIgnoreCase(ON_CONTEXT_MENU); + } + + ValueExpression ve = getValueExpression(DISABLE_DEFAULT); + if (ve != null) { + try { + Boolean value = (Boolean) ve.getValue(getFacesContext().getELContext()); + if (value != null) { + return value; + } + } catch (ELException e) { + throw new FacesException(e); + } + } + + return this.disableDefault; + } + + public void setDisableDefault(boolean disableDefault) { + this.disableDefault = disableDefault; + this.disableDefaultSet = true; + } } Modified: trunk/ui/componentControl/src/main/java/org/richfaces/renderkit/ComponentControlRendererBase.java =================================================================== --- trunk/ui/componentControl/src/main/java/org/richfaces/renderkit/ComponentControlRendererBase.java 2009-02-23 15:07:20 UTC (rev 12713) +++ trunk/ui/componentControl/src/main/java/org/richfaces/renderkit/ComponentControlRendererBase.java 2009-02-23 16:08:24 UTC (rev 12714) @@ -122,7 +122,7 @@ writer.writeText("//", null); writer.write("<![CDATA["); - String attachEventBodyStart = "\n{\n Richfaces.componentControl.attachEvent('"; + String attachEventBodyStart = "\n{\n Richfaces.componentControl.attachEvent('"; StringBuilder attachEventBodyEnd = new StringBuilder(); attachEventBodyEnd.append("', '"); attachEventBodyEnd.append(convertToString(variables.getVariable("event")));

15 years, 2 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 February 2009