[richfaces-svn-commits] JBoss Rich Faces SVN: r9588 - in trunk/ui/tree/src/main/java/org/richfaces: renderkit and 1 other directory.
Author: nbelaevski
Date: 2008-07-14 20:27:05 -0400 (Mon, 14 Jul 2008)
New Revision: 9588
Modified:
trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java
trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeDataModelEventNavigator.java
trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java
Log:
http://jira.jboss.com/jira/browse/RF-3898
Modified: trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java 2008-07-15 00:00:44
UTC (rev 9587)
+++ trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java 2008-07-15 00:27:05
UTC (rev 9588)
@@ -384,8 +384,7 @@
AbstractTreeDataModel dataModel = (AbstractTreeDataModel) getExtendedDataModel();
dataModel.walk(faces, visitor, range, rowKey,
argument,
- false/*faces.getExternalContext().getRequestParameterMap().get(
- getBaseClientId(faces) + LAST_ELEMENT_FLAG) != null*/);
+ false);
} finally {
try {
setRowKey(faces, savedRowKey);
Modified:
trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeDataModelEventNavigator.java
===================================================================
---
trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeDataModelEventNavigator.java 2008-07-15
00:00:44 UTC (rev 9587)
+++
trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeDataModelEventNavigator.java 2008-07-15
00:27:05 UTC (rev 9588)
@@ -49,7 +49,7 @@
public TreeDataModelEventNavigator(UITree tree, TreeRowKey floatingKey) {
super();
this.tree = tree;
- this.rowKey = (TreeRowKey) this.tree.getRowKey();
+ this.rowKey = floatingKey;
this.floatingKey = floatingKey;
}
@@ -98,6 +98,11 @@
//if (level != 0) {
beforeUp(level);
//}
+ } else {
+ beforeDown();
+ afterDown();
+ beforeUp(1);
+ afterUp(1);
}
this.tree.setRowKey(context, null);
Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java 2008-07-15
00:00:44 UTC (rev 9587)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java 2008-07-15
00:27:05 UTC (rev 9588)
@@ -594,12 +594,10 @@
if (key != null) {
droppedDownToLevelFlag.setContext(null);
- //openLevelDownTable(context, input, writer);
- input.setRowKey(context, key);
- } else {
- input.setRowKey(context, null);
}
+ input.setRowKey(context, key);
+
RendererDataModelEventNavigator levelNavigator = new
RendererDataModelEventNavigator(input, rowKey, context,
droppedDownToLevelFlag);
@@ -631,10 +629,6 @@
input.walk(context, new DataVisitorWithLastElement(droppedDownToLevelFlag, input,
levelNavigator, key), treeRange, key, null);
- /*if (key != null) {
- closeLevelDownTable(context, input, writer);
- }*/
-
levelNavigator.followRowKey(context, null);
} finally {
input.setRowKey(context, null);