db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1073375 - in /db/derby/code/trunk/java: drda/org/apache/derby/impl/drda/ engine/org/apache/derby/diag/ engine/org/apache/derby/iapi/services/classfile/ engine/org/apache/derby/iapi/services/property/ engine/org/apache/derby/iapi/store/acce...
Date Tue, 22 Feb 2011 16:11:24 GMT
Author: kahatlen
Date: Tue Feb 22 16:11:22 2011
New Revision: 1073375

URL: http://svn.apache.org/viewvc?rev=1073375&view=rev
Log:
DERBY-5060: use collection apis

Patch contributed by Dave Brosius <dbrosius@apache.org>.

Modified:
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/TestProto.java
    db/derby/code/trunk/java/engine/org/apache/derby/diag/StatementCache.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/MemberTable.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyValidation.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowUtil.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/IdUtil.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethod.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/TopService.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CollectNodesVisitor.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnOrdering.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromList.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashJoinStrategy.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParameterNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowOrderingImpl.java

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java Tue Feb 22 16:11:22 2011
@@ -1685,7 +1685,7 @@ class DRDAConnThread extends Thread {
 			managerLevel = reader.readNetworkShort();
 			if (CodePoint.isKnownManager(manager))
 			{
-				knownManagers.addElement(new Integer(manager));
+				knownManagers.add(new Integer(manager));
 				//if the manager level hasn't been set, set it
 				currentLevel = appRequester.getManagerLevel(manager);
 				if (currentLevel == appRequester.MGR_LEVEL_UNKNOWN)
@@ -1696,14 +1696,14 @@ class DRDAConnThread extends Thread {
 					if (currentLevel != managerLevel)
 					{
 						//keep a list of conflicting managers
-						errorManagers.addElement(new Integer(manager));
-						errorManagersLevel.addElement(new Integer (managerLevel));
+						errorManagers.add(new Integer(manager));
+						errorManagersLevel.add(new Integer (managerLevel));
 					}
 				}
 
 			}
 			else
-				unknownManagers.addElement(new Integer(manager));
+				unknownManagers.add(new Integer(manager));
 			if (SanityManager.DEBUG)
 			   trace("Manager = " + java.lang.Integer.toHexString(manager) + 
 					  " ManagerLevel " + managerLevel);
@@ -1716,8 +1716,8 @@ class DRDAConnThread extends Thread {
 			int j = 0;
 			for (int i = 0; i < errorManagers.size(); i++)
 			{
-				oa[j++] = errorManagers.elementAt(i);
-				oa[j++] = errorManagersLevel.elementAt(i);
+				oa[j++] = errorManagers.get(i);
+				oa[j++] = errorManagersLevel.get(i);
 			}
 			throw new DRDAProtocolException(DRDAProtocolException.DRDA_Proto_MGRLVLRM,
 										  this, 0,
@@ -1798,7 +1798,7 @@ class DRDAConnThread extends Thread {
 		writer.startDdm(CodePoint.MGRLVLLS);
 		for (int i = 0; i < knownManagers.size(); i++)
 		{
-			manager = ((Integer)knownManagers.elementAt(i)).intValue();
+			manager = ((Integer)knownManagers.get(i)).intValue();
 			appLevel = appRequester.getManagerLevel(manager);
 			serverLevel = server.getManagerLevel(manager);
 			if (serverLevel >= appLevel)
@@ -1817,7 +1817,7 @@ class DRDAConnThread extends Thread {
 		// write 0 for all unknown managers
 		for (int i = 0; i < unknownManagers.size(); i++)
 		{
-			manager = ((Integer)unknownManagers.elementAt(i)).intValue();
+			manager = ((Integer)unknownManagers.get(i)).intValue();
 			writer.writeCodePoint4Bytes(manager, 0);
 		}
 		writer.endDdm();

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java Tue Feb 22 16:11:22 2011
@@ -1834,8 +1834,8 @@ public final class NetworkServerControlI
 					else
 						return currentSession;
 				}
-				retval = (Session) runQueue.elementAt(0);
-				runQueue.removeElementAt(0);
+				retval = (Session) runQueue.get(0);
+				runQueue.remove(0);
 				if (currentSession != null)
 					runQueueAdd(currentSession);
 			} catch (InterruptedException e) {
@@ -2246,13 +2246,13 @@ public final class NetworkServerControlI
 				break;
 			case COMMAND_TRACE:
 				{
-					boolean on = isOn((String)commandArgs.elementAt(0));
+					boolean on = isOn((String)commandArgs.get(0));
 					trace(sessionArg, on);
 					consoleTraceMessage(sessionArg, on);
 					break;
 				}
 			case COMMAND_TRACEDIRECTORY:
-				String directory = (String) commandArgs.elementAt(0);
+				String directory = (String) commandArgs.get(0);
 				sendSetTraceDirectory(directory);
 				consolePropertyMessage("DRDA_TraceDirectoryChange.I", directory);
 				break;
@@ -2263,7 +2263,7 @@ public final class NetworkServerControlI
 				break;
 			case COMMAND_LOGCONNECTIONS:
 				{
-					boolean on = isOn((String)commandArgs.elementAt(0));
+					boolean on = isOn((String)commandArgs.get(0));
 					logConnections(on);
 					consolePropertyMessage("DRDA_LogConnectionsChange.I", on ? "DRDA_ON.I" : "DRDA_OFF.I");
 					break;
@@ -2277,10 +2277,10 @@ public final class NetworkServerControlI
 			case COMMAND_MAXTHREADS:
 				max = 0;
 				try{
-					max = Integer.parseInt((String)commandArgs.elementAt(0));
+					max = Integer.parseInt((String)commandArgs.get(0));
 				}catch(NumberFormatException e){
 					consolePropertyMessage("DRDA_InvalidValue.U", new String [] 
-						{(String)commandArgs.elementAt(0), "maxthreads"});
+						{(String)commandArgs.get(0), "maxthreads"});
 				}
 				if (max < MIN_MAXTHREADS)
 					consolePropertyMessage("DRDA_InvalidValue.U", new String [] 
@@ -2294,12 +2294,12 @@ public final class NetworkServerControlI
 				break;
 			case COMMAND_TIMESLICE:
 				int timeslice = 0;
-				String timeSliceArg = (String)commandArgs.elementAt(0);
+				String timeSliceArg = (String)commandArgs.get(0);
             	try{
                 	timeslice = Integer.parseInt(timeSliceArg);
             	}catch(NumberFormatException e){
 					consolePropertyMessage("DRDA_InvalidValue.U", new String [] 
-						{(String)commandArgs.elementAt(0), "timeslice"});
+						{(String)commandArgs.get(0), "timeslice"});
             	}
 				if (timeslice < MIN_TIMESLICE)
 					consolePropertyMessage("DRDA_InvalidValue.U", new String [] 
@@ -2324,7 +2324,7 @@ public final class NetworkServerControlI
 	{
 		synchronized(runQueue)
 		{
-			runQueue.addElement(clientSession);
+			runQueue.add(clientSession);
 			runQueue.notify();
 		}
 	}
@@ -2349,12 +2349,12 @@ public final class NetworkServerControlI
 				{
 					newpos = processDashArg(i, args);
 					if (newpos == i)
-						commandArgs.addElement(args[i++]);
+						commandArgs.add(args[i++]);
 					else
 						i = newpos;
 				}
 				else
-					commandArgs.addElement(args[i++]);
+					commandArgs.add(args[i++]);
 			}
 					
 			// look up command
@@ -2365,7 +2365,7 @@ public final class NetworkServerControlI
 					if (StringUtil.SQLEqualsIgnoreCase(COMMANDS[i], 
 													   (String)commandArgs.firstElement()))
 					{
-						commandArgs.removeElementAt(0);
+						commandArgs.remove(0);
 						return i;
 					}
 				}

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/TestProto.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/TestProto.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/TestProto.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/TestProto.java Tue Feb 22 16:11:22 2011
@@ -834,8 +834,8 @@ public class TestProto {
 				case CodePoint.MGRLVLLS:
 					while (reader.moreDdmData())
 					{
-						manager.addElement(new Integer(reader.readNetworkShort()));
-						managerLevel.addElement(new Integer(reader.readNetworkShort()));
+						manager.add(new Integer(reader.readNetworkShort()));
+						managerLevel.add(new Integer(reader.readNetworkShort()));
 					}
 					break;
 				default:
@@ -883,13 +883,13 @@ public class TestProto {
 			for (int i = 0; i < manager.size(); i++)
 			{
 				reqVal = getCP();
-				mgr = ((Integer)(manager.elementAt(i))).intValue();
+				mgr = ((Integer)(manager.get(i))).intValue();
 				if (mgr != reqVal)
 				{
 					cpError(mgr, reqVal);
 					return;
 				}
-				mgrLevel = ((Integer)(managerLevel.elementAt(i))).intValue();
+				mgrLevel = ((Integer)(managerLevel.get(i))).intValue();
 				reqVal = getInt();
 				if (mgrLevel != reqVal)
 				{

Modified: db/derby/code/trunk/java/engine/org/apache/derby/diag/StatementCache.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/diag/StatementCache.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/diag/StatementCache.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/diag/StatementCache.java Tue Feb 22 16:11:22 2011
@@ -87,7 +87,7 @@ public final class StatementCache extend
 				final CachedStatement cs = (CachedStatement) i.next();
 				final GenericPreparedStatement ps =
 					(GenericPreparedStatement) cs.getPreparedStatement();
-				data.addElement(ps);
+				data.add(ps);
 			}
 		}
 	}
@@ -100,7 +100,7 @@ public final class StatementCache extend
 		position++;
 
 		for (; position < data.size(); position++) {
-			currentPs = (GenericPreparedStatement) data.elementAt(position);
+			currentPs = (GenericPreparedStatement) data.get(position);
 	
 			if (currentPs != null)
 				return true;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java Tue Feb 22 16:11:22 2011
@@ -421,12 +421,12 @@ public class ClassHolder {
 		item.setIndex(cptEntries.size());
 		if (key != null)
 			cptHashTable.put(key, item);
-		cptEntries.addElement(item);
+		cptEntries.add(item);
 
 		cptEstimatedSize += item.classFileSize();
 
 		if (item.doubleSlot()) {
-			cptEntries.addElement(null);
+			cptEntries.add(null);
 			return 2;
 		} else {
 			return 1;
@@ -567,7 +567,7 @@ public class ClassHolder {
 	*/
 
 	public ConstantPoolEntry getEntry(int index) {
-		return (ConstantPoolEntry) cptEntries.elementAt(index);
+		return (ConstantPoolEntry) cptEntries.get(index);
 	}
 
 	/**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java Tue Feb 22 16:11:22 2011
@@ -143,7 +143,7 @@ public class ClassInvestigator extends C
 
         for (int i = 0; i < interfaceCount; i++)
         {
-            implemented.addElement(className(interfaces[i]));
+            implemented.add(className(interfaces[i]));
         }
         return implemented.elements();
 	}
@@ -458,7 +458,7 @@ public class ClassInvestigator extends C
 
 		newCpe.index = index;
 
-		cptEntries.setElementAt(newCpe, index);
+		cptEntries.set(index, newCpe);
 	}
 
 	private static ConstantPoolEntry getConstant(ClassInput in)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/MemberTable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/MemberTable.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/MemberTable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/MemberTable.java Tue Feb 22 16:11:22 2011
@@ -45,7 +45,7 @@ class MemberTable {
 									item.getDescriptor(),
 									entries.size());
 		/* Add to the Vector */
-		entries.addElement(item);
+		entries.add(item);
 
 		/* Add to the Hashtable */
 		hashtable.put(mth, mth);
@@ -65,7 +65,7 @@ class MemberTable {
 			return null;
 		}
 
-		return (ClassMember) entries.elementAt(mth.index);
+		return (ClassMember) entries.get(mth.index);
 	}
 
 	void put(ClassFormatOutput out) throws IOException {
@@ -73,7 +73,7 @@ class MemberTable {
 		Vector lentries = entries;
 		int count = lentries.size();
 		for (int i = 0; i < count; i++) {
-			((ClassMember) lentries.elementAt(i)).put(out);
+			((ClassMember) lentries.get(i)).put(out);
 		}
 	}
 
@@ -87,7 +87,7 @@ class MemberTable {
 		Vector lentries = entries;
 		int count = lentries.size();
 		for (int i = 0; i < count; i++) {
-			size += ((ClassMember) lentries.elementAt(i)).classFileSize();
+			size += ((ClassMember) lentries.get(i)).classFileSize();
 		}
 
 		return size;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyValidation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyValidation.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyValidation.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyValidation.java Tue Feb 22 16:11:22 2011
@@ -57,7 +57,7 @@ public class PropertyValidation implemen
 			synchronized (this) {
 
 				for (int i = 0; i < notifyOnSet.size() ; i++) {
-					PropertySetCallback psc = (PropertySetCallback) notifyOnSet.elementAt(i);
+					PropertySetCallback psc = (PropertySetCallback) notifyOnSet.get(i);
 					if (!psc.validate(key, value, d))
 						continue;
 
@@ -100,7 +100,7 @@ public class PropertyValidation implemen
 		Serializable mappedValue = null;
  		if (notifyOnSet != null) {
 			for (int i = 0; i < notifyOnSet.size() && mappedValue == null; i++) {
-				PropertySetCallback psc = (PropertySetCallback) notifyOnSet.elementAt(i);
+				PropertySetCallback psc = (PropertySetCallback) notifyOnSet.get(i);
 				mappedValue = psc.map(key, value, set);
 			}
 		}
@@ -125,7 +125,7 @@ public class PropertyValidation implemen
 
  		if (notifyOnSet != null) {
 			for (int i = 0; i < notifyOnSet.size(); i++) {
-				PropertySetCallback psc = (PropertySetCallback) notifyOnSet.elementAt(i);
+				PropertySetCallback psc = (PropertySetCallback) notifyOnSet.get(i);
 				psc.validate(key, value, set);
 			}
 		}
@@ -135,7 +135,7 @@ public class PropertyValidation implemen
 
 		if (notifyOnSet == null)
 			notifyOnSet = new Vector(1,1);
-		notifyOnSet.addElement(who);
+		notifyOnSet.add(who);
 
 	}
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowUtil.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowUtil.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowUtil.java Tue Feb 22 16:11:22 2011
@@ -516,7 +516,7 @@ public class RowUtil
                     {
                         str += 
                             "vec[" + i + "]:" + 
-                            RowUtil.toString((Object[]) vec.elementAt(i));
+                            RowUtil.toString((Object[]) vec.get(i));
 
                         str += "\n";
                     }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/IdUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/IdUtil.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/IdUtil.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/IdUtil.java Tue Feb 22 16:11:22 2011
@@ -129,7 +129,7 @@ public abstract class IdUtil
 		while (true)
 		{
 			String thisId = parseId(r,true);
-			v.addElement(thisId);
+			v.add(thisId);
 			int dot;
 
 			try {
@@ -421,7 +421,7 @@ public abstract class IdUtil
 				if (thisQName.length != 2)
 					throw StandardException.newException(SQLState.DB_CLASS_PATH_PARSE_ERROR,input);
 
-				v.addElement(thisQName); 
+				v.add(thisQName);
 				int delim = r.read();
 				if (delim != ':')
 				{
@@ -492,7 +492,7 @@ public abstract class IdUtil
 			int delim;
 			try {
 				String thisId = IdUtil.parseId(r,normalize);
-				v.addElement(thisId);
+				v.add(thisId);
 				r.mark(0);
 				delim = r.read();
 				if (delim != ',')
@@ -532,7 +532,7 @@ public abstract class IdUtil
 		HashSet h = new HashSet();
 		for(int ix=0;ix<l2.length;ix++) h.add(l2[ix]); 
 		Vector v = new Vector();
-		for(int ix=0;ix<l1.length;ix++) if (h.contains(l1[ix])) v.addElement(l1[ix]);
+		for(int ix=0;ix<l1.length;ix++) if (h.contains(l1[ix])) v.add(l1[ix]);
 		return vectorToIdList(v,true); 
 	}
 
@@ -603,7 +603,7 @@ public abstract class IdUtil
 			if (!h.contains(l[ix]))
 				h.add(l[ix]);
 			else
-				v.addElement(l[ix]);
+				v.add(l[ix]);
 		}
 		return vectorToIdList(v,true);
 	}
@@ -626,7 +626,7 @@ public abstract class IdUtil
 			if (!h.contains(normal_a[ix]))
 			{
 				h.add(normal_a[ix]);
-				v.addElement(external_a[ix]);
+				v.add(external_a[ix]);
 			}
 		}
 		return vectorToIdList(v,false);
@@ -709,7 +709,7 @@ public abstract class IdUtil
 		//to normal form.
 		for (int ix=0; ix < enteredList_a.length; ix++)
 			if (!id.equals(IdUtil.parseSQLIdentifier(enteredList_a[ix])))
-				v.addElement(enteredList_a[ix]);
+				v.add(enteredList_a[ix]);
 		if (v.size() == 0)
 			return null;
 		else

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java Tue Feb 22 16:11:22 2011
@@ -1021,7 +1021,7 @@ public abstract class EmbedPreparedState
           //This way we will get a copy of the current statement's parameter
           //values rather than a pointer to the statement's parameter value
           //set which will change with every new statement in the batch.
-          batchStatements.addElement(getParms().getClone());
+          batchStatements.add(getParms().getClone());
           clearParameters();
   	  }
     }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java Tue Feb 22 16:11:22 2011
@@ -910,7 +910,7 @@ public class EmbedStatement extends Conn
   	  synchronized (getConnectionSynchronization()) {
 		  if (batchStatements == null)
 			  batchStatements = new Vector();
-        batchStatements.addElement(sql);
+        batchStatements.add(sql);
   		}
 	}
 
@@ -981,7 +981,7 @@ public class EmbedStatement extends Conn
                     // has been executed, since first time around we probably
                     // didn't do anything to notice interrupts yet.
                     InterruptStatus.throwIf(lcc);
-					if (executeBatchElement(stmts.elementAt(i)))
+					if (executeBatchElement(stmts.get(i)))
 						throw newSQLException(SQLState.RESULTSET_RETURN_NOT_ALLOWED);
 					returnUpdateCountForBatch[i] = getUpdateCount();
 				}

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethod.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethod.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethod.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethod.java Tue Feb 22 16:11:22 2011
@@ -211,7 +211,7 @@ class BCMethod implements MethodBuilder 
 
 		if (thrownExceptions == null)
 			thrownExceptions = new Vector();
-		thrownExceptions.addElement(exceptionClass);
+		thrownExceptions.add(exceptionClass);
 	}
 
 	/**
@@ -358,7 +358,7 @@ class BCMethod implements MethodBuilder 
 
 				for (int i = 0; i < numExc; i++) {
 					// put each exception into the constant pool
-					String e = thrownExceptions.elementAt(i).toString();
+					String e = thrownExceptions.get(i).toString();
 					int ei2 = modClass.addClassReference(e);
 
 					// add constant pool index to exception attribute_info

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java Tue Feb 22 16:11:22 2011
@@ -147,7 +147,7 @@ public class BasicDaemon implements Daem
 			clientNumber = numClients++;
 
 			clientRecord = new ServiceRecord(newClient, onDemandOnly, true);
-			subscription.insertElementAt(clientRecord, clientNumber);
+			subscription.add(clientNumber, clientRecord);
 		}
 
 
@@ -177,7 +177,7 @@ public class BasicDaemon implements Daem
 			return;
 
 		// client number is never reused.  Just null out the vector entry.
-		subscription.setElementAt(null, clientNumber);
+		subscription.set(clientNumber, null);
 	}
 
 	public void serviceNow(int clientNumber)
@@ -185,7 +185,7 @@ public class BasicDaemon implements Daem
 		if (clientNumber < 0 || clientNumber > subscription.size())
 			return;
 
-		ServiceRecord clientRecord = (ServiceRecord)subscription.elementAt(clientNumber);
+		ServiceRecord clientRecord = (ServiceRecord)subscription.get(clientNumber);
 		if (clientRecord == null)
 			return;
 
@@ -251,7 +251,7 @@ public class BasicDaemon implements Daem
 
 		while (nextService < subscription.size())
 		{
-			clientRecord = (ServiceRecord)subscription.elementAt(nextService++);
+			clientRecord = (ServiceRecord)subscription.get(nextService++);
 			if (clientRecord != null && (clientRecord.needImmediateService() || (!urgent && clientRecord.needService())))
 				return clientRecord;
 		}
@@ -503,7 +503,7 @@ public class BasicDaemon implements Daem
 				boolean noSubscriptionRequests = true; 
 				for (int urgentServiced = 0; urgentServiced < subscription.size(); urgentServiced++)
 				{
-					ServiceRecord clientRecord = (ServiceRecord)subscription.elementAt(urgentServiced);
+					ServiceRecord clientRecord = (ServiceRecord)subscription.get(urgentServiced);
 					if (clientRecord != null &&	clientRecord.needService())
 					{
 						noSubscriptionRequests = false;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java Tue Feb 22 16:11:22 2011
@@ -143,7 +143,7 @@ abstract class BaseMonitor
 		super();
 
 		services = new Vector(0, 1);
-		services.addElement(new TopService(this));	// first element is always the free-floating service
+		services.add(new TopService(this));	// first element is always the free-floating service
 	}
 
 	/* Methods of ModuleFactory includes BootStrap and Runnable */
@@ -184,7 +184,7 @@ abstract class BaseMonitor
 				if (position == 0)
 					break;
 
-				ts = (TopService) services.elementAt(position);
+				ts = (TopService) services.get(position);
 			}
 
 			// push a new context manager
@@ -205,7 +205,7 @@ abstract class BaseMonitor
 		}
 		
 		Monitor.getStream().println(LINE);
-		((TopService) services.elementAt(0)).shutdown();
+		((TopService) services.get(0)).shutdown();
 
 		ContextService.stop();
 		Monitor.clearMonitor();
@@ -230,7 +230,7 @@ abstract class BaseMonitor
 		} finally {
 			synchronized (this) {
 				if (removeService) {
-					boolean found = services.removeElement(ts);
+					boolean found = services.remove(ts);
 					if (SanityManager.DEBUG) {
 						SanityManager.ASSERT(found, "service was not found " + serviceModule);
 					}
@@ -408,7 +408,7 @@ abstract class BaseMonitor
 		TopService myts = null;
 		synchronized (this) {
 			for (int i = 1; i < services.size(); i++) {
-				TopService ts = (TopService) services.elementAt(i);
+				TopService ts = (TopService) services.get(i);
 				if (ts.isPotentialService(key)) {
 					myts = ts;
 					break;
@@ -539,10 +539,10 @@ abstract class BaseMonitor
 	private synchronized TopService findTopService(Object serviceModule) {
 
 		if (serviceModule == null)
-			return (TopService) services.elementAt(0);
+			return (TopService) services.get(0);
 
 		for (int i = 1; i < services.size(); i++) {
-			TopService ts = (TopService) services.elementAt(i);
+			TopService ts = (TopService) services.get(i);
 			if (ts.inService(serviceModule))
 				return ts;
 		}
@@ -729,7 +729,7 @@ abstract class BaseMonitor
 				return null;
 
 			// try to create an instance
-			Object instance = newInstance((Class) implementations.elementAt(index));
+			Object instance = newInstance((Class) implementations.get(index));
 
 			if (BaseMonitor.canSupport(instance, properties))
 				return instance;
@@ -747,7 +747,7 @@ abstract class BaseMonitor
 		for (int i = startIndex; i < implementations.size(); i++) {
 
 			//try {
-				Class factoryClass = (Class) implementations.elementAt(i);
+				Class factoryClass = (Class) implementations.get(i);
 				if (!factoryInterface.isAssignableFrom(factoryClass)) {
 					continue;
 				}
@@ -831,7 +831,7 @@ abstract class BaseMonitor
 
 			// count the number of services that implement the required protocol
 			for (int i = 1; i < services.size(); i++) {
-				ts = (TopService) services.elementAt(i);
+				ts = (TopService) services.get(i);
 				if (ts.isActiveService()) {
 					if (ts.getKey().getFactoryInterface().getName().equals(protocol))
 						count++;
@@ -843,7 +843,7 @@ abstract class BaseMonitor
 			if (count != 0) {
 				int j = 0;
 				for (int i = 1; i < services.size(); i++) {
-					ts = (TopService) services.elementAt(i);
+					ts = (TopService) services.get(i);
 					if (ts.isActiveService()) {
 						if (ts.getKey().getFactoryInterface().getName().equals(protocol)) {
 							list[j++] = ts.getServiceType().getUserServiceName(ts.getKey().getIdentifier());
@@ -1149,13 +1149,13 @@ nextModule:
 						offset += envModuleCount[eji];
 					}
 
-					implementations.insertElementAt(possibleModule, offset);
+					implementations.add(offset, possibleModule);
 					envModuleCount[envJDKId]++;
 
 				}
 				else {
 					// just add to the end of the vector
-					implementations.addElement(possibleModule);
+					implementations.add(possibleModule);
 				}
 
 				// Since ModuleControl and ModuleSupportable are not called directly
@@ -1715,7 +1715,7 @@ nextModule:
 				}
 
 				for (int i = 1; i < services.size(); i++) {
-					TopService ts2 = (TopService) services.elementAt(i);
+					TopService ts2 = (TopService) services.get(i);
 					if (ts2.isPotentialService(serviceKey)) {
 						// if the service already exists then  just return null
 						return null;
@@ -1748,7 +1748,7 @@ nextModule:
 				}
 
 				ts = new TopService(this, serviceKey, provider, serviceLocale);
-				services.addElement(ts);
+				services.add(ts);
 			}
 
 			if (SanityManager.DEBUG) {
@@ -1844,7 +1844,7 @@ nextModule:
 			if (ts != null) {
 				ts.shutdown();
 				synchronized (this) {
-					services.removeElement(ts);
+					services.remove(ts);
 				}
 
 				// Service root will only have been created if

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/TopService.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/TopService.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/TopService.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/TopService.java Tue Feb 22 16:11:22 2011
@@ -280,7 +280,7 @@ final class TopService {
                 // and result in an ArrayIndexOutOfBoundsException.
                 synchronized (moduleInstances) {
                     if (i < moduleInstances.size()) {
-                        module = (ModuleInstance) moduleInstances.elementAt(i);
+                        module = (ModuleInstance) moduleInstances.get(i);
                     } else {
                         // No more instances to look at, break out of the loop.
                         break;
@@ -327,12 +327,12 @@ final class TopService {
 		ModuleInstance module = new ModuleInstance(instance, key.getIdentifier(), service,
 				topModule == null ? (Object) null : topModule.getInstance());
 
-		moduleInstances.addElement(module);
+		moduleInstances.add(module);
 
 		try {
 			BaseMonitor.boot(instance, create, properties);
 		} catch (StandardException se) {
-			moduleInstances.removeElement(module);
+			moduleInstances.remove(module);
 			throw se;
 		}
 
@@ -357,7 +357,7 @@ final class TopService {
 		}
 	
 		TopService.stop(instance);
-		moduleInstances.removeElement(module);
+		moduleInstances.remove(module);
 
 		// if we reached here it's because someone else beat us adding the module, so use theirs.
 		return findModule(key, true, properties);
@@ -385,7 +385,7 @@ final class TopService {
 				if (moduleInstances.isEmpty())
 					return true;
 
-				module = (ModuleInstance) moduleInstances.elementAt(0);
+				module = (ModuleInstance) moduleInstances.get(0);
 
 			}
 			
@@ -393,7 +393,7 @@ final class TopService {
 			TopService.stop(instance);
 			
 			synchronized (this) {
-				moduleInstances.removeElementAt(0);
+				moduleInstances.remove(0);
 			}
 		}
 	}

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java Tue Feb 22 16:11:22 2011
@@ -276,7 +276,7 @@ public class AggregateNode extends Unary
 		instantiateAggDef();
 
 		/* Add ourselves to the aggregateVector before we do anything else */
-		aggregateVector.addElement(this);
+		aggregateVector.add(this);
 
         CompilerContext cc = getCompilerContext();
         

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CollectNodesVisitor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CollectNodesVisitor.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CollectNodesVisitor.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CollectNodesVisitor.java Tue Feb 22 16:11:22 2011
@@ -95,7 +95,7 @@ public class CollectNodesVisitor impleme
 	{
 		if (nodeClass.isInstance(node))
 		{
-			nodeList.addElement(node);	
+			nodeList.add(node);
 		}
 		return node;
 	}

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnOrdering.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnOrdering.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnOrdering.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnOrdering.java Tue Feb 22 16:11:22 2011
@@ -83,8 +83,8 @@ class ColumnOrdering {
 	boolean contains(int tableNumber, int columnNumber)
 	{
 		for (int i = 0; i < columns.size(); i++) {
-			Integer col = (Integer) columns.elementAt(i);
-			Integer tab = (Integer) tables.elementAt(i);
+			Integer col = (Integer) columns.get(i);
+			Integer tab = (Integer) tables.get(i);
 
 			if (tab.intValue() == tableNumber &&
 				col.intValue() == columnNumber) {
@@ -112,8 +112,8 @@ class ColumnOrdering {
 	 */
 	void addColumn(int tableNumber, int columnNumber)
 	{
-		tables.addElement(new Integer(tableNumber));
-		columns.addElement(new Integer(columnNumber));
+		tables.add(new Integer(tableNumber));
+		columns.add(new Integer(columnNumber));
 	}
 
 	/**
@@ -127,11 +127,11 @@ class ColumnOrdering {
 		*/
 		for (int i = tables.size() - 1; i >= 0; i--)
 		{
-			Integer tab = (Integer) tables.elementAt(i);
+			Integer tab = (Integer) tables.get(i);
 			if (tab.intValue() == tableNumber)
 			{
-				tables.removeElementAt(i);
-				columns.removeElementAt(i);
+				tables.remove(i);
+				columns.remove(i);
 			}
 		}
 	}
@@ -150,8 +150,8 @@ class ColumnOrdering {
 
 		for (int i = 0; i < columns.size(); i++) {
 			/* Integers are immutable, so just copy the pointers */
-			retval.columns.addElement(columns.elementAt(i));
-			retval.tables.addElement(tables.elementAt(i));
+			retval.columns.addElement(columns.get(i));
+			retval.tables.addElement(tables.get(i));
 		}
 
 		return retval;
@@ -163,7 +163,7 @@ class ColumnOrdering {
 			return false;
 
 		for (int i = 0; i < tables.size(); i++) {
-			Integer tab = (Integer) tables.elementAt(i);
+			Integer tab = (Integer) tables.get(i);
 			
 			if (tab.intValue() == tableNumber)
 				return true;
@@ -178,7 +178,7 @@ class ColumnOrdering {
 			return false;
 
 		for (int i = 0; i < tables.size(); i++) {
-			Integer tab = (Integer) tables.elementAt(i);
+			Integer tab = (Integer) tables.get(i);
 			
 			if (tab.intValue() != tableNumber)
 				return true;
@@ -194,8 +194,8 @@ class ColumnOrdering {
 			retval += "Direction: " + myDirection;
 
 			for (int i = 0; i < columns.size(); i++) {
-				retval += " Table " + tables.elementAt(i) +
-							", Column " + columns.elementAt(i);
+				retval += " Table " + tables.get(i) +
+							", Column " + columns.get(i);
 			}
 		}
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java Tue Feb 22 16:11:22 2011
@@ -341,7 +341,7 @@ public class CompilerContextImpl extends
 	public int addSavedObject(Object obj) {
 		if (savedObjects == null) savedObjects = new Vector();
 
-		savedObjects.addElement(obj);
+		savedObjects.add(obj);
 		return savedObjects.size()-1;
 	}
 
@@ -456,9 +456,9 @@ public class CompilerContextImpl extends
 		*/
 		for (int i = 0; i < storeCostConglomIds.size(); i++)
 		{
-			Long conglomId = (Long) storeCostConglomIds.elementAt(i);
+			Long conglomId = (Long) storeCostConglomIds.get(i);
 			if (conglomId.longValue() == conglomerateNumber)
-				return (StoreCostController) storeCostControllers.elementAt(i);
+				return (StoreCostController) storeCostControllers.get(i);
 		}
 
 		/*
@@ -468,13 +468,10 @@ public class CompilerContextImpl extends
 						lcc.getTransactionCompile().openStoreCost(conglomerateNumber);
 
 		/* Put it in the array */
-		storeCostControllers.insertElementAt(retval,
-											storeCostControllers.size());
+		storeCostControllers.add(storeCostControllers.size(), retval);
 
 		/* Put the conglomerate number in its array */
-		storeCostConglomIds.insertElementAt(
-								new Long(conglomerateNumber),
-								storeCostConglomIds.size());
+		storeCostConglomIds.add(storeCostConglomIds.size(), new Long(conglomerateNumber));
 
 		return retval;
 	}
@@ -487,15 +484,15 @@ public class CompilerContextImpl extends
 		for (int i = 0; i < storeCostControllers.size(); i++)
 		{
 			StoreCostController scc =
-				(StoreCostController) storeCostControllers.elementAt(i);
+				(StoreCostController) storeCostControllers.get(i);
 			try {
 				scc.close();
 			} catch (StandardException se) {
 			}
 		}
 
-		storeCostControllers.removeAllElements();
-		storeCostConglomIds.removeAllElements();
+		storeCostControllers.clear();
+		storeCostConglomIds.clear();
 	}
 
 	/**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java Tue Feb 22 16:11:22 2011
@@ -173,7 +173,7 @@ public class CreateAliasNode extends DDL
 
 					modes = new int[paramCount];
 					for (int i = 0; i < paramCount; i++) {
-                        int currentMode =  ((Integer) (((Vector) parameters[2]).elementAt(i))).intValue();
+                        int currentMode =  ((Integer) (((Vector) parameters[2]).get(i))).intValue();
                         modes[i] = currentMode;
   
                         //

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java Tue Feb 22 16:11:22 2011
@@ -323,7 +323,7 @@ public class CreateIndexNode extends DDL
 			/* Verify that this column's name is unique within the list
 			 * Having a space at the end meaning descending on the column
 			 */
-			columnNames[index] = (String) columnNameList.elementAt(index);
+			columnNames[index] = (String) columnNameList.get(index);
 			if (columnNames[index].endsWith(" "))
 			{
 				columnNames[index] = columnNames[index].substring(0, columnNames[index].length() - 1);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java Tue Feb 22 16:11:22 2011
@@ -809,7 +809,7 @@ public class CursorNode extends DMLState
 
 		for (int index = 0; index < size; index++)
 		{
-		    columnName = (String) updatableColumns.elementAt(index);
+		    columnName = (String) updatableColumns.get(index);
 		    tableDescriptor = targetTable.getTableDescriptor();
 		    if ( tableDescriptor.getColumnDescriptor(columnName) == null)
 		    {

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java Tue Feb 22 16:11:22 2011
@@ -953,8 +953,8 @@ abstract class DMLModStatementNode exten
 					{
 						//find  the referencing  table Name
 						fktd = fkcd.getTableDescriptor();
-						refTableNames.addElement(fktd.getSchemaName() + "." + fktd.getName());
-						refActions.addElement(new Integer(raRules[inner]));
+						refTableNames.add(fktd.getSchemaName() + "." + fktd.getName());
+						refActions.add(new Integer(raRules[inner]));
 						//find the referencing column name required for update null.
 						refColumns = fkcd.getReferencedColumns();
 						coldl = fktd.getColumnDescriptorList();
@@ -964,9 +964,9 @@ abstract class DMLModStatementNode exten
 							cold =(ColumnDescriptor)coldl.elementAt(refColumns[i]-1);
 							releventColDes.add(cold);
 						}
-						refColDescriptors.addElement(releventColDes);
-						refIndexConglomNum.addElement(new Long(conglomNumbers[inner]));
-						fkColMap.addElement(colArray);
+						refColDescriptors.add(releventColDes);
+						refIndexConglomNum.add(new Long(conglomNumbers[inner]));
+						fkColMap.add(colArray);
 					}
 				}
 			}
@@ -980,7 +980,7 @@ abstract class DMLModStatementNode exten
 			ConglomerateDescriptor pkIndexConglom = pktd.getConglomerateDescriptor(pkuuid);
 
 			TableDescriptor refTd = cd.getTableDescriptor();
-			fkVector.addElement(new FKInfo(
+			fkVector.add(new FKInfo(
 									fkNames,							// foreign key names
 									refTd.getName(),				// table being modified
 									statementType,						// INSERT|UPDATE|DELETE
@@ -1006,7 +1006,7 @@ abstract class DMLModStatementNode exten
 			fkInfo = new FKInfo[size];
 			for (int i = 0; i < size; i++)
 			{
-				fkInfo[i] = (FKInfo)fkVector.elementAt(i);
+				fkInfo[i] = (FKInfo)fkVector.get(i);
 			}
 		}
 
@@ -1021,13 +1021,13 @@ abstract class DMLModStatementNode exten
 			fkColArrays = new int[size][];
 			for (int i = 0; i < size; i++)
 			{
-				fkTableNames[i] = (String)refTableNames.elementAt(i);
-				fkRefActions[i]  = ((Integer) refActions.elementAt(i)).intValue();
+				fkTableNames[i] = (String)refTableNames.get(i);
+				fkRefActions[i]  = ((Integer) refActions.get(i)).intValue();
 				fkColDescriptors[i] =
-					(ColumnDescriptorList)refColDescriptors.elementAt(i);
+					(ColumnDescriptorList)refColDescriptors.get(i);
 				fkIndexConglomNumbers[i] =
-					((Long)refIndexConglomNum.elementAt(i)).longValue();
-				fkColArrays[i] = ((int[])fkColMap.elementAt(i));
+					((Long)refIndexConglomNum.get(i)).longValue();
+				fkColArrays[i] = ((int[])fkColMap.get(i));
 			}
 		}		
 
@@ -1759,7 +1759,7 @@ abstract class DMLModStatementNode exten
 				if (i == distinctCount)		// first appearence
 				{
 					distinctConglomNums[distinctCount++] = cd.getConglomerateNumber();
-					conglomVector.addElement( cd );
+					conglomVector.add( cd );
 				}
 			}
 
@@ -1793,7 +1793,7 @@ abstract class DMLModStatementNode exten
 
 		for ( int ictr = 0; ictr < indexCount; ictr++ )
 		{
-			cd = (ConglomerateDescriptor) affectedConglomerates.elementAt( ictr );
+			cd = (ConglomerateDescriptor) affectedConglomerates.get( ictr );
 
 			indicesToMaintain[ ictr ] = cd.getIndexDescriptor();
 			indexConglomerateNumbers[ ictr ] = cd.getConglomerateNumber();

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java Tue Feb 22 16:11:22 2011
@@ -2159,7 +2159,7 @@ public class FromBaseTable extends FromT
 		if (this.dependencyMap != null)
 		{
 			for (int i = 0; i < locations.size() ; i++)
-				this.dependencyMap.clear(((Integer)locations.elementAt(i)).intValue());
+				this.dependencyMap.clear(((Integer)locations.get(i)).intValue());
 		}
 	}
 
@@ -4124,7 +4124,7 @@ public class FromBaseTable extends FromT
 
 		if (fbtVector != null)
 		{
-			fbtVector.addElement(this);
+			fbtVector.add(this);
 		}
 
 		return isOrdered;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromList.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromList.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromList.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromList.java Tue Feb 22 16:11:22 2011
@@ -750,7 +750,7 @@ public class FromList extends QueryTreeN
 					ft.isFlattenableJoinNode())
 				{
 					//save the table number of the node to be flattened
-					flattenedTableNumbers.addElement(new Integer(ft.getTableNumber()));
+					flattenedTableNumbers.add(new Integer(ft.getTableNumber()));
 
 					/* Remove the node from the list and insert its
 					 * FromList here.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java Tue Feb 22 16:11:22 2011
@@ -659,7 +659,7 @@ public class GroupByNode extends SingleC
 		int alSize = aggregateVector.size();
 		for (int index = 0; index < alSize; index++)
 		{
-			aggregate = (AggregateNode) aggregateVector.elementAt(index);
+			aggregate = (AggregateNode) aggregateVector.get(index);
 
 			/*
 			** AGG RESULT: Set the aggregate result to null in the
@@ -896,7 +896,7 @@ public class GroupByNode extends SingleC
 
 			for (int i=0; i < aggregateVector.size(); i++) {
 					AggregateNode agg =
-						(AggregateNode)aggregateVector.elementAt(i);
+						(AggregateNode)aggregateVector.get(i);
 					debugPrint(formatNodeString("[" + i + "]:", depth + 1));
 					agg.treePrint(depth + 1);
 			}
@@ -1232,7 +1232,7 @@ public class GroupByNode extends SingleC
 		{
 			if (aggregateVector.size() == 1)
 			{
-				AggregateNode an = (AggregateNode) aggregateVector.elementAt(0);
+				AggregateNode an = (AggregateNode) aggregateVector.get(0);
 				AggregateDefinition ad = an.getAggregateDefinition();
 				if (ad instanceof MaxMinAggregateDefinition)
 				{

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashJoinStrategy.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashJoinStrategy.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashJoinStrategy.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashJoinStrategy.java Tue Feb 22 16:11:22 2011
@@ -651,7 +651,7 @@ public class HashJoinStrategy extends Ba
 			// Is there an equijoin condition on this column?
 			if (predList.hasOptimizableEquijoin(innerTable, columns[colCtr]))
 			{
-				hashKeyVector.addElement(new Integer(colCtr));
+				hashKeyVector.add(new Integer(colCtr));
 			}
 		}
 
@@ -661,7 +661,7 @@ public class HashJoinStrategy extends Ba
 			int[] keyCols = new int[hashKeyVector.size()];
 			for (int index = 0; index < keyCols.length; index++)
 			{
-				keyCols[index] = ((Integer) hashKeyVector.elementAt(index)).intValue();
+				keyCols[index] = ((Integer) hashKeyVector.get(index)).intValue();
 			}
 			return keyCols;
 		}

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java Tue Feb 22 16:11:22 2011
@@ -897,15 +897,15 @@ public final class LikeEscapeOperatorNod
         // using a method call directly, thus need internal sql capability
         methodCall.internalCall = true;
 
-        param.addElement(parameterNode);
+        param.add(parameterNode);
         if (escapeNode != null)
-            param.addElement(escapeNode);
+            param.add(escapeNode);
 
         QueryTreeNode maxWidthNode = getNodeFactory().getNode(
             C_NodeTypes.INT_CONSTANT_NODE,
             new Integer(maxWidth),
             getContextManager());
-        param.addElement(maxWidthNode);
+        param.add(maxWidthNode);
 
         methodCall.addParms(param);
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java Tue Feb 22 16:11:22 2011
@@ -176,7 +176,7 @@ abstract class MethodCallNode extends Ja
 		{
 			QueryTreeNode	qt;
 
-			qt = (QueryTreeNode) parameterList.elementAt(index);
+			qt = (QueryTreeNode) parameterList.get(index);
 
 			/*
 			** Since we need the parameter to be in Java domain format, put a

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParameterNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParameterNode.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParameterNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParameterNode.java Tue Feb 22 16:11:22 2011
@@ -421,7 +421,7 @@ public class ParameterNode extends Value
 			** Check the first parameter to see if it is a return
 			** parameter.
 			*/
-			boolean hasReturnParam = ((ParameterNode)parameterList.elementAt(0)).isReturnOutputParam();
+			boolean hasReturnParam = ((ParameterNode)parameterList.get(0)).isReturnOutputParam();
 
 			/*
 			** Generate the following:

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java Tue Feb 22 16:11:22 2011
@@ -1967,13 +1967,13 @@ public class PredicateList extends Query
 				if (predicate.getEquivalenceClass() != -1)
 				{
 					outerJCL.removeElementAt(jcIndex);
-					movePreds.addElement(predicate);
+					movePreds.add(predicate);
 				}
 			}
 			for (int mpIndex = 0; mpIndex < movePreds.size(); mpIndex++)
 			{
 				outerJCL.insertElementAt(
-                    (Predicate) movePreds.elementAt(mpIndex), 0);
+                    (Predicate) movePreds.get(mpIndex), 0);
 			}
 
 			// Walk this list as the outer
@@ -3893,7 +3893,7 @@ public class PredicateList extends Query
 
 		while (true)
 		{
-			maxPreds.removeAllElements();
+			maxPreds.clear();
 			int conglomIndex = chooseLongestMatch(predsForConglomerates,
 												  maxPreds, numWorkingPredicates);
 			
@@ -3908,7 +3908,7 @@ public class PredicateList extends Query
 				/* remove the predicates that we've calculated the selectivity
 				 * of, from workingPredicates.
 				 */
-				Predicate p =(Predicate) maxPreds.elementAt(i);
+				Predicate p =(Predicate) maxPreds.get(i);
 				workingPredicates.removeOptPredicate(p);
 			}	
 			
@@ -4018,8 +4018,8 @@ public class PredicateList extends Query
 		for (int i = 0; i < uniquepreds.size(); i++)
 		{
 			Predicate p = 
-				((PredicateWrapper)uniquepreds.elementAt(i)).getPredicate();
-			ret.addElement(p);
+				((PredicateWrapper)uniquepreds.get(i)).getPredicate();
+			ret.add(p);
 			for (int j = 0; j < predArray.length; j++)
 			{
 				if (predArray[j] == null)
@@ -4151,13 +4151,13 @@ public class PredicateList extends Query
 				if (nextPW.getIndexPosition() == index)
 					numDuplicates--;
 			}
-			pwList.removeElementAt(index);
+			pwList.remove(index);
 			numPreds--;
 		}
 
 		PredicateWrapper elementAt(int i)
 		{
-			return (PredicateWrapper)pwList.elementAt(i);
+			return (PredicateWrapper)pwList.get(i);
 		}
 
 		void insert(PredicateWrapper pw)
@@ -4172,7 +4172,7 @@ public class PredicateList extends Query
 					break;
 			}
 			numPreds++;
-			pwList.insertElementAt(pw, i);
+			pwList.add(i, pw);
 		} 
 		
 		int size()
@@ -4203,7 +4203,7 @@ public class PredicateList extends Query
 
 			if (elementAt(0).getIndexPosition() != 0)
 			{
-				pwList.removeAllElements();
+				pwList.clear();
 				numPreds = numDuplicates = 0;
 				return;
 			}
@@ -4228,7 +4228,7 @@ public class PredicateList extends Query
 				if (elementAt(k).getIndexPosition() == 
 							elementAt(k-1).getIndexPosition())
 					numDuplicates--;
-				pwList.removeElementAt(k);
+				pwList.remove(k);
 			}
 			numPreds = j + 1;
 		}
@@ -4251,14 +4251,14 @@ public class PredicateList extends Query
 			if (lastIndexPosition != 0)
 				return null;
 
-			scratch.addElement(elementAt(0));	// always add 0.
+			scratch.add(elementAt(0));	// always add 0.
 
 			for (int i = 1; i < numPreds; i++)
 			{
 				if (elementAt(i).getIndexPosition() == lastIndexPosition)
 					continue;
 				lastIndexPosition = elementAt(i).getIndexPosition();
-				scratch.addElement(elementAt(i));
+				scratch.add(elementAt(i));
 			}
 			return scratch;
 		}

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java Tue Feb 22 16:11:22 2011
@@ -2965,7 +2965,7 @@ public class ResultColumnList extends Qu
 
 			for (int index = 0; index < ucSize; index++)
 			{
-				columnName = (String) updateColumns.elementAt(index);
+				columnName = (String) updateColumns.get(index);
 
 				resultColumn = getResultColumn(columnName);
 				if (SanityManager.DEBUG)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java Tue Feb 22 16:11:22 2011
@@ -1899,7 +1899,7 @@ public abstract class ResultSetNode exte
 
 		for (int index = 0; index < size; index++)
 		{
-			count += (((AggregateNode) aggregateVector.elementAt(index)).isDistinct() == true) ?
+			count += (((AggregateNode) aggregateVector.get(index)).isDistinct() == true) ?
 						1 : 0;
 		}
 		

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowOrderingImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowOrderingImpl.java?rev=1073375&r1=1073374&r2=1073375&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowOrderingImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowOrderingImpl.java Tue Feb 22 16:11:22 2011
@@ -101,7 +101,7 @@ class RowOrderingImpl implements RowOrde
 		if (orderPosition >= ordering.size())
 			return false;
 
-		ColumnOrdering co = (ColumnOrdering) ordering.elementAt(orderPosition);
+		ColumnOrdering co = (ColumnOrdering) ordering.get(orderPosition);
 
 		/*
 		** Is the column in question ordered with the given direction at
@@ -138,7 +138,7 @@ class RowOrderingImpl implements RowOrde
 		boolean ordered = false;
 
 		for (int i = 0; i < ordering.size(); i++) {
-			ColumnOrdering co = (ColumnOrdering) ordering.elementAt(i);
+			ColumnOrdering co = (ColumnOrdering) ordering.get(i);
 
 			/*
 			** Is the column in question ordered with the given direction at
@@ -168,7 +168,7 @@ class RowOrderingImpl implements RowOrde
 		for (i = vec.size() - 1; i >= 0; i--)
 		{
 			Optimizable optTable =
-							(Optimizable) vec.elementAt(i);
+							(Optimizable) vec.get(i);
 
 			if (optTable.hasTableNumber())
 			{
@@ -195,12 +195,12 @@ class RowOrderingImpl implements RowOrde
 		if (ordering.size() == 0)
 		{
 			currentColumnOrdering = new ColumnOrdering(direction);
-			ordering.addElement(currentColumnOrdering);
+			ordering.add(currentColumnOrdering);
 		}
 		else
 		{
 			currentColumnOrdering =
-				(ColumnOrdering) ordering.elementAt(ordering.size() - 1);
+				(ColumnOrdering) ordering.get(ordering.size() - 1);
 		}
 
 		if (SanityManager.DEBUG)
@@ -223,7 +223,7 @@ class RowOrderingImpl implements RowOrde
 			return;
 
 		currentColumnOrdering = new ColumnOrdering(direction);
-		ordering.addElement(currentColumnOrdering);
+		ordering.add(currentColumnOrdering);
 	}
 
 	public void optimizableAlwaysOrdered(Optimizable optimizable)
@@ -253,7 +253,7 @@ class RowOrderingImpl implements RowOrde
 				(ordering.size() == 0) ||
 				(
 					hasTableNumber &&
-					((ColumnOrdering) ordering.elementAt(0)).hasTable(
+					((ColumnOrdering) ordering.get(0)).hasTable(
 																	tableNumber)
 				)
 			)
@@ -267,7 +267,7 @@ class RowOrderingImpl implements RowOrde
 			if (optimizable.hasTableNumber())
 				removeOptimizable(optimizable.getTableNumber());
 
-			alwaysOrderedOptimizables.addElement(optimizable);
+			alwaysOrderedOptimizables.add(optimizable);
 		}
 	}
 
@@ -301,10 +301,10 @@ class RowOrderingImpl implements RowOrde
 			/*
 			** First, remove the table from all the ColumnOrderings
 			*/
-			ColumnOrdering ord = (ColumnOrdering) ordering.elementAt(i);
+			ColumnOrdering ord = (ColumnOrdering) ordering.get(i);
 			ord.removeColumns(tableNumber);
 			if (ord.empty())
-				ordering.removeElementAt(i);
+				ordering.remove(i);
 		}
 
 		/* Remove from list of always-ordered columns */
@@ -328,13 +328,13 @@ class RowOrderingImpl implements RowOrde
 		for (i = vec.size() - 1; i >= 0; i--)
 		{
 			Optimizable optTable =
-							(Optimizable) vec.elementAt(i);
+							(Optimizable) vec.get(i);
 
 			if (optTable.hasTableNumber())
 			{
 				if (optTable.getTableNumber() == tableNumber)
 				{
-					vec.removeElementAt(i);
+					vec.remove(i);
 				}
 			}
 		}
@@ -343,7 +343,7 @@ class RowOrderingImpl implements RowOrde
 	/** @see RowOrdering#addUnorderedOptimizable */
 	public void addUnorderedOptimizable(Optimizable optimizable)
 	{
-		unorderedOptimizables.addElement(optimizable);
+		unorderedOptimizables.add(optimizable);
 	}
 
 	/** @see RowOrdering#copy */
@@ -359,25 +359,25 @@ class RowOrderingImpl implements RowOrde
 		RowOrderingImpl dest = (RowOrderingImpl) copyTo;
 
 		/* Clear the ordering of what we're copying to */
-		dest.ordering.removeAllElements();
+		dest.ordering.clear();
 		dest.currentColumnOrdering = null;
 
-		dest.unorderedOptimizables.removeAllElements();
+		dest.unorderedOptimizables.clear();
 		for (int i = 0; i < unorderedOptimizables.size(); i++) {
-			dest.unorderedOptimizables.addElement(
-											unorderedOptimizables.elementAt(i));
+			dest.unorderedOptimizables.add(
+											unorderedOptimizables.get(i));
 		}
 
-		dest.alwaysOrderedOptimizables.removeAllElements();
+		dest.alwaysOrderedOptimizables.clear();
 		for (int i = 0; i < alwaysOrderedOptimizables.size(); i++) {
-			dest.alwaysOrderedOptimizables.addElement(
-										alwaysOrderedOptimizables.elementAt(i));
+			dest.alwaysOrderedOptimizables.add(
+										alwaysOrderedOptimizables.get(i));
 		}
 
 		for (int i = 0; i < ordering.size(); i++) {
-			ColumnOrdering co = (ColumnOrdering) ordering.elementAt(i);
+			ColumnOrdering co = (ColumnOrdering) ordering.get(i);
 
-			dest.ordering.addElement(co.cloneMe());
+			dest.ordering.add(co.cloneMe());
 
 			if (co == currentColumnOrdering)
 				dest.rememberCurrentColumnOrdering(i);
@@ -389,7 +389,7 @@ class RowOrderingImpl implements RowOrde
 	}
 
 	private void rememberCurrentColumnOrdering(int posn) {
-		currentColumnOrdering = (ColumnOrdering) ordering.elementAt(posn);
+		currentColumnOrdering = (ColumnOrdering) ordering.get(posn);
 	}
 
 	public String toString() {
@@ -402,14 +402,14 @@ class RowOrderingImpl implements RowOrde
 
 			for (i = 0; i < unorderedOptimizables.size(); i++) 
 			{
-				Optimizable opt = (Optimizable) unorderedOptimizables.elementAt(i);
+				Optimizable opt = (Optimizable) unorderedOptimizables.get(i);
 				if (opt.getBaseTableName() != null)
 				{
 					retval += opt.getBaseTableName();
 				}
 				else
 				{
-					retval += unorderedOptimizables.elementAt(i).toString();
+					retval += unorderedOptimizables.get(i).toString();
 				}
 				retval += " ";
 			}
@@ -419,21 +419,21 @@ class RowOrderingImpl implements RowOrde
 
 			for (i = 0; i < alwaysOrderedOptimizables.size(); i++) 
 			{
-				Optimizable opt = (Optimizable) alwaysOrderedOptimizables.elementAt(i);
+				Optimizable opt = (Optimizable) alwaysOrderedOptimizables.get(i);
 				if (opt.getBaseTableName() != null)
 				{
 					retval += opt.getBaseTableName();
 				}
 				else
 				{
-					retval += alwaysOrderedOptimizables.elementAt(i).toString();
+					retval += alwaysOrderedOptimizables.get(i).toString();
 				}
 				retval += " ";
 			}
 			retval += "\n";
 
 			for (i = 0; i < ordering.size(); i++) {
-				retval += " ColumnOrdering " + i + ": " + ordering.elementAt(i);
+				retval += " ColumnOrdering " + i + ": " + ordering.get(i);
 			}
 		}
 
@@ -449,7 +449,7 @@ class RowOrderingImpl implements RowOrde
 		for (int i = 0; i < unorderedOptimizables.size(); i++)
 		{
 			Optimizable thisOpt =
-				(Optimizable) unorderedOptimizables.elementAt(i);
+				(Optimizable) unorderedOptimizables.get(i);
 
 			if (thisOpt != optimizable)
 				return true;



Mime
View raw message