[dbunit-commit] dbunit/src/java/org/dbunit/database QueryDataSet.java,1.2,1.2.4.1 DatabaseDataSet.java,1.19,1.19.4.1

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/database
In directory sc8-pr-cvs1:/tmp/cvs-serv10340/dbunit/src/java/org/dbunit/database

Modified Files:
      Tag: branch-iterator
	QueryDataSet.java DatabaseDataSet.java 
Log Message:
Added iterator() and reverseIterator() to IDataSet interface.

Index: QueryDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/QueryDataSet.java,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -d -r1.2 -r1.2.4.1
*** QueryDataSet.java	16 Feb 2003 06:27:27 -0000	1.2
--- QueryDataSet.java	6 Apr 2003 13:56:30 -0000	1.2.4.1
***************
*** 29,32 ****
--- 29,34 ----
  import org.dbunit.dataset.DataSetException;
  import org.dbunit.dataset.ITable;
+ import org.dbunit.dataset.ITableIterator;
+ import org.dbunit.dataset.DefaultTableIterator;
  
  /**
***************
*** 66,96 ****
  
      ////////////////////////////////////////////////////////////////////////////
!     // IDataSet interface
! 
!     /**
!      *  Gets the tableNames attribute of the QueryDataSet object
!      *
!      * @return                       An array of all the table names
!      * @exception  org.dbunit.dataset.DataSetException  Thrown if there is an issue.
!      */
!     public String[] getTableNames() throws DataSetException
!     {
!         List names = new ArrayList();
!         for (Iterator it = _tables.iterator(); it.hasNext();)
!         {
!             TableEntry entry = (TableEntry)it.next();
!             names.add(entry.getTableName());
!         }
! 
!         return (String[])names.toArray(new String[0]);
!     }
  
!     /**
!      *  Gets the tables attribute of the QueryDataSet object
!      *
!      * @return                       The tables value
!      * @exception  org.dbunit.dataset.DataSetException  Thrown if there is an issue.
!      */
!     public ITable[] getTables() throws DataSetException
      {
          try
--- 68,74 ----
  
      ////////////////////////////////////////////////////////////////////////////
!     // AbstractDataSet class
  
!     protected ITableIterator createIterator(boolean reversed) throws DataSetException
      {
          try
***************
*** 111,115 ****
              }
  
!             return (ITable[])tableList.toArray(new ITable[0]);
          }
          catch (SQLException e)
--- 89,94 ----
              }
  
!             ITable[] tables = (ITable[])tableList.toArray(new ITable[0]);
!             return new DefaultTableIterator(tables, reversed);
          }
          catch (SQLException e)
***************
*** 117,120 ****
--- 96,114 ----
              throw new DataSetException(e);
          }
+     }
+ 
+     ////////////////////////////////////////////////////////////////////////////
+     // IDataSet interface
+ 
+     public String[] getTableNames() throws DataSetException
+     {
+         List names = new ArrayList();
+         for (Iterator it = _tables.iterator(); it.hasNext();)
+         {
+             TableEntry entry = (TableEntry)it.next();
+             names.add(entry.getTableName());
+         }
+ 
+         return (String[])names.toArray(new String[0]);
      }
  

Index: DatabaseDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/DatabaseDataSet.java,v
retrieving revision 1.19
retrieving revision 1.19.4.1
diff -C2 -d -r1.19 -r1.19.4.1
*** DatabaseDataSet.java	14 Feb 2003 17:22:22 -0000	1.19
--- DatabaseDataSet.java	6 Apr 2003 13:56:32 -0000	1.19.4.1
***************
*** 239,242 ****
--- 239,253 ----
          return (ITable[])tableList.toArray(new ITable[0]);
      }
+ 
+     public ITableIterator iterator() throws DataSetException
+     {
+         return new DefaultTableIterator(getTables());
+     }
+ 
+     public ITableIterator reverseIterator() throws DataSetException
+     {
+         return new DefaultTableIterator(getTables(), true);
+     }
+ 
  }