Java5 update - convert more code to use generics:wq

Change-Id: I7ea32cad40a6657e4e5886d04af008cb6d67ac6e

3 files changed, 11 insertions, 15 deletions

diff --git a/qadevOOo/runner/lib/MultiPropertyTest.java b/qadevOOo/runner/lib/MultiPropertyTest.java
index 03f51fe5e6ce..403f9cb4037f 100644
--- a/qadevOOo/runner/lib/MultiPropertyTest.java
+++ b/qadevOOo/runner/lib/MultiPropertyTest.java
@@ -74,7 +74,7 @@ public class MultiPropertyTest extends MultiMethodTest
      */
     protected void before()
     {
-        XServiceInfo xInfo = (XServiceInfo) UnoRuntime.queryInterface(
+        XServiceInfo xInfo = UnoRuntime.queryInterface(
                 XServiceInfo.class, oObj);
 
         optionalService = entry.isOptional;
diff --git a/qadevOOo/runner/lib/Parameters.java b/qadevOOo/runner/lib/Parameters.java
index bd24289ded5a..2db421c1142f 100644
--- a/qadevOOo/runner/lib/Parameters.java
+++ b/qadevOOo/runner/lib/Parameters.java
@@ -45,7 +45,7 @@ public class Parameters implements XPropertySet {
     final Parameters defaults;
     Property[] props;
 
-    public Parameters(Map params) {
+    public Parameters(Map<String, Object> params) {
         this (params, null);
     }
 
@@ -57,7 +57,7 @@ public class Parameters implements XPropertySet {
         Set<String> paramSet = new HashSet<String>(parameters.keySet());
 
         if (defaults != null) {
-            Set defSet = defaults.toMap().keySet();
+            Set<String> defSet = defaults.toMap().keySet();
             paramSet.addAll(defSet);
         }
 
@@ -148,14 +148,10 @@ public class Parameters implements XPropertySet {
         };
     }
 
-    public Map toMap() {
-        return new HashMap(parameters) {
-            public Object get(Object obj) {
-                if (obj instanceof String) {
-                    return Parameters.this.get((String) obj);
-                } else {
-                    return null;
-                }
+    public Map<String,Object> toMap() {
+        return new HashMap<String,Object>(parameters) {
+            public String get(String obj) {
+               return Parameters.this.get(obj);
             }
         };
     }
diff --git a/qadevOOo/runner/lib/TestParameters.java b/qadevOOo/runner/lib/TestParameters.java
index 8849e2816474..3a01fd251794 100644
--- a/qadevOOo/runner/lib/TestParameters.java
+++ b/qadevOOo/runner/lib/TestParameters.java
@@ -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 HashMap {
+public class TestParameters extends HashMap<String,Object> {
 
     /**
      * The ConnectionString for Office Connection<br>
@@ -230,13 +230,13 @@ public class TestParameters extends HashMap {
 
 
     /**
-     * Wraper around "put()"
+     * Wrapper around "put()"
      * @param key A key of this table.
      * @param val The value of the key.
      * @return The value of this key.
      * @see java.util.HashMap
      */
-    public Object put(Object key, Object val) {
+    public Object put(String key, Object val) {
         return super.put(key,val);
     }
 
@@ -289,7 +289,7 @@ public class TestParameters extends HashMap {
         Object context = get( "ComponentContext" );
         if ( context == null )
         {
-            XPropertySet factoryProps = (XPropertySet)com.sun.star.uno.UnoRuntime.queryInterface(
+            XPropertySet factoryProps = com.sun.star.uno.UnoRuntime.queryInterface(
                 XPropertySet.class, getMSF() );
             try
             {