Java5 update - Convert Hashtable to HashMap

Change-Id: Ibb568e841ff574d5232429ce0ba99e421ed7f05c

5 files changed, 34 insertions, 30 deletions

diff --git a/qadevOOo/tests/java/ifc/style/_CharacterProperties.java b/qadevOOo/tests/java/ifc/style/_CharacterProperties.java
index 06bfdc911388..e84635d29d78 100644
--- a/qadevOOo/tests/java/ifc/style/_CharacterProperties.java
+++ b/qadevOOo/tests/java/ifc/style/_CharacterProperties.java
@@ -18,17 +18,19 @@
 
 package ifc.style;
 
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+
+import lib.MultiPropertyTest;
+import util.ValueChanger;
+import util.utils;
+
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XNameContainer;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.Type;
 import com.sun.star.xml.AttributeData;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import lib.MultiPropertyTest;
-
-import util.ValueChanger;
-import util.utils;
 
 
 /**
@@ -481,11 +483,11 @@ public class _CharacterProperties extends MultiPropertyTest {
     }
 
     private class OwnUserDefinedAttributes implements XNameContainer{
-        Hashtable members = null;
+        HashMap members = null;
 
 
         public OwnUserDefinedAttributes() {
-            members = new Hashtable();
+            members = new HashMap();
         }
 
         public Object getByName(String str) throws com.sun.star.container.NoSuchElementException, com.sun.star.lang.WrappedTargetException {
@@ -493,18 +495,18 @@ public class _CharacterProperties extends MultiPropertyTest {
         }
 
         public String[] getElementNames() {
-            Enumeration oEnum = members.keys();
+            Iterator oEnum = members.keySet().iterator();
             int count = members.size();
             String[] res = new String[count];
             int i=0;
-            while(oEnum.hasMoreElements())
-                res[i] = (String)oEnum.nextElement();
+            while(oEnum.hasNext())
+                res[i++] = (String)oEnum.next();
             return res;
         }
 
         public com.sun.star.uno.Type getElementType() {
-            Enumeration oEnum = members.keys();
-            String key = (String)oEnum.nextElement();
+            Iterator oEnum = members.keySet().iterator();
+            String key = (String)oEnum.next();
             Object o = members.get(key);
             return new Type(o.getClass());
         }
diff --git a/qadevOOo/tests/java/ifc/system/_XProxySettings.java b/qadevOOo/tests/java/ifc/system/_XProxySettings.java
index 39bc733e7d45..dd08f4cfec96 100644
--- a/qadevOOo/tests/java/ifc/system/_XProxySettings.java
+++ b/qadevOOo/tests/java/ifc/system/_XProxySettings.java
@@ -18,7 +18,7 @@
 
 package ifc.system;
 
-import java.util.Hashtable;
+import java.util.Map;
 
 import lib.MultiMethodTest;
 import lib.Status;
@@ -30,7 +30,7 @@ import com.sun.star.system.XProxySettings;
  * Tests <code>com.sun.star.system.XProxySettings</code> interface. The result
  * of each method is compared with expected settings which is specified by the
  * caller of the tests via object relation "XProxySettings.proxaSettings". That
- * should be a Hashtable containing the following keys:
+ * should be a HashMap containing the following keys:
  * <ul>
  *   <li>ftpProxyAddress</li>
  *   <li>ftpProxyPort</li>
@@ -54,10 +54,10 @@ public class _XProxySettings extends MultiMethodTest {
     public XProxySettings oObj;
 
     /**
-     * Contains a Hashtable with correct results of the tested methods. See
+     * Contains a HashMap with correct results of the tested methods. See
      * the class description.
      */
-    Hashtable expectedProxies;
+    Map expectedProxies;
 
     /**
      * Checks that the "XProxySettings.proxySettings" object relation is
@@ -68,7 +68,7 @@ public class _XProxySettings extends MultiMethodTest {
      * @see #expectedProxies
      */
     public void before() {
-        expectedProxies = (Hashtable)tEnv.getObjRelation(
+        expectedProxies = (Map)tEnv.getObjRelation(
                 "XProxySettings.proxySettings");
 
         if (expectedProxies == null) {
diff --git a/qadevOOo/tests/java/ifc/text/_NumberingLevel.java b/qadevOOo/tests/java/ifc/text/_NumberingLevel.java
index b9c9bf186a53..e1de222fb130 100644
--- a/qadevOOo/tests/java/ifc/text/_NumberingLevel.java
+++ b/qadevOOo/tests/java/ifc/text/_NumberingLevel.java
@@ -18,13 +18,15 @@
 
 package ifc.text;
 
-import com.sun.star.beans.PropertyValue;
-import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Iterator;
+
 import lib.StatusException;
 import lib.TestParameters;
 import share.LogWriter;
 
+import com.sun.star.beans.PropertyValue;
+
 
 /**
 * Testing <code>com.sun.star.text.NumberingLevel</code><p>
@@ -63,7 +65,7 @@ import share.LogWriter;
 public class _NumberingLevel {
 
     private static TestParameters tParam = null;
-    private static Hashtable NumberingLevel = new Hashtable();
+    private static HashMap NumberingLevel = new HashMap();
     private static PropertyValue[] PropertyArray = null;
     private static LogWriter log = null;
 
@@ -137,8 +139,8 @@ public class _NumberingLevel {
 
             // get rest of properties and check if they are optional
             if (! NumberingLevel.isEmpty()){
-                for (Enumeration e = NumberingLevel.keys() ; e.hasMoreElements() ;) {
-                    String property = (String) e.nextElement();
+                for (Iterator e = NumberingLevel.keySet().iterator() ; e.hasNext() ;) {
+                    String property = (String) e.next();
 
                     // if some elements are not optional -> failed
                     if ( ! ((Boolean)NumberingLevel.get(property)).booleanValue() ){
diff --git a/qadevOOo/tests/java/mod/_proxyset/SOffice52ProxySettings.java b/qadevOOo/tests/java/mod/_proxyset/SOffice52ProxySettings.java
index be1f9d44443a..d70b7cfe1d70 100644
--- a/qadevOOo/tests/java/mod/_proxyset/SOffice52ProxySettings.java
+++ b/qadevOOo/tests/java/mod/_proxyset/SOffice52ProxySettings.java
@@ -19,7 +19,7 @@
 package mod._proxyset;
 
 import java.io.PrintWriter;
-import java.util.Hashtable;
+import java.util.HashMap;
 
 import lib.StatusException;
 import lib.TestCase;
@@ -60,7 +60,7 @@ public class SOffice52ProxySettings extends TestCase {
      * <ul>
      *  <li> <code>'XProxySettings.proxySettings'</code> for
      *      {@link ifc.system._XProxySettings} : </li>
-     *   <p>It passes a Hashtable with expected proxy settings as object
+     *   <p>It passes a HashMap with expected proxy settings as object
      *   relation "XProxySettings.proxySettings", to verify results. The expected
      *   settings are taken from parameters. The following parameters are recognized:
      *   <ul>
@@ -96,7 +96,7 @@ public class SOffice52ProxySettings extends TestCase {
         TestEnvironment tEnv = new TestEnvironment(oObj);
 
         // extracting parameters to proxy settings
-        Hashtable proxySettings = new Hashtable(12);
+        HashMap proxySettings = new HashMap(12);
 
         String prefix = "test.proxy.soffice52.";
 
diff --git a/qadevOOo/tests/java/mod/_proxyset/SystemProxySettings.java b/qadevOOo/tests/java/mod/_proxyset/SystemProxySettings.java
index 53bae9ce7f96..006b42697fc3 100644
--- a/qadevOOo/tests/java/mod/_proxyset/SystemProxySettings.java
+++ b/qadevOOo/tests/java/mod/_proxyset/SystemProxySettings.java
@@ -19,7 +19,7 @@
 package mod._proxyset;
 
 import java.io.PrintWriter;
-import java.util.Hashtable;
+import java.util.HashMap;
 
 import lib.TestCase;
 import lib.TestEnvironment;
@@ -59,7 +59,7 @@ public class SystemProxySettings extends TestCase {
      * <ul>
      *  <li> <code>'XProxySettings.proxySettings'</code> for
      *      {@link ifc.system._XProxySettings} : </li>
-     *   <p>It passes a Hashtable with expected proxy settings as object
+     *   <p>It passes a HashMap with expected proxy settings as object
      *   relation "XProxySettings.proxySettings", to verify results. The expected
      *   settings are taken from parameters. The following parameters are recognized:
      *   <ul>
@@ -98,7 +98,7 @@ public class SystemProxySettings extends TestCase {
         TestEnvironment tEnv = new TestEnvironment( oObj );
 
         // extracting parameters to proxy settings
-        Hashtable proxySettings = new Hashtable(12);
+        HashMap proxySettings = new HashMap(12);
 
         String prefix = "test.proxy.system.";