You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@myfaces.apache.org by so...@apache.org on 2008/04/11 23:29:03 UTC

svn commit: r647321 - /myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/HierarchyUtils.java

Author: sobryan
Date: Fri Apr 11 14:29:01 2008
New Revision: 647321

URL: http://svn.apache.org/viewvc?rev=647321&view=rev
Log:
TRINIDAD-1037: Trinidad tree/treeTable expand all handling

Thanks Kamran.

Modified:
    myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/HierarchyUtils.java

Modified: myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/HierarchyUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/HierarchyUtils.java?rev=647321&r1=647320&r2=647321&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/HierarchyUtils.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/HierarchyUtils.java Fri Apr 11 14:29:01 2008
@@ -55,11 +55,18 @@
       // However, getSize() can be called, and will return -1 if it's
       // expensive.  We should likely use getSize() first, see if it's
       // >= 0 and < 100, then otherwise go into this code
-      for(Object key : added)
+      
+      size = added.getSize();
+      if(size < 0)
       {
-        if (++size > 100)
-          break;
-      }
+        size = 0;
+        for(Object key : added)
+        {
+          if (++size > 100)
+            break;
+        }
+      }      
+      
       if (size < 100)
         state.addAll(added);
       else