[richfaces-svn-commits] JBoss Rich Faces SVN: r2520 - in trunk/samples/tree-demo/src/main: webapp/pages and 1 other directory.

Mon Aug 27 14:40:45 EDT 2007

Author: nbelaevski
Date: 2007-08-27 14:40:44 -0400 (Mon, 27 Aug 2007)
New Revision: 2520

Modified:
   trunk/samples/tree-demo/src/main/java/org/richfaces/Bean.java
   trunk/samples/tree-demo/src/main/webapp/pages/index.jsp
Log:
http://jira.jboss.com/jira/browse/RF-700 fixed, demo application updated

Modified: trunk/samples/tree-demo/src/main/java/org/richfaces/Bean.java
===================================================================

--- trunk/samples/tree-demo/src/main/java/org/richfaces/Bean.java	2007-08-27 18:40:24 UTC (rev 2519)
+++ trunk/samples/tree-demo/src/main/java/org/richfaces/Bean.java	2007-08-27 18:40:44 UTC (rev 2520)
@@ -22,11 +22,9 @@
 package org.richfaces;
 
 import java.io.IOException;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Set;
 
 import javax.faces.FacesException;
 import javax.faces.application.Application;
@@ -87,6 +85,8 @@
 	
 	private int counter1 = 0;
 
+	private int counter2 = 0;
+
 	public String getIcon() {
 		return icon;
 	}
@@ -210,8 +210,10 @@
 	
 	public void setReRenderValue(boolean value) {
 		if (value) {
-			Set set = tree.getOrCreateDetachableRowKeys();
-			set.add(tree.getRowKey());
+			tree.addRequestKey(tree.getRowKey());
+			FacesContext context = FacesContext.getCurrentInstance();
+			AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context);
+			ajaxContext.getAjaxAreasToRender().add(tree.getClientId(context));
 		}
 	}
 	
@@ -219,13 +221,7 @@
 		counter ++;
 		
 		UITree tree = getTree(event);
-		TreeRowKey key = (TreeRowKey)tree.getRowKey();
-		Set keys = tree.getAjaxKeys();
-		if (keys == null)
-		{
-			keys = new HashSet();
-			tree.setAjaxKeys(keys);
-		}
+		tree.addRequestKey(tree.getRowKey());
 
 		AjaxContext ajaxCtx = AjaxContext.getCurrentInstance();
 		FacesContext fctx = FacesContext.getCurrentInstance();
@@ -234,11 +230,10 @@
 		for (int i = 0; i < 5; i++)
 		{
 			ListRowKey dirtyKey = new ListRowKey(Integer.toString(i));
-			keys.add(dirtyKey);
+			tree.addRequestKey(dirtyKey);
 			tree.setRowKey(dirtyKey);
 			ajaxCtx.addComponentToAjaxRender(tree.getParent(), tree.getClientId(fctx));
 		}
-		tree.setRowKey(key);
 	}
 	
 	private void initData() {
@@ -457,8 +452,11 @@
 		return counter1;
 	}
 	
+	public int getCounter2() {
+		return counter2++;
+	}
+	
 	public void incCounter1() {
-		tree.setAjaxKeys(null);
 		counter1++;
 	}
 }
\ No newline at end of file

Modified: trunk/samples/tree-demo/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/samples/tree-demo/src/main/webapp/pages/index.jsp	2007-08-27 18:40:24 UTC (rev 2519)
+++ trunk/samples/tree-demo/src/main/webapp/pages/index.jsp	2007-08-27 18:40:44 UTC (rev 2520)
@@ -59,6 +59,8 @@
 	</head>
 	<body>
 		<f:view>
+			<h:outputText id="counter" value="#{bean.counter2}" />
+		
 			<a4j:outputPanel ajaxRendered="true">
 				<h:messages />
 			</a4j:outputPanel>
@@ -134,6 +136,7 @@
 					icon="#{bean.icon}"
                     dropListener="#{bean.processDrop}"
                     styleClass="#{bean.styleClass}"
+                    reRender=":counter"
                     >
 
 					<f:facet name="icon">


