Java cleanup, Convert Vector to ArrayList

Change-Id: I323a6625f93347e69f3114fc10cb04dc759a539f

2 files changed, 26 insertions, 20 deletions

diff --git a/forms/qa/complex/forms/CheckOGroupBoxModel.java b/forms/qa/complex/forms/CheckOGroupBoxModel.java
index 33b6c2ed3dcd..62b97c9d9e70 100644
--- a/forms/qa/complex/forms/CheckOGroupBoxModel.java
+++ b/forms/qa/complex/forms/CheckOGroupBoxModel.java
@@ -17,31 +17,35 @@
  */
 package complex.forms;
 
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+
+import util.FormTools;
+import util.SOfficeFactory;
+import util.ValueChanger;
+
 import com.sun.star.beans.Property;
 import com.sun.star.beans.PropertyAttribute;
 import com.sun.star.beans.PropertyChangeEvent;
 import com.sun.star.beans.XMultiPropertySet;
 import com.sun.star.beans.XPropertiesChangeListener;
-import com.sun.star.lang.EventObject;
 import com.sun.star.drawing.XControlShape;
+import com.sun.star.lang.EventObject;
 import com.sun.star.lang.XComponent;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
-// import complexlib.ComplexTestCase;
 import com.sun.star.util.CloseVetoException;
 import com.sun.star.util.XCloseable;
-import java.util.Vector;
-import util.FormTools;
-import util.SOfficeFactory;
-import util.ValueChanger;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.openoffice.test.OfficeConnection;
-import static org.junit.Assert.*;
+// import complexlib.ComplexTestCase;
 
 /**
  */
@@ -130,7 +134,7 @@ public class CheckOGroupBoxModel
         Property[] properties = m_xPropSet.getPropertySetInfo().getProperties();
         String[] testPropsNames = null;
 
-        Vector<String> tNames = new Vector<String>();
+        ArrayList<String> tNames = new ArrayList<String>();
 
         for (int i = 0; i < properties.length; i++)
         {
diff --git a/forms/qa/integration/forms/ListBox.java b/forms/qa/integration/forms/ListBox.java
index acdfc71fbfef..d6c574973fa9 100644
--- a/forms/qa/integration/forms/ListBox.java
+++ b/forms/qa/integration/forms/ListBox.java
@@ -17,6 +17,10 @@
  */
 package integration.forms;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
 import com.sun.star.awt.XListBox;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XChild;
@@ -32,13 +36,11 @@ import com.sun.star.sdbc.XParameters;
 import com.sun.star.sdbc.XPreparedStatement;
 import com.sun.star.uno.Exception;
 import com.sun.star.uno.UnoRuntime;
+
 import connectivity.tools.HsqlColumnDescriptor;
 import connectivity.tools.HsqlDatabase;
 import connectivity.tools.HsqlTableDescriptor;
 import connectivity.tools.sdb.Connection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Vector;
 
 public class ListBox extends TestCase
 {
@@ -175,10 +177,10 @@ public class ListBox extends TestCase
             final String[] keyTypes = fieldDefinitions[0];
             final String[] keyCreationArgs = fieldDefinitions[1];
 
-            Vector< HsqlColumnDescriptor > foreignKeyColumns = new Vector< HsqlColumnDescriptor >();
+            ArrayList< HsqlColumnDescriptor > foreignKeyColumns = new ArrayList< HsqlColumnDescriptor >();
             foreignKeyColumns.add( new HsqlColumnDescriptor( "ID", "integer", HsqlColumnDescriptor.PRIMARY ) );
 
-            Vector< String[] > foreignKeyValues = new Vector< String[] >();
+            ArrayList< String[] > foreignKeyValues = new ArrayList< String[] >();
 
             StringBuffer foreignKeyInsertSQL = new StringBuffer();
             foreignKeyInsertSQL.append( "INSERT INTO \"" + m_foreignKeyTableName + "\" VALUES (?" );