Updating to Java5 - convert Vector to ArrayList

Change-Id: I585312848dacf5128a64469874a1c65452a2b5c8

4 files changed, 57 insertions, 58 deletions

diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java
index b827e68ed451..8133074e7375 100644
--- a/wizards/com/sun/star/wizards/db/DBMetaData.java
+++ b/wizards/com/sun/star/wizards/db/DBMetaData.java
@@ -17,14 +17,12 @@
  */
 package com.sun.star.wizards.db;
 
-import com.sun.star.awt.XWindow;
-import com.sun.star.lang.XInitialization;
-import com.sun.star.ui.dialogs.XExecutableDialog;
+import java.util.ArrayList;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
-import com.sun.star.lang.IllegalArgumentException;
-import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.awt.VclWindowPeerAttribute;
+import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.beans.UnknownPropertyException;
@@ -35,35 +33,39 @@ import com.sun.star.container.XNameAccess;
 import com.sun.star.container.XNameContainer;
 import com.sun.star.frame.XModel;
 import com.sun.star.frame.XStorable;
+import com.sun.star.lang.IllegalArgumentException;
+import com.sun.star.lang.Locale;
+import com.sun.star.lang.WrappedTargetException;
 import com.sun.star.lang.XComponent;
-import com.sun.star.sdbc.DataType;
-import com.sun.star.sdb.XOfficeDatabaseDocument;
+import com.sun.star.lang.XInitialization;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.lang.XSingleServiceFactory;
+import com.sun.star.sdb.XCompletedConnection;
 import com.sun.star.sdb.XDocumentDataSource;
-import com.sun.star.sdb.tools.XConnectionTools;
-import com.sun.star.sdbcx.XColumnsSupplier;
-
-import com.sun.star.ucb.XSimpleFileAccess;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.util.XCloseable;
-import com.sun.star.util.XNumberFormatsSupplier;
-
-import com.sun.star.task.XInteractionHandler;
 import com.sun.star.sdb.XFormDocumentsSupplier;
+import com.sun.star.sdb.XOfficeDatabaseDocument;
+import com.sun.star.sdb.XQueriesSupplier;
 import com.sun.star.sdb.XQueryDefinitionsSupplier;
 import com.sun.star.sdb.XReportDocumentsSupplier;
+import com.sun.star.sdb.tools.XConnectionTools;
+import com.sun.star.sdbc.DataType;
 import com.sun.star.sdbc.SQLException;
-import com.sun.star.sdbc.XDatabaseMetaData;
+import com.sun.star.sdbc.XConnection;
 import com.sun.star.sdbc.XDataSource;
+import com.sun.star.sdbc.XDatabaseMetaData;
 import com.sun.star.sdbc.XResultSet;
 import com.sun.star.sdbc.XRow;
-import com.sun.star.sdb.XCompletedConnection;
-import com.sun.star.lang.Locale;
-import com.sun.star.lang.XSingleServiceFactory;
-import com.sun.star.sdb.XQueriesSupplier;
-import com.sun.star.sdbc.XConnection;
+import com.sun.star.sdbcx.XColumnsSupplier;
 import com.sun.star.sdbcx.XTablesSupplier;
+import com.sun.star.task.XInteractionHandler;
+import com.sun.star.ucb.XSimpleFileAccess;
+import com.sun.star.ui.dialogs.XExecutableDialog;
+import com.sun.star.uno.Any;
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XInterface;
+import com.sun.star.util.XCloseable;
+import com.sun.star.util.XNumberFormatsSupplier;
 import com.sun.star.wizards.common.Configuration;
 import com.sun.star.wizards.common.Desktop;
 import com.sun.star.wizards.common.FileAccess;
@@ -71,13 +73,9 @@ import com.sun.star.wizards.common.JavaTools;
 import com.sun.star.wizards.common.NamedValueCollection;
 import com.sun.star.wizards.common.NumberFormatter;
 import com.sun.star.wizards.common.Properties;
+import com.sun.star.wizards.common.PropertyNames;
 import com.sun.star.wizards.common.Resource;
 import com.sun.star.wizards.common.SystemDialog;
-import com.sun.star.uno.Any;
-import com.sun.star.wizards.common.PropertyNames;
-import java.util.Vector;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 public class DBMetaData
 {
@@ -89,7 +87,7 @@ public class DBMetaData
     private XPropertySet xDataSourcePropertySet;
     public String[] DataSourceNames;
     public String[] CommandNames;
-    public java.util.Vector CommandObjects = new Vector(1);
+    public java.util.ArrayList CommandObjects = new ArrayList(1);
     public Locale aLocale;
     public int[] CommandTypes;
     public String DataSourceName;
@@ -246,7 +244,7 @@ public class DBMetaData
     public void setTableByName(String _tableName)
     {
         CommandObject oTableObject = new CommandObject(_tableName, com.sun.star.sdb.CommandType.TABLE);
-        this.CommandObjects.addElement(oTableObject);
+        this.CommandObjects.add(oTableObject);
     }
 
     public CommandObject getTableByName(String _tablename)
@@ -264,7 +262,7 @@ public class DBMetaData
         CommandObject oCommand = null;
         for (int i = 0; i < CommandObjects.size(); i++)
         {
-            oCommand = (CommandObject) CommandObjects.elementAt(i);
+            oCommand = (CommandObject) CommandObjects.get(i);
             if ((oCommand.Name.equals(_commandname)) && (oCommand.CommandType == _commandtype))
             {
                 return oCommand;
@@ -273,7 +271,7 @@ public class DBMetaData
         if (oCommand == null)
         {
             oCommand = new CommandObject(_commandname, _commandtype);
-            CommandObjects.addElement(oCommand);
+            CommandObjects.add(oCommand);
         }
         return oCommand;
     }
@@ -281,7 +279,7 @@ public class DBMetaData
     public void setQueryByName(String _QueryName)
     {
         CommandObject oQueryObject = new CommandObject(_QueryName, com.sun.star.sdb.CommandType.QUERY);
-        this.CommandObjects.addElement(oQueryObject);
+        this.CommandObjects.add(oQueryObject);
     }
 
     public class CommandObject
@@ -964,10 +962,10 @@ public class DBMetaData
         try
         {
             XRow xRow = UnoRuntime.queryInterface( XRow.class, _xResultSet );
-            Vector aColVector = new Vector();
+            ArrayList aColVector = new ArrayList();
             while (_xResultSet.next())
             {
-                aColVector.addElement(xRow.getString(_icol));
+                aColVector.add(xRow.getString(_icol));
             }
             sColValues = new String[aColVector.size()];
             aColVector.toArray(sColValues);
diff --git a/wizards/com/sun/star/wizards/db/RecordParser.java b/wizards/com/sun/star/wizards/db/RecordParser.java
index ea1079fce5ce..e19f18bf8ba3 100644
--- a/wizards/com/sun/star/wizards/db/RecordParser.java
+++ b/wizards/com/sun/star/wizards/db/RecordParser.java
@@ -275,7 +275,7 @@ public class RecordParser extends QueryMetaData
         return getColumnValue(CurDBFieldColumn.ColIndex, CurDBFieldColumn.getFieldType());
     }
 
-    public boolean getcurrentRecordData(java.util.Vector DataVector)
+    public boolean getcurrentRecordData(java.util.ArrayList DataVector)
     {
         Object[] RecordValueArray = new Object[RecordFieldColumns.length];
         for (int i = 0; i < RecordFieldColumns.length; i++)
@@ -283,7 +283,7 @@ public class RecordParser extends QueryMetaData
             FieldColumn CurDBFieldColumn = this.RecordFieldColumns[i];
             RecordValueArray[i] = getColumnValue(CurDBFieldColumn.ColIndex, CurDBFieldColumn.getFieldType()); //FinalColIndex
         }
-        DataVector.addElement(RecordValueArray);
+        DataVector.add(RecordValueArray);
         return true;
     }
 
diff --git a/wizards/com/sun/star/wizards/db/RelationController.java b/wizards/com/sun/star/wizards/db/RelationController.java
index 9d4183d7c142..cb331fb5e872 100644
--- a/wizards/com/sun/star/wizards/db/RelationController.java
+++ b/wizards/com/sun/star/wizards/db/RelationController.java
@@ -17,7 +17,7 @@
  */
 package com.sun.star.wizards.db;
 
-import java.util.Vector;
+import java.util.ArrayList;
 
 import com.sun.star.sdbc.SQLException;
 import com.sun.star.sdbc.XResultSet;
@@ -62,7 +62,7 @@ public class RelationController extends CommandName
         try
         {
             String[] sTableNames = super.getCommandMetaData().getTableNames();
-            Vector aReferencedTableVector = new Vector();
+            ArrayList aReferencedTableVector = new ArrayList();
             XResultSet xResultSet = super.getCommandMetaData().xDBMetaData.getExportedKeys((getCatalogName(this)), getSchemaName(), getTableName());
             XRow xRow = UnoRuntime.queryInterface(XRow.class, xResultSet);
             while (xResultSet.next())
@@ -107,8 +107,8 @@ public class RelationController extends CommandName
             XResultSet xResultSet = super.getCommandMetaData().xDBMetaData.getImportedKeys(getCatalogName(oLocCommandName), oLocCommandName.getSchemaName(), oLocCommandName.getTableName());
             XRow xRow = UnoRuntime.queryInterface(XRow.class, xResultSet);
             boolean bleaveLoop = false;
-            Vector aMasterFieldNamesVector = new Vector();
-            Vector aSlaveFieldNamesVector = new Vector();
+            ArrayList aMasterFieldNamesVector = new ArrayList();
+            ArrayList aSlaveFieldNamesVector = new ArrayList();
             while (xResultSet.next() && !bleaveLoop)
             {
                 String sPrimaryCatalog = null;
diff --git a/wizards/com/sun/star/wizards/db/TableDescriptor.java b/wizards/com/sun/star/wizards/db/TableDescriptor.java
index 83440c904367..e1b12dac85fe 100644
--- a/wizards/com/sun/star/wizards/db/TableDescriptor.java
+++ b/wizards/com/sun/star/wizards/db/TableDescriptor.java
@@ -17,18 +17,15 @@
  */
 package com.sun.star.wizards.db;
 
-import com.sun.star.awt.XWindow;
-import com.sun.star.beans.PropertyVetoException;
-import com.sun.star.beans.UnknownPropertyException;
-import com.sun.star.lang.IllegalArgumentException;
-import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.sdbc.SQLException;
-import com.sun.star.wizards.common.JavaTools;
+import java.util.ArrayList;
 import java.util.Vector;
 
 import com.sun.star.awt.VclWindowPeerAttribute;
+import com.sun.star.awt.XWindow;
 import com.sun.star.beans.Property;
 import com.sun.star.beans.PropertyValue;
+import com.sun.star.beans.PropertyVetoException;
+import com.sun.star.beans.UnknownPropertyException;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.ContainerEvent;
 import com.sun.star.container.XContainer;
@@ -37,7 +34,10 @@ import com.sun.star.container.XHierarchicalNameAccess;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.lang.EventObject;
+import com.sun.star.lang.IllegalArgumentException;
+import com.sun.star.lang.WrappedTargetException;
 import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.sdbc.SQLException;
 import com.sun.star.sdbcx.KeyType;
 import com.sun.star.sdbcx.XAppend;
 import com.sun.star.sdbcx.XColumnsSupplier;
@@ -47,6 +47,7 @@ import com.sun.star.sdbcx.XKeysSupplier;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.wizards.common.Desktop;
+import com.sun.star.wizards.common.JavaTools;
 import com.sun.star.wizards.common.Properties;
 import com.sun.star.wizards.common.PropertyNames;
 
@@ -64,8 +65,8 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen
     private XAppend xKeyAppend;
     private XDrop xKeyDrop;
     private String[] sTableFilters = null;
-    private Vector columncontainer;
-    private Vector keycolumncontainer;
+    private ArrayList columncontainer;
+    private ArrayList keycolumncontainer;
     public XHierarchicalNameAccess xTableHierarchicalNameAccess;
     private CommandName ComposedTableName;
     private XAppend xKeyColAppend;
@@ -83,8 +84,8 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen
     public TableDescriptor(XMultiServiceFactory xMSF, XWindow _xWindow, String _sColumnAlreadyExistsMessage)
     {
         super(xMSF);
-        columncontainer = new Vector();
-        keycolumncontainer = new Vector();
+        columncontainer = new ArrayList();
+        keycolumncontainer = new ArrayList();
         sColumnAlreadyExistsMessage = _sColumnAlreadyExistsMessage;
         xWindow = _xWindow;
     }
@@ -410,7 +411,7 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen
                             oColumnDescriptor.Name = (String) _oValue;
                         }
                         columncontainer.remove(i);
-                        columncontainer.insertElementAt(oColumnDescriptor, i);
+                        columncontainer.add(i, oColumnDescriptor);
                         return true;
                     }
                 }
@@ -449,7 +450,7 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen
                         oColumnDescriptor.xColPropertySet = _xColPropertySet;
                         oColumnDescriptor.Name = (String) _xColPropertySet.getPropertyValue(PropertyNames.PROPERTY_NAME);
                         columncontainer.remove(i);
-                        columncontainer.insertElementAt(oColumnDescriptor, i);
+                        columncontainer.add(i, oColumnDescriptor);
                         return true;
                     }
                 }
@@ -711,7 +712,7 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen
 
     public String[] getNonBinaryFieldNames()
     {
-        Vector NonBinaryFieldNameVector = new Vector();
+        ArrayList NonBinaryFieldNameVector = new ArrayList();
         try
         {
             for (int i = 0; i < columncontainer.size(); i++)
@@ -725,7 +726,7 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen
                     itype = AnyConverter.toInt(xColPropertySet.getPropertyValue("Type"));
                     if (!isBinaryDataType(itype))
                     {
-                        NonBinaryFieldNameVector.addElement(oColumnDescriptor.Name);
+                        NonBinaryFieldNameVector.add(oColumnDescriptor.Name);
                     }
                 }
                 catch (Exception e)