JBoss Rich Faces SVN: r14532 - in branches/community/3.3.X/samples/tree-demo/src/main: webapp/pages and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-06-05 06:26:10 -0400 (Fri, 05 Jun 2009)
New Revision: 14532
Added:
branches/community/3.3.X/samples/tree-demo/src/main/webapp/pages/RF-7323.jsp
Modified:
branches/community/3.3.X/samples/tree-demo/src/main/java/org/richfaces/rf4351/Bean.java
Log:
Tree/TreeNode: process attribute doesn't work
https://jira.jboss.org/jira/browse/RF-7323
Modified: branches/community/3.3.X/samples/tree-demo/src/main/java/org/richfaces/rf4351/Bean.java
===================================================================
--- branches/community/3.3.X/samples/tree-demo/src/main/java/org/richfaces/rf4351/Bean.java 2009-06-05 10:25:37 UTC (rev 14531)
+++ branches/community/3.3.X/samples/tree-demo/src/main/java/org/richfaces/rf4351/Bean.java 2009-06-05 10:26:10 UTC (rev 14532)
@@ -21,6 +21,7 @@
package org.richfaces.rf4351;
+import java.util.Date;
import java.util.Set;
import java.util.TreeSet;
@@ -163,6 +164,32 @@
checkChars(skipChars);
}
+ private Date date = new Date();
+ private String value = "";
+ private int counter = 0;
+
+ public void dateAction() {
+ date = new Date();
+ }
+
+ public String getDate() {
+ return value + " -" + (counter++) + "- Date: " + date;
+ }
+
+ public void setDate(Date date) {
+ this.date = date;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+
+
// 4] NameStartChar ::= ":" | [A-Z] | "_" | [a-z] | [#xC0-#xD6] |
// [#xD8-#xF6] | [#xF8-#x2FF] | [#x370-#x37D] | [#x37F-#x1FFF] | [#x200C-#x200D] |
// [#x2070-#x218F] | [#x2C00-#x2FEF] | [#x3001-#xD7FF] | [#xF900-#xFDCF] |
Added: branches/community/3.3.X/samples/tree-demo/src/main/webapp/pages/RF-7323.jsp
===================================================================
--- branches/community/3.3.X/samples/tree-demo/src/main/webapp/pages/RF-7323.jsp (rev 0)
+++ branches/community/3.3.X/samples/tree-demo/src/main/webapp/pages/RF-7323.jsp 2009-06-05 10:26:10 UTC (rev 14532)
@@ -0,0 +1,31 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/tree"
+ prefix="rich"%>
+<html>
+<head>
+<title></title>
+</head>
+<body>
+<f:view>
+ <a4j:status startText="...start..." stopText="stopped" />
+
+ <h:form id="id" >
+ <h:inputText id="input" value="#{rf4351.value}" />
+ <a4j:commandLink value="process" process="input" ajaxSingle="true" /><br /><br />
+
+ <h:outputText id="output" value="#{rf4351.date}" />
+ <a4j:commandLink value="reRender" reRender="output" ajaxSingle="true" /><br /><br />
+
+ <rich:tree id="tree" value="#{rf4351.data}" var="node" switchType="ajax"
+ rowKeyConverter="org.richfaces.TreeRowKeyConverter">
+ <rich:treeNode ajaxSingle="true" process="input" >
+ <h:outputText value="#{node}" />
+ <a4j:commandLink ajaxSingle="true" value="link" process="input" reRender="output" action="#{rf4351.dateAction}"/>
+ </rich:treeNode>
+ </rich:tree>
+ </h:form>
+</f:view>
+</body>
+</html>
\ No newline at end of file
15 years, 7 months
JBoss Rich Faces SVN: r14531 - branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-06-05 06:25:37 -0400 (Fri, 05 Jun 2009)
New Revision: 14531
Modified:
branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
Log:
Tree/TreeNode: process attribute doesn't work
https://jira.jboss.org/jira/browse/RF-7323
Modified: branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
===================================================================
--- branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2009-06-04 23:06:46 UTC (rev 14530)
+++ branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2009-06-05 10:25:37 UTC (rev 14531)
@@ -28,6 +28,7 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import org.ajax4jsf.context.AjaxContext;
import org.ajax4jsf.javascript.JSFunction;
import org.ajax4jsf.javascript.JSFunctionDefinition;
import org.ajax4jsf.javascript.ScriptUtils;
@@ -97,7 +98,7 @@
context);
Map<String, Object> eventOptions = AjaxRendererUtils.buildEventOptions(context,
nodeFacet);
- Map<Object, Object> parameters = (Map<Object, Object>) eventOptions.get("parameters");
+ Map<String, Object> parameters = (Map<String, Object>) eventOptions.get("parameters");
parameters.remove(id);
parameters.put(id + NODE_EXPANDED_INPUT_SUFFIX, String.valueOf(!expanded));
@@ -261,7 +262,7 @@
String nodeExpandedId = id + NODE_EXPANDED_INPUT_SUFFIX;
Object nodeExpandedValue = requestMap.get(nodeExpandedId);
if (nodeExpandedValue != null) {
- boolean nodeExpanded = Boolean.valueOf(nodeExpandedValue.toString()).booleanValue();
+ boolean nodeExpanded = Boolean.valueOf(nodeExpandedValue.toString());
if (tree.isExpanded() ^ nodeExpanded) {
if (nodeExpanded) {
new ExpandNodeCommandEvent(tree, key).queue();
@@ -269,7 +270,7 @@
new CollapseNodeCommandEvent(tree, key).queue();
}
- if (Boolean.valueOf((String) requestMap.get(id + AJAX_EXPANDED_SUFFIX)).booleanValue()) {
+ if (Boolean.valueOf((String) requestMap.get(id + AJAX_EXPANDED_SUFFIX))) {
new AjaxExpandedEvent(node).queue();
new AjaxExpandedEvent(tree).queue();
} else {
@@ -279,8 +280,7 @@
}
}
- if (id.equals(tree.getAttributes()
- .get(UITree.SELECTION_INPUT_ATTRIBUTE))) {
+ if (id.equals(tree.getAttributes().get(UITree.SELECTION_INPUT_ATTRIBUTE))) {
if (!componentState.isSelected(key)) {
if (tree.getAttributes().get(
@@ -297,6 +297,11 @@
tree.getAttributes().remove(UITree.SELECTION_INPUT_ATTRIBUTE);
}
+ if (AjaxRendererUtils.isAjaxRequest(context)) {
+ AjaxContext.getCurrentInstance(context)
+ .addAreasToProcessFromComponent(context, node);
+ }
+
super.doDecode(context, component);
}
15 years, 7 months
JBoss Rich Faces SVN: r14530 - branches/sandbox/rf4_build.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2009-06-04 19:06:46 -0400 (Thu, 04 Jun 2009)
New Revision: 14530
Added:
branches/sandbox/rf4_build/make.sh
Log:
Build system: make.sh check-in
Added: branches/sandbox/rf4_build/make.sh
===================================================================
--- branches/sandbox/rf4_build/make.sh (rev 0)
+++ branches/sandbox/rf4_build/make.sh 2009-06-04 23:06:46 UTC (rev 14530)
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+PROJECT_DIR=`pwd`
+TAG_DIR='trunk'
+
+for MODULE in 'version-matrix' 'cdk' 'framework' 'ui' 'examples'
+do
+ echo
+ echo -e "\033[40m\033[1;32m---------------------------------\033[0m"
+ echo -e "\033[40m\033[1;32mMaking $MODULE/$TAG_DIR \033[0m"
+ echo -e "\033[40m\033[1;32m---------------------------------\033[0m"
+ echo
+
+ cd $PROJECT_DIR/$MODULE/$TAG_DIR
+
+ if mvn clean install; then
+ echo
+ else
+ exit $?
+ fi
+done
+
+
15 years, 7 months
JBoss Rich Faces SVN: r14529 - branches/sandbox/rf4_build/version-matrix/trunk.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2009-06-04 18:34:59 -0400 (Thu, 04 Jun 2009)
New Revision: 14529
Modified:
branches/sandbox/rf4_build/version-matrix/trunk/pom.xml
Log:
Build system: snapshot repository added
Modified: branches/sandbox/rf4_build/version-matrix/trunk/pom.xml
===================================================================
--- branches/sandbox/rf4_build/version-matrix/trunk/pom.xml 2009-06-04 22:23:19 UTC (rev 14528)
+++ branches/sandbox/rf4_build/version-matrix/trunk/pom.xml 2009-06-04 22:34:59 UTC (rev 14529)
@@ -30,6 +30,15 @@
<snapshots><enabled>false</enabled></snapshots>
<url>http://repository.jboss.org/maven2</url>
</repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <releases><enabled>false</enabled></releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ <url>http://snapshots.jboss.org/maven2</url>
+ </repository>
</repositories>
<dependencyManagement>
@@ -76,6 +85,8 @@
<version>${jsf.version}</version>
<scope>provided</scope>
</dependency>
+
+ <!-- Included because of http://jira.codehaus.org/browse/MNG-2205 -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -100,6 +111,8 @@
<version>1.2</version>
<scope>provided</scope>
</dependency>
+ <!-- -->
+
</dependencies>
</dependencyManagement>
15 years, 7 months
JBoss Rich Faces SVN: r14528 - branches/sandbox/rf4_build/version-matrix/trunk.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2009-06-04 18:23:19 -0400 (Thu, 04 Jun 2009)
New Revision: 14528
Modified:
branches/sandbox/rf4_build/version-matrix/trunk/pom.xml
Log:
Build system: common JSF dependencies added
Modified: branches/sandbox/rf4_build/version-matrix/trunk/pom.xml
===================================================================
--- branches/sandbox/rf4_build/version-matrix/trunk/pom.xml 2009-06-04 21:48:55 UTC (rev 14527)
+++ branches/sandbox/rf4_build/version-matrix/trunk/pom.xml 2009-06-04 22:23:19 UTC (rev 14528)
@@ -76,8 +76,31 @@
<version>${jsf.version}</version>
<scope>provided</scope>
</dependency>
-
- </dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</dependencyManagement>
<build>
@@ -104,5 +127,21 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
15 years, 7 months
JBoss Rich Faces SVN: r14527 - branches/sandbox/rf4_build/version-matrix/trunk.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2009-06-04 17:48:55 -0400 (Thu, 04 Jun 2009)
New Revision: 14527
Modified:
branches/sandbox/rf4_build/version-matrix/trunk/pom.xml
Log:
Build system: release plugins configuration removed - doesn't work as necessary
Modified: branches/sandbox/rf4_build/version-matrix/trunk/pom.xml
===================================================================
--- branches/sandbox/rf4_build/version-matrix/trunk/pom.xml 2009-06-04 21:44:31 UTC (rev 14526)
+++ branches/sandbox/rf4_build/version-matrix/trunk/pom.xml 2009-06-04 21:48:55 UTC (rev 14527)
@@ -83,12 +83,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>${project.scm.developerConnection}/${project.artifactId}</tagBase>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-eclipse-plugin</artifactId>
<configuration>
<wtpversion>2.0</wtpversion>
15 years, 7 months
JBoss Rich Faces SVN: r14524 - branches/sandbox/rf4_build/version-matrix/trunk.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2009-06-04 17:39:26 -0400 (Thu, 04 Jun 2009)
New Revision: 14524
Modified:
branches/sandbox/rf4_build/version-matrix/trunk/pom.xml
Log:
Build system: eclipse and release plugins configuration added
Modified: branches/sandbox/rf4_build/version-matrix/trunk/pom.xml
===================================================================
--- branches/sandbox/rf4_build/version-matrix/trunk/pom.xml 2009-06-04 21:26:47 UTC (rev 14523)
+++ branches/sandbox/rf4_build/version-matrix/trunk/pom.xml 2009-06-04 21:39:26 UTC (rev 14524)
@@ -12,7 +12,6 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces</groupId>
- <!-- TODO: should artifactId start with 'richfaces'? -->
<artifactId>version-matrix</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -84,6 +83,19 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <tagBase>${project.scm.developerConnection}/${project.artifactId}</tagBase>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <wtpversion>2.0</wtpversion>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
15 years, 7 months