November 2009 - richfaces-svn-commits

JBoss Rich Faces SVN: r15994 - in root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component: state and 1 other directory.

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

Author: abelevich Date: 2009-11-25 06:34:50 -0500 (Wed, 25 Nov 2009) New Revision: 15994 Added: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/state/ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/state/SubTableState.java Log: Added: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/state/SubTableState.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/state/SubTableState.java (rev 0) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/state/SubTableState.java 2009-11-25 11:34:50 UTC (rev 15994) @@ -0,0 +1,17 @@ +package org.richfaces.component.state; + +import org.ajax4jsf.model.RepeatState; + +public abstract class SubTableState extends RepeatState { + + private boolean expanded; + + public boolean isExpanded() { + return this.expanded; + } + + public void setExpanded(boolean expanded) { + this.expanded = expanded; + } + +}

14 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r15993 - in branches/community/3.3.X: framework/impl and 3 other directories.

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

Author: nbelaevski Date: 2009-11-24 18:37:45 -0500 (Tue, 24 Nov 2009) New Revision: 15993 Modified: branches/community/3.3.X/framework/impl/pom.xml branches/community/3.3.X/pom.xml branches/community/3.3.X/test-applications/pom.xml branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/pom.xml branches/community/3.3.X/test-applications/seamApp/web/pom.xml Log: JSF 2.0 configuration: - added skip=true for Maven deploy plugin under jsf2_0 profile except richfaces-impl - updated test-applications configuration - removed unused RF dependencies from tests in regression-area application Modified: branches/community/3.3.X/framework/impl/pom.xml =================================================================== --- branches/community/3.3.X/framework/impl/pom.xml 2009-11-24 23:08:30 UTC (rev 15992) +++ branches/community/3.3.X/framework/impl/pom.xml 2009-11-24 23:37:45 UTC (rev 15993) @@ -162,6 +162,12 @@ <build> <plugins> <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>false</skip> + </configuration> + </plugin> + <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> <classifier>jsf2</classifier> Modified: branches/community/3.3.X/pom.xml =================================================================== --- branches/community/3.3.X/pom.xml 2009-11-24 23:08:30 UTC (rev 15992) +++ branches/community/3.3.X/pom.xml 2009-11-24 23:37:45 UTC (rev 15993) @@ -233,6 +233,19 @@ </scm> <profiles> <profile> + <id>jsf2_0</id> + <build> + <plugins> + <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>sandbox</id> <modules> <module>sandbox</module> Modified: branches/community/3.3.X/test-applications/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/pom.xml 2009-11-24 23:08:30 UTC (rev 15992) +++ branches/community/3.3.X/test-applications/pom.xml 2009-11-24 23:37:45 UTC (rev 15993) @@ -78,30 +78,25 @@ <dependencies> <dependency> - <artifactId>richfaces-ui</artifactId> - <groupId>org.richfaces.ui</groupId> - <version>${rfVersion}</version> + <artifactId>richfaces-ui</artifactId> + <groupId>org.richfaces.ui</groupId> + <version>${rfVersion}</version> </dependency> <dependency> - <artifactId>richfaces-impl</artifactId> - <groupId>org.richfaces.framework</groupId> - <version>${rfVersion}</version> + <artifactId>richfaces-api</artifactId> + <groupId>org.richfaces.framework</groupId> + <version>${rfVersion}</version> </dependency> <dependency> - <artifactId>richfaces-api</artifactId> - <groupId>org.richfaces.framework</groupId> - <version>${rfVersion}</version> - </dependency> - <dependency> <artifactId>servlet-api</artifactId> <groupId>javax.servlet</groupId> <version>2.5</version> </dependency> <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>1.0</version> - <scope>provided</scope> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.uwyn</groupId> @@ -123,6 +118,30 @@ <profiles> <profile> + <id>jsf1_2</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>${rfVersion}</version> + </dependency> + </dependencies> + </profile> + <profile> + <id>jsf2_0</id> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>${rfVersion}</version> + <classifier>jsf2</classifier> + </dependency> + </dependencies> + </profile> + <profile> <id>myfaces</id> <dependencies> <dependency> Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/pom.xml 2009-11-24 23:08:30 UTC (rev 15992) +++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/pom.xml 2009-11-24 23:37:45 UTC (rev 15993) @@ -29,17 +29,7 @@ <artifactId>richfaces-api</artifactId> <version>${richversion}</version> </dependency> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <version>${richversion}</version> - </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui</artifactId> - <version>${richversion}</version> - </dependency> - <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> <version>${jsfversion}</version> Modified: branches/community/3.3.X/test-applications/seamApp/web/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/seamApp/web/pom.xml 2009-11-24 23:08:30 UTC (rev 15992) +++ branches/community/3.3.X/test-applications/seamApp/web/pom.xml 2009-11-24 23:37:45 UTC (rev 15993) @@ -55,11 +55,6 @@ <version>${rfVersion}</version> </dependency> <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <version>${rfVersion}</version> - </dependency> - <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> <version>${rfVersion}</version> @@ -121,4 +116,30 @@ </plugin> </plugins> </build> + <profiles> + <profile> + <id>jsf1_2</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>${rfVersion}</version> + </dependency> + </dependencies> + </profile> + <profile> + <id>jsf2_0</id> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>${rfVersion}</version> + <classifier>jsf2</classifier> + </dependency> + </dependencies> + </profile> + </profiles> </project>

14 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r15992 - in branches/community/3.3.X/samples: darkX and 6 other directories.

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

Author: nbelaevski Date: 2009-11-24 18:08:30 -0500 (Tue, 24 Nov 2009) New Revision: 15992 Modified: branches/community/3.3.X/samples/darkX/pom.xml branches/community/3.3.X/samples/glassX/pom.xml branches/community/3.3.X/samples/laguna/pom.xml branches/community/3.3.X/samples/pom.xml branches/community/3.3.X/samples/richfaces-demo/pom.xml branches/community/3.3.X/samples/skins/pom.xml branches/community/3.3.X/samples/themes/pom.xml branches/community/3.3.X/samples/violetRays/pom.xml Log: Configuration updated for JSF2 - continued Modified: branches/community/3.3.X/samples/darkX/pom.xml =================================================================== --- branches/community/3.3.X/samples/darkX/pom.xml 2009-11-24 19:24:34 UTC (rev 15991) +++ branches/community/3.3.X/samples/darkX/pom.xml 2009-11-24 23:08:30 UTC (rev 15992) @@ -32,41 +32,26 @@ </plugin> </plugins> </build> - <profiles> - <profile> - <id>jsf1_2</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>jsf2_0</id> - <dependencies> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <version>${project.version}</version> - <classifier>jsf2</classifier> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - </profiles> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <scope>provided</scope> + </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/samples/glassX/pom.xml =================================================================== --- branches/community/3.3.X/samples/glassX/pom.xml 2009-11-24 19:24:34 UTC (rev 15991) +++ branches/community/3.3.X/samples/glassX/pom.xml 2009-11-24 23:08:30 UTC (rev 15992) @@ -33,40 +33,26 @@ </plugin> </plugins> </build> - <profiles> - <profile> - <id>jsf1_2</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>jsf2_0</id> - <dependencies> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <version>${project.version}</version> - <classifier>jsf2</classifier> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - </profiles> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/samples/laguna/pom.xml =================================================================== --- branches/community/3.3.X/samples/laguna/pom.xml 2009-11-24 19:24:34 UTC (rev 15991) +++ branches/community/3.3.X/samples/laguna/pom.xml 2009-11-24 23:08:30 UTC (rev 15992) @@ -24,4 +24,22 @@ </plugins> </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + </project> Modified: branches/community/3.3.X/samples/pom.xml =================================================================== --- branches/community/3.3.X/samples/pom.xml 2009-11-24 19:24:34 UTC (rev 15991) +++ branches/community/3.3.X/samples/pom.xml 2009-11-24 23:08:30 UTC (rev 15992) @@ -14,6 +14,53 @@ <properties>  </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.2_12</version> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>1.2_12</version> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.0.1</version> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>2.0.1</version> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>${project.version}</version> + <classifier>jsf2</classifier> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + </dependency> + </dependencies> + </dependencyManagement> +  <build> <plugins> @@ -60,7 +107,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>3.8.1</version> <scope>test</scope> </dependency> <dependency> @@ -113,7 +159,6 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>javax.el</groupId> @@ -167,7 +212,6 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -184,12 +228,10 @@ <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> - <version>1.2_12</version> </dependency> <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-impl</artifactId> - <version>1.2_12</version> <scope>runtime</scope> </dependency> </dependencies> @@ -214,18 +256,15 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>${project.version}</version> <classifier>jsf2</classifier> </dependency> <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-api</artifactId> - <version>2.0.1</version> </dependency> <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-impl</artifactId> - <version>2.0.1</version> <scope>runtime</scope> </dependency> <dependency> @@ -386,7 +425,6 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>${project.version}</version> <exclusions> <exclusion> <groupId>javax.faces</groupId> Modified: branches/community/3.3.X/samples/richfaces-demo/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/pom.xml 2009-11-24 19:24:34 UTC (rev 15991) +++ branches/community/3.3.X/samples/richfaces-demo/pom.xml 2009-11-24 23:08:30 UTC (rev 15992) @@ -277,7 +277,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>3.8.1</version> <scope>test</scope> </dependency> <dependency> @@ -374,7 +373,7 @@ <artifactId>dom4j</artifactId> <version>1.6.1</version> </dependency> -<dependency> + <dependency> <groupId>org.antlr</groupId> <artifactId>antlr</artifactId> <version>3.0</version> @@ -410,7 +409,7 @@ </exclusion> </exclusions> </dependency> - <dependency> + <dependency> <groupId>javax.annotation</groupId> <artifactId>jsr250-api</artifactId> <version>1.0</version> Modified: branches/community/3.3.X/samples/skins/pom.xml =================================================================== --- branches/community/3.3.X/samples/skins/pom.xml 2009-11-24 19:24:34 UTC (rev 15991) +++ branches/community/3.3.X/samples/skins/pom.xml 2009-11-24 23:08:30 UTC (rev 15992) @@ -8,5 +8,21 @@ <groupId>org.richfaces.samples</groupId> <artifactId>skins</artifactId> <name>skins</name> - <dependencies /> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: branches/community/3.3.X/samples/themes/pom.xml =================================================================== --- branches/community/3.3.X/samples/themes/pom.xml 2009-11-24 19:24:34 UTC (rev 15991) +++ branches/community/3.3.X/samples/themes/pom.xml 2009-11-24 23:08:30 UTC (rev 15992) @@ -10,34 +10,6 @@ <artifactId>themes</artifactId> <version>3.3.3-SNAPSHOT</version> <name>themes</name> - <profiles> - <profile> - <id>jsf1_2</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>jsf2_0</id> - <dependencies> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <version>${project.version}</version> - <classifier>jsf2</classifier> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - </profiles> <build> <plugins> <plugin> @@ -68,13 +40,27 @@ <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.3-SNAPSHOT</version> + <scope>provided</scope> </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <scope>provided</scope> + </dependency> </dependencies> </project> Modified: branches/community/3.3.X/samples/violetRays/pom.xml =================================================================== --- branches/community/3.3.X/samples/violetRays/pom.xml 2009-11-24 19:24:34 UTC (rev 15991) +++ branches/community/3.3.X/samples/violetRays/pom.xml 2009-11-24 23:08:30 UTC (rev 15992) @@ -32,13 +32,27 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>3.8.1</version> <scope>test</scope> </dependency> <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> + <scope>provided</scope> </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <scope>provided</scope> + </dependency> </dependencies> </project> \ No newline at end of file

14 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r15991 - in branches/community/3.3.X: ui/assembly and 1 other directories.

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

Author: nbelaevski Date: 2009-11-24 14:24:34 -0500 (Tue, 24 Nov 2009) New Revision: 15991 Modified: branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.java branches/community/3.3.X/ui/assembly/pom.xml branches/community/3.3.X/ui/assembly/src/main/assembly/richfaces.xml Log: Changes for inclusion of richfaces-impl-jsf2 into distribution archive Modified: branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.java =================================================================== --- branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.java 2009-11-24 19:16:28 UTC (rev 15990) +++ branches/community/3.3.X/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AssemblyLibraryMojo.java 2009-11-24 19:24:34 UTC (rev 15991) @@ -50,6 +50,7 @@ import org.apache.maven.model.Dependency; import org.apache.maven.model.Model; import org.apache.maven.model.Parent; +import org.apache.maven.model.Profile; import org.apache.maven.model.Resource; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; import org.apache.maven.model.io.xpp3.MavenXpp3Writer; @@ -253,6 +254,11 @@ private String templateXpath; /** + * @parameter + */ + private boolean includeProjectDependencies = false; + + /** * */ public AssemblyLibraryMojo() { @@ -503,6 +509,9 @@ private void setupGeneratedProject( Map<String, Dependency> projectsDependencies) throws MojoExecutionException { + + Map localProjectDependencies = new HashMap(); + Model generatedProject; try { MavenXpp3Reader reader = new MavenXpp3Reader(); @@ -510,10 +519,48 @@ } catch (Exception e1) { throw new MojoExecutionException("Unable to read local POM", e1); } + + if (includeProjectDependencies) { + Set activeProfilesIds = new HashSet(); + List activeProfiles = project.getActiveProfiles(); + if (activeProfiles != null) { + for (Iterator activeProfilesItr = activeProfiles.iterator(); activeProfilesItr.hasNext(); ) { + Profile activeProfile = (Profile) activeProfilesItr.next(); + activeProfilesIds.add(activeProfile.getId()); + } + } + + List dependencies = generatedProject.getDependencies(); + if (dependencies != null) { + for (Iterator itr = dependencies.iterator(); itr.hasNext(); ) { + Dependency dependency = (Dependency) itr.next(); + localProjectDependencies.put(dependency.getManagementKey(), dependency); + } + } + + List profiles = generatedProject.getProfiles(); + if (profiles != null) { + for (Iterator profilesItr = profiles.iterator(); profilesItr.hasNext(); ) { + Profile profile = (Profile) profilesItr.next(); + if (activeProfilesIds.contains(profile.getId())) { + List profileDependencies = profile.getDependencies(); + if (profileDependencies != null) { + for (Iterator itr = profileDependencies.iterator(); itr.hasNext(); ) { + Dependency dependency = (Dependency) itr.next(); + localProjectDependencies.put(dependency.getManagementKey(), dependency); + } + } + } + } + } + } + generatedProject.getDependencies() .addAll(projectsDependencies.values()); writePom(generatedProject); - project.setDependencies(new ArrayList<Dependency>(projectsDependencies.values())); + + localProjectDependencies.putAll(projectsDependencies); + project.setDependencies(new ArrayList<Dependency>(localProjectDependencies.values())); // project.setFile(generatedPom); } Modified: branches/community/3.3.X/ui/assembly/pom.xml =================================================================== --- branches/community/3.3.X/ui/assembly/pom.xml 2009-11-24 19:16:28 UTC (rev 15990) +++ branches/community/3.3.X/ui/assembly/pom.xml 2009-11-24 19:24:34 UTC (rev 15991) @@ -64,6 +64,7 @@ --> <excludeXcss>**/basic.xcss, **/basic_classes.xcss, **/basic_both.xcss, **/extended.xcss, **/extended_classes.xcss, **/extended_both.xcss, **/skin*.xcss, **/tiny_mce/**, **/org/richfaces/renderkit/html/css/simple.xcss, **/org/richfaces/renderkit/html/css/violetRays.xcss</excludeXcss> <commonStyle>org/richfaces/skin.xcss</commonStyle> + <includeProjectDependencies>true</includeProjectDependencies> </configuration> <executions> <execution> @@ -430,6 +431,24 @@ </plugin> </plugins> </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <version>3.3.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>3.3.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>3.3.3-SNAPSHOT</version> + <classifier>jsf2</classifier> + </dependency> + </dependencies> </profile> </profiles> <dependencies /> Modified: branches/community/3.3.X/ui/assembly/src/main/assembly/richfaces.xml =================================================================== --- branches/community/3.3.X/ui/assembly/src/main/assembly/richfaces.xml 2009-11-24 19:16:28 UTC (rev 15990) +++ branches/community/3.3.X/ui/assembly/src/main/assembly/richfaces.xml 2009-11-24 19:24:34 UTC (rev 15991) @@ -46,10 +46,11 @@ <dependencySet> <outputDirectory>/lib</outputDirectory> <unpack>false</unpack> - <scope>runtime</scope> + <scope>compile</scope> <includes> <include>org.richfaces.framework:richfaces-api</include> <include>org.richfaces.framework:richfaces-impl</include> + <include>org.richfaces.framework:richfaces-impl:*:jsf2</include> <include>org.richfaces.framework:richfaces-test</include> </includes> <excludes>

14 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r15990 - in branches/community/3.3.X: samples/calendar-sample/src/main/webapp/WEB-INF and 3 other directories.

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

Author: Alex.Kolonitsky Date: 2009-11-24 14:16:28 -0500 (Tue, 24 Nov 2009) New Revision: 15990 Added: branches/community/3.3.X/samples/calendar-sample/src/main/java/org/richfaces/RF8052.java branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8052/ branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8052/RF-8052.html branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8052/menu.jsp branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8052/other.jsp Modified: branches/community/3.3.X/samples/calendar-sample/src/main/webapp/WEB-INF/faces-config.xml branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/index.jsp branches/community/3.3.X/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js Log: https://jira.jboss.org/jira/browse/RF-8159 problem with framsets and rich:calendar Added: branches/community/3.3.X/samples/calendar-sample/src/main/java/org/richfaces/RF8052.java =================================================================== --- branches/community/3.3.X/samples/calendar-sample/src/main/java/org/richfaces/RF8052.java (rev 0) +++ branches/community/3.3.X/samples/calendar-sample/src/main/java/org/richfaces/RF8052.java 2009-11-24 19:16:28 UTC (rev 15990) @@ -0,0 +1,40 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces; + +import java.util.Date; + +/** + * @author akolonitsky + * @since Nov 24, 2009 + */ +public class RF8052 { + private Date date = new Date(); + + public Date getDate() { + return new Date(); + } + + public void setDate(Date date) { + this.date = date; + } +} Modified: branches/community/3.3.X/samples/calendar-sample/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/community/3.3.X/samples/calendar-sample/src/main/webapp/WEB-INF/faces-config.xml 2009-11-24 17:21:30 UTC (rev 15989) +++ branches/community/3.3.X/samples/calendar-sample/src/main/webapp/WEB-INF/faces-config.xml 2009-11-24 19:16:28 UTC (rev 15990) @@ -17,6 +17,11 @@ <managed-bean-class>org.richfaces.CalendarBean</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> </managed-bean> + <managed-bean> + <managed-bean-name>rf8052</managed-bean-name> + <managed-bean-class>org.richfaces.RF8052</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> <validator> <validator-id>org.richfaces.CalendarValidator</validator-id> <validator-class>org.richfaces.CalendarValidator</validator-class> Added: branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8052/RF-8052.html =================================================================== --- branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8052/RF-8052.html (rev 0) +++ branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8052/RF-8052.html 2009-11-24 19:16:28 UTC (rev 15990) @@ -0,0 +1,8 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/frameset.dtd" > +<html> +<frameset id="MainFrameSet" cols="195px,100%"> + <frame id="frameThree" name="buttonsPanelFrame" src="menu.jsf" /> + <frame id="frameTwo" name="detailsPanelFrame" /> +</frameset> +</html> \ No newline at end of file Added: branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8052/menu.jsp =================================================================== --- branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8052/menu.jsp (rev 0) +++ branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8052/menu.jsp 2009-11-24 19:16:28 UTC (rev 15990) @@ -0,0 +1,16 @@ +<%@ 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/calendar" prefix="rich" %> +<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/panelmenu" prefix="pm" %> +<html> +<body> +<f:view> + <h:outputLink id="link" target="detailsPanelFrame" value="other.jsf"> + <h:outputText value="Click me (#{rf8052.date})" /> + </h:outputLink> + <h:outputLink id="link2" target="qwe" value="other.jsf"> + <h:outputText value="Click me 2 (#{rf8052.date})" /> + </h:outputLink> +</f:view> +</body> +</html> \ No newline at end of file Added: branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8052/other.jsp =================================================================== --- branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8052/other.jsp (rev 0) +++ branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8052/other.jsp 2009-11-24 19:16:28 UTC (rev 15990) @@ -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/calendar" prefix="rich" %> +<html> +<body> +<f:view> + <rich:calendar id="calendar" /><br /> + <h:outputText value="#{rf8052.date}" /> +</f:view> + +</body> +</html> \ No newline at end of file Modified: branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/index.jsp =================================================================== --- branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/index.jsp 2009-11-24 17:21:30 UTC (rev 15989) +++ branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/index.jsp 2009-11-24 19:16:28 UTC (rev 15990) @@ -1,19 +1,19 @@ <%@ 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/calendar" prefix="calendar" %> +<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/calendar" prefix="calendar" %> <html> <head> <title></title> </head> <body> <f:view> - <h:form> - <h:panelGrid columns="1"> - <h:selectOneRadio binding="#{skinBean.component}" /> - <h:commandLink action="#{skinBean.change}" value="set skin" /> - </h:panelGrid> - <br /> + <h:form> + <h:panelGrid columns="1"> + <h:selectOneRadio binding="#{skinBean.component}" /> + <h:commandLink action="#{skinBean.change}" value="set skin" /> + </h:panelGrid> <br /> + <br /> <calendar:calendar id="calendar" dataModel="#{calendarDataModel}" locale="#{calendarBean.locale}"> <f:facet name="header"> <f:verbatim> Modified: branches/community/3.3.X/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js =================================================================== --- branches/community/3.3.X/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2009-11-24 17:21:30 UTC (rev 15989) +++ branches/community/3.3.X/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2009-11-24 19:16:28 UTC (rev 15990) @@ -599,7 +599,7 @@ var value = options.labels || {}; var defaultLabels = {apply:'Apply', today:'Today', clean:'Clean', ok:'OK', cancel:'Cancel', close:'x'}; - for (name in defaultLabels) { + for (var name in defaultLabels) { if (!value[name]) value[name] = defaultLabels[name]; } this.params.labels = value;

14 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r15989 - root/examples-sandbox/trunk/components/tables/src/main/webapp.

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

Author: konstantin.mishin Date: 2009-11-24 12:21:30 -0500 (Tue, 24 Nov 2009) New Revision: 15989 Modified: root/examples-sandbox/trunk/components/tables/src/main/webapp/extendedtable.xhtml Log: RF-7852 ExtendedDataTable sample Modified: root/examples-sandbox/trunk/components/tables/src/main/webapp/extendedtable.xhtml =================================================================== --- root/examples-sandbox/trunk/components/tables/src/main/webapp/extendedtable.xhtml 2009-11-24 17:03:02 UTC (rev 15988) +++ root/examples-sandbox/trunk/components/tables/src/main/webapp/extendedtable.xhtml 2009-11-24 17:21:30 UTC (rev 15989) @@ -32,11 +32,11 @@ <h:head> <title>Richfaces ExtendedDataTable</title> - <style> + <style type="text/css"> @charset "utf-8"; .extendedDataTable{ width:500px; - height: 1000px; + height: 500px; } </style> </h:head> @@ -56,6 +56,9 @@ <rich:column id="column_title" width="200px"> <h:outputText value="#{record.title}" /> + <f:facet name="footer"> + <h:outputText id="columnFooter2" value="Column Footer Facet2"/> + </f:facet> </rich:column> <rich:column id="column_email" width="300px">

14 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r15988 - in root/ui-sandbox/trunk/components/tables/ui/src/main: resources/META-INF/resources and 1 other directory.

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

Author: konstantin.mishin Date: 2009-11-24 12:03:02 -0500 (Tue, 24 Nov 2009) New Revision: 15988 Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.css root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js Log: RF-7871 Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2009-11-24 16:36:33 UTC (rev 15987) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2009-11-24 17:03:02 UTC (rev 15988) @@ -226,8 +226,9 @@ writer.writeAttribute(HTML.ID_ATTRIBUTE, table.getClientId(context) + ":b", null); writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-body", null); writer.startElement(HTML.DIV_ELEM, table); - writer.startElement(HTML.DIV_ELEM, table); - writer.endElement(HTML.DIV_ELEM); +// writer.startElement(HTML.DIV_ELEM, table); TODO +// writer.write(" "); +// writer.endElement(HTML.DIV_ELEM); writer.startElement(HTML.TABLE_ELEMENT, table); writer.writeAttribute(HTML.CELLPADDING_ATTRIBUTE, "0", null); writer.writeAttribute(HTML.CELLSPACING_ATTRIBUTE, "0", null); @@ -287,7 +288,6 @@ RendererState state = (RendererState)rowHolder; UIDataTableBase table = state.getRow(); writer.startElement(HTML.TR_ELEMENT, table); - writer.writeAttribute(HTML.ID_ATTRIBUTE, table.getClientId(context), null); Iterator<UIComponent> columns = null; if (state.isFrozen()) { columns = state.getFrozenColumns().iterator(); Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.css =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.css 2009-11-24 16:36:33 UTC (rev 15987) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.css 2009-11-24 17:03:02 UTC (rev 15988) @@ -20,9 +20,10 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ .rich-extable{ + overflow: hidden; background-color: #FFFFFF; border: 1px solid #C4C0C9; - height: 100%; + /*height: 100%;*/ } .rich-extable-header { @@ -33,7 +34,6 @@ overflow-x: hidden; overflow-y: scroll; width: 100%; - height: 0px; } .rich-extable-footer { Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js 2009-11-24 16:36:33 UTC (rev 15987) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js 2009-11-24 17:03:02 UTC (rev 15988) @@ -38,7 +38,7 @@ var element = document.getElementById(id); var bodyElement = document.getElementById(id + ":b"); var contentElement = bodyElement.firstChild;//TODO Richfaces.firstDescendant; - var marginElement = contentElement.firstChild;//TODO this.marginElement = Richfaces.firstDescendant(this.contentElement); + //TODO var marginElement = contentElement.firstChild;this.marginElement = Richfaces.firstDescendant(this.contentElement); var dataTableElement = contentElement.lastChild;//TODO this.dataTableElement = Richfaces.lastDescendant(this.contentElement); var frozenHeaderPartElement = document.getElementById(id + ":frozenHeader"); @@ -52,6 +52,10 @@ var updateLayout = function() { var offsetWidth = frozenHeaderPartElement ? frozenHeaderPartElement.offsetWidth : 0; normalPartStyle.width = element.clientWidth - offsetWidth + "px"; + var delta = scrollElement.firstChild.offsetHeight - scrollElement.clientHeight; + if (delta) { + scrollElement.style.height = scrollElement.offsetHeight + delta; + } var height = element.clientHeight; var el = element.firstChild; while (el) {

14 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r15987 - in root/ui-sandbox/trunk/components/tables/ui/src/main: java/org/richfaces/event and 5 other directories.

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

Author: abelevich Date: 2009-11-24 11:36:33 -0500 (Tue, 24 Nov 2009) New Revision: 15987 Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/event/ToggleEvent.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/event/ToggleListener.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/taglib/SubTableHandler.java root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/toggler.js root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/tables.taglib.xml root/ui-sandbox/trunk/components/tables/ui/src/main/templates/org/richfaces/renderkit/html/toggle-control.template.xml Log: expand subTables functionality Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java 2009-11-24 15:31:22 UTC (rev 15986) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java 2009-11-24 16:36:33 UTC (rev 15987) @@ -24,13 +24,16 @@ import java.util.Iterator; import javax.el.MethodExpression; +import javax.faces.component.StateHelper; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.event.AbortProcessingException; import javax.faces.event.FacesEvent; import javax.faces.event.PhaseId; +import org.ajax4jsf.model.DataComponentState; import org.ajax4jsf.model.DataVisitor; +import org.richfaces.component.state.SubTableState; import org.richfaces.event.ToggleEvent; import org.richfaces.event.ToggleListener; @@ -39,7 +42,7 @@ * JSF component class * */ -public abstract class UISubTable extends UIDataTableBase implements Row, Column, Expandable{ +public abstract class UISubTable extends UIDataTableBase implements Row, Column, Expandable { public static final String COMPONENT_TYPE = "org.richfaces.SubTable"; @@ -50,13 +53,52 @@ public static final String SWITCH_TYPE_CLIENT = "client"; public static final String SWITCH_TYPE_AJAX = "ajax"; + + private boolean expanded = Boolean.TRUE; enum PropertyKeys { - switchType, expanded, toggleExpression + switchType, expanded, toggleExpression, childState } - + @Override + protected DataComponentState createComponentState() { + return new SubTableState() { + + @Override + public int getFirst() { + return UISubTable.this.getFirst(); + } + + @Override + public int getRows() { + return UISubTable.this.getRows(); + } + }; + } + +/* + @Override + public Object getIterationState() { + StateHelper stateHelper = getStateHelper(); + return new Object[] {stateHelper.get(PropertyKeys.childState), this.expanded}; + } + + @Override + public void setIterationState(Object stateObject) { + StateHelper stateHelper = getStateHelper(); + + if (stateObject != null) { + Object[] state = (Object[]) stateObject; + stateHelper.put(PropertyKeys.childState, state[0]); + this.expanded = (Boolean) state[1]; + } else { + stateHelper.remove(PropertyKeys.childState); + this.expanded = Boolean.TRUE; + } + } */ + + @Override public Iterator<UIComponent> fixedChildren() { return new SubtableFixedChildrenIterator(this); } @@ -93,10 +135,12 @@ } public void setExpanded(boolean expanded) { +// ((SubTableState)getComponentState()).setExpanded(expanded); getStateHelper().put(PropertyKeys.expanded, expanded); } public boolean isExpanded() { +// return ((SubTableState)getComponentState()).isExpanded(); return (Boolean) getStateHelper().eval(PropertyKeys.expanded, Boolean.TRUE); } @@ -126,7 +170,10 @@ MethodExpression expression = getToggleListener(); if(expression != null) { expression.invoke(getFacesContext().getELContext(), new Object[]{toggleEvent}); - } + } + //??? +// ((SubTableState)getComponentState()).setExpanded(toggleEvent.isExpanded()); +// getStateHelper().put(PropertyKeys.expanded, toggleEvent.isExpanded()); } } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/event/ToggleEvent.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/event/ToggleEvent.java 2009-11-24 15:31:22 UTC (rev 15986) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/event/ToggleEvent.java 2009-11-24 16:36:33 UTC (rev 15987) @@ -4,20 +4,24 @@ import javax.faces.event.FacesEvent; import javax.faces.event.FacesListener; +/** + * @author Anton Belevich + * + */ public class ToggleEvent extends FacesEvent { private static final long serialVersionUID = 2916560585918250885L; - private String state; + private boolean expanded; - public ToggleEvent(UIComponent target, String state) { + public ToggleEvent(UIComponent target, boolean expanded) { super(target); - this.state = state; + this.expanded = expanded; } - public String getState() { - return this.state; + public boolean isExpanded() { + return this.expanded; } @Override Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/event/ToggleListener.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/event/ToggleListener.java 2009-11-24 15:31:22 UTC (rev 15986) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/event/ToggleListener.java 2009-11-24 16:36:33 UTC (rev 15987) @@ -2,6 +2,10 @@ import javax.faces.event.FacesListener; +/** + * @author Anton Belevich + * + */ public interface ToggleListener extends FacesListener { public void processToggle(ToggleEvent event); Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2009-11-24 15:31:22 UTC (rev 15986) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2009-11-24 16:36:33 UTC (rev 15987) @@ -298,6 +298,16 @@ public void encodeTableBodyStart(ResponseWriter writer, FacesContext context, UIDataTableBase component) throws IOException { writer.startElement(HTML.TBOBY_ELEMENT, component); getUtils().encodeId(context, component); + + String predefinedStyles = null; + if(component instanceof UISubTable) { + UISubTable subTable = (UISubTable)component; + if(!subTable.isExpanded()) { + predefinedStyles = "display: none;"; + } + } + + encodeStyle(writer, context, component, predefinedStyles); } public void encodeTableEnd(ResponseWriter writer, FacesContext context, UIDataTableBase component) throws IOException { @@ -536,7 +546,7 @@ protected void encodeStyleClass(ResponseWriter writer, FacesContext context, UIComponent component , String styleClassAttribute, String styleClass) throws IOException { - boolean isEmpty = isEmpty(component, styleClassAttribute); + boolean isEmpty = isEmptyAttr(component, styleClassAttribute); if( isEmpty && !(styleClass != null && styleClass.trim().length() != 0)) { return; } @@ -545,7 +555,7 @@ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, componentStyleClass, null); } - protected boolean isEmpty(UIComponent component, String attribute) { + protected boolean isEmptyAttr(UIComponent component, String attribute) { if(attribute == null) { return true; } @@ -553,14 +563,26 @@ return !(value != null && value.trim().length()!=0); } - protected void encodeStyle(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { - String style = (String)component.getAttributes().get(HTML.STYLE_ATTRIBUTE); - if(!isEmptyStyle(style)) { - writer.writeAttribute(HTML.STYLE_ATTRIBUTE, style, null); + protected void encodeStyle(ResponseWriter writer, FacesContext context, UIComponent component, String predefinedStyles) throws IOException { + StringBuffer toEncode = new StringBuffer(); + + if(!isEmptyAttr(component, HTML.STYLE_ATTRIBUTE)) { + String style = ((String)component.getAttributes().get(HTML.STYLE_ATTRIBUTE)).trim(); + style = style.endsWith(";") ? style : style + ";"; + toEncode.append(style); } + + if(!isEmpty(predefinedStyles)) { + String style = predefinedStyles.endsWith(";") ? predefinedStyles : predefinedStyles + ";"; + toEncode.append(style); + } + + if(toEncode.length() > 0) { + writer.writeAttribute(HTML.STYLE_ATTRIBUTE, toEncode.toString(), null); + } } - protected boolean isEmptyStyle(String style) { + protected boolean isEmpty(String style) { return !((style != null) && (style.trim().length()!=0)); } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java 2009-11-24 15:31:22 UTC (rev 15986) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java 2009-11-24 16:36:33 UTC (rev 15987) @@ -2,14 +2,17 @@ import java.io.IOException; import java.text.MessageFormat; +import java.util.HashMap; import java.util.Map; import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; import javax.faces.component.UIComponent; +import javax.faces.component.UIForm; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; +import org.ajax4jsf.javascript.ScriptUtils; import org.ajax4jsf.renderkit.RendererBase; import org.ajax4jsf.renderkit.RendererUtils.HTML; import org.richfaces.component.Expandable; @@ -17,12 +20,16 @@ import org.richfaces.component.UIToggleControl; import org.richfaces.event.ToggleEvent; +/** + * @author Anton Belevich + * + */ @ResourceDependencies({ @ResourceDependency(name = "toggler.js") }) public abstract class ToggleControlRendererBase extends RendererBase { - private static final String MANAGER_SCRIPT = "<script type=\"text/javascript\">ToggleManager.add(new Toggle(\"{0}\", \"{1}\", \"{2}\"));</script>"; + private static final String MANAGER_SCRIPT = "<script type=\"text/javascript\">ToggleManager.add(new Toggle(\"{0}\", {1}));</script>"; private static final String CLIENT_TOGGLE_SCRIPT = "ToggleManager.clientToggle(''{0}'', ''{1}'');"; @@ -48,7 +55,7 @@ Map<String, String> params = context.getExternalContext().getRequestParameterMap(); - String hiddenId = toggle.getClientId() + HIDDEN; + String hiddenId = toggle.getClientId(); String state = params.get(hiddenId); if(state != null && state.trim().length()> 0) { @@ -58,11 +65,9 @@ String prevState = getState(((Expandable)processed).isExpanded()); if(!state.equals(prevState)) { - new ToggleEvent(processed, state).queue(); + new ToggleEvent(processed, isExpanded(state)).queue(); } - } - } } @@ -76,17 +81,17 @@ ResponseWriter writer = context.getResponseWriter(); String toggleId = toggleControl.getClientId(context); - String subTableId = subTable.getClientId(context); - boolean expanded = subTable.isExpanded(); - String initialState = getState(expanded); + String options = encodeOptions(context, toggleControl, subTable); - String registerScript = MessageFormat.format(MANAGER_SCRIPT, toggleId, subTableId, initialState); + String registerScript = MessageFormat.format(MANAGER_SCRIPT, toggleId, options); writer.write(registerScript); String switchType = subTable.getSwichType(); + boolean expanded = subTable.isExpanded(); + encodeControl(context, writer, toggleControl, switchType, expanded, false); encodeControl(context, writer, toggleControl, switchType, !expanded, true); - encodeHiddenInput(context, writer, toggleControl); + // encodeHiddenInput(context, writer, toggleControl); } } @@ -127,6 +132,22 @@ writer.endElement(HTML.SPAN_ELEM); } + public String encodeOptions(FacesContext context, UIToggleControl toggleControl, UISubTable subTable) { + + UIForm nestingForm = getUtils().getNestingForm(context, toggleControl); + + String formId = nestingForm.getClientId(context); + String forId = subTable.getClientId(context); + String state = getState(subTable.isExpanded()); + + HashMap<String, String> options = new HashMap<String, String>(); + options.put("formId", formId); + options.put("forId", forId); + options.put("initialState", state); + + return ScriptUtils.toScript(options); + } + public void encodeHiddenInput(FacesContext context, ResponseWriter writer, UIComponent component) throws IOException { String hiddenId = component.getClientId(context) +HIDDEN; @@ -136,7 +157,7 @@ writer.writeAttribute(HTML.NAME_ATTRIBUTE, hiddenId, null); writer.writeAttribute(HTML.TYPE_ATTR,"hidden", null); writer.endElement(HTML.INPUT_ELEM); - + } public String getStyleClass(FacesContext context, UIToggleControl control) { @@ -182,4 +203,8 @@ return expand ? EXPAND_STATE: COLLAPSE_STATE; } + protected boolean isExpanded(String state) { + return state.equals(EXPAND_STATE); + } + } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/taglib/SubTableHandler.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/taglib/SubTableHandler.java 2009-11-24 15:31:22 UTC (rev 15986) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/taglib/SubTableHandler.java 2009-11-24 16:36:33 UTC (rev 15987) @@ -12,6 +12,10 @@ import org.richfaces.component.UISubTable; +/** + * @author Anton Belevich + * + */ public class SubTableHandler extends ComponentHandler{ private static final SubTableHandlerMetaRule metaRule = new SubTableHandlerMetaRule(); Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/toggler.js =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/toggler.js 2009-11-24 15:31:22 UTC (rev 15986) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/toggler.js 2009-11-24 16:36:33 UTC (rev 15987) @@ -1,7 +1,8 @@ -function Toggle(id, forId, initialState){ +function Toggle(id, options){ this.id = id; - this.forId = forId; - this.state = initialState; + this.forId = options.forId; + this.state = options.initialState; + this.formId = options.formId; this.hidden = id + ":hidden"; } @@ -9,61 +10,66 @@ return id.replace(/:/g, "\\:"); } -Toggle.prototype.clientToggle= function(toState){ - var elements = this.getElement(this.forId); - - if(this.state != toState) { +Toggle.prototype.toggle = function(toState) { + var elements = this.getElement(this.forId); + + if(this.state != toState) { - var hideId = this.id + ":" + toState; - var showId = this.id + ":" + this.state; + var hideId = this.id + ":" + toState; + var showId = this.id + ":" + this.state; - var hideControl = this.getElement(hideId); - var showControl = this.getElement(showId); - - this.command("show", showControl); - this.command("hide", hideControl); - - if(toState == 'collapse') { - this.command("hide", elements); - } else { - this.command("show", elements); - } - this.state = toState; - this.saveState(this.state); - } + var hideControl = this.getElement(hideId); + var showControl = this.getElement(showId); + + this.command("show", showControl); + this.command("hide", hideControl); + + if(toState == 'collapse') { + this.command("hide", elements); + } else { + this.command("show", elements); + } + this.state = toState; + // this.saveState(this.state); + } } Toggle.prototype.saveState= function(state) { - var id = this.hidden; + /*var id = this.hidden; var element = this.getElement(id); if(element) { - element[0].attr('value', state); - } + element.attr('value', state); + }*/ } +Toggle.prototype.clientToggle= function(toState){ + this.toggle(toState); +} + Toggle.prototype.serverToggle = function(toState) { + if(mojarra && mojarra.jsfcljs) { + var form = this.getElement(this.formId); + var prv = {}; + if(this.id) { + prv[this.id] = toState; + mojarra.jsfcljs(form[0],prv,''); + } + } } Toggle.prototype.ajaxToggle = function(toState) { } -Toggle.prototype.command = function(name, elements){ +Toggle.prototype.command = function(name, element){ if(name) { - for(var i in elements) { - var element = elements[i]; - if(element && typeof element[name] == 'function') { + if(element && typeof element[name] == 'function') { element[name](); - } - } - } + } + } } -Toggle.prototype.getElement = function() { - var elements = new Array(); - for(var i = 0; i < arguments.length; i++) { - elements[i] = $("#" + this.convertId(arguments[i])); - } - return elements; +Toggle.prototype.getElement = function(id) { + return $("#" + this.convertId(id)); } ToggleManager = new Object(); Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/tables.taglib.xml =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/tables.taglib.xml 2009-11-24 15:31:22 UTC (rev 15986) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/tables.taglib.xml 2009-11-24 16:36:33 UTC (rev 15987) @@ -36,7 +36,7 @@ <component> <component-type>org.richfaces.SubTable</component-type>  -  + <handler-class>org.richfaces.taglib.SubTableHandler</handler-class> </component> </tag> <tag> Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/templates/org/richfaces/renderkit/html/toggle-control.template.xml =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/templates/org/richfaces/renderkit/html/toggle-control.template.xml 2009-11-24 15:31:22 UTC (rev 15986) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/templates/org/richfaces/renderkit/html/toggle-control.template.xml 2009-11-24 16:36:33 UTC (rev 15987) @@ -13,9 +13,11 @@ </cc:interface> <cc:implementation> + <cdk:call expression="getUtils().encodeBeginFormIfNessesary(facesContext, cc);"/> <span id="#{clientId}" class="#{cc.attributes['styleClass']}"> <cdk:call expression="encodeControl(facesContext, cc);" /> </span> + <cdk:call expression="getUtils().encodeEndFormIfNessesary(facesContext, cc);"/> </cc:implementation> </cdk:root> \ No newline at end of file

14 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r15986 - in root: framework/trunk/impl/src/main/resources/META-INF/resources and 1 other directory.

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

Author: pyaschenko Date: 2009-11-24 10:31:22 -0500 (Tue, 24 Nov 2009) New Revision: 15986 Modified: root/examples/trunk/components/core-demo/pom.xml root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces.js Log: ajax client library: richfaces.processRequestParams function was added pom changes Modified: root/examples/trunk/components/core-demo/pom.xml =================================================================== --- root/examples/trunk/components/core-demo/pom.xml 2009-11-24 14:16:19 UTC (rev 15985) +++ root/examples/trunk/components/core-demo/pom.xml 2009-11-24 15:31:22 UTC (rev 15986) @@ -66,16 +66,6 @@ <version>1.5.8</version> <scope>provided</scope> </dependency> -<dependency> -<groupId>com.sun.faces</groupId> -<artifactId>jsf-api</artifactId> -<version>2.0.2-SNAPSHOT</version> -</dependency> -<dependency> -<groupId>com.sun.faces</groupId> -<artifactId>jsf-impl</artifactId> -<version>2.0.2-SNAPSHOT</version> -</dependency> </dependencies> </project> \ No newline at end of file Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces.js =================================================================== --- root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces.js 2009-11-24 14:16:19 UTC (rev 15985) +++ root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces.js 2009-11-24 15:31:22 UTC (rev 15986) @@ -439,6 +439,58 @@ } }()); + // TODO: + richfaces.processRequestParams = function(source, options) { + options = options || {}; + var sourceId = (typeof source == 'object' && source.id) ? source.id : source; + + parameters = options.parameters || {}; // TODO: change "parameters" to "richfaces.ajax.params" + parameters.execute = "@component"; + parameters.render = "@component"; + + if (!parameters.RICHFACES_AJAX) { + parameters.RICHFACES_AJAX = sourceId; + } + + var eventHandlers; + + for (var eventName in AJAX_EVENTS) { + var handler = createEventHandler(options[eventName]); + + var serverHandler = AJAX_EVENTS[eventName]; + if (serverHandler) { + handler = curry(serverHandler, handler); + } + + if (handler) { + eventHandlers = eventHandlers || {}; + eventHandlers[eventName] = handler; + } + } + + if (options.status) { + var namedStatusEventHandler = function() { setGlobalStatusNameVariable(options.status); }; + + //TODO add support for options.submit + eventHandlers = eventHandlers || {}; + if (eventHandlers.begin) { + eventHandlers.begin = chain(namedStatusEventHandler, eventHandlers.begin); + } else { + eventHandlers.begin = namedStatusEventHandler; + } + } + + parameters[sourceId] = sourceId; + + if (eventHandlers) { + var eventsAdapter = richfaces.createJSFEventsAdapter(eventHandlers); + parameters['onevent'] = eventsAdapter; + parameters['onerror'] = eventsAdapter; + } + + return parameters; + }; + richfaces.ajax = function(source, event, options) { options = options || {}; var sourceId = (typeof source == 'object' && source.id) ? source.id : source;

14 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r15985 - branches/community/3.3.X/ui/tabPanel/src/main/java/org/richfaces/renderkit.

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

Author: Alex.Kolonitsky Date: 2009-11-24 09:16:19 -0500 (Tue, 24 Nov 2009) New Revision: 15985 Modified: branches/community/3.3.X/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabRendererBase.java Log: RF-8154 Modified: branches/community/3.3.X/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabRendererBase.java =================================================================== --- branches/community/3.3.X/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabRendererBase.java 2009-11-24 10:37:57 UTC (rev 15984) +++ branches/community/3.3.X/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabRendererBase.java 2009-11-24 14:16:19 UTC (rev 15985) @@ -36,6 +36,7 @@ import java.io.IOException; import java.util.HashSet; import java.util.Set; +import java.util.Map; /** @@ -69,9 +70,12 @@ UITab tab = (UITab) component; UITabPanel panel = tab.getPane(); + Map<String, String> requestParameterMap = context.getExternalContext() + .getRequestParameterMap(); if (AjaxRendererUtils.isAjaxRequest(context) - && panel.getSwitchType().equals(UISwitchablePanel.AJAX_METHOD)) { + && tab.getSwitchTypeOrDefault().equals(UISwitchablePanel.AJAX_METHOD) + && requestParameterMap.get(tab.getClientId(context)) != null) { // add toggle panel itself to rendered list of components AjaxRendererUtils.addRegionByName(context, panel, panel.getId());

14 years, 5 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 November 2009