svn commit: r603418 - /beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactory.java

[cr...@apache.org]

Author: crogers
Date: Tue Dec 11 15:53:31 2007
New Revision: 603418

URL: http://svn.apache.org/viewvc?rev=603418&view=rev
Log:
This is a contribution from Jacob Danner to fix BEEHIVE-1206 - NetUI databinding iterator does not support RowSet. Thanks Jacob.

Tests: netui BVT (WinXP passed)


Modified:
    beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactory.java

Modified: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactory.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactory.java?rev=603418&r1=603417&r2=603418&view=diff
==============================================================================
--- beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactory.java (original)
+++ beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/IteratorFactory.java Tue Dec 11 15:53:31 2007
@@ -98,10 +98,11 @@
             return new MapIterator((Map)object);
         } else if(object.getClass().isArray()) {
             return new ArrayIterator(object);
-        } else if(object instanceof Enumeration)
+        } else if(object instanceof Enumeration) {
             return new EnumerationIterator((Enumeration)object);
-        else if(object instanceof ResultSet && !(object instanceof RowSet))
+        } else if(object instanceof ResultSet && !(object instanceof RowSet)) {
             return new ResultSetIterator((ResultSet)object);
+        }
 
         // check to see if there is a registered IteratorPlant that can handle this type
         Iterator ret = null;
@@ -111,6 +112,15 @@
             ret = plant.createIterator(object);
 
             if(ret != null) return ret;
+        }
+
+        // BEEHIVE-1206 -> netui databinding iterator does not support RowSet,
+        // but javadoc says it does. Use the default ResultSetIterator if an
+        // Iterator has not already been configured in the
+        // beehive-netui-config.xml/iterator-factories element
+        // since RowSet is common registered iterator
+        if(object instanceof RowSet) {
+            return new ResultSetIterator((ResultSet)object);
         }
 
         return new AtomicObjectIterator(object);