diff options
author | Noel Grandin <noel@peralex.com> | 2013-05-03 15:03:19 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-05-06 11:45:53 +0200 |
commit | 8be40d31d78723debd47f671544f480c1c606db7 (patch) | |
tree | 0051888bb41793e4d65704a93a4cfc659119c8bc /javaunohelper/test/com/sun | |
parent | e527a340051b55a6f05d05f397d82ec797165163 (diff) |
Java cleanup, convert Hashtable to HashMap
Change-Id: If8a9c0c3a4b357fb9c0ff096f44ed1b44ebbcef4
Diffstat (limited to 'javaunohelper/test/com/sun')
-rw-r--r-- | javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java | 4 | ||||
-rw-r--r-- | javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java | 13 |
2 files changed, 7 insertions, 10 deletions
diff --git a/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java b/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java index 2a292be96b1a..8e8032f1addd 100644 --- a/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java +++ b/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java @@ -28,7 +28,7 @@ import com.sun.star.lang.XMultiServiceFactory; public class Bootstrap_Test { - static public boolean test( String ini_file, java.util.Hashtable<String,String> bootstrap_parameters ) + static public boolean test( String ini_file, java.util.Map<String,String> bootstrap_parameters ) throws java.lang.Exception { boolean passed = false; @@ -91,7 +91,7 @@ public class Bootstrap_Test { if ( args.length == 0 ) usage(); - java.util.Hashtable<String,String> bootstrap_parameters = new java.util.Hashtable<String,String>(); + java.util.HashMap<String,String> bootstrap_parameters = new java.util.HashMap<String,String>(); for ( int nPos = 1; nPos < args.length; ++nPos ) { String arg = args[ nPos ]; diff --git a/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java b/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java index 1a28a77f84f2..7847a86a26ec 100644 --- a/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java +++ b/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java @@ -17,25 +17,22 @@ */ package com.sun.star.comp.helper; -import com.sun.star.uno.XComponentContext; +import java.util.HashMap; + import com.sun.star.lang.XComponent; import com.sun.star.lang.XMultiComponentFactory; - -import com.sun.star.comp.helper.ComponentContext; -import com.sun.star.comp.helper.ComponentContextEntry; import com.sun.star.uno.UnoRuntime; - -import java.util.Hashtable; +import com.sun.star.uno.XComponentContext; public class ComponentContext_Test { public static void main(String args[]) { try { - Hashtable<String,Object> table = new Hashtable<String,Object>(); + HashMap<String,Object> table = new HashMap<String,Object>(); table.put( "bla1", new ComponentContextEntry( null, new Integer( 1 ) ) ); XComponentContext xInitialContext = Bootstrap.createInitialComponentContext( table ); - table = new Hashtable<String,Object>(); + table = new HashMap<String,Object>(); table.put( "bla2", new ComponentContextEntry( new Integer( 2 ) ) ); table.put( "bla3", new Integer( 3 ) ); XComponentContext xContext = new ComponentContext( table, xInitialContext ); |