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/30 15:33:14 UTC

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

Author: imario
Date: Tue May 30 06:33:14 2006
New Revision: 410276

URL: http://svn.apache.org/viewvc?rev=410276&view=rev
Log:
revert r406721 - for loop is NOT unnecessary

Modified:
    myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.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=410276&r1=410275&r2=410276&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 Tue May 30 06:33:14 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)



Re: svn commit: r410276 - /myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java

Posted by Sean Schofield <se...@gmail.com>.
Again, its not clear why this was reverted.  You should probably
create a JIRA issue if the fix was causing a problem and reference
that in your checkin.

Sean

On 5/30/06, imario@apache.org <im...@apache.org> wrote:
> Author: imario
> Date: Tue May 30 06:33:14 2006
> New Revision: 410276
>
> URL: http://svn.apache.org/viewvc?rev=410276&view=rev
> Log:
> revert r406721 - for loop is NOT unnecessary
>
> Modified:
>     myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.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=410276&r1=410275&r2=410276&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 Tue May 30 06:33:14 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)
>
>
>