Java cleanup, convert more Vector to ArrayList

Change-Id: Icb807382eaf50f515f2c9dfada0c061414baed33

4 files changed, 41 insertions, 41 deletions

diff --git a/wizards/com/sun/star/wizards/common/FileAccess.java b/wizards/com/sun/star/wizards/common/FileAccess.java
index 573e9fa9d889..c559a3ad2b5b 100644
--- a/wizards/com/sun/star/wizards/common/FileAccess.java
+++ b/wizards/com/sun/star/wizards/common/FileAccess.java
@@ -53,7 +53,7 @@ public class FileAccess
 {
 
     /**
-     * 
+     *
      * @param xMSF
      * @param sPath
      * @param sAddPath
@@ -497,7 +497,7 @@ public class FileAccess
      * @param xMSF
      * @param FilterName the prefix of the filename. a "-" is added to the prefix !
      * @param FolderName the folder (URL) to look for files...
-     * @return an array with two array members. The first one, with document titles, 
+     * @return an array with two array members. The first one, with document titles,
      * the second with the corresponding URLs.
      * @deprecated please use the getFolderTitles() with ArrayList
      */
@@ -506,8 +506,8 @@ public class FileAccess
         String[][] LocLayoutFiles = new String[2][];
         try
         {
-            java.util.Vector<String> TitleVector = null;
-            java.util.Vector<String> NameVector = null;
+            java.util.ArrayList<String> TitleVector = null;
+            java.util.ArrayList<String> NameVector = null;
 
             XInterface xDocInterface = (XInterface) xMSF.createInstance("com.sun.star.document.DocumentProperties");
             XDocumentProperties xDocProps = UnoRuntime.queryInterface(XDocumentProperties.class, xDocInterface);
@@ -517,8 +517,8 @@ public class FileAccess
 
             String[] nameList = xSimpleFileAccess.getFolderContents(FolderName, false);
 
-            TitleVector = new java.util.Vector<String>(/*nameList.length*/);
-            NameVector = new java.util.Vector<String>(nameList.length);
+            TitleVector = new java.util.ArrayList<String>(/*nameList.length*/);
+            NameVector = new java.util.ArrayList<String>(nameList.length);
 
             FilterName = FilterName == null || FilterName.equals(PropertyNames.EMPTY_STRING) ? null : FilterName + "-";
 
@@ -531,15 +531,15 @@ public class FileAccess
                 if (FilterName == null || fileName.startsWith(FilterName))
                 {
                     xDocProps.loadFromMedium(nameList[i], noArgs);
-                    NameVector.addElement(nameList[i]);
-                    TitleVector.addElement(xDocProps.getTitle());
+                    NameVector.add(nameList[i]);
+                    TitleVector.add(xDocProps.getTitle());
                 }
             }
             String[] LocNameList = new String[NameVector.size()];
             String[] LocTitleList = new String[TitleVector.size()];
 
-            NameVector.copyInto(LocNameList);
-            TitleVector.copyInto(LocTitleList);
+            NameVector.toArray(LocNameList);
+            TitleVector.toArray(LocTitleList);
             LocLayoutFiles[1] = LocNameList;
             LocLayoutFiles[0] = LocTitleList;
 
@@ -598,7 +598,7 @@ public class FileAccess
     }
 
     /**
-     * 
+     *
      * @param xMSF
      * @param _sStartFilterName
      * @param FolderNames
@@ -1050,7 +1050,7 @@ public class FileAccess
     }
 
     /**
-     * shortens a filename to a user displayable representation. 
+     * shortens a filename to a user displayable representation.
      * @param path
      * @param maxLength
      * @return
diff --git a/wizards/com/sun/star/wizards/common/JavaTools.java b/wizards/com/sun/star/wizards/common/JavaTools.java
index 37004bd4efff..5436983d9167 100644
--- a/wizards/com/sun/star/wizards/common/JavaTools.java
+++ b/wizards/com/sun/star/wizards/common/JavaTools.java
@@ -92,11 +92,11 @@ public class JavaTools
 
     /**converts a list of Integer values included in an Integer vector to a list of int values
      *
-     * 
+     *
      * @param _aIntegerVector
      * @return
      */
-    public static int[] IntegerTointList(Vector<Integer> _aIntegerVector)
+    public static int[] IntegerTointList(java.util.List<Integer> _aIntegerVector)
     {
         try
         {
@@ -117,12 +117,12 @@ public class JavaTools
     }
 
     /**converts a list of Boolean values included in a Boolean vector to a list of boolean values
-     * 
-     * 
+     *
+     *
      * @param _aBooleanVector
      * @return
      */
-    public static boolean[] BooleanTobooleanList(Vector<Boolean> _aBooleanVector)
+    public static boolean[] BooleanTobooleanList(java.util.List<Boolean> _aBooleanVector)
     {
         try
         {
diff --git a/wizards/com/sun/star/wizards/db/TypeInspector.java b/wizards/com/sun/star/wizards/db/TypeInspector.java
index 4c4ea18594b5..a5ae2925b1dc 100644
--- a/wizards/com/sun/star/wizards/db/TypeInspector.java
+++ b/wizards/com/sun/star/wizards/db/TypeInspector.java
@@ -17,7 +17,7 @@
  */
 package com.sun.star.wizards.db;
 
-import java.util.Vector;
+import java.util.ArrayList;
 
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.sdbc.ColumnSearch;
@@ -69,27 +69,27 @@ public class TypeInspector
         try
         {
             xResultSet = _xResultSet;
-            Vector<String> aTypeNameVector = new Vector<String>();
-            Vector<Integer> aTypeVector = new Vector<Integer>();
-            Vector<Integer> aNullableVector = new Vector<Integer>();
-            Vector<Boolean> aAutoIncrementVector = new Vector<Boolean>();
-            Vector<Integer> aPrecisionVector = new Vector<Integer>();
-            Vector<Integer> aMinScaleVector = new Vector<Integer>();
-            Vector<Integer> aMaxScaleVector = new Vector<Integer>();
-            Vector<Integer> aSearchableVector = new Vector<Integer>();
+            ArrayList<String> aTypeNameVector = new ArrayList<String>();
+            ArrayList<Integer> aTypeVector = new ArrayList<Integer>();
+            ArrayList<Integer> aNullableVector = new ArrayList<Integer>();
+            ArrayList<Boolean> aAutoIncrementVector = new ArrayList<Boolean>();
+            ArrayList<Integer> aPrecisionVector = new ArrayList<Integer>();
+            ArrayList<Integer> aMinScaleVector = new ArrayList<Integer>();
+            ArrayList<Integer> aMaxScaleVector = new ArrayList<Integer>();
+            ArrayList<Integer> aSearchableVector = new ArrayList<Integer>();
             // Integer[] aIntegerDataTypes = null;
 //      XResultSet xResultSet = xDBMetaDagetTypeInfo();
             XRow xRow = UnoRuntime.queryInterface(XRow.class, xResultSet);
             while (xResultSet.next())
             {
-                aTypeNameVector.addElement(xRow.getString(1));
-                aTypeVector.addElement(new Integer(xRow.getShort(2)));
-                aPrecisionVector.addElement(new Integer(xRow.getInt(3)));
-                aNullableVector.addElement(new Integer(xRow.getShort(7)));
-                aSearchableVector.addElement(new Integer(xRow.getShort(9)));
-                aAutoIncrementVector.addElement(Boolean.valueOf(xRow.getBoolean(12)));
-                aMinScaleVector.addElement(new Integer(xRow.getShort(14)));
-                aMaxScaleVector.addElement(new Integer(xRow.getShort(15)));
+                aTypeNameVector.add(xRow.getString(1));
+                aTypeVector.add(new Integer(xRow.getShort(2)));
+                aPrecisionVector.add(new Integer(xRow.getInt(3)));
+                aNullableVector.add(new Integer(xRow.getShort(7)));
+                aSearchableVector.add(new Integer(xRow.getShort(9)));
+                aAutoIncrementVector.add(Boolean.valueOf(xRow.getBoolean(12)));
+                aMinScaleVector.add(new Integer(xRow.getShort(14)));
+                aMaxScaleVector.add(new Integer(xRow.getShort(15)));
 
             }
             sDataTypeNames = new String[aTypeNameVector.size()];
@@ -404,21 +404,21 @@ public class TypeInspector
         return (getAutoIncrementIndex(_xColPropertySet) != INVALID);
     }
 
-    /** finds the first available DataType that can be used as a primary key in a table. 
+    /** finds the first available DataType that can be used as a primary key in a table.
      * @return The first datatype that also supports Autoincrmentation is taken according to the following list:
      *1) INTEGER
      *2) FLOAT
      *3) REAL
      *4) DOUBLE
      *5) NUMERIC
-     *6) DECIMAL         * 
+     *6) DECIMAL         *
      * If no appropriate datatype is found ther first available numeric type after DataType.INTEGER
      * according to the 'convertDataType' method is returned
      */
-    /**TODO the fallback order is the same as implemented in the method 'convertDataType'. 
+    /**TODO the fallback order is the same as implemented in the method 'convertDataType'.
      * It's not very elegant to have the same intelligence
      * on several spots in the class!!
-     * 
+     *
      */
     public TypeInfo findAutomaticPrimaryKeyType()
     {
diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java b/wizards/com/sun/star/wizards/ui/FieldSelection.java
index 7317a900669c..46845aa6098e 100644
--- a/wizards/com/sun/star/wizards/ui/FieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java
@@ -604,17 +604,17 @@ public class FieldSelection
         {
             int MaxOriginalCount = AllFieldNames.length;
             String[] SelList = xFieldsListBox.getItems();
-            Vector<String> NewSourceVector = new Vector<String>();
+            ArrayList<String> NewSourceVector = new ArrayList<String>();
             for (int i = 0; i < MaxOriginalCount; i++)
             {
                 SearchString = AllFieldNames[i];
                 if (JavaTools.FieldInList(SelList, SearchString) != -1)
                 {
-                    NewSourceVector.addElement(SearchString);
+                    NewSourceVector.add(SearchString);
                 }
                 else if (JavaTools.FieldInList(OldSelFieldItems, SearchString) != -1)
                 {
-                    NewSourceVector.addElement(SearchString);
+                    NewSourceVector.add(SearchString);
                 }
             }
             xFieldsListBox.removeItems((short) 0, xFieldsListBox.getItemCount());