Java cleanup, convert Hashtable to HashMap

Change-Id: If8a9c0c3a4b357fb9c0ff096f44ed1b44ebbcef4

3 files changed, 5 insertions, 5 deletions

diff --git a/accessibility/bridge/org/openoffice/accessibility/AccessBridge.java b/accessibility/bridge/org/openoffice/accessibility/AccessBridge.java
index f9b56fe03be5..ebd0552a4d26 100644
--- a/accessibility/bridge/org/openoffice/accessibility/AccessBridge.java
+++ b/accessibility/bridge/org/openoffice/accessibility/AccessBridge.java
@@ -38,7 +38,7 @@ import java.awt.Window;
 
 public class AccessBridge {
     //
-    protected static java.util.Hashtable<String, Window> topWindowMap = new java.util.Hashtable<String, Window>();
+    protected static java.util.HashMap<String, Window> topWindowMap = new java.util.HashMap<String, Window>();
 
     private static java.awt.Window getTopWindowImpl(XAccessible xAccessible) {
         // Because it can not be garantied that
diff --git a/accessibility/bridge/org/openoffice/accessibility/WindowsAccessBridgeAdapter.java b/accessibility/bridge/org/openoffice/accessibility/WindowsAccessBridgeAdapter.java
index 41e0e0381da6..5d7a81750b48 100644
--- a/accessibility/bridge/org/openoffice/accessibility/WindowsAccessBridgeAdapter.java
+++ b/accessibility/bridge/org/openoffice/accessibility/WindowsAccessBridgeAdapter.java
@@ -34,7 +34,7 @@ import javax.accessibility.*;
 public class WindowsAccessBridgeAdapter {
     private static Method registerVirtualFrame;
     private static Method revokeVirtualFrame;
-    private static java.util.Hashtable<Integer, Accessible> frameMap;
+    private static java.util.HashMap<Integer, Accessible> frameMap;
 
     protected static native byte[] getProcessID();
 
@@ -71,7 +71,7 @@ public class WindowsAccessBridgeAdapter {
 
                         if (AnyConverter.isLong(any)) {
                             createMapping(AnyConverter.toLong(any));
-                            frameMap = new java.util.Hashtable<Integer, Accessible>();
+                            frameMap = new java.util.HashMap<Integer, Accessible>();
                         }
                     }
                 }
@@ -163,7 +163,7 @@ public class WindowsAccessBridgeAdapter {
     public static void registerTopWindow(int handle, XAccessible xAccessible) {
         Integer hwnd = new Integer(handle);
 
-        if (!frameMap.contains(hwnd)) {
+        if (!frameMap.containsKey(hwnd)) {
             if (Build.DEBUG) {
                 System.err.println("Native frame " + hwnd + " of role " +
                     AccessibleRoleAdapter.getAccessibleRole(xAccessible) +
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleObjectFactory.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleObjectFactory.java
index a79aacf9ffda..4023ee9b2c4a 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleObjectFactory.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleObjectFactory.java
@@ -31,7 +31,7 @@ public class AccessibleObjectFactory {
     // This type is needed for conversions from/to uno Any
     public static final Type XAccessibleType = new Type(XAccessible.class);
 
-    private static java.util.Hashtable<String, WeakReference<Component>> objectList = new java.util.Hashtable<String, WeakReference<Component>>();
+    private static java.util.HashMap<String, WeakReference<Component>> objectList = new java.util.HashMap<String, WeakReference<Component>>();
     private static java.awt.FocusTraversalPolicy focusTraversalPolicy = new FocusTraversalPolicy();
 
     private static java.awt.EventQueue theEventQueue = java.awt.Toolkit.getDefaultToolkit().