1 files changed, 10 insertions, 9 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 );
             }
         }