Java5 update - convert Vector to ArrayList

Change-Id: I630b22da7fbfd2a1c821420d045146e5042c5c28

18 files changed, 61 insertions, 55 deletions

diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java
index b08d59e4911e..aa7753836029 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java
@@ -17,6 +17,7 @@
  */
 package ifc.accessibility;
 
+import java.util.ArrayList;
 import java.util.Vector;
 
 import lib.MultiMethodTest;
@@ -50,7 +51,7 @@ public class _XAccessibleComponent extends MultiMethodTest {
 
     public XAccessibleComponent oObj = null;
     private Rectangle bounds = null;
-    private Vector KnownBounds = new Vector();
+    private ArrayList KnownBounds = new ArrayList();
 
 
     /**
@@ -534,7 +535,7 @@ public class _XAccessibleComponent extends MultiMethodTest {
             cnt = 50;
         }
 
-        Vector childComp = new Vector();
+        ArrayList childComp = new ArrayList();
 
         for (int i = 0; i < cnt; i++) {
             try {
diff --git a/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java
index e6931d471fc0..75d751643f3d 100644
--- a/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java
@@ -18,9 +18,10 @@
 
 package ifc.beans;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Random;
 import java.util.Set;
-import java.util.Vector;
 
 import lib.MultiMethodTest;
 import lib.StatusException;
@@ -54,7 +55,7 @@ import com.sun.star.uno.UnoRuntime;
 public class _XFastPropertySet extends MultiMethodTest {
 
     public XFastPropertySet oObj = null;
-    private Vector handles = new Vector();
+    private List handles = new ArrayList();
     private int handle = -1;
     private Set exclude = null ;
 
@@ -176,7 +177,7 @@ public class _XFastPropertySet extends MultiMethodTest {
 
         Random rnd = new Random();
         int nr = rnd.nextInt(handles.size());
-        handle = ((Integer)handles.elementAt(nr)).intValue();
+        handle = ((Integer)handles.get(nr)).intValue();
     }
 
     private boolean isChangeable(int handle) {
diff --git a/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java b/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java
index 45ef2ebf832b..27cc0ae55e0a 100644
--- a/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java
+++ b/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java
@@ -18,7 +18,7 @@
 
 package ifc.i18n;
 
-import java.util.Vector;
+import java.util.ArrayList;
 
 import lib.MultiMethodTest;
 import lib.Status;
@@ -170,7 +170,7 @@ public class _XBreakIterator extends MultiMethodTest {
         tRes.tested("previousCharacters()", bRes);
     }
 
-    Vector vBounds = new Vector();
+    ArrayList vBounds = new ArrayList();
 
     /**
     * Saves bounds of all returned words for the future tests. <p>
@@ -205,7 +205,7 @@ public class _XBreakIterator extends MultiMethodTest {
         requiredMethod("nextWord()");
 
         int i = UnicodeString.length() - 1;
-        Vector vPrevBounds = new Vector();
+        ArrayList vPrevBounds = new ArrayList();
         while( i > 0  ) {
             Boundary bounds =
                 oObj.previousWord(UnicodeString, i, locale, wordType);
@@ -343,7 +343,7 @@ public class _XBreakIterator extends MultiMethodTest {
         tRes.tested("isEndWord()", bRes);
     }
 
-    Vector vSentenceStart = new Vector();
+    ArrayList vSentenceStart = new ArrayList();
     /**
      * Tries to find all sentences starting positions passing every character
      * as position parameter and stores them. Then tries to pass invalid
@@ -549,8 +549,8 @@ public class _XBreakIterator extends MultiMethodTest {
         return cType;
     }
 
-    Vector vCharBlockBounds = new Vector();
-    Vector vCharBlockTypes = new Vector();
+    ArrayList vCharBlockBounds = new ArrayList();
+    ArrayList vCharBlockTypes = new ArrayList();
 
     /**
      * Creates array of all char blocks with their boundaries and
diff --git a/qadevOOo/tests/java/ifc/io/_XDataInputStream.java b/qadevOOo/tests/java/ifc/io/_XDataInputStream.java
index defa0b798b97..c59fe46493f1 100644
--- a/qadevOOo/tests/java/ifc/io/_XDataInputStream.java
+++ b/qadevOOo/tests/java/ifc/io/_XDataInputStream.java
@@ -18,7 +18,7 @@
 
 package ifc.io;
 
-import java.util.Vector;
+import java.util.List;
 
 import lib.MultiMethodTest;
 import lib.Status;
@@ -81,7 +81,7 @@ public class _XDataInputStream extends MultiMethodTest {
         XInterface x = (XInterface)tEnv.getObjRelation("StreamWriter") ;
         oStream = (XDataOutputStream)UnoRuntime.queryInterface(
                                                     XDataOutputStream.class, x);
-        Vector data = (Vector) tEnv.getObjRelation("StreamData") ;
+        List data = (List) tEnv.getObjRelation("StreamData") ;
         if (data == null || oStream == null) {
             throw new StatusException(Status.failed("Object relation not found."));
         }
diff --git a/qadevOOo/tests/java/ifc/io/_XDataOutputStream.java b/qadevOOo/tests/java/ifc/io/_XDataOutputStream.java
index edb2cef046f6..293c872d43e0 100644
--- a/qadevOOo/tests/java/ifc/io/_XDataOutputStream.java
+++ b/qadevOOo/tests/java/ifc/io/_XDataOutputStream.java
@@ -18,7 +18,7 @@
 
 package ifc.io;
 
-import java.util.Vector;
+import java.util.List;
 
 import lib.MultiMethodTest;
 
@@ -70,7 +70,7 @@ public class _XDataOutputStream extends MultiMethodTest {
     */
     public void before() throws RuntimeException {
 
-        Vector data = (Vector) tEnv.getObjRelation("StreamData") ;
+        List data = (List) tEnv.getObjRelation("StreamData") ;
         if (data == null) {
             throw new RuntimeException("Object relation 'StreamData' not found.");
         }
diff --git a/qadevOOo/tests/java/ifc/sdbc/_XParameters.java b/qadevOOo/tests/java/ifc/sdbc/_XParameters.java
index e4366f3d8337..06b50e2ccb38 100644
--- a/qadevOOo/tests/java/ifc/sdbc/_XParameters.java
+++ b/qadevOOo/tests/java/ifc/sdbc/_XParameters.java
@@ -18,7 +18,7 @@
 
 package ifc.sdbc;
 
-import java.util.Vector;
+import java.util.List;
 
 import lib.MultiMethodTest;
 import lib.Status;
@@ -95,13 +95,13 @@ public class _XParameters extends MultiMethodTest {
     // oObj filled by MultiMethodTest
     public XParameters oObj = null ;
 
-    private Vector data = null ;
+    private List data = null ;
 
     /**
     * Gets object relation
     */
     public void before() {
-        data = (Vector) tEnv.getObjRelation("XParameters.ParamValues") ;
+        data = (List) tEnv.getObjRelation("XParameters.ParamValues") ;
         if (data == null) {
             log.println("!!! Relation not found !!!") ;
         }
diff --git a/qadevOOo/tests/java/ifc/sdbc/_XRow.java b/qadevOOo/tests/java/ifc/sdbc/_XRow.java
index 3fe8dc1d3ae0..12f4f22fca55 100644
--- a/qadevOOo/tests/java/ifc/sdbc/_XRow.java
+++ b/qadevOOo/tests/java/ifc/sdbc/_XRow.java
@@ -18,7 +18,7 @@
 
 package ifc.sdbc;
 
-import java.util.Vector;
+import java.util.List;
 
 import lib.MultiMethodTest;
 
@@ -95,14 +95,14 @@ public class _XRow extends MultiMethodTest {
 
     // oObj filled by MultiMethodTest
     public XRow oObj = null ;
-    private Vector data = null ;
+    private List data = null ;
     private boolean notNullRes = true ;
 
     /**
     * Retrieves object relation first.
     */
     public void before() {
-        data = (Vector) tEnv.getObjRelation("CurrentRowData") ;
+        data = (List) tEnv.getObjRelation("CurrentRowData") ;
     }
 
     /**
diff --git a/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java b/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java
index a70f0154b5ff..b08cd9256ebb 100644
--- a/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java
+++ b/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java
@@ -18,7 +18,7 @@
 
 package ifc.sdbc;
 
-import java.util.Vector;
+import java.util.List;
 
 import lib.MultiMethodTest;
 import lib.Status;
@@ -93,14 +93,14 @@ public class _XRowUpdate extends MultiMethodTest {
     // oObj filled by MultiMethodTest
     public XRowUpdate oObj = null ;
 
-    private Vector rowData = null ;
+    private List rowData = null ;
     private XRow row = null ;
 
     /**
     * Gets relations.
     */
     public void before() {
-        rowData = (Vector) tEnv.getObjRelation("CurrentRowData") ;
+        rowData = (List) tEnv.getObjRelation("CurrentRowData") ;
         if (rowData == null) {
             log.println("!!! 'CurrentRowData' relation not found !!!") ;
         }
diff --git a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
index dfb07a353876..e75b1b15d5df 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
@@ -18,7 +18,10 @@
 
 package mod._dbaccess;
 
+import ifc.sdb._XCompletedExecution;
+
 import java.io.PrintWriter;
+import java.util.ArrayList;
 import java.util.Vector;
 
 import lib.Status;
@@ -28,15 +31,21 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 import util.DBTools;
 import util.utils;
+import util.db.DataSource;
+import util.db.DataSourceDescriptor;
 
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.beans.XPropertySet;
+import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sdb.CommandType;
 import com.sun.star.sdb.ParametersRequest;
+import com.sun.star.sdb.RowChangeEvent;
 import com.sun.star.sdb.XInteractionSupplyParameters;
+import com.sun.star.sdbc.SQLException;
 import com.sun.star.sdbc.XConnection;
+import com.sun.star.sdbc.XParameters;
 import com.sun.star.sdbc.XResultSet;
 import com.sun.star.sdbc.XResultSetUpdate;
 import com.sun.star.sdbc.XRow;
@@ -49,13 +58,6 @@ import com.sun.star.ucb.AuthenticationRequest;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.util.XCloseable;
-import com.sun.star.frame.XModel;
-import com.sun.star.sdb.RowChangeEvent;
-import com.sun.star.sdbc.SQLException;
-import com.sun.star.sdbc.XParameters;
-import ifc.sdb._XCompletedExecution;
-import util.db.DataSource;
-import util.db.DataSourceDescriptor;
 
 /**
  * Test for object which is represented by service
@@ -380,7 +382,7 @@ public class ORowSet extends TestCase {
             // Adding relations for XRow as a Vector with all data
             // of current row of RowSet.
 
-            Vector rowData = new Vector();
+            ArrayList rowData = new ArrayList();
 
             for (int i = 0; i < DBTools.TST_TABLE_VALUES[0].length; i++) {
                 rowData.add(DBTools.TST_TABLE_VALUES[0][i]);
@@ -413,7 +415,7 @@ public class ORowSet extends TestCase {
             }
 
             // Adding relation for XParameters ifc test
-            tEnv.addObjRelation( "XParameters.ParamValues", new Vector() );
+            tEnv.addObjRelation( "XParameters.ParamValues", new ArrayList() );
 
             // Adding relation for XRowUpdate
             final XRow row = UnoRuntime.queryInterface( XRow.class, m_rowSet );
diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
index df55740ed4a6..d9424522eb08 100644
--- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
+++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
@@ -17,7 +17,11 @@
  */
 package mod._forms;
 
+import ifc.form._XDatabaseParameterBroadcaster;
+import ifc.sdb._XCompletedExecution;
+
 import java.io.PrintWriter;
+import java.util.ArrayList;
 import java.util.Vector;
 
 import lib.Status;
@@ -68,8 +72,6 @@ import com.sun.star.util.DateTime;
 import com.sun.star.util.Time;
 import com.sun.star.util.XCloseable;
 import com.sun.star.view.XControlAccess;
-import ifc.form._XDatabaseParameterBroadcaster;
-import ifc.sdb._XCompletedExecution;
 
 
 /**
@@ -620,7 +622,7 @@ public class ODatabaseForm extends TestCase {
         tEnv.addObjRelation("XColumnLocate.ColumnName", DBTools.TST_STRING_F);
 
         // Adding relation for XParameters ifc test
-        Vector params = new Vector();
+        ArrayList params = new ArrayList();
 
 
         /*****  statement parameter types and their initial
@@ -710,7 +712,7 @@ public class ODatabaseForm extends TestCase {
         // Adding relations for XRow as a Vector with all data
         // of current row of RowSet.
 
-        Vector rowData = new Vector();
+        ArrayList rowData = new ArrayList();
 
         for (int i = 0; i < DBTools.TST_TABLE_VALUES[0].length; i++) {
             rowData.add(DBTools.TST_TABLE_VALUES[0][i]);
diff --git a/qadevOOo/tests/java/mod/_fwl/FilterFactory.java b/qadevOOo/tests/java/mod/_fwl/FilterFactory.java
index b0c8fab1048d..1e8bae332788 100644
--- a/qadevOOo/tests/java/mod/_fwl/FilterFactory.java
+++ b/qadevOOo/tests/java/mod/_fwl/FilterFactory.java
@@ -18,9 +18,8 @@
 
 package mod._fwl;
 
-import com.sun.star.beans.NamedValue;
 import java.io.PrintWriter;
-import java.util.Vector;
+import java.util.ArrayList;
 
 import lib.Status;
 import lib.StatusException;
@@ -29,6 +28,7 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 import util.utils;
 
+import com.sun.star.beans.NamedValue;
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.lang.XMultiServiceFactory;
@@ -119,8 +119,8 @@ public class FilterFactory extends TestCase {
 
 
         // XMSF
-        Vector vFTypes = new Vector();
-        Vector vFArgs = new Vector();
+        ArrayList vFTypes = new ArrayList();
+        ArrayList vFArgs = new ArrayList();
         for (int i = 0; i < filterNames.length; i++) {
             PropertyValue[] filterProps = null;
             try {
diff --git a/qadevOOo/tests/java/mod/_sc/ScStyleObj.java b/qadevOOo/tests/java/mod/_sc/ScStyleObj.java
index 5450b43fed14..2b929a966925 100644
--- a/qadevOOo/tests/java/mod/_sc/ScStyleObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScStyleObj.java
@@ -19,7 +19,7 @@
 package mod._sc;
 
 import java.io.PrintWriter;
-import java.util.Vector;
+import java.util.ArrayList;
 
 import lib.StatusException;
 import lib.TestCase;
@@ -247,7 +247,7 @@ public class ScStyleObj extends TestCase {
 
     public String[] getPropertyNames(XPropertySet props) {
         Property[] the_props = props.getPropertySetInfo().getProperties();
-        Vector names = new Vector() ;
+        ArrayList names = new ArrayList() ;
 
         for (int i=0;i<the_props.length;i++) {
             boolean isWritable =
diff --git a/qadevOOo/tests/java/mod/_stm/DataInputStream.java b/qadevOOo/tests/java/mod/_stm/DataInputStream.java
index 5cb5bec9b6ed..3affe2fd325a 100644
--- a/qadevOOo/tests/java/mod/_stm/DataInputStream.java
+++ b/qadevOOo/tests/java/mod/_stm/DataInputStream.java
@@ -19,7 +19,7 @@
 package mod._stm;
 
 import java.io.PrintWriter;
-import java.util.Vector;
+import java.util.ArrayList;
 
 import lib.StatusException;
 import lib.TestCase;
@@ -131,7 +131,7 @@ public class DataInputStream extends TestCase {
         xDataSink.setInputStream(xPipeInput) ;
 
         // all data types for writing to an XDataInputStream
-        Vector data = new Vector() ;
+        ArrayList data = new ArrayList() ;
         data.add(new Boolean(true)) ;
         data.add(new Byte((byte)123)) ;
         data.add(new Character((char)1234)) ;
diff --git a/qadevOOo/tests/java/mod/_stm/DataOutputStream.java b/qadevOOo/tests/java/mod/_stm/DataOutputStream.java
index c2b1f5ef903a..df8007d06ab8 100644
--- a/qadevOOo/tests/java/mod/_stm/DataOutputStream.java
+++ b/qadevOOo/tests/java/mod/_stm/DataOutputStream.java
@@ -19,7 +19,7 @@
 package mod._stm;
 
 import java.io.PrintWriter;
-import java.util.Vector;
+import java.util.ArrayList;
 
 import lib.StatusException;
 import lib.TestCase;
@@ -105,7 +105,7 @@ public class DataOutputStream extends TestCase {
         xDataSource.setOutputStream(xPipeOutput);
 
         // all data types for writing to an XDataInputStream
-        Vector data = new Vector() ;
+        ArrayList data = new ArrayList() ;
         data.add(new Boolean(true)) ;
         data.add(new Byte((byte)123)) ;
         data.add(new Character((char)1234)) ;
diff --git a/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java b/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java
index c97103d44cdf..eb9b398cf934 100644
--- a/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java
+++ b/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java
@@ -19,7 +19,7 @@
 package mod._stm;
 
 import java.io.PrintWriter;
-import java.util.Vector;
+import java.util.ArrayList;
 
 import lib.StatusException;
 import lib.TestCase;
@@ -130,7 +130,7 @@ public class MarkableOutputStream extends TestCase {
         oObj = (XInterface) mostream;
 
         // all data types for writing to an XDataInputStream
-        Vector data = new Vector() ;
+        ArrayList data = new ArrayList() ;
         data.add(new Boolean(true)) ;
         data.add(new Byte((byte)123)) ;
         data.add(new Character((char)1234)) ;
diff --git a/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java b/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java
index 5901a7dd4696..d2a3925818b9 100644
--- a/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java
+++ b/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java
@@ -19,7 +19,7 @@
 package mod._stm;
 
 import java.io.PrintWriter;
-import java.util.Vector;
+import java.util.ArrayList;
 
 import lib.StatusException;
 import lib.TestCase;
@@ -250,7 +250,7 @@ public class ObjectInputStream extends TestCase {
 
 
         // all data types for writing to an XDataInputStream
-        Vector data = new Vector() ;
+        ArrayList data = new ArrayList() ;
         data.add(new Boolean(true)) ;
         data.add(new Byte((byte)123)) ;
         data.add(new Character((char)1234)) ;
diff --git a/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java b/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java
index e7c2c4aa3484..bccf7540de6b 100644
--- a/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java
+++ b/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java
@@ -19,7 +19,7 @@
 package mod._stm;
 
 import java.io.PrintWriter;
-import java.util.Vector;
+import java.util.ArrayList;
 
 import lib.StatusException;
 import lib.TestCase;
@@ -240,7 +240,7 @@ public class ObjectOutputStream extends TestCase {
         oObj = oStream;
 
         // all data types for writing to an XDataInputStream
-        Vector data = new Vector() ;
+        ArrayList data = new ArrayList() ;
         data.add(new Boolean(true)) ;
         data.add(new Byte((byte)123)) ;
         data.add(new Character((char)1234)) ;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextCursor.java b/qadevOOo/tests/java/mod/_sw/SwXTextCursor.java
index 037a78f6c1f7..2053403a6e5d 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextCursor.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextCursor.java
@@ -18,7 +18,7 @@
 package mod._sw;
 
 import java.io.PrintWriter;
-import java.util.Vector;
+import java.util.ArrayList;
 
 import lib.StatusException;
 import lib.TestCase;
@@ -292,7 +292,7 @@ public class SwXTextCursor extends TestCase {
 
     public String[] getPropertyNames(XPropertySet props) {
         Property[] the_props = props.getPropertySetInfo().getProperties();
-        Vector names = new Vector();
+        ArrayList names = new ArrayList();
 
         for (int i = 0; i < the_props.length; i++) {
             boolean isWritable = ((the_props[i].Attributes & PropertyAttribute.READONLY) == 0);