From baccb18f9ad5258c6efae6b23aa90c96b1a8e211 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 28 Jun 2012 11:17:11 +0200 Subject: Java5 update - convert Vector to ArrayList and Enumeration to Iterator Change-Id: I94323dcfa4c8069f228dd3079f3842131314610e --- .../sun/star/comp/bridgefactory/BridgeFactory.java | 13 ++-- .../star/comp/servicemanager/ServiceManager.java | 74 ++++++++++++---------- 2 files changed, 45 insertions(+), 42 deletions(-) (limited to 'jurt/com/sun/star/comp') 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 ServiceManager class is an implmentation of the ServiceManagerthe 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 ServiceManager. */ 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 ServiceManager. */ 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 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 + * @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( -- cgit