Author: nbelaevski
Date: 2007-12-21 22:10:52 -0500 (Fri, 21 Dec 2007)
New Revision: 4966
Modified:
trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java
Log:
http://jira.jboss.com/jira/browse/RF-980
Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2007-12-22
00:32:17 UTC (rev 4965)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2007-12-22
03:10:52 UTC (rev 4966)
@@ -66,10 +66,11 @@
String id = treeNode.getClientId(context);
if (UITree.SWITCH_AJAX.equals(tree.getSwitchType())) {
- JSFunction function = AjaxRendererUtils.buildAjaxFunction(tree.getNodeFacet(),
+ UITreeNode nodeFacet = tree.getNodeFacet();
+ JSFunction function = AjaxRendererUtils.buildAjaxFunction(nodeFacet,
context);
Map eventOptions = AjaxRendererUtils.buildEventOptions(context,
- tree.getNodeFacet());
+ nodeFacet);
Map parameters = (Map) eventOptions.get("parameters");
parameters.remove(id);
Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java 2007-12-22
00:32:17 UTC (rev 4965)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java 2007-12-22
03:10:52 UTC (rev 4966)
@@ -492,7 +492,9 @@
Object rowKey = tree.getRowKey();
try {
tree.setRowKey(selectedNodeKey);
- result = tree.getNodeFacet().getClientId(context);
+ if (tree.isRowAvailable()) {
+ result = tree.getNodeFacet().getClientId(context);
+ }
} finally {
try {
tree.setRowKey(rowKey);