Updating to Java5 - convert Vector to ArrayList

Change-Id: I585312848dacf5128a64469874a1c65452a2b5c8

3 files changed, 24 insertions, 13 deletions

diff --git a/wizards/com/sun/star/wizards/common/ConfigSet.java b/wizards/com/sun/star/wizards/common/ConfigSet.java
index 73ca3c2e05da..7971551e78f0 100644
--- a/wizards/com/sun/star/wizards/common/ConfigSet.java
+++ b/wizards/com/sun/star/wizards/common/ConfigSet.java
@@ -34,7 +34,7 @@ public class ConfigSet implements ConfigNode, XMLProvider, ListModel
 
     private Class childClass;
     private Map childrenMap = new HashMap();
-    private List childrenList = new Vector();
+    private List childrenList = new ArrayList();
     public Object root;
     /**
      * After reading the configuration set items,
@@ -404,7 +404,7 @@ public class ConfigSet implements ConfigNode, XMLProvider, ListModel
          * to a vector, ordered by there index property
          */
         String[] names = Configuration.getChildrenNames(confView);
-        Vector v = new Vector(names.length);
+        ArrayList v = new ArrayList(names.length);
         Object member = null;
         int index = 0;
         for (int i = 0; i < names.length; i++)
@@ -417,7 +417,7 @@ public class ConfigSet implements ConfigNode, XMLProvider, ListModel
                 {
                     v.add(null);
                 }
-                v.setElementAt(member, index);
+                v.set(index, member);
 
             }
         /**
diff --git a/wizards/com/sun/star/wizards/common/JavaTools.java b/wizards/com/sun/star/wizards/common/JavaTools.java
index af417b9b1525..da92a7a97c34 100644
--- a/wizards/com/sun/star/wizards/common/JavaTools.java
+++ b/wizards/com/sun/star/wizards/common/JavaTools.java
@@ -367,7 +367,7 @@ public class JavaTools
         String[] StringArray;
         if (!MainString.equals(PropertyNames.EMPTY_STRING))
         {
-            Vector StringVector = new Vector();
+            ArrayList StringVector = new ArrayList();
             String LocString = null;
             int iIndex;
             do
@@ -375,18 +375,18 @@ public class JavaTools
                 iIndex = MainString.indexOf(Token);
                 if (iIndex < 0)
                 {
-                    StringVector.addElement(MainString);
+                    StringVector.add(MainString);
                 }
                 else
                 {
-                    StringVector.addElement(MainString.substring(0, iIndex));
+                    StringVector.add(MainString.substring(0, iIndex));
                     MainString = MainString.substring(iIndex + 1, MainString.length());
                 }
             }
             while (iIndex >= 0);
             int FieldCount = StringVector.size();
             StringArray = new String[FieldCount];
-            StringVector.copyInto(StringArray);
+            StringVector.toArray(StringArray);
         }
         else
         {
@@ -501,7 +501,7 @@ public class JavaTools
         };
         if ((baselist != null) && (_complist != null))
         {
-            Vector retvector = new Vector();
+            ArrayList retvector = new ArrayList();
 //          String[] orderedcomplist = new String[_complist.length];
 //          System.arraycopy(_complist, 0, orderedcomplist, 0, _complist.length);
             for (int i = 0; i < baselist.length; i++)
@@ -528,7 +528,7 @@ public class JavaTools
         {
             if (baselist.length > 0)
             {
-                Vector retvector = new Vector();
+                ArrayList retvector = new ArrayList();
                 for (int i = 0; i < baselist.length; i++)
                 {
                     String sValue = baselist[i][_compindex];
@@ -718,7 +718,7 @@ public class JavaTools
 
     public static String[] removefromList(String[] _sbaselist, String[] _sdellist)
     {
-        Vector tempbaselist = new Vector();
+        ArrayList tempbaselist = new ArrayList();
         for (int i = 0; i < _sbaselist.length; i++)
         {
             if (FieldInList(_sdellist, _sbaselist[i]) == -1)
diff --git a/wizards/com/sun/star/wizards/common/UCB.java b/wizards/com/sun/star/wizards/common/UCB.java
index 847e7ac265fc..69b7a53645d0 100644
--- a/wizards/com/sun/star/wizards/common/UCB.java
+++ b/wizards/com/sun/star/wizards/common/UCB.java
@@ -18,14 +18,25 @@
 
 package com.sun.star.wizards.common;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Vector;
 
 import com.sun.star.beans.Property;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sdbc.XResultSet;
 import com.sun.star.sdbc.XRow;
-import com.sun.star.ucb.*;
+import com.sun.star.ucb.Command;
+import com.sun.star.ucb.GlobalTransferCommandArgument;
+import com.sun.star.ucb.NameClash;
+import com.sun.star.ucb.OpenCommandArgument2;
+import com.sun.star.ucb.OpenMode;
+import com.sun.star.ucb.TransferCommandOperation;
+import com.sun.star.ucb.XCommandProcessor;
+import com.sun.star.ucb.XContentAccess;
+import com.sun.star.ucb.XContentIdentifier;
+import com.sun.star.ucb.XContentIdentifierFactory;
+import com.sun.star.ucb.XContentProvider;
+import com.sun.star.ucb.XDynamicResultSet;
 import com.sun.star.uno.UnoRuntime;
 
 /**
@@ -163,7 +174,7 @@ public class UCB
 
         XResultSet xResultSet = xSet.getStaticResultSet();
         
-        List files = new Vector();
+        List files = new ArrayList();
 
         if (xResultSet.first())
         {