diff options
author | Noel Grandin <noel@peralex.com> | 2012-06-27 15:20:39 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-06-29 22:03:00 +0200 |
commit | 33ec740d1438c3dddf8e1974757ed05bb76425ca (patch) | |
tree | 37868edd825fe8f3777a077549e61f1379da7cd3 /qadevOOo/runner/lib | |
parent | 10dd7e74c551f3e252405ba0f80a2f143d9129e5 (diff) |
Java5 update - Convert Hashtable to HashMap
Change-Id: Ibb568e841ff574d5232429ce0ba99e421ed7f05c
Diffstat (limited to 'qadevOOo/runner/lib')
-rw-r--r-- | qadevOOo/runner/lib/Parameters.java | 6 | ||||
-rw-r--r-- | qadevOOo/runner/lib/TestEnvironment.java | 4 | ||||
-rw-r--r-- | qadevOOo/runner/lib/TestParameters.java | 8 | ||||
-rw-r--r-- | qadevOOo/runner/lib/TestResult.java | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/qadevOOo/runner/lib/Parameters.java b/qadevOOo/runner/lib/Parameters.java index 07d109e7a5ce..9f0a7e58108d 100644 --- a/qadevOOo/runner/lib/Parameters.java +++ b/qadevOOo/runner/lib/Parameters.java @@ -19,7 +19,7 @@ package lib; import java.util.Iterator; -import java.util.Hashtable; +import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -149,7 +149,7 @@ public class Parameters implements XPropertySet { } public Map toMap() { - return new Hashtable(parameters) { + return new HashMap(parameters) { public Object get(Object obj) { if (obj instanceof String) { return Parameters.this.get((String) obj); @@ -199,7 +199,7 @@ public class Parameters implements XPropertySet { } public static Map toMap(XPropertySet props) { - Hashtable result = new Hashtable(10); + HashMap result = new HashMap(10); XPropertySetInfo setInfo = props.getPropertySetInfo(); Property[] properties = setInfo.getProperties(); diff --git a/qadevOOo/runner/lib/TestEnvironment.java b/qadevOOo/runner/lib/TestEnvironment.java index 1bc9cd10a2f8..e88c90e3c0f3 100644 --- a/qadevOOo/runner/lib/TestEnvironment.java +++ b/qadevOOo/runner/lib/TestEnvironment.java @@ -19,7 +19,7 @@ package lib; import com.sun.star.uno.XInterface; -import java.util.Hashtable; +import java.util.HashMap; /** @@ -34,7 +34,7 @@ public final class TestEnvironment { * Contains object relations - auxiliary objects associated with the * tested object and required for testing. */ - private final Hashtable relations = new Hashtable(10); + private final HashMap relations = new HashMap(10); /** * An instance of the tested implementation object. diff --git a/qadevOOo/runner/lib/TestParameters.java b/qadevOOo/runner/lib/TestParameters.java index 79bc75308ee1..8849e2816474 100644 --- a/qadevOOo/runner/lib/TestParameters.java +++ b/qadevOOo/runner/lib/TestParameters.java @@ -18,7 +18,7 @@ package lib; -import java.util.Hashtable; +import java.util.HashMap; import util.PropertyName; import com.sun.star.beans.XPropertySet; import com.sun.star.uno.XComponentContext; @@ -31,7 +31,7 @@ import com.sun.star.uno.XComponentContext; * for example, standard paths, connection strings, etc. The TestParameters * also provides XMultiServiceFactory for the test (tests). */ -public class TestParameters extends Hashtable { +public class TestParameters extends HashMap { /** * The ConnectionString for Office Connection<br> @@ -167,7 +167,7 @@ public class TestParameters extends Hashtable { * Wraper around "get()" with some debug output * @param key A key of this table. * @return The value of this key. - * @see java.util.Hashtable + * @see java.util.HashMap */ public Object get(Object key) { Object val = super.get(key); @@ -234,7 +234,7 @@ public class TestParameters extends Hashtable { * @param key A key of this table. * @param val The value of the key. * @return The value of this key. - * @see java.util.Hashtable + * @see java.util.HashMap */ public Object put(Object key, Object val) { return super.put(key,val); diff --git a/qadevOOo/runner/lib/TestResult.java b/qadevOOo/runner/lib/TestResult.java index f95e5d3e7cf7..e49aaa6224b3 100644 --- a/qadevOOo/runner/lib/TestResult.java +++ b/qadevOOo/runner/lib/TestResult.java @@ -18,7 +18,7 @@ package lib; -import java.util.Hashtable; +import java.util.HashMap; /** * The class supports interface tests development and Status calculation. @@ -27,7 +27,7 @@ public class TestResult { /** * Contains methods having been tested and their results. */ - protected Hashtable testedMethods = new Hashtable(); + protected HashMap testedMethods = new HashMap(); /** * The method makes method tested with the result, i.e. it adds to its |