Java5 update - convert Vector to ArrayList and Enumeration to Iterator

Change-Id: I94323dcfa4c8069f228dd3079f3842131314610e

5 files changed, 85 insertions, 89 deletions

diff --git a/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java b/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
index 8f24e6476a8b..ccb59106d89c 100644
--- a/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
+++ b/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
@@ -19,23 +19,18 @@
 package com.sun.star.comp.bridgefactory;
 
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.Vector;
 
-
 import com.sun.star.bridge.BridgeExistsException;
 import com.sun.star.bridge.XBridge;
 import com.sun.star.bridge.XBridgeFactory;
 import com.sun.star.bridge.XInstanceProvider;
-
 import com.sun.star.comp.loader.FactoryHelper;
-
 import com.sun.star.connection.XConnection;
-
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.lang.XSingleServiceFactory;
-
 import com.sun.star.registry.XRegistryKey;
-
 import com.sun.star.uno.IBridge;
 import com.sun.star.uno.UnoRuntime;
 
@@ -173,19 +168,19 @@ public class BridgeFactory implements XBridgeFactory/*, XEventListener*/ {
      * @see                           com.sun.star.bridge.XBridgeFactory
      */
     public synchronized XBridge[] getExistingBridges() throws com.sun.star.uno.RuntimeException {
-        Vector vector = new Vector();
+        ArrayList vector = new ArrayList();
 
         IBridge iBridges[] = UnoRuntime.getBridges();
         for(int i = 0; i < iBridges.length; ++ i) {
             XBridge xBridge = UnoRuntime.queryInterface(XBridge.class, iBridges[i]);
 
             if(xBridge != null)
-                vector.addElement(xBridge);
+                vector.add(xBridge);
         }
 
         XBridge xBridges[]= new XBridge[vector.size()];
         for(int i = 0; i < vector.size(); ++ i)
-            xBridges[i] = (XBridge)vector.elementAt(i);
+            xBridges[i] = (XBridge)vector.get(i);
 
         return xBridges;
     }
diff --git a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
index d320da7730c8..de95d7b93227 100644
--- a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
+++ b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
@@ -18,28 +18,26 @@
 
 package com.sun.star.comp.servicemanager;
 
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XComponentContext;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collections;
 
-import com.sun.star.container.XSet;
 import com.sun.star.container.XContentEnumerationAccess;
 import com.sun.star.container.XEnumeration;
-
+import com.sun.star.container.XSet;
 import com.sun.star.lang.XComponent;
 import com.sun.star.lang.XEventListener;
 import com.sun.star.lang.XInitialization;
+import com.sun.star.lang.XMultiComponentFactory;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.lang.XServiceInfo;
-import com.sun.star.lang.XSingleServiceFactory;
 import com.sun.star.lang.XSingleComponentFactory;
-import com.sun.star.lang.XMultiComponentFactory;
-
+import com.sun.star.lang.XSingleServiceFactory;
+import com.sun.star.loader.XImplementationLoader;
 import com.sun.star.registry.XRegistryKey;
 import com.sun.star.registry.XSimpleRegistry;
-
-import com.sun.star.loader.XImplementationLoader;
-
-import java.lang.reflect.InvocationTargetException;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
 
 /**
  * The <code>ServiceManager</code> class is an implmentation of the <code>ServiceManager</code>the central class needed for
@@ -81,7 +79,7 @@ public class ServiceManager implements XMultiServiceFactory,
             "com.sun.star.lang.ServiceManager"
     };
 
-    java.util.Vector    eventListener;
+    ArrayList    eventListener;
     java.util.Hashtable factoriesByImplNames;
     java.util.Hashtable factoriesByServiceNames;  // keys:
 
@@ -91,7 +89,7 @@ public class ServiceManager implements XMultiServiceFactory,
      * Creates a new instance of the <code>ServiceManager</code>.
      */
     public ServiceManager() {
-        eventListener           = new java.util.Vector();
+        eventListener           = new ArrayList();
         factoriesByImplNames    = new java.util.Hashtable();
         factoriesByServiceNames = new java.util.Hashtable();
         m_xDefaultContext = null;
@@ -100,7 +98,7 @@ public class ServiceManager implements XMultiServiceFactory,
      * Creates a new instance of the <code>ServiceManager</code>.
      */
     public ServiceManager( XComponentContext xContext ) {
-        eventListener           = new java.util.Vector();
+        eventListener           = new ArrayList();
         factoriesByImplNames    = new java.util.Hashtable();
         factoriesByServiceNames = new java.util.Hashtable();
         m_xDefaultContext = xContext;
@@ -307,14 +305,14 @@ public class ServiceManager implements XMultiServiceFactory,
         Object factory = null;
 
         if ( factoriesByServiceNames.containsKey( serviceName ) ) {
-            java.util.Vector aviableFact = (java.util.Vector) factoriesByServiceNames.get( serviceName );
+            ArrayList aviableFact = (ArrayList) factoriesByServiceNames.get( serviceName );
 
             DEBUG("");
             DEBUG("aviable factories for " + serviceName +" "+ aviableFact);
             DEBUG("");
 
             if ( !aviableFact.isEmpty() )
-                factory = aviableFact.lastElement();
+                factory = aviableFact.get(aviableFact.size()-1);
 
         } else // not found in list of services - now try the implementations
             factory = factoriesByImplNames.get( serviceName ); // return null if none is aviable
@@ -446,13 +444,13 @@ public class ServiceManager implements XMultiServiceFactory,
         throws com.sun.star.uno.RuntimeException
     {
         if (eventListener != null) {
-            java.util.Enumeration enumer = eventListener.elements();
+            java.util.Iterator enumer = eventListener.iterator();
 
-            while (enumer.hasMoreElements()) {
-                XEventListener listener = (XEventListener) enumer.nextElement();
+            while (enumer.hasNext()) {
+                XEventListener listener = (XEventListener) enumer.next();
                 listener.disposing(new com.sun.star.lang.EventObject(this));
             }
-            eventListener.removeAllElements();
+            eventListener.clear();
         }
 
         factoriesByServiceNames.clear();
@@ -477,7 +475,7 @@ public class ServiceManager implements XMultiServiceFactory,
           if ( eventListener.contains(xListener) )
               throw new com.sun.star.uno.RuntimeException("Listener already registred.");
 
-           eventListener.addElement(xListener);
+           eventListener.add(xListener);
     }
 
     /**
@@ -497,7 +495,7 @@ public class ServiceManager implements XMultiServiceFactory,
           if ( !eventListener.contains(xListener) )
               throw new com.sun.star.uno.RuntimeException("Listener is not registered.");
 
-        eventListener.removeElement(xListener);
+        eventListener.remove(xListener);
     }
 
     /**
@@ -554,21 +552,21 @@ public class ServiceManager implements XMultiServiceFactory,
 
 
         String[] serviceNames = xServiceInfo.getSupportedServiceNames();
-        java.util.Vector vec  ;
+        ArrayList vec  ;
 
         for (int i=0; i<serviceNames.length; i++) {
             if ( !factoriesByServiceNames.containsKey( serviceNames[i] ) ) {
                 DEBUG("> no registered services found under " + serviceNames[i] + ": adding..." );
-                factoriesByServiceNames.put(serviceNames[i], new java.util.Vector());
+                factoriesByServiceNames.put(serviceNames[i], new ArrayList());
             }
 
-            vec = (java.util.Vector) factoriesByServiceNames.get( serviceNames[i] );
+            vec = (ArrayList) factoriesByServiceNames.get( serviceNames[i] );
 
             if ( vec.contains( object ) )
                 System.err.println("The implementation " + xServiceInfo.getImplementationName() +
                     " already registered for the service " + serviceNames[i] + " - ignoring!");
             else
-                vec.addElement(object);
+                vec.add(object);
         }
     }
 
@@ -615,9 +613,9 @@ public class ServiceManager implements XMultiServiceFactory,
 
         for ( int i=0; i<serviceNames.length; i++ ) {
             if ( factoriesByServiceNames.containsKey( serviceNames[i] ) ) {
-                java.util.Vector vec = (java.util.Vector) factoriesByServiceNames.get(serviceNames[i]);
+                ArrayList vec = (ArrayList) factoriesByServiceNames.get(serviceNames[i]);
 
-                if ( !vec.removeElement(object) )
+                if ( !vec.remove(object) )
                     System.err.println("The implementation " + xServiceInfo.getImplementationName() +
                         " is not registered for the service " + serviceNames[i] + " - ignoring!");
 
@@ -677,10 +675,10 @@ public class ServiceManager implements XMultiServiceFactory,
     {
         XEnumeration enumer  ;
 
-        java.util.Vector serviceList = (java.util.Vector) factoriesByServiceNames.get(serviceName);
+        ArrayList serviceList = (ArrayList) factoriesByServiceNames.get(serviceName);
 
         if (serviceList != null)
-            enumer = new ServiceEnumerationImpl( serviceList.elements() );
+            enumer = new ServiceEnumerationImpl( serviceList.iterator() );
         else
             enumer = new ServiceEnumerationImpl();
 
@@ -739,7 +737,7 @@ public class ServiceManager implements XMultiServiceFactory,
      * @since       UDK1.0
      */
     class ServiceEnumerationImpl implements XEnumeration {
-        java.util.Enumeration enumeration = null;
+        java.util.Iterator enumeration = null;
 
         /**
          * Constructs a new empty instance.
@@ -754,6 +752,16 @@ public class ServiceManager implements XMultiServiceFactory,
          * @see     com.sun.star.container.XEnumeration
          */
         public ServiceEnumerationImpl(java.util.Enumeration enumer) {
+            enumeration = Collections.list(enumer).iterator();
+        }
+
+        /**
+         * Constructs a new instance with a given enumeration.
+         * <p>
+         * @param   enumer  is the enumeration which should been wrapped.
+         * @see     com.sun.star.container.XEnumeration
+         */
+        public ServiceEnumerationImpl(java.util.Iterator enumer) {
             enumeration = enumer;
         }
 
@@ -766,7 +774,7 @@ public class ServiceManager implements XMultiServiceFactory,
         public boolean hasMoreElements()
                 throws com.sun.star.uno.RuntimeException
         {
-            return enumeration != null && enumeration.hasMoreElements();
+            return enumeration != null && enumeration.hasNext();
 
             }
 
@@ -786,7 +794,7 @@ public class ServiceManager implements XMultiServiceFactory,
                 throw new com.sun.star.container.NoSuchElementException();
 
             try {
-                return enumeration.nextElement();
+                return enumeration.next();
             } catch (java.util.NoSuchElementException e) {
                 com.sun.star.container.NoSuchElementException ex =
                     new com.sun.star.container.NoSuchElementException(
diff --git a/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java b/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java
index bb8bfa29e3d4..d4d6bdb83322 100644
--- a/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java
+++ b/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java
@@ -18,17 +18,14 @@
 package com.sun.star.lib.connections.pipe;
 
 import java.io.IOException;
-
+import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.StringTokenizer;
-import java.util.Enumeration;
-import java.util.Vector;
-
-import com.sun.star.lib.util.NativeLibraryLoader;
-
-import com.sun.star.io.XStreamListener;
 
 import com.sun.star.connection.XConnection;
 import com.sun.star.connection.XConnectionBroadcaster;
+import com.sun.star.io.XStreamListener;
+import com.sun.star.lib.util.NativeLibraryLoader;
 
 /**
  * The PipeConnection implements the <code>XConnection</code> interface
@@ -54,7 +51,7 @@ public class PipeConnection implements XConnection, XConnectionBroadcaster {
 
     protected String    _aDescription;
     protected long      _nPipeHandle;
-    protected Vector    _aListeners;
+    protected ArrayList    _aListeners;
     protected boolean   _bFirstRead;
 
     /**
@@ -68,7 +65,7 @@ public class PipeConnection implements XConnection, XConnectionBroadcaster {
     {
         if (DEBUG) System.err.println("##### " + getClass().getName() + " - instantiated " + description );
 
-        _aListeners = new Vector();
+        _aListeners = new ArrayList();
         _bFirstRead = true;
 
         // get pipe name from pipe descriptor
@@ -100,33 +97,33 @@ public class PipeConnection implements XConnection, XConnectionBroadcaster {
     }
 
     public void addStreamListener(XStreamListener aListener ) throws com.sun.star.uno.RuntimeException {
-        _aListeners.addElement(aListener);
+        _aListeners.add(aListener);
     }
 
     public void removeStreamListener(XStreamListener aListener ) throws com.sun.star.uno.RuntimeException {
-        _aListeners.removeElement(aListener);
+        _aListeners.remove(aListener);
     }
 
     private void notifyListeners_open() {
-        Enumeration elements = _aListeners.elements();
-        while(elements.hasMoreElements()) {
-            XStreamListener xStreamListener = (XStreamListener)elements.nextElement();
+        Iterator elements = _aListeners.iterator();
+        while(elements.hasNext()) {
+            XStreamListener xStreamListener = (XStreamListener)elements.next();
             xStreamListener.started();
         }
     }
 
     private void notifyListeners_close() {
-        Enumeration elements = _aListeners.elements();
-        while(elements.hasMoreElements()) {
-            XStreamListener xStreamListener = (XStreamListener)elements.nextElement();
+        Iterator elements = _aListeners.iterator();
+        while(elements.hasNext()) {
+            XStreamListener xStreamListener = (XStreamListener)elements.next();
             xStreamListener.closed();
         }
     }
 
     private void notifyListeners_error(com.sun.star.uno.Exception exception) {
-        Enumeration elements = _aListeners.elements();
-        while(elements.hasMoreElements()) {
-            XStreamListener xStreamListener = (XStreamListener)elements.nextElement();
+        Iterator elements = _aListeners.iterator();
+        while(elements.hasNext()) {
+            XStreamListener xStreamListener = (XStreamListener)elements.next();
             xStreamListener.error(exception);
         }
     }
diff --git a/jurt/com/sun/star/lib/connections/socket/SocketConnection.java b/jurt/com/sun/star/lib/connections/socket/SocketConnection.java
index 308d7d37219a..5207bade57ef 100644
--- a/jurt/com/sun/star/lib/connections/socket/SocketConnection.java
+++ b/jurt/com/sun/star/lib/connections/socket/SocketConnection.java
@@ -20,20 +20,16 @@ package com.sun.star.lib.connections.socket;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
-
 import java.net.Socket;
-
-import java.util.Enumeration;
-import java.util.Vector;
-
-
-import com.sun.star.io.XStreamListener;
+import java.util.ArrayList;
+import java.util.Iterator;
 
 import com.sun.star.connection.XConnection;
 import com.sun.star.connection.XConnectionBroadcaster;
+import com.sun.star.io.XStreamListener;
 
 /**
  * The SocketConnection implements the <code>XConnection</code> interface
@@ -56,7 +52,7 @@ public class SocketConnection implements XConnection, XConnectionBroadcaster {
     protected Socket       _socket;
     protected InputStream  _inputStream;
     protected OutputStream _outputStream;
-    protected Vector       _listeners;
+    protected ArrayList       _listeners;
     protected boolean      _firstRead;
 
     /**
@@ -78,7 +74,7 @@ public class SocketConnection implements XConnection, XConnectionBroadcaster {
         _inputStream = new BufferedInputStream(socket.getInputStream());
         _outputStream = new BufferedOutputStream(socket.getOutputStream());
 
-        _listeners = new Vector();
+        _listeners = new ArrayList();
         _firstRead = true;
     }
 
@@ -86,33 +82,33 @@ public class SocketConnection implements XConnection, XConnectionBroadcaster {
 
 
     public void addStreamListener(XStreamListener aListener ) throws com.sun.star.uno.RuntimeException {
-        _listeners.addElement(aListener);
+        _listeners.add(aListener);
     }
 
     public void removeStreamListener(XStreamListener aListener ) throws com.sun.star.uno.RuntimeException {
-        _listeners.removeElement(aListener);
+        _listeners.remove(aListener);
     }
 
     private void notifyListeners_open() {
-        Enumeration elements = _listeners.elements();
-        while(elements.hasMoreElements()) {
-            XStreamListener xStreamListener = (XStreamListener)elements.nextElement();
+        Iterator elements = _listeners.iterator();
+        while(elements.hasNext()) {
+            XStreamListener xStreamListener = (XStreamListener)elements.next();
             xStreamListener.started();
         }
     }
 
     private void notifyListeners_close() {
-        Enumeration elements = _listeners.elements();
-        while(elements.hasMoreElements()) {
-            XStreamListener xStreamListener = (XStreamListener)elements.nextElement();
+        Iterator elements = _listeners.iterator();
+        while(elements.hasNext()) {
+            XStreamListener xStreamListener = (XStreamListener)elements.next();
             xStreamListener.closed();
         }
     }
 
     private void notifyListeners_error(com.sun.star.uno.Exception exception) {
-        Enumeration elements = _listeners.elements();
-        while(elements.hasMoreElements()) {
-            XStreamListener xStreamListener = (XStreamListener)elements.nextElement();
+        Iterator elements = _listeners.iterator();
+        while(elements.hasNext()) {
+            XStreamListener xStreamListener = (XStreamListener)elements.next();
             xStreamListener.error(exception);
         }
     }
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
index b2d3a98bff97..36c66ffe66e7 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
+++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
@@ -167,7 +167,7 @@ public class java_remote_bridge
     protected MessageDispatcher _messageDispatcher;
     protected int               _life_count = 0;    // determines if this bridge is alife, which is controlled by acquire and release calls
 
-    private final Vector _listeners = new Vector();
+    private final ArrayList _listeners = new ArrayList();
 
     protected IThreadPool       _iThreadPool;
 
@@ -341,9 +341,9 @@ public class java_remote_bridge
     private void notifyListeners() {
         EventObject eventObject = new EventObject(this);
 
-        Enumeration elements = _listeners.elements();
-        while(elements.hasMoreElements()) {
-            XEventListener xEventListener = (XEventListener)elements.nextElement();
+        Iterator elements = _listeners.iterator();
+        while(elements.hasNext()) {
+            XEventListener xEventListener = (XEventListener)elements.next();
 
             try {
                 xEventListener.disposing(eventObject);
@@ -669,11 +669,11 @@ public class java_remote_bridge
 
     // Methods XComponent
     public void addEventListener(XEventListener xEventListener) {
-        _listeners.addElement(xEventListener);
+        _listeners.add(xEventListener);
     }
 
     public void removeEventListener(XEventListener xEventListener) {
-        _listeners.removeElement(xEventListener);
+        _listeners.remove(xEventListener);
     }
 
     // @see NotifyDispose.addDisposeListener