You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by im...@apache.org on 2006/05/31 16:48:22 UTC
svn commit: r410547 - in
/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2:
HtmlTreeRenderer.java TreeTag.java
Author: imario
Date: Wed May 31 07:48:21 2006
New Revision: 410547
URL: http://svn.apache.org/viewvc?rev=410547&view=rev
Log:
revert fix - have to wait for tomahawk release and merge down then
Modified:
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/TreeTag.java
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java?rev=410547&r1=410546&r2=410547&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java Wed May 31 07:48:21 2006
@@ -217,12 +217,9 @@
}
// now encode each of the nodes in the level immediately below the root
- for (int i=0; i < rootNode.getChildCount(); i++)
+ if (walker.next())
{
- if (walker.next())
- {
- encodeTree(context, out, tree, walker);
- }
+ encodeTree(context, out, tree, walker);
}
}
@@ -273,14 +270,9 @@
}
}
- TreeNode node = tree.getNode();
-
- for (int i=0; i < node.getChildCount(); i++)
+ if (walker.next())
{
- if (walker.next())
- {
- encodeTree(context, out, tree, walker);
- }
+ encodeTree(context, out, tree, walker);
}
if (clientSideToggle)
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/TreeTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/TreeTag.java?rev=410547&r1=410546&r2=410547&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/TreeTag.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/TreeTag.java Wed May 31 07:48:21 2006
@@ -154,27 +154,27 @@
if (_showNav != null)
{
- setBooleanProperty(component, "showNav", _showNav);
+ ((HtmlTree)component).setShowNav(Boolean.getBoolean(_showNav));
}
if (_showLines != null)
{
- setBooleanProperty(component, "showLines", _showLines);
+ ((HtmlTree)component).setShowLines(Boolean.getBoolean(_showLines));
}
if (_clientSideToggle != null)
{
- setBooleanProperty(component, "clientSideToggle", _clientSideToggle);
+ ((HtmlTree)component).setClientSideToggle(Boolean.getBoolean(_clientSideToggle));
}
if (_showRootNode != null)
{
- setBooleanProperty(component, "showRootNode", _showRootNode);
+ ((HtmlTree)component).setShowRootNode(Boolean.getBoolean(_showRootNode));
}
if (_preserveToggle != null)
{
- setBooleanProperty(component, "preserveToggle", _preserveToggle);
+ ((HtmlTree)component).setPreserveToggle(Boolean.getBoolean(_preserveToggle));
}
if (_javascriptLocation != null)