Author: nbelaevski
Date: 2008-07-15 13:24:47 -0400 (Tue, 15 Jul 2008)
New Revision: 9621
Modified:
trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModel.java
Log:
http://jira.jboss.com/jira/browse/RF-3912
Modified: trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModel.java
===================================================================
---
trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModel.java 2008-07-15
17:05:57 UTC (rev 9620)
+++
trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModel.java 2008-07-15
17:24:47 UTC (rev 9621)
@@ -48,15 +48,17 @@
private Object modelKey;
private Object varObject;
private StackingTreeModel model;
- public StackEntry(Object varObject, Object modelKey, StackingTreeModel model) {
+ private Object rowData;
+
+ public StackEntry(Object varObject, Object modelKey, Object rowData, StackingTreeModel
model) {
super();
this.varObject = varObject;
this.modelKey = modelKey;
+ this.rowData = rowData;
this.model = model;
}
}
- private Object rowData;
// private StackingTreeModel stackingTreeModel;
private LinkedList<StackEntry> stackEntries = new LinkedList<StackEntry>();
@@ -208,8 +210,7 @@
//System.out.println("StackingTreeModel.setupModel() " + rowData);
Object varObject = setupVariable(rowData, facesContext);
- this.rowData = rowData;
- getRoot().stackEntries.add(new StackEntry(varObject, key, this));
+ getRoot().stackEntries.add(new StackEntry(varObject, key, rowData, this));
return true;
}
@@ -486,7 +487,7 @@
public Object getRowData() {
if (isRowAvailable()) {
StackEntry lastEntry = (StackEntry) stackEntries.getLast();
- return lastEntry.model.rowData;
+ return lastEntry.rowData;
}
throw new IllegalStateException(