summaryrefslogtreecommitdiff
path: root/javaunohelper
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-06-29 21:21:40 +0200
committerMichael Stahl <mstahl@redhat.com>2012-06-29 22:03:05 +0200
commit37e1055f8ca2e28a4ea954feec42d0c60aad3278 (patch)
treecd8529069a4c02b66edd488d14971dbbd340f076 /javaunohelper
parentf9fa0dd66b830ff21c4a2dcd201151a4e9ca2de8 (diff)
revert changes to public URE APIs in previous commit
Change-Id: I8f5309ee5fbda34ad1bb9e724c26e04692253649
Diffstat (limited to 'javaunohelper')
-rw-r--r--javaunohelper/com/sun/star/comp/helper/Bootstrap.java9
-rw-r--r--javaunohelper/com/sun/star/comp/helper/ComponentContext.java7
2 files changed, 7 insertions, 9 deletions
diff --git a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
index d5fda64c035e..b8a3bf19a8f5 100644
--- a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
+++ b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
@@ -37,8 +37,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.PrintStream;
import java.util.Iterator;
-import java.util.Map;
-import java.util.HashMap;
+import java.util.Hashtable;
import java.util.Random;
/** Bootstrap offers functionality to obtain a context or simply
@@ -94,7 +93,7 @@ public class Bootstrap {
context entries (type class ComponentContextEntry).
@return a new context.
*/
- static public XComponentContext createInitialComponentContext( Map<String,Object> context_entries )
+ static public XComponentContext createInitialComponentContext( Hashtable<String, Object> context_entries )
throws Exception
{
XImplementationLoader xImpLoader = UnoRuntime.queryInterface(
@@ -117,7 +116,7 @@ public class Bootstrap {
// initial component context
if (context_entries == null)
- context_entries = new HashMap<String,Object>( 1 );
+ context_entries = new Hashtable<String,Object>( 1 );
// add smgr
context_entries.put(
"/singletons/com.sun.star.lang.theServiceManager",
@@ -172,7 +171,7 @@ public class Bootstrap {
@see "cppuhelper/defaultBootstrap_InitialComponentContext()"
*/
static public final XComponentContext defaultBootstrap_InitialComponentContext(
- String ini_file, Map<String,String> bootstrap_parameters )
+ String ini_file, Hashtable<String,String> bootstrap_parameters )
throws Exception
{
// jni convenience: easier to iterate over array than calling Hashtable
diff --git a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
index 0f08c548b8e7..5075eb8d224d 100644
--- a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
+++ b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
@@ -27,8 +27,7 @@ import com.sun.star.lang.XComponent;
import com.sun.star.lang.XEventListener;
import com.sun.star.lang.EventObject;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Hashtable;
import java.util.Iterator;
import java.util.ArrayList;
@@ -58,7 +57,7 @@ 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 Map<String,Object> m_table;
+ private Hashtable<String,Object> m_table;
private XComponentContext m_xDelegate;
private XMultiComponentFactory m_xSMgr;
@@ -75,7 +74,7 @@ public class ComponentContext implements XComponentContext, XComponent
@param xDelegate
if values are not found, request is delegated to this object
*/
- public ComponentContext( Map<String,Object> table, XComponentContext xDelegate )
+ public ComponentContext( Hashtable<String,Object> table, XComponentContext xDelegate )
{
m_eventListener = new ArrayList<XEventListener>();
m_table = table;