You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ar...@apache.org on 2007/10/01 05:28:54 UTC
svn commit: r580826 -
/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/ChildPropertyTreeModel.java
Author: arobinson74
Date: Sun Sep 30 20:28:53 2007
New Revision: 580826
URL: http://svn.apache.org/viewvc?rev=580826&view=rev
Log:
Fix for TRINIDAD-746
Modified:
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/ChildPropertyTreeModel.java
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/ChildPropertyTreeModel.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/ChildPropertyTreeModel.java?rev=580826&r1=580825&r2=580826&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/ChildPropertyTreeModel.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/ChildPropertyTreeModel.java Sun Sep 30 20:28:53 2007
@@ -213,7 +213,24 @@
{
Object rowData = getRowData();
Object value = getChildData(rowData);
- return (value != null);
+
+ if (value != null)
+ {
+ if (value instanceof Collection<?>)
+ {
+ return !((Collection<?>)value).isEmpty();
+ }
+ else if (value.getClass().isArray())
+ {
+ return Array.getLength(value) > 0;
+ }
+ else if (value instanceof DataModel)
+ {
+ return ((DataModel)value).getRowCount() > 0;
+ }
+ }
+
+ return value != null;
}
@Override