You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2005/11/14 13:01:10 UTC

svn commit: r344107 - /myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java

Author: mmarinschek
Date: Mon Nov 14 04:01:04 2005
New Revision: 344107

URL: http://svn.apache.org/viewcvs?rev=344107&view=rev
Log:
fix for MYFACES-568. Thanks to Mathias Werlitz.

Modified:
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java?rev=344107&r1=344106&r2=344107&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java Mon Nov 14 04:01:04 2005
@@ -396,7 +396,8 @@
 
         int bitMask = NOTHING;
         bitMask += (node.isLeaf()) ? NOTHING : CHILDREN;
-        bitMask += (tree.isNodeExpanded()) ? EXPANDED : NOTHING;
+        if (bitMask == CHILDREN) // if there are no children, ignore expand state -> more flexible with dynamic tree-structures
+        	bitMask += (tree.isNodeExpanded()) ? EXPANDED : NOTHING;
         bitMask += (tree.isLastChild(tree.getNodeId())) ? LAST : NOTHING;
         bitMask += (showLines) ? LINES : NOTHING;