From 8be40d31d78723debd47f671544f480c1c606db7 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 3 May 2013 15:03:19 +0200 Subject: Java cleanup, convert Hashtable to HashMap Change-Id: If8a9c0c3a4b357fb9c0ff096f44ed1b44ebbcef4 --- .../test/com/sun/star/comp/helper/Bootstrap_Test.java | 4 ++-- .../com/sun/star/comp/helper/ComponentContext_Test.java | 13 +++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) (limited to 'javaunohelper/test') 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 bootstrap_parameters ) + static public boolean test( String ini_file, java.util.Map 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 bootstrap_parameters = new java.util.Hashtable(); + java.util.HashMap bootstrap_parameters = new java.util.HashMap(); 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 table = new Hashtable(); + HashMap table = new HashMap(); table.put( "bla1", new ComponentContextEntry( null, new Integer( 1 ) ) ); XComponentContext xInitialContext = Bootstrap.createInitialComponentContext( table ); - table = new Hashtable(); + table = new HashMap(); table.put( "bla2", new ComponentContextEntry( new Integer( 2 ) ) ); table.put( "bla3", new Integer( 3 ) ); XComponentContext xContext = new ComponentContext( table, xInitialContext ); -- cgit