svn commit: r410546 - in /myfaces/tomahawk/branches/1_1_3/core/src/main/java/org/apache/myfaces/custom/tree2: HtmlTreeRenderer.java TreeTag.java

[im...@apache.org]

Author: imario
Date: Wed May 31 07:47:23 2006
New Revision: 410546

URL: http://svn.apache.org/viewvc?rev=410546&view=rev
Log:
regression of TOMAHAWK-47 - reverted back to setBooleanProperty in
TreeTag class
revert r406721 - for loop is NOT unnecessary

Modified:
    myfaces/tomahawk/branches/1_1_3/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java
    myfaces/tomahawk/branches/1_1_3/core/src/main/java/org/apache/myfaces/custom/tree2/TreeTag.java

Modified: myfaces/tomahawk/branches/1_1_3/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_1_3/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java?rev=410546&r1=410545&r2=410546&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_3/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_3/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java Wed May 31 07:47:23 2006
@@ -217,9 +217,12 @@
             }
 
             // now encode each of the nodes in the level immediately below the root
-            if (walker.next())
+            for (int i=0; i < rootNode.getChildCount(); i++)
             {
-                encodeTree(context, out, tree, walker);
+                if (walker.next())
+                {
+                	encodeTree(context, out, tree, walker);
+                }
             }
         }
 
@@ -270,9 +273,14 @@
             }
         }
 
-        if (walker.next())
+        TreeNode node = tree.getNode();
+
+        for (int i=0; i < node.getChildCount(); i++)
         {
-            encodeTree(context, out, tree, walker);
+            if (walker.next())
+            {
+            	encodeTree(context, out, tree, walker);
+            }
         }
 
         if (clientSideToggle)

Modified: myfaces/tomahawk/branches/1_1_3/core/src/main/java/org/apache/myfaces/custom/tree2/TreeTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_1_3/core/src/main/java/org/apache/myfaces/custom/tree2/TreeTag.java?rev=410546&r1=410545&r2=410546&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_3/core/src/main/java/org/apache/myfaces/custom/tree2/TreeTag.java (original)
+++ myfaces/tomahawk/branches/1_1_3/core/src/main/java/org/apache/myfaces/custom/tree2/TreeTag.java Wed May 31 07:47:23 2006
@@ -154,27 +154,27 @@
 
         if (_showNav != null)
         {
-            ((HtmlTree)component).setShowNav(Boolean.getBoolean(_showNav));
+        	setBooleanProperty(component, "showNav", _showNav);
         }
 
         if (_showLines != null)
         {
-            ((HtmlTree)component).setShowLines(Boolean.getBoolean(_showLines));
+        	setBooleanProperty(component, "showLines", _showLines);
         }
 
         if (_clientSideToggle != null)
         {
-            ((HtmlTree)component).setClientSideToggle(Boolean.getBoolean(_clientSideToggle));
+        	setBooleanProperty(component, "clientSideToggle", _clientSideToggle);
         }
 
         if (_showRootNode != null)
         {
-            ((HtmlTree)component).setShowRootNode(Boolean.getBoolean(_showRootNode));
+        	setBooleanProperty(component, "showRootNode", _showRootNode);
         }
 
         if (_preserveToggle != null)
         {
-            ((HtmlTree)component).setPreserveToggle(Boolean.getBoolean(_preserveToggle));
+        	setBooleanProperty(component, "preserveToggle", _preserveToggle);
         }
 
         if (_javascriptLocation != null)