@@ -1878,10 +1876,10 @@ public String toString() { StringBuffer sb = new StringBuffer("Criteria:: "); - Enumeration e = keys(); - while (e.hasMoreElements()) + Iterator it = keySet().iterator(); + while (it.hasNext()) { - String key = (String)e.nextElement(); + String key = (String)it.next(); sb.append(key).append("<=>") .append(super.get(key).toString()).append(": "); } @@ -1926,9 +1924,9 @@ ) { isEquiv = true; - for (Enumeration e=criteria.keys(); e.hasMoreElements(); ) + for (Iterator it=criteria.keySet().iterator(); it.hasNext(); ) { - String key = (String)e.nextElement(); + String key = (String)it.next(); if ( this.containsKey(key) ) { Criterion a = this.getCriterion(key); @@ -2465,7 +2463,7 @@ } /** - * Adds an 'IN' clause with the criteria supplied as a Vector. + * Adds an 'IN' clause with the criteria supplied as a List. * For example: * *
@@ -2479,11 +2477,11 @@ * "AND"ed to the existing criterion. * * @param column The column to run the comparison on - * @param values A Vector with the allowed values. + * @param values A List with the allowed values. * @return A modified Criteria object. */ public Criteria andIn(String column, - Vector values) + List values) { and(column, (Object)values, Criteria.IN); return this; @@ -2539,7 +2537,7 @@ } /** - * Adds a 'NOT IN' clause with the criteria supplied as a Vector. + * Adds a 'NOT IN' clause with the criteria supplied as a List. * For example: * *
@@ -2553,11 +2551,11 @@ * "AND"ed to the existing criterion. * * @param column The column to run the comparison on - * @param values A Vector with the disallowed values. + * @param values A List with the disallowed values. * @return A modified Criteria object. */ public Criteria andNotIn(String column, - Vector values) + List values) { and(column, (Object)values, Criteria.NOT_IN); return this; @@ -3077,7 +3075,7 @@ } /** - * Adds an 'IN' clause with the criteria supplied as a Vector. + * Adds an 'IN' clause with the criteria supplied as a List. * For example: * *
@@ -3091,11 +3089,11 @@ * "OR"ed to the existing criterion. * * @param column The column to run the comparison on - * @param values A Vector with the allowed values. + * @param values A List with the allowed values. * @return A modified Criteria object. */ public Criteria orIn(String column, - Vector values) + List values) { or(column, (Object)values, Criteria.IN); return this; @@ -3151,7 +3149,7 @@ } /** - * Adds a 'NOT IN' clause with the criteria supplied as a Vector. + * Adds a 'NOT IN' clause with the criteria supplied as a List. * For example: * *
@@ -3165,11 +3163,11 @@ * "OR"ed to the existing criterion. * * @param column The column to run the comparison on - * @param values A Vector with the disallowed values. + * @param values A List with the disallowed values. * @return A modified Criteria object. */ public Criteria orNotIn(String column, - Vector values) + List values) { or(column, (Object)values, Criteria.NOT_IN); return this; @@ -3593,9 +3591,9 @@ StringStack inClause = new StringStack(); - if (value instanceof Vector) + if (value instanceof List) { - value = ((Vector)value).toArray (new Object[0]); + value = ((List)value).toArray (new Object[0]); } for (int i = 0; i < Array.getLength(value); i++) Index: src/java/org/apache/torque/util/LargeSelect.java =================================================================== RCS file: /home/cvspublic/jakarta-turbine-torque/src/java/org/apache/torque/util/LargeSelect.java,v retrieving revision 1.2 diff -u -r1.2 LargeSelect.java --- src/java/org/apache/torque/util/LargeSelect.java 10 Aug 2001 12:23:04 -0000 1.2 +++ src/java/org/apache/torque/util/LargeSelect.java 28 Apr 2002 21:09:16 -0000 @@ -55,7 +55,8 @@ */ import java.sql.Connection; -import java.util.Vector; +import java.util.List; +import java.util.ArrayList; import org.apache.torque.Torque; import org.apache.torque.util.BasePeer; import org.apache.torque.pool.DBConnection; @@ -92,7 +93,7 @@ private String dbName; private DBConnection db = null; private QueryDataSet qds = null; - private Vector results = null; + private List results = null; private Thread thread = null; private boolean killThread = false; private int position; @@ -201,7 +202,7 @@ { this.memoryLimit = memoryLimit; this.name = name; - results = new Vector(); + results = new ArrayList(); query = BasePeer.createQueryString(criteria); dbName = criteria.getDbName(); blockEnd = blockBegin + memoryLimit - 1; @@ -211,10 +212,10 @@ /** * Gets the next block of rows. * - * @return A Vector of query results. + * @return A List of query results. * @exception Exception, a generic exception. */ - public Vector getNextResults() + public List getNextResults() throws Exception { return getResults(position, miniblock); @@ -223,10 +224,10 @@ /** * Gets a block of rows which have previously been retrieved. * - * @return a Vector of query results. + * @return a List of query results. * @exception Exception, a generic exception. */ - public Vector getPreviousResults() + public List getPreviousResults() throws Exception { return getResults(position-2*miniblock, miniblock); @@ -237,10 +238,10 @@ * rows in the block was specified in the constructor. * * @param start The starting row. - * @return a Vector of query results. + * @return a List of query results. * @exception Exception, a generic exception. */ - public Vector getResults(int start) throws Exception + public List getResults(int start) throws Exception { return getResults(start, miniblock); } @@ -251,11 +252,11 @@ * * @param start The starting row. * @param size The number of rows. - * @return a Vector of query results. + * @return a List of query results. * @exception Exception, a generic exception. */ - synchronized public Vector getResults(int start, - int size) + synchronized public List getResults(int start, + int size) throws Exception { if (size > memoryLimit) @@ -308,10 +309,10 @@ throw new Exception("parameter configuration not accounted for"); } - Vector returnResults = new Vector(size); + List returnResults = new ArrayList(size); for (int i=(start-blockBegin); i<(start-blockBegin+size); i++) { - returnResults.addElement( results.elementAt(i) ); + returnResults.add( results.get(i) ); } position = start+size; return returnResults; @@ -344,12 +345,12 @@ { size = blockEnd - currentlyFilledTo; } - Vector tempResults = BasePeer.getSelectResults( qds, - size, - false); + List tempResults = BasePeer.getSelectResults( qds, + size, + false); for (int i=0; i