Java cleanup, Convert Vector to ArrayList

Change-Id: I323a6625f93347e69f3114fc10cb04dc759a539f

2 files changed, 10 insertions, 10 deletions

diff --git a/odk/examples/DevelopersGuide/Forms/ButtonOperator.java b/odk/examples/DevelopersGuide/Forms/ButtonOperator.java
index a447381a2c69..3d121589d8e6 100644
--- a/odk/examples/DevelopersGuide/Forms/ButtonOperator.java
+++ b/odk/examples/DevelopersGuide/Forms/ButtonOperator.java
@@ -32,6 +32,8 @@
  *
  *************************************************************************/
 // java base stuff
+import java.util.ArrayList;
+
 import com.sun.star.awt.ActionEvent;
 import com.sun.star.awt.XActionListener;
 import com.sun.star.awt.XButton;
@@ -42,7 +44,6 @@ import com.sun.star.form.runtime.XFormOperations;
 import com.sun.star.lang.EventObject;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;
-import java.util.Vector;
 
 
 /**************************************************************************/
@@ -55,7 +56,7 @@ public class ButtonOperator implements XActionListener, XFeatureInvalidation
     private XPropertySet        m_form;
     private XFormOperations     m_formOperations;
 
-    private Vector<XPropertySet>              m_aButtons;
+    private ArrayList<XPropertySet>              m_aButtons;
 
     /* ------------------------------------------------------------------ */
     /** ctor
@@ -65,7 +66,7 @@ public class ButtonOperator implements XActionListener, XFeatureInvalidation
         m_componentContext = xCtx;
         m_aDocument = aDocument;
         m_form = _form;
-        m_aButtons = new Vector<XPropertySet>();
+        m_aButtons = new ArrayList<XPropertySet>();
     }
 
     /* ------------------------------------------------------------------ */
@@ -89,7 +90,7 @@ public class ButtonOperator implements XActionListener, XFeatureInvalidation
     {
         for ( int i=0; i < m_aButtons.size(); ++i )
         {
-            XPropertySet button = m_aButtons.elementAt( i );
+            XPropertySet button = m_aButtons.get( i );
             if ( _formFeature == getAssociatedFormFeature( button ) )
                 return button;
         }
@@ -104,7 +105,7 @@ public class ButtonOperator implements XActionListener, XFeatureInvalidation
         int nPos = -1;
         for ( int i=0; ( i < m_aButtons.size() ) && ( -1 == nPos ); ++i )
         {
-            if ( xButton.equals( m_aButtons.elementAt( i ) ) )
+            if ( xButton.equals( m_aButtons.get( i ) ) )
                 nPos = i;
         }
         return nPos;
@@ -207,9 +208,8 @@ public class ButtonOperator implements XActionListener, XFeatureInvalidation
 
     public void invalidateAllFeatures() throws com.sun.star.uno.RuntimeException
     {
-        for ( int i=0; i < m_aButtons.size(); ++i )
+        for ( XPropertySet buttonModel : m_aButtons )
         {
-            XPropertySet buttonModel = m_aButtons.elementAt( i );
             updateButtonState( buttonModel, getAssociatedFormFeature( buttonModel ) );
         }
     }
diff --git a/odk/examples/DevelopersGuide/Forms/SalesFilter.java b/odk/examples/DevelopersGuide/Forms/SalesFilter.java
index e4c516160d0f..33053db662ca 100644
--- a/odk/examples/DevelopersGuide/Forms/SalesFilter.java
+++ b/odk/examples/DevelopersGuide/Forms/SalesFilter.java
@@ -362,7 +362,7 @@ class SalesFilter implements XActionListener, XPropertyChangeListener, XResetLis
         String[] aOldFilterItems = (String[])m_xFilterList.getPropertyValue( "StringItemList" );
 
         // translate this into a vector - much more comfort to work with a vector than with an array ....
-        java.util.Vector aFilterItems = new java.util.Vector();
+        java.util.ArrayList aFilterItems = new java.util.ArrayList();
         for ( int i=0; i<aOldFilterItems.length; ++i )
             aFilterItems.add( aOldFilterItems[i] );
 
@@ -384,7 +384,7 @@ class SalesFilter implements XActionListener, XPropertyChangeListener, XResetLis
         if ( aFilterItems.size() > 10 ) // (6 standard items + 5 user defined items)
         {
             // the first (and thus oldes) user defined item
-            aFilterItems.removeElementAt( 6 );
+            aFilterItems.remove( 6 );
             // keep our date vector synchron
             m_aFilterDates.removeElementAt( 6 );
         }
@@ -397,7 +397,7 @@ class SalesFilter implements XActionListener, XPropertyChangeListener, XResetLis
         m_bAdjustingFilterList = true;
         String[] aNewFilterItems = new String[ aFilterItems.size() ];
         for ( int i=0; i<aFilterItems.size(); ++i )
-            aNewFilterItems[i] = (String)aFilterItems.elementAt( i );
+            aNewFilterItems[i] = (String)aFilterItems.get( i );
         m_xFilterList.setPropertyValue( "StringItemList", aNewFilterItems );
         m_bAdjustingFilterList = false;