[richfaces-svn-commits] JBoss Rich Faces SVN: r12336 - trunk/framework/api/src/main/java/org/richfaces/model.

[richfaces-svn-commits at lists.jboss.org]

Author: nbelaevski
Date: 2009-01-19 10:04:31 -0500 (Mon, 19 Jan 2009)
New Revision: 12336

Modified:
   trunk/framework/api/src/main/java/org/richfaces/model/CacheableTreeDataModel.java
   trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModel.java
Log:
https://jira.jboss.org/jira/browse/RF-5771

Modified: trunk/framework/api/src/main/java/org/richfaces/model/CacheableTreeDataModel.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/CacheableTreeDataModel.java	2009-01-19 15:01:08 UTC (rev 12335)
+++ trunk/framework/api/src/main/java/org/richfaces/model/CacheableTreeDataModel.java	2009-01-19 15:04:31 UTC (rev 12336)
@@ -223,4 +223,4 @@
 		
 		return node;
 	}
-}
+}
\ No newline at end of file

Modified: trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModel.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModel.java	2009-01-19 15:01:08 UTC (rev 12335)
+++ trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModel.java	2009-01-19 15:04:31 UTC (rev 12336)
@@ -292,13 +292,12 @@
 		
 		if (treeRange == null || treeRange.processNode(argumentKey)) {
 			if (argumentKey != null) {
-				getRoot().setRowKey(argumentKey);
 				processElement(context, dataVisitor, argument, argumentKey, last);
-				getRoot().setRowKey(argumentKey);
-			} else {
-				getRoot().setRowKey(argumentKey);
 			}
 
+			//setup key in order for nested components to initialize data models
+			getRoot().setRowKey(context, argumentKey);
+
 			final ShiftingDataVisitor shiftingDataVisitor = new ShiftingDataVisitor(
 					new Visitor1(dataVisitor));
 			
@@ -483,9 +482,13 @@
 	}
 
 	public void setRowKey(Object key) {
-		setupKey(key, FacesContext.getCurrentInstance());
+		setRowKey(FacesContext.getCurrentInstance(), key);
 	}
 
+	public void setRowKey(FacesContext context, Object key) {
+		setupKey(key, context);
+	}
+
 	public void addStackingModel(StackingTreeModel model) {
 		this.models.put(model.id, model);
 		model.setParent(this);
@@ -712,7 +715,7 @@
 		UIComponent component, Converter converter) {
 
 	    //force model leave
-	    setRowKey(null);
+	    setRowKey(context, null);
 	    
 	    String[] strings = ListRowKey.fromString(keyString);
 	    int l = strings.length / 2;