Java5 updates - update code to use generics

This is all of the code I missed in my first set of patches.

Change-Id: I8c7c9e5ac28dc3c2f3ac062c806fbf0787c997bd

2 files changed, 27 insertions, 25 deletions

diff --git a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
index 30eb200bd0ce..d5fda64c035e 100644
--- a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
+++ b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
@@ -36,8 +36,9 @@ import java.io.File;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintStream;
-import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.HashMap;
 import java.util.Random;
 
 /** Bootstrap offers functionality to obtain a context or simply
@@ -93,7 +94,7 @@ public class Bootstrap {
         context entries (type class ComponentContextEntry).
         @return a new context.
     */
-    static public XComponentContext createInitialComponentContext( Hashtable context_entries )
+    static public XComponentContext createInitialComponentContext( Map<String,Object> context_entries )
         throws Exception
     {
         XImplementationLoader xImpLoader = UnoRuntime.queryInterface(
@@ -116,7 +117,7 @@ public class Bootstrap {
 
         // initial component context
         if (context_entries == null)
-            context_entries = new Hashtable( 1 );
+            context_entries = new HashMap<String,Object>( 1 );
         // add smgr
         context_entries.put(
             "/singletons/com.sun.star.lang.theServiceManager",
@@ -171,7 +172,7 @@ public class Bootstrap {
         @see "cppuhelper/defaultBootstrap_InitialComponentContext()"
     */
     static public final XComponentContext defaultBootstrap_InitialComponentContext(
-        String ini_file, Hashtable bootstrap_parameters )
+        String ini_file, Map<String,String> bootstrap_parameters )
         throws Exception
     {
         // jni convenience: easier to iterate over array than calling Hashtable
@@ -179,13 +180,13 @@ public class Bootstrap {
         if (null != bootstrap_parameters)
         {
             pairs = new String [ 2 * bootstrap_parameters.size() ];
-            Enumeration keys = bootstrap_parameters.keys();
+            Iterator<String> keys = bootstrap_parameters.keySet().iterator();
             int n = 0;
-            while (keys.hasMoreElements())
+            while (keys.hasNext())
             {
-                String name = (String)keys.nextElement();
+                String name = keys.next();
                 pairs[ n++ ] = name;
-                pairs[ n++ ] = (String)bootstrap_parameters.get( name );
+                pairs[ n++ ] = bootstrap_parameters.get( name );
             }
         }
 
diff --git a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
index 868f1c723c41..0f08c548b8e7 100644
--- a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
+++ b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
@@ -27,9 +27,10 @@ import com.sun.star.lang.XComponent;
 import com.sun.star.lang.XEventListener;
 import com.sun.star.lang.EventObject;
 
-import java.util.Hashtable;
-import java.util.Enumeration;
-import java.util.Vector;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Iterator;
+import java.util.ArrayList;
 
 
 //==================================================================================================
@@ -57,13 +58,13 @@ public class ComponentContext implements XComponentContext, XComponent
     private static final String SMGR_NAME = "/singletons/com.sun.star.lang.theServiceManager";
     private static final String TDMGR_NAME = "/singletons/com.sun.star.reflection.theTypeDescriptionManager";
 
-    private Hashtable m_table;
+    private Map<String,Object> m_table;
     private XComponentContext m_xDelegate;
 
     private XMultiComponentFactory m_xSMgr;
     private boolean m_bDisposeSMgr;
 
-    private Vector m_eventListener;
+    private ArrayList<XEventListener> m_eventListener;
 
     /** Ctor to create a component context passing a hashtable for values and a delegator
         reference. Entries of the passed hashtable are either direct values or
@@ -74,9 +75,9 @@ public class ComponentContext implements XComponentContext, XComponent
         @param xDelegate
                if values are not found, request is delegated to this object
     */
-    public ComponentContext( Hashtable table, XComponentContext xDelegate )
+    public ComponentContext( Map<String,Object> table, XComponentContext xDelegate )
     {
-        m_eventListener = new Vector();
+        m_eventListener = new ArrayList<XEventListener>();
         m_table = table;
         m_xDelegate = xDelegate;
         m_xSMgr = null;
@@ -219,20 +220,20 @@ public class ComponentContext implements XComponentContext, XComponent
 
         // fire events
         EventObject evt = new EventObject( this );
-        Enumeration eventListener = m_eventListener.elements();
-        while (eventListener.hasMoreElements())
+        Iterator<XEventListener> eventListener = m_eventListener.iterator();
+        while (eventListener.hasNext())
         {
-            XEventListener listener = (XEventListener)eventListener.nextElement();
+            XEventListener listener = eventListener.next();
             listener.disposing( evt );
         }
-        m_eventListener.removeAllElements();
+        m_eventListener.clear();
 
         XComponent tdmgr = null;
         // dispose values, then service manager, then typdescription manager
-        Enumeration keys = m_table.keys();
-        while (keys.hasMoreElements())
+        Iterator<String> keys = m_table.keySet().iterator();
+        while (keys.hasNext())
         {
-            String name = (String)keys.nextElement();
+            String name = keys.next();
             if (! name.equals( SMGR_NAME ))
             {
                 Object o = m_table.get( name );
@@ -286,7 +287,7 @@ public class ComponentContext implements XComponentContext, XComponent
           if (m_eventListener.contains( xListener ))
               throw new com.sun.star.uno.RuntimeException( "Listener already registred." );
 
-           m_eventListener.addElement( xListener );
+           m_eventListener.add( xListener );
     }
     //______________________________________________________________________________________________
     public void removeEventListener( XEventListener xListener )
@@ -296,6 +297,6 @@ public class ComponentContext implements XComponentContext, XComponent
           if (! m_eventListener.contains( xListener ))
               throw new com.sun.star.uno.RuntimeException( "Listener is not registered." );
 
-        m_eventListener.removeElement( xListener );
+        m_eventListener.remove( xListener );
     }
 }