June 2009 - richfaces-svn-commits

JBoss Rich Faces SVN: r14562 - in branches/sandbox/rf4_build: docs/trunk/commons/resources and 7 other directories.

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

Author: nbelaevski Date: 2009-06-08 14:08:41 -0400 (Mon, 08 Jun 2009) New Revision: 14562 Added: branches/sandbox/rf4_build/docs/trunk/guides/ branches/sandbox/rf4_build/docs/trunk/guides/cdkguide/ branches/sandbox/rf4_build/docs/trunk/guides/cdkguide/en/ branches/sandbox/rf4_build/docs/trunk/guides/cdkguide/pom.xml branches/sandbox/rf4_build/docs/trunk/guides/pom.xml Modified: branches/sandbox/rf4_build/docs/trunk/commons/resources/pom.xml branches/sandbox/rf4_build/docs/trunk/pom.xml branches/sandbox/rf4_build/examples/trunk/components/calendar-demo/pom.xml branches/sandbox/rf4_build/examples/trunk/components/panel-demo/pom.xml branches/sandbox/rf4_build/examples/trunk/components/tree-demo/pom.xml branches/sandbox/rf4_build/ui/trunk/components/panel/pom.xml branches/sandbox/rf4_build/version-matrix/trunk/pom.xml Log: Build system: ${example.componentName} added Modified: branches/sandbox/rf4_build/docs/trunk/commons/resources/pom.xml =================================================================== --- branches/sandbox/rf4_build/docs/trunk/commons/resources/pom.xml 2009-06-08 17:01:10 UTC (rev 14561) +++ branches/sandbox/rf4_build/docs/trunk/commons/resources/pom.xml 2009-06-08 18:08:41 UTC (rev 14562) @@ -16,7 +16,7 @@ <packaging>pom</packaging> <modules> - <module>${translation}</module> + <module>${docs.translation}</module> </modules> </project> \ No newline at end of file Added: branches/sandbox/rf4_build/docs/trunk/guides/cdkguide/pom.xml =================================================================== --- branches/sandbox/rf4_build/docs/trunk/guides/cdkguide/pom.xml (rev 0) +++ branches/sandbox/rf4_build/docs/trunk/guides/cdkguide/pom.xml 2009-06-08 18:08:41 UTC (rev 14562) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 + http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <parent> + <groupId>org.richfaces.docs</groupId> + <artifactId>guides</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.docs.guides</groupId> + <artifactId>cdkguide</artifactId> + <packaging>pom</packaging> + + <modules> +  + </modules> + +</project> \ No newline at end of file Added: branches/sandbox/rf4_build/docs/trunk/guides/pom.xml =================================================================== --- branches/sandbox/rf4_build/docs/trunk/guides/pom.xml (rev 0) +++ branches/sandbox/rf4_build/docs/trunk/guides/pom.xml 2009-06-08 18:08:41 UTC (rev 14562) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 + http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <parent> + <groupId>org.richfaces</groupId> + <artifactId>docs</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.docs</groupId> + <artifactId>guides</artifactId> + <packaging>pom</packaging> + +  + <modules> + <module>cdkguide</module> + </modules> + +</project> \ No newline at end of file Modified: branches/sandbox/rf4_build/docs/trunk/pom.xml =================================================================== --- branches/sandbox/rf4_build/docs/trunk/pom.xml 2009-06-08 17:01:10 UTC (rev 14561) +++ branches/sandbox/rf4_build/docs/trunk/pom.xml 2009-06-08 18:08:41 UTC (rev 14562) @@ -17,10 +17,7 @@ <modules> <module>commons</module> + <module>guides</module> </modules> - <properties> - <translation>en</translation> - </properties> - </project> \ No newline at end of file Modified: branches/sandbox/rf4_build/examples/trunk/components/calendar-demo/pom.xml =================================================================== --- branches/sandbox/rf4_build/examples/trunk/components/calendar-demo/pom.xml 2009-06-08 17:01:10 UTC (rev 14561) +++ branches/sandbox/rf4_build/examples/trunk/components/calendar-demo/pom.xml 2009-06-08 18:08:41 UTC (rev 14562) @@ -12,7 +12,18 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.examples.components</groupId> - <artifactId>calendar-demo</artifactId> + <artifactId>${example.componentName}-demo</artifactId> <packaging>war</packaging> + + <dependencies> + <dependency> + <groupId>org.richfaces.ui.components</groupId> + <artifactId>${example.componentName}-ui</artifactId> + </dependency> + </dependencies> + <properties> + <example.componentName>calendar</example.componentName> + </properties> + </project> \ No newline at end of file Modified: branches/sandbox/rf4_build/examples/trunk/components/panel-demo/pom.xml =================================================================== --- branches/sandbox/rf4_build/examples/trunk/components/panel-demo/pom.xml 2009-06-08 17:01:10 UTC (rev 14561) +++ branches/sandbox/rf4_build/examples/trunk/components/panel-demo/pom.xml 2009-06-08 18:08:41 UTC (rev 14562) @@ -12,7 +12,18 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.examples.components</groupId> - <artifactId>panel-demo</artifactId> + <artifactId>${example.componentName}-demo</artifactId> <packaging>war</packaging> + + <dependencies> + <dependency> + <groupId>org.richfaces.ui.components</groupId> + <artifactId>${example.componentName}-ui</artifactId> + </dependency> + </dependencies> + <properties> + <example.componentName>panel</example.componentName> + </properties> + </project> \ No newline at end of file Modified: branches/sandbox/rf4_build/examples/trunk/components/tree-demo/pom.xml =================================================================== --- branches/sandbox/rf4_build/examples/trunk/components/tree-demo/pom.xml 2009-06-08 17:01:10 UTC (rev 14561) +++ branches/sandbox/rf4_build/examples/trunk/components/tree-demo/pom.xml 2009-06-08 18:08:41 UTC (rev 14562) @@ -12,7 +12,18 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.examples.components</groupId> - <artifactId>tree-demo</artifactId> + <artifactId>${example.componentName}-demo</artifactId> <packaging>war</packaging> + + <dependencies> + <dependency> + <groupId>org.richfaces.ui.components</groupId> + <artifactId>${example.componentName}-ui</artifactId> + </dependency> + </dependencies> + <properties> + <example.componentName>tree</example.componentName> + </properties> + </project> \ No newline at end of file Modified: branches/sandbox/rf4_build/ui/trunk/components/panel/pom.xml =================================================================== --- branches/sandbox/rf4_build/ui/trunk/components/panel/pom.xml 2009-06-08 17:01:10 UTC (rev 14561) +++ branches/sandbox/rf4_build/ui/trunk/components/panel/pom.xml 2009-06-08 18:08:41 UTC (rev 14562) @@ -12,7 +12,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui.components</groupId> - <artifactId>panel</artifactId> + <artifactId>panel-ui</artifactId> <packaging>jar</packaging> </project> \ No newline at end of file Modified: branches/sandbox/rf4_build/version-matrix/trunk/pom.xml =================================================================== --- branches/sandbox/rf4_build/version-matrix/trunk/pom.xml 2009-06-08 17:01:10 UTC (rev 14561) +++ branches/sandbox/rf4_build/version-matrix/trunk/pom.xml 2009-06-08 18:08:41 UTC (rev 14562) @@ -21,6 +21,10 @@ <framework.version>${project.version}</framework.version> <ui.version>${project.version}</ui.version> <cdk.version>${project.version}</cdk.version> + <docs.version>${project.version}</docs.version> + <docs.translation>en</docs.translation> + +  </properties> <repositories> @@ -66,14 +70,30 @@ <version>${framework.version}</version> <scope>test</scope> </dependency> -  -  + </dependency> <dependency> + <groupId>org.richfaces.docs.commons</groupId> + <artifactId>highlight</artifactId> + <version>${docs.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.docs.commons.resources</groupId> + <artifactId>${docs.translation}</artifactId> + <version>${docs.version}</version> + </dependency> + + <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> <version>${jsf.version}</version>

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r14561 - in branches/sandbox/rf4_build: docs and 6 other directories.

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

Author: nbelaevski Date: 2009-06-08 13:01:10 -0400 (Mon, 08 Jun 2009) New Revision: 14561 Added: branches/sandbox/rf4_build/docs/ branches/sandbox/rf4_build/docs/trunk/ branches/sandbox/rf4_build/docs/trunk/commons/ branches/sandbox/rf4_build/docs/trunk/commons/highlight/ branches/sandbox/rf4_build/docs/trunk/commons/highlight/pom.xml branches/sandbox/rf4_build/docs/trunk/commons/pom.xml branches/sandbox/rf4_build/docs/trunk/commons/resources/ branches/sandbox/rf4_build/docs/trunk/commons/resources/en/ branches/sandbox/rf4_build/docs/trunk/commons/resources/en/pom.xml branches/sandbox/rf4_build/docs/trunk/commons/resources/pom.xml branches/sandbox/rf4_build/docs/trunk/pom.xml branches/sandbox/rf4_build/settings.xml Modified: branches/sandbox/rf4_build/make.sh branches/sandbox/rf4_build/version-matrix/trunk/pom.xml Log: Build system: docs-commons added Property changes on: branches/sandbox/rf4_build/docs/trunk/commons/highlight ___________________________________________________________________ Name: svn:ignore + target Added: branches/sandbox/rf4_build/docs/trunk/commons/highlight/pom.xml =================================================================== --- branches/sandbox/rf4_build/docs/trunk/commons/highlight/pom.xml (rev 0) +++ branches/sandbox/rf4_build/docs/trunk/commons/highlight/pom.xml 2009-06-08 17:01:10 UTC (rev 14561) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 + http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <parent> + <groupId>org.richfaces.docs</groupId> + <artifactId>commons</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.docs.commons</groupId> + <artifactId>highlight</artifactId> + + <dependencies> + <dependency> + <groupId>org.eclipse.wst.css</groupId> + <artifactId>core</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.wst.sse</groupId> + <artifactId>core</artifactId> + </dependency> + <dependency> + <groupId>com.uwyn</groupId> + <artifactId>jhighlight</artifactId> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>fop</artifactId> + </dependency> + </dependencies> + +</project> \ No newline at end of file Added: branches/sandbox/rf4_build/docs/trunk/commons/pom.xml =================================================================== --- branches/sandbox/rf4_build/docs/trunk/commons/pom.xml (rev 0) +++ branches/sandbox/rf4_build/docs/trunk/commons/pom.xml 2009-06-08 17:01:10 UTC (rev 14561) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 + http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <parent> + <groupId>org.richfaces</groupId> + <artifactId>docs</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.docs</groupId> + <artifactId>commons</artifactId> + <packaging>pom</packaging> + + <modules> + <module>resources</module> + <module>highlight</module> + </modules> + +</project> \ No newline at end of file Property changes on: branches/sandbox/rf4_build/docs/trunk/commons/resources/en ___________________________________________________________________ Name: svn:ignore + target Added: branches/sandbox/rf4_build/docs/trunk/commons/resources/en/pom.xml =================================================================== --- branches/sandbox/rf4_build/docs/trunk/commons/resources/en/pom.xml (rev 0) +++ branches/sandbox/rf4_build/docs/trunk/commons/resources/en/pom.xml 2009-06-08 17:01:10 UTC (rev 14561) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 + http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <parent> + <groupId>org.richfaces.docs.commons</groupId> + <artifactId>resources</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.docs.commons.resources</groupId> + <artifactId>en</artifactId> + + +</project> \ No newline at end of file Added: branches/sandbox/rf4_build/docs/trunk/commons/resources/pom.xml =================================================================== --- branches/sandbox/rf4_build/docs/trunk/commons/resources/pom.xml (rev 0) +++ branches/sandbox/rf4_build/docs/trunk/commons/resources/pom.xml 2009-06-08 17:01:10 UTC (rev 14561) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 + http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <parent> + <groupId>org.richfaces.docs</groupId> + <artifactId>commons</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.docs.commons</groupId> + <artifactId>resources</artifactId> + <packaging>pom</packaging> + + <modules> + <module>${translation}</module> + </modules> + +</project> \ No newline at end of file Added: branches/sandbox/rf4_build/docs/trunk/pom.xml =================================================================== --- branches/sandbox/rf4_build/docs/trunk/pom.xml (rev 0) +++ branches/sandbox/rf4_build/docs/trunk/pom.xml 2009-06-08 17:01:10 UTC (rev 14561) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 + http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <parent> + <groupId>org.richfaces</groupId> + <artifactId>version-matrix</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces</groupId> + <artifactId>docs</artifactId> + <packaging>pom</packaging> + + <modules> + <module>commons</module> + </modules> + + <properties> + <translation>en</translation> + </properties> + +</project> \ No newline at end of file Modified: branches/sandbox/rf4_build/make.sh =================================================================== --- branches/sandbox/rf4_build/make.sh 2009-06-08 16:29:20 UTC (rev 14560) +++ branches/sandbox/rf4_build/make.sh 2009-06-08 17:01:10 UTC (rev 14561) @@ -2,8 +2,13 @@ PROJECT_DIR=`pwd` TAG_DIR='trunk' +settings=$PROJECT_DIR/settings.xml -for MODULE in 'version-matrix' 'cdk' 'framework' 'ui' 'examples' +case "`uname`" in + CYGWIN*) settings=`cygpath -w $settings` ;; +esac + +for MODULE in 'version-matrix' 'cdk' 'framework' 'ui' 'docs' 'examples' do echo echo -e "\033[40m\033[1;32m---------------------------------\033[0m" @@ -13,7 +18,7 @@ cd $PROJECT_DIR/$MODULE/$TAG_DIR - if mvn clean install; then + if mvn -s $settings clean install; then echo else exit $? Added: branches/sandbox/rf4_build/settings.xml =================================================================== --- branches/sandbox/rf4_build/settings.xml (rev 0) +++ branches/sandbox/rf4_build/settings.xml 2009-06-08 17:01:10 UTC (rev 14561) @@ -0,0 +1,307 @@ + + + +<settings> +  + <localRepository>~/.m2t/repository</localRepository> + +  + +  + +  + <proxies> +  + </proxies> + +  + <servers> +  + +  + </servers> + +  + <mirrors> +  + </mirrors> + +  + <profiles> +  + +  + <profile> + <id>RichFaces</id> + <repositories> + <repository> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + <id>repository.jboss.com</id> + <name>Jboss Repository for Maven</name> + <url> + http://repository.jboss.com/maven2/ + </url> + <layout>default</layout> + </repository> + <repository> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>always</updatePolicy> + </snapshots> + <id>maven2-snapshots.jboss.com</id> + <name>Jboss Repository for Maven Snapshots</name> + <url>http://snapshots.jboss.org/maven2</url> + <layout>default</layout> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>maven2-snapshots.jboss.com</id> + <name>Jboss Repository for Maven Snapshots</name> + <url>http://snapshots.jboss.org/maven2</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>always</updatePolicy> + </snapshots> + </pluginRepository> + <pluginRepository> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + <id>repository.jboss.com</id> + <name>Jboss Repository for Maven</name> + <url> + http://repository.jboss.com/maven2/ + </url> + <layout>default</layout> + </pluginRepository> + </pluginRepositories> + </profile> + </profiles> + +  + <activeProfiles> + <activeProfile>RichFaces</activeProfile> + </activeProfiles> +</settings> Modified: branches/sandbox/rf4_build/version-matrix/trunk/pom.xml =================================================================== --- branches/sandbox/rf4_build/version-matrix/trunk/pom.xml 2009-06-08 16:29:20 UTC (rev 14560) +++ branches/sandbox/rf4_build/version-matrix/trunk/pom.xml 2009-06-08 17:01:10 UTC (rev 14561) @@ -86,6 +86,7 @@ <scope>provided</scope> </dependency> +   <dependency> <groupId>javax.servlet</groupId> @@ -113,6 +114,112 @@ </dependency>  +  + <dependency> + <groupId>org.eclipse.wst.sse</groupId> + <artifactId>core</artifactId> + <version>1.1.202-v200709061102</version> + <exclusions> + <exclusion> + <artifactId>xerces</artifactId> + <groupId>org.apache</groupId> + </exclusion> + <exclusion> + <artifactId>bundle</artifactId> + <groupId>system</groupId> + </exclusion> + <exclusion> + <artifactId>core</artifactId> + <groupId>org.eclipse.wst.xml</groupId> + </exclusion> + <exclusion> + <artifactId>runtime</artifactId> + <groupId>org.eclipse.core</groupId> + </exclusion> + <exclusion> + <artifactId>resources</artifactId> + <groupId>org.eclipse.core</groupId> + </exclusion> + <exclusion> + <artifactId>filebuffers</artifactId> + <groupId>org.eclipse.core</groupId> + </exclusion> + <exclusion> + <artifactId>text</artifactId> + <groupId>org.eclipse</groupId> + </exclusion> + <exclusion> + <artifactId>commands</artifactId> + <groupId>org.eclipse.core</groupId> + </exclusion> + <exclusion> + <artifactId>common</artifactId> + <groupId>org.eclipse.emf</groupId> + </exclusion> + <exclusion> + <artifactId>icu</artifactId> + <groupId>com.ibm</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse.wst.css</groupId> + <artifactId>core</artifactId> + <version>1.1.101-v200705302225</version> + <exclusions> + <exclusion> + <artifactId>xerces</artifactId> + <groupId>org.apache</groupId> + </exclusion> + <exclusion> + <artifactId>bundle</artifactId> + <groupId>system</groupId> + </exclusion> + <exclusion> + <artifactId>core</artifactId> + <groupId>org.eclipse.wst.xml</groupId> + </exclusion> + <exclusion> + <artifactId>runtime</artifactId> + <groupId>org.eclipse.core</groupId> + </exclusion> + <exclusion> + <artifactId>resources</artifactId> + <groupId>org.eclipse.core</groupId> + </exclusion> + <exclusion> + <artifactId>filebuffers</artifactId> + <groupId>org.eclipse.core</groupId> + </exclusion> + <exclusion> + <artifactId>text</artifactId> + <groupId>org.eclipse</groupId> + </exclusion> + <exclusion> + <artifactId>commands</artifactId> + <groupId>org.eclipse.core</groupId> + </exclusion> + <exclusion> + <artifactId>common</artifactId> + <groupId>org.eclipse.emf</groupId> + </exclusion> + <exclusion> + <artifactId>icu</artifactId> + <groupId>com.ibm</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.uwyn</groupId> + <artifactId>jhighlight</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>fop</artifactId> + <version>0.95</version> + </dependency> +  </dependencies> </dependencyManagement>

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r14560 - branches/community/3.3.X/docs.

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

Author: nbelaevski Date: 2009-06-08 12:29:20 -0400 (Mon, 08 Jun 2009) New Revision: 14560 Removed: branches/community/3.3.X/docs/xslt/ Log: Empty xslt folder removed

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r14559 - branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/resources/images.

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

Author: msorokin Date: 2009-06-08 12:18:49 -0400 (Mon, 08 Jun 2009) New Revision: 14559 Added: branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/resources/images/albumView.png branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/resources/images/imageView.png Log: https://jira.jboss.org/jira/browse/RF-5768 TooTip section Added: branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/resources/images/albumView.png =================================================================== (Binary files differ) Property changes on: branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/resources/images/albumView.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/resources/images/imageView.png =================================================================== (Binary files differ) Property changes on: branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/resources/images/imageView.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r14558 - branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/resources/images.

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

Author: msorokin Date: 2009-06-08 12:17:19 -0400 (Mon, 08 Jun 2009) New Revision: 14558 Added: branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/resources/images/tooltip.png Log: Added: branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/resources/images/tooltip.png =================================================================== (Binary files differ) Property changes on: branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/resources/images/tooltip.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r14557 - branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/docbook/includes.

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

Author: msorokin Date: 2009-06-08 12:16:12 -0400 (Mon, 08 Jun 2009) New Revision: 14557 Modified: branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/docbook/includes/albumView.xml branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/docbook/includes/imageView.xml Log: https://jira.jboss.org/jira/browse/RF-5768 TooTip section Modified: branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/docbook/includes/albumView.xml =================================================================== --- branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/docbook/includes/albumView.xml 2009-06-08 15:56:13 UTC (rev 14556) +++ branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/docbook/includes/albumView.xml 2009-06-08 16:16:12 UTC (rev 14557) @@ -2,11 +2,18 @@ <section id="albumView"> <title>Album View</title> <para> - Work in progress... + Album view allows you to observe album items as thumbnails, scale the size of the thumbnails with the slider control, as well as to switch to slideshow mode. By clicking on an image in the Album View the Image View is opened. </para> - - <section> + <figure> + <title>Some title</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/albumView.png"/> + </imageobject> + </mediaobject> + </figure> + <section> <title>Image Size Control with <rich:inputNumberSlider></title> <para> The <emphasis role="bold"><property>rich:inputNumberSlider</property></emphasis> component in the Photo Album Demo is used as a control that helps a user to change photos size while previewing an album. @@ -126,7 +133,7 @@ ...]]></programlisting> <para> - When the <emphasis role="bold"><property><rich:inputNumberSlider<</property></emphasis> is rendered, at first its default value for image size is 120 px. + When the <emphasis role="bold"><property><rich:inputNumberSlider></property></emphasis> is rendered, at first its default value for image size is 120 px. </para> <figure> @@ -138,7 +145,7 @@ </mediaobject> </figure> <para> - Vizit following pages at RichFaces Live Demo for more information, examples and sources on the components used in the application and described in this chapter: + Visit following pages at RichFaces Live Demo for more information, examples and sources on the components used in the application and described in this chapter: </para> <itemizedlist> @@ -159,153 +166,7 @@ </section> - <section id="imagesScroller"> - <title>Images Scroller</title> - <para> - The Images Scroller implementation in the Photo Album application is basically <emphasis role="bold"><property><a4j:repeat></property></emphasis> with the value attribute bound to <code>#{model.selectedAlbum.images}</code>, which is a collection of images of the selected album and the <emphasis role="bold"><property><rich:dataScroller>></property></emphasis> component tied to the <emphasis role="bold"><property><a4j:repeat></property></emphasis> . - </para> - - <para> - The source code you can find in the includes/images/imageScroller.xhtml file. - Now let's go deeper into the details. The main component here is <emphasis role="bold"><property><a4j:repeat></property></emphasis>: - - </para> - - <programlisting role="XML"><![CDATA[... -<a4j:repeat value="#{model.selectedAlbum.images}" rows="5" - var="img" id="repeat" rowKeyVar="rk"> - - <a4j:outputPanel layout="block" - styleClass="preview_box_photo_nav #{model.selectedImage == img ? 'preview_box_photo_current' : 'preview_box_photo_default'}"> - <h:panelGroup layout="block" styleClass="preview_box_photo_80"> - <h:graphicImage styleClass="pr_photo_bg" - value="/img/shell/frame_photo_80.png" /> - <h:panelGrid cellpadding="0" cellspacing="2"> - <h:panelGroup layout="block"> - <a4j:mediaOutput element="img" - createContent="#{imageLoader.paintImage}" - value="#{fileManager.transformPath(img.fullPath, '_small80')}"> - </a4j:mediaOutput> - <br /> - </h:panelGroup> - </h:panelGrid> - <h:panelGroup layout="block" styleClass="photo_name"> - <h:outputText value="#{img.name}" /> - </h:panelGroup> - <h:panelGroup layout="block" styleClass="photo_data"> - <h:outputText value="#{rk + 1}" /> - </h:panelGroup> - </h:panelGroup> - - <a4j:support event="onclick" rendered="#{model.selectedImage != img}" - reRender="mainArea,treePanel, imagesTable" action="#{controller.showImage(img)}" /> - </a4j:outputPanel> -</a4j:repeat> -...]]></programlisting> - - <para> - Each element of the - - <emphasis role="bold"><property><a4j:repeat></property></emphasis> has a corresponding <emphasis role="bold"><property><a4j:outputPanel></property></emphasis> with the <emphasis role="bold"><property><a4j:mediaOutput></property></emphasis> as a nested element. <emphasis role="bold"><property><a4j:mediaOutput></property></emphasis> renders the thumbnail of the image. As the rows attribute is set to "5" (<code>rows="5"</code>), only 5 images are displayed on the page at a time. - - </para> - - <para> - As you've noticed, the currently selected image in the images scroller has different style, namely: a red frame around thumbnail, which is implemented with this code: - </para> - <programlisting role="XML"><![CDATA[... -<a4j:outputPanel layout="block" -styleClass="preview_box_photo_nav #{model.selectedImage == img ? 'preview_box_photo_current' : 'preview_box_photo_default'}"> -...]]></programlisting> - <para> - As you can see from the code snippet, - identification of whether the currently selected image is the same image displayed by the <emphasis role="bold"><property><a4j:repeat></property></emphasis> is performed in the styleClass, if it returns "true", different style is applied. - </para> - <para> - Each <emphasis role="bold"><property><a4j:repeat></property></emphasis> has a corresponding <emphasis role="bold"><property><a4j:support></property></emphasis> configured like this: - </para> - <programlisting role="XML"><![CDATA[... - <a4j:support event="onclick" - rendered="#{model.selectedImage != img}" - reRender="mainArea,treePanel, imagesTable" - action="#{controller.showImage(img)}" /> - -...]]></programlisting> - - <para> - On every click <emphasis role="bold"><property><a4j:support></property></emphasis> calls <code> #{controller.showImage(img)}</code> method that sets the current image, thumbnail of which has just been clicked on. For more details please see Controller.java class. - </para> - - <para> - To implement thumbnails scrolling effect the <emphasis role="bold"><property><rich:datascroller></property></emphasis> is attached to the <emphasis role="bold"><property><a4j:repeat></property></emphasis>: - </para> - - <programlisting role="XML"><![CDATA[... -<rich:datascroller page="#{controller.getPage()}" - styleClass="image-scroller" lastPageMode="full" for="repeat" reRender="imagesTable" - boundaryControls="hide" stepControls="hide"> - <f:facet name="pages"> - <h:outputText /> - </f:facet> - <f:facet name="fastforward"> - <h:graphicImage styleClass="image-scroller-right-arrow" - value="img/shell/arr_right.png" /> - </f:facet> - <f:facet name="fastforward_disabled"> - <h:graphicImage styleClass="image-scroller-right-arrow" - value="img/shell/arr_right_dis.png" /> - </f:facet> - <f:facet name="fastrewind"> - <h:graphicImage styleClass="image-scroller-left-arrow" - value="img/shell/arr_left.png" /> - </f:facet> - <f:facet name="fastrewind_disabled"> - <h:graphicImage styleClass="image-scroller-left-arrow" - value="img/shell/arr_left_dis.png" /> - </f:facet> -</rich:datascroller> - -...]]></programlisting> - <para> - The page attribute identifies which page should be displayed right now. For instance, if you have only 20 images and the current image has the 12<superscript>th</superscript> index in the collection, then the 3<superscript>rd</superscript> page will be displayed: - - </para> - <programlisting role="XML"><![CDATA[... -public Integer getPage(){ - final Integer index = model.getSelectedAlbum().getIndex(model.getSelectedImage()); - return index / 5 + 1; - } - -...]]></programlisting> - - <para> - The <code>lastPageMode="full" </code> attribute ensures that 5 thumbnails are always shown on the page. If this attribute hadn't been configured like this, in case the 19th thumbnail out of 20 had been selected then only 2 last thumbnails would have been displayed. - </para> - - <para> - As you can see, <emphasis role="bold"><property><rich:dataScroller></property></emphasis> has a slightly different look-and-feel, the trick is in the redefinition of <property>fastforward</property>, <property>fastforward_disabled</property>, <property>fastrewind</property> and <property>fastrewind_disabled</property> facets on which places we display our images. We didn't redefine other facets because they are not rendered to the page which is achieved with <code>boundaryControls="hide"</code> and <code>stepControls="hide</code> attributes of <emphasis role="bold"><property><rich:dataSroller></property></emphasis>. - </para> - - <para> - Vizit following pages at RichFaces Live Demo for more information, examples and sources on the components used in the application and described in this chapter: - </para> - - <itemizedlist> - <listitem> - <para> - <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dataTableScroller.jsf...">DataTableScrolling</ulink> page for the <emphasis role="bold"><property><rich:dataScroller></property></emphasis> component; - </para> - </listitem> - - <listitem> - <para> - <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/repeat.jsf?c=repeat">Repeat</ulink> for the <emphasis role="bold"><property><a4j:repeat></property></emphasis> component. - </para> - </listitem> - - </itemizedlist> - - </section> + <section id="slideshow"> <title>Slideshow</title> Modified: branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/docbook/includes/imageView.xml =================================================================== --- branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/docbook/includes/imageView.xml 2009-06-08 15:56:13 UTC (rev 14556) +++ branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/docbook/includes/imageView.xml 2009-06-08 16:16:12 UTC (rev 14557) @@ -2,12 +2,163 @@ <section id="imageView"> <title>Image View</title> <para> - Work in progress... + Image View in the Photo Album application is a page where only one image is displayed. In this view you can also browse the current album with the image scroller and well as to switch to <property>slide show</property> mode. </para> + + <figure> + <title>Some title</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/imageView.png"/> + </imageobject> + </mediaobject> + </figure> <section id="customImagesScroller"> <title>Custom images scroller widget</title> - <para> - Work in progress... - </para> + + <para> + The Images Scroller implementation in the Photo Album application is basically <emphasis role="bold"><property><a4j:repeat></property></emphasis> with the value attribute bound to <code>#{model.selectedAlbum.images}</code>, which is a collection of images of the selected album and the <emphasis role="bold"><property><rich:dataScroller></property></emphasis> component tied to the <emphasis role="bold"><property><a4j:repeat></property></emphasis> . + </para> + + <para> + The source code you can find in the includes/images/imageScroller.xhtml file. + Now let's go deeper into the details. The main component here is <emphasis role="bold"><property><a4j:repeat></property></emphasis>: + + </para> + + <programlisting role="XML"><![CDATA[... +<a4j:repeat value="#{model.selectedAlbum.images}" rows="5" + var="img" id="repeat" rowKeyVar="rk"> + + <a4j:outputPanel layout="block" + styleClass="preview_box_photo_nav #{model.selectedImage == img ? 'preview_box_photo_current' : 'preview_box_photo_default'}"> + <h:panelGroup layout="block" styleClass="preview_box_photo_80"> + <h:graphicImage styleClass="pr_photo_bg" + value="/img/shell/frame_photo_80.png" /> + <h:panelGrid cellpadding="0" cellspacing="2"> + <h:panelGroup layout="block"> + <a4j:mediaOutput element="img" + createContent="#{imageLoader.paintImage}" + value="#{fileManager.transformPath(img.fullPath, '_small80')}"> + </a4j:mediaOutput> + <br /> + </h:panelGroup> + </h:panelGrid> + <h:panelGroup layout="block" styleClass="photo_name"> + <h:outputText value="#{img.name}" /> + </h:panelGroup> + <h:panelGroup layout="block" styleClass="photo_data"> + <h:outputText value="#{rk + 1}" /> + </h:panelGroup> + </h:panelGroup> + + <a4j:support event="onclick" rendered="#{model.selectedImage != img}" + reRender="mainArea,treePanel, imagesTable" action="#{controller.showImage(img)}" /> + </a4j:outputPanel> +</a4j:repeat> +...]]></programlisting> + + <para> + Each element of the + + <emphasis role="bold"><property><a4j:repeat></property></emphasis> has a corresponding <emphasis role="bold"><property><a4j:outputPanel></property></emphasis> with the <emphasis role="bold"><property><a4j:mediaOutput></property></emphasis> as a nested element. <emphasis role="bold"><property><a4j:mediaOutput></property></emphasis> renders the thumbnail of the image. As the rows attribute is set to "5" (<code>rows="5"</code>), only 5 images are displayed on the page at a time. + + </para> + + <para> + As you've noticed, the currently selected image in the images scroller has different style, namely: a red frame around thumbnail, which is implemented with this code: + </para> + <programlisting role="XML"><![CDATA[... +<a4j:outputPanel layout="block" +styleClass="preview_box_photo_nav #{model.selectedImage == img ? 'preview_box_photo_current' : 'preview_box_photo_default'}"> +...]]></programlisting> + <para> + As you can see from the code snippet, + identification of whether the currently selected image is the same image displayed by the <emphasis role="bold"><property><a4j:repeat></property></emphasis> is performed in the styleClass, if it returns "true", different style is applied. + </para> + <para> + Each <emphasis role="bold"><property><a4j:repeat></property></emphasis> has a corresponding <emphasis role="bold"><property><a4j:support></property></emphasis> configured like this: + </para> + <programlisting role="XML"><![CDATA[... + <a4j:support event="onclick" + rendered="#{model.selectedImage != img}" + reRender="mainArea,treePanel, imagesTable" + action="#{controller.showImage(img)}" /> + +...]]></programlisting> + + <para> + On every click <emphasis role="bold"><property><a4j:support></property></emphasis> calls <code> #{controller.showImage(img)}</code> method that sets the current image, thumbnail of which has just been clicked on. For more details please see Controller.java class. + </para> + + <para> + To implement thumbnails scrolling effect the <emphasis role="bold"><property><rich:datascroller></property></emphasis> is attached to the <emphasis role="bold"><property><a4j:repeat></property></emphasis>: + </para> + + <programlisting role="XML"><![CDATA[... +<rich:datascroller page="#{controller.getPage()}" + styleClass="image-scroller" lastPageMode="full" for="repeat" reRender="imagesTable" + boundaryControls="hide" stepControls="hide"> + <f:facet name="pages"> + <h:outputText /> + </f:facet> + <f:facet name="fastforward"> + <h:graphicImage styleClass="image-scroller-right-arrow" + value="img/shell/arr_right.png" /> + </f:facet> + <f:facet name="fastforward_disabled"> + <h:graphicImage styleClass="image-scroller-right-arrow" + value="img/shell/arr_right_dis.png" /> + </f:facet> + <f:facet name="fastrewind"> + <h:graphicImage styleClass="image-scroller-left-arrow" + value="img/shell/arr_left.png" /> + </f:facet> + <f:facet name="fastrewind_disabled"> + <h:graphicImage styleClass="image-scroller-left-arrow" + value="img/shell/arr_left_dis.png" /> + </f:facet> +</rich:datascroller> + +...]]></programlisting> + <para> + The page attribute identifies which page should be displayed right now. For instance, if you have only 20 images and the current image has the 12<superscript>th</superscript> index in the collection, then the 3<superscript>rd</superscript> page will be displayed: + + </para> + <programlisting role="XML"><![CDATA[... +public Integer getPage(){ + final Integer index = model.getSelectedAlbum().getIndex(model.getSelectedImage()); + return index / 5 + 1; + } + +...]]></programlisting> + + <para> + The <code>lastPageMode="full" </code> attribute ensures that 5 thumbnails are always shown on the page. If this attribute hadn't been configured like this, in case the 19th thumbnail out of 20 had been selected then only 2 last thumbnails would have been displayed. + </para> + + <para> + As you can see, <emphasis role="bold"><property><rich:dataScroller></property></emphasis> has a slightly different look-and-feel, the trick is in the redefinition of <property>fastforward</property>, <property>fastforward_disabled</property>, <property>fastrewind</property> and <property>fastrewind_disabled</property> facets on which places we display our images. We didn't redefine other facets because they are not rendered to the page which is achieved with <code>boundaryControls="hide"</code> and <code>stepControls="hide</code> attributes of <emphasis role="bold"><property><rich:dataSroller></property></emphasis>. + </para> + + <para> + Vizit following pages at RichFaces Live Demo for more information, examples and sources on the components used in the application and described in this chapter: + </para> + + <itemizedlist> + <listitem> + <para> + <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dataTableScroller.jsf...">DataTableScrolling</ulink> page for the <emphasis role="bold"><property><rich:dataScroller></property></emphasis> component; + </para> + </listitem> + + <listitem> + <para> + <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/repeat.jsf?c=repeat">Repeat</ulink> for the <emphasis role="bold"><property><a4j:repeat></property></emphasis> component. + </para> + </listitem> + + </itemizedlist> + </section> </section>

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r14556 - in branches/community/3.3.X: ui/tooltip/src/main/java/org/richfaces/renderkit/html and 1 other directories.

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

Author: konstantin.mishin Date: 2009-06-08 11:56:13 -0400 (Mon, 08 Jun 2009) New Revision: 14556 Modified: branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java branches/community/3.3.X/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java branches/community/3.3.X/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js Log: RF-7327 Modified: branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java =================================================================== --- branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java 2009-06-08 15:26:15 UTC (rev 14555) +++ branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java 2009-06-08 15:56:13 UTC (rev 14556) @@ -651,6 +651,40 @@ } /** + * Puts value into map under specified key if the value is not empty and not default. + * Performs optional value wrapping. + * + * @param hash + * @param name + * @param value + * @param defaultValue + * + * @since 3.3.2 + */ + public void addToScriptHash(Map<String, Object> hash, + String name, + Object value, + String defaultValue) { + addToScriptHash(hash, name, value, defaultValue, null); + } + + /** + * Puts value into map under specified key if the value is not empty and not default. + * Performs optional value wrapping. + * + * @param hash + * @param name + * @param value + * + * @since 3.3.2 + */ + public void addToScriptHash(Map<String, Object> hash, + String name, + Object value) { + addToScriptHash(hash, name, value, null, null); + } + + /** * Convert HTML attribute name to component property name. * * @param key Modified: branches/community/3.3.X/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java =================================================================== --- branches/community/3.3.X/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java 2009-06-08 15:26:15 UTC (rev 14555) +++ branches/community/3.3.X/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java 2009-06-08 15:56:13 UTC (rev 14556) @@ -42,6 +42,7 @@ import org.ajax4jsf.javascript.ScriptUtils; import org.ajax4jsf.renderkit.AjaxComponentRendererBase; import org.ajax4jsf.renderkit.AjaxRendererUtils; +import org.ajax4jsf.renderkit.RendererUtils; import org.ajax4jsf.renderkit.RendererUtils.ScriptHashVariableWrapper; import org.ajax4jsf.resource.InternetResource; import org.richfaces.component.UIToolTip; @@ -154,22 +155,13 @@ UIComponent component) { Map<String, Object> eventOptions = AjaxRendererUtils.buildEventOptions( context, component); - String jsVarName = "_toolTip"; - // after element is subsituted in DOM tree, we have to re-create - // it's JS-reference, cause old one is already invalid - String clientId = component.getClientId(context); - String oncompleteTooltip = ";" + "{" + "var " + jsVarName + " = $('" - + clientId + "').component;" + jsVarName - + ".toolTipContent = $('" + clientId + "content');" + jsVarName - + ".displayDiv();" + "}"; + String oncompleteTooltip = "; request.options.control.displayDiv();"; // before element will be substituted in DOM tree, we need to hide // toolTipe to avoid blinking - String fireBeforeUpdateDOM = ";" + "{ var " + jsVarName + " = $('" - + clientId + "').component;" + jsVarName - + ".toolTip.style.display = 'none'; }"; + String fireBeforeUpdateDOM = "; request.options.control.toolTip.style.display = 'none';"; // enable ajaxSingle mode, i.e. we do not need to submit all form // controls to get tooltip content @@ -197,7 +189,7 @@ } else { JSFunctionDefinition beforeUpdate = new JSFunctionDefinition(); beforeUpdate.addParameter("request"); - beforeUpdate.addParameter("showEvent"); + beforeUpdate.addParameter("event"); beforeUpdate.addParameter("data"); beforeUpdate.addToBody(fireBeforeUpdateDOM); eventOptions.put(AjaxRendererUtils.ONBEFOREDOMUPDATE_ATTR_NAME, beforeUpdate); @@ -213,7 +205,7 @@ ret.append("<script "); ret.append("type=\"text/javascript\" "); ret.append("id =\"script").append(component.getClientId(context)).append("\">\n"); - ret.append(constructJSVariable(context, component)).append(";\n\n"); + ret.append(constructJSVariable(context, component)).append("\n"); ret.append("</script>"); context.getResponseWriter().write(ret.toString()); @@ -256,52 +248,45 @@ String targetClientId = getTargetId(context, component); Map<String, Object> options = new HashMap<String, Object>(); - //Map<JSReference, Object> eventsMap = new HashMap<JSReference, Object>(); String eventShow = (toolTip.isAttached()) ? toolTip.getShowEvent() : ""; if (eventShow.startsWith("on")) { eventShow = eventShow.substring(2); } - getUtils().addToScriptHash(options, "showEvent", eventShow, "mouseover", ScriptHashVariableWrapper.DEFAULT); + RendererUtils utils = getUtils(); + utils.addToScriptHash(options, "showEvent", eventShow); String eventHide = (toolTip.isAttached()) ? toolTip.getHideEvent() : ""; if (eventHide.startsWith("on")) { eventHide = eventHide.substring(2); } - getUtils().addToScriptHash(options, "hideEvent", eventHide, null, ScriptHashVariableWrapper.DEFAULT); + utils.addToScriptHash(options, "hideEvent", eventHide); - getUtils().addToScriptHash(options, "delay", toolTip.getShowDelay(), "0", ScriptHashVariableWrapper.DEFAULT); - getUtils().addToScriptHash(options, "hideDelay", toolTip.getHideDelay(), "0", ScriptHashVariableWrapper.DEFAULT); + utils.addToScriptHash(options, "delay", toolTip.getShowDelay(), "0"); + utils.addToScriptHash(options, "hideDelay", toolTip.getHideDelay(), "0"); if (AJAX_MODE.equalsIgnoreCase(toolTip.getMode())) { - JSFunctionDefinition ajaxFunc = new JSFunctionDefinition("event", "ajaxOptions"); + JSFunctionDefinition ajaxFunc = new JSFunctionDefinition("event"); JSFunction function = AjaxRendererUtils.buildAjaxFunction(component, context); - JSReference ref = new JSReference("ajaxOptions"); - function.addParameter(ref); - ajaxFunc.addToBody(function); - getUtils().addToScriptHash(options, "ajaxFunction", ajaxFunc, null, ScriptHashVariableWrapper.DEFAULT); Map<String, Object> ajaxOptions = buildEventOptions(context, toolTip); ajaxOptions.putAll(getParamsMap(context, toolTip)); - getUtils().addToScriptHash(options, "ajaxOptions", ajaxOptions, null, ScriptHashVariableWrapper.DEFAULT); + function.addParameter(ajaxOptions); + ajaxFunc.addToBody(function); + utils.addToScriptHash(options, "ajaxFunction", ajaxFunc); } - - JSFunctionDefinition completeFunc = getUtils().getAsEventHandler( - context, component, "oncomplete", "; return true;"); - getUtils().addToScriptHash(options, "oncomplete", completeFunc, null, ScriptHashVariableWrapper.DEFAULT); - - JSFunctionDefinition hideFunc = getUtils().getAsEventHandler( + JSFunctionDefinition hideFunc = utils.getAsEventHandler( context, component, "onhide", "; return true;"); - getUtils().addToScriptHash(options, "onhide", hideFunc, null, ScriptHashVariableWrapper.DEFAULT); + utils.addToScriptHash(options, "onhide", hideFunc); - JSFunctionDefinition showFunc = getUtils().getAsEventHandler( + JSFunctionDefinition showFunc = utils.getAsEventHandler( context, component, "onshow", "; return true;"); - getUtils().addToScriptHash(options, "onshow", showFunc, null, ScriptHashVariableWrapper.DEFAULT); + utils.addToScriptHash(options, "onshow", showFunc); - getUtils().addToScriptHash(options, "disabled", toolTip.isDisabled(), "false", ScriptHashVariableWrapper.DEFAULT); - getUtils().addToScriptHash(options, "direction", toolTip.getDirection(), "bottom-right", ScriptHashVariableWrapper.DEFAULT); - getUtils().addToScriptHash(options, "followMouse", toolTip.isFollowMouse(), "false", ScriptHashVariableWrapper.DEFAULT); - getUtils().addToScriptHash(options, "horizontalOffset", toolTip.getHorizontalOffset(), "10", ScriptHashVariableWrapper.DEFAULT); - getUtils().addToScriptHash(options, "verticalOffset", toolTip.getVerticalOffset(), "10", ScriptHashVariableWrapper.DEFAULT); + utils.addToScriptHash(options, "disabled", toolTip.isDisabled(), "false"); + utils.addToScriptHash(options, "direction", toolTip.getDirection(), "bottom-right"); + utils.addToScriptHash(options, "followMouse", toolTip.isFollowMouse(), "false"); + utils.addToScriptHash(options, "horizontalOffset", toolTip.getHorizontalOffset(), "10"); + utils.addToScriptHash(options, "verticalOffset", toolTip.getVerticalOffset(), "10"); StringBuffer ret = new StringBuffer(); ret.append("new ToolTip(").append(QUOT).append(toolTip.getClientId(context)).append(QUOT_COMMA) Modified: branches/community/3.3.X/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js =================================================================== --- branches/community/3.3.X/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js 2009-06-08 15:26:15 UTC (rev 14555) +++ branches/community/3.3.X/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js 2009-06-08 15:56:13 UTC (rev 14556) @@ -9,13 +9,11 @@ ToolTip.prototype = { //default values of options - showEvent: "mouseover", + showEvent: null, hideEvent: null, delay: 0, hideDelay: 0, ajaxFunction: null, - ajaxOptions: null, - oncomplete: null, onhide: null, onshow: null, disabled: false, @@ -254,19 +252,15 @@ this.setToolTipPosition(e); } var event = A4J.AJAX.CloneObject(e, false); - var ajaxOptions = this.ajaxOptions; - if(this.clientAjaxParams){ - if(e.clientX){ - this.clientAjaxParams['clientX'] = e.clientX; - this.clientAjaxParams['clientY'] = e.clientY; - } else { - this.clientAjaxParams['event.pageX'] = e.pageX; - this.clientAjaxParams['event.pageY'] = e.pageY; - - } + if(e.clientX){ + this.clientAjaxParams['clientX'] = e.clientX; + this.clientAjaxParams['clientY'] = e.clientY; + } else { + this.clientAjaxParams['event.pageX'] = e.pageX; + this.clientAjaxParams['event.pageY'] = e.pageY; - Object.extend(ajaxOptions['parameters'], this.clientAjaxParams); } + if (this.delay>0) { this.setToolTipPosition(e); @@ -274,15 +268,15 @@ { if (this.toolTipDefaultContent) { - this.setToolTipVisible(false); + this.setToolTipVisible(); } - this.ajaxFunction(event, ajaxOptions); + this.ajaxFunction(event); }.bind(this), this.delay); } else { - this.setToolTipVisible(false); - this.ajaxFunction(event, ajaxOptions); + this.setToolTipVisible(); + this.ajaxFunction(event); } } else { this.setToolTipPosition(e); @@ -613,37 +607,17 @@ this.onshow(this.eventCopy); } - this.setToolTipVisible(true); - -// if(this.delay > 0) { -// this.queuedToolTip = setTimeout('Richfaces.tooltips[\'' + this.parentId + '\'].setToolTipVisible(true)', this.delay); -// } else { -// this.setToolTipVisible(true); -// } - - -// if(this.mode != 'ajax'){ -// this.oncomplete(window.event); -// } + this.setToolTipVisible(); } }, - setToolTipVisible: function(runOnComplete){ + setToolTipVisible: function(){ this.activationTimerHandle = undefined; this.toolTip.style.display = "block"; this.toolTip.style.visibility = "visible"; if(this.iframe) { this.iframe.style.display = "block"; - } - - if(runOnComplete){ - if(this.oncomplete!=null) - { - this.oncomplete(window.event); - } - - } - + } } }

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r14555 - Plan and 1 other directory.

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

Author: tkuprevich Date: 2009-06-08 11:26:15 -0400 (Mon, 08 Jun 2009) New Revision: 14555 Modified: branches/community/3.3.X/test-applications/qa/Test Plan/TestPlan-RF.doc Log: Modified: branches/community/3.3.X/test-applications/qa/Test Plan/TestPlan-RF.doc =================================================================== (Binary files differ)

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r14554 - in branches/community/3.3.X/ui/togglePanel/src: main/java/org/richfaces/component and 1 other directories.

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

Author: Alex.Kolonitsky Date: 2009-06-08 10:41:30 -0400 (Mon, 08 Jun 2009) New Revision: 14554 Modified: branches/community/3.3.X/ui/togglePanel/src/main/config/component/togglePanel.xml branches/community/3.3.X/ui/togglePanel/src/main/java/org/richfaces/component/UIToggleControl.java branches/community/3.3.X/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java Log: toggleControl: panelId attribute doesn't work https://jira.jboss.org/jira/browse/RF-7334 Modified: branches/community/3.3.X/ui/togglePanel/src/main/config/component/togglePanel.xml =================================================================== --- branches/community/3.3.X/ui/togglePanel/src/main/config/component/togglePanel.xml 2009-06-08 14:18:56 UTC (rev 14553) +++ branches/community/3.3.X/ui/togglePanel/src/main/config/component/togglePanel.xml 2009-06-08 14:41:30 UTC (rev 14554) @@ -182,14 +182,6 @@ </description> </property> - - <property required="false" el="true" elonly="true"> - <name>panelId</name> - <classname>java.lang.String</classname> - <description>Attribute defines Id for corresponding panel - </description> - </property> - <property hidden="true"> <name>actionExpression</name> </property> Modified: branches/community/3.3.X/ui/togglePanel/src/main/java/org/richfaces/component/UIToggleControl.java =================================================================== --- branches/community/3.3.X/ui/togglePanel/src/main/java/org/richfaces/component/UIToggleControl.java 2009-06-08 14:18:56 UTC (rev 14553) +++ branches/community/3.3.X/ui/togglePanel/src/main/java/org/richfaces/component/UIToggleControl.java 2009-06-08 14:41:30 UTC (rev 14554) @@ -45,9 +45,6 @@ public static final String COMPONENT_FAMILY = "javax.faces.Command"; - public abstract void setPanelId(String panelId); - public abstract String getPanelId(); - public abstract void setSwitchToState(String switchToState); public abstract String getSwitchToState(); Modified: branches/community/3.3.X/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java =================================================================== --- branches/community/3.3.X/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java 2009-06-08 14:18:56 UTC (rev 14553) +++ branches/community/3.3.X/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java 2009-06-08 14:41:30 UTC (rev 14554) @@ -247,7 +247,7 @@ "ABYBC"); assertEquals("ABYBC", (String) switchValue); - toggleControl.setPanelId(togglePanel.getClientId(facesContext)); + toggleControl.setFor(togglePanel.getClientId(facesContext)); toggleControl.setReRender(togglePanel.getClientId(facesContext)); assertEquals(togglePanel.getClientId(facesContext), toggleControl .getReRender());

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r14553 - branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/docbook/includes.

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

Author: msorokin Date: 2009-06-08 10:18:56 -0400 (Mon, 08 Jun 2009) New Revision: 14553 Modified: branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/docbook/includes/tooltips.xml Log: https://jira.jboss.org/jira/browse/RF-5768 TooTip section Modified: branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/docbook/includes/tooltips.xml =================================================================== --- branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/docbook/includes/tooltips.xml 2009-06-08 13:44:15 UTC (rev 14552) +++ branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/docbook/includes/tooltips.xml 2009-06-08 14:18:56 UTC (rev 14553) @@ -1,7 +1,72 @@ <?xml version="1.0" encoding="UTF-8"?> <section id="tooltips"> - <title>ToolTips</title> + <title>ToolTips TBR</title> <para> - Work in progress... + When using RichFaces components library you've got nealy everything to build UI, making a tooltip is not an exception. RichFaces provides a separate component to make a bubble appeare when the user hovers a UI element or layout area. + The component is <emphasis role="bold"><property><rich:toolTip></property></emphasis>. + There's nothing complicated in using <emphasis role="bold"><property><rich:toolTip></property></emphasis>: you just need to set the text to be shown in the tooltip with the <emphasis><property>"value"</property></emphasis> attribute and specify for which component you want the tooltip to be shown with the <emphasis><property>"for"</property></emphasis> attribute that takes the id of the targeted component as a parameter. </para> + + <programlisting role="XML"><![CDATA[... +<rich:panel id="panelId"> +<p>Element which has a tooltip</p> +</rich:panel> +<rich:toolTip value="This is a tooltip." for="panelId"/> +...]]></programlisting> + + <para> + Alternatively, you can just place <emphasis role="bold"><property><rich:toolTip></property></emphasis> as a nested element of container for which the tooltip is shown. + + </para> + + + <programlisting role="XML"><![CDATA[... +<div> +<p>Element which has a tooltip</p> + +<rich:toolTip> +<p>Tooltip text</p> +</rich:toolTip> +</div> +...]]></programlisting> + <para>This approach was adopted in the Photo Alum to display tooltips for </para> + + <para> + This code outputs an album's image. + </para> + + <programlisting role="XML"><![CDATA[... +<a4j:mediaOutput id="img" element="img" styleClass="main-image" + createContent="#{imageLoader.paintImage}" style="border : 3px solid #808080;" + value="#{fileManager.transformPath(model.selectedImage.fullPath, '_medium')}"> + +</rich:dragSupport> + <rich:toolTip followMouse="true" direction="top-right" + showDelay="500" styleClass="tooltip" rendered="#{model.selectedImage.showMetaInfo}"> + <span style="white-space:nowrap; display:block; text-align:left;"> + <h:outputText value="Size in bytes: #{model.selectedImage.size}" /> + <br /> + <h:outputText + value="#{messages['original_size']}: #{model.selectedImage.height}x#{model.selectedImage.width}" /> + <br /> + <h:outputText value="Captured at: #{model.selectedImage.created}" /> + <br /> + <h:outputText + value="#{messages['camera']}: #{model.selectedImage.cameraModel}" /> + </span> + </rich:toolTip> +</a4j:mediaOutput> +...]]></programlisting> + + <para>The <emphasis role="bold"><property><rich:toolTip></property></emphasis> is nested in <emphasis role="bold"><property><a4j:mediaOutput></property></emphasis> +and prints the size of the image, size in pixels, when the picture was taken and the type of camera used to take the picture. + </para> + <figure> + <title>Tooltip</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/tooltip.png"/> + </imageobject> + </mediaobject> + </figure> </section>

16 years, 11 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits June 2009