java: remove some casting in lib.TestParameters#getMSF

where the return value is always cast to XMultiServiceFactory,
so just do the cast in the method and avoid noise at the call sites.

Change-Id: I3a2e06ac6edb3c6021eda6442032db57aaa22e13

12 files changed, 18 insertions, 18 deletions

diff --git a/scripting/workben/ifc/scripting/_XScriptInfoAccess.java b/scripting/workben/ifc/scripting/_XScriptInfoAccess.java
index 765936a72584..077e570956cd 100644
--- a/scripting/workben/ifc/scripting/_XScriptInfoAccess.java
+++ b/scripting/workben/ifc/scripting/_XScriptInfoAccess.java
@@ -186,7 +186,7 @@ public class _XScriptInfoAccess extends MultiMethodTest {
         log.println(testdata.get("description"));
 
         Object obj = ScriptingUtils.getDefault().getScriptStorage(
-            (XMultiServiceFactory) tParam.getMSF(), location);
+            tParam.getMSF(), location);
 
         XScriptInfoAccess access = UnoRuntime.queryInterface(XScriptInfoAccess.class, obj);
 
diff --git a/scripting/workben/ifc/scripting/_XScriptInvocation.java b/scripting/workben/ifc/scripting/_XScriptInvocation.java
index 38863de54397..59f263e13bd0 100644
--- a/scripting/workben/ifc/scripting/_XScriptInvocation.java
+++ b/scripting/workben/ifc/scripting/_XScriptInvocation.java
@@ -181,7 +181,7 @@ public class _XScriptInvocation extends MultiMethodTest {
         XSimpleFileAccess access = null;
 
         try {
-            Object fa = ((XMultiServiceFactory) tParam.getMSF()).createInstance(
+            Object fa = tParam.getMSF().createInstance(
                 "com.sun.star.ucb.SimpleFileAccess");
 
             access = UnoRuntime.queryInterface(XSimpleFileAccess.class, fa);
@@ -194,7 +194,7 @@ public class _XScriptInvocation extends MultiMethodTest {
 
     private XModel loadDocument(String name) {
         XModel model = null;
-        SOfficeFactory factory = SOfficeFactory.getFactory((XMultiServiceFactory) tParam.getMSF());
+        SOfficeFactory factory = SOfficeFactory.getFactory(tParam.getMSF());
 
         String fullname = util.utils.getFullTestURL(name);
 
diff --git a/scripting/workben/ifc/scripting/_XScriptNameResolver.java b/scripting/workben/ifc/scripting/_XScriptNameResolver.java
index fcee4802c5d4..030b37d91aa1 100644
--- a/scripting/workben/ifc/scripting/_XScriptNameResolver.java
+++ b/scripting/workben/ifc/scripting/_XScriptNameResolver.java
@@ -161,7 +161,7 @@ public class _XScriptNameResolver extends MultiMethodTest {
         XSimpleFileAccess access = null;
 
         try {
-            Object fa = ((XMultiServiceFactory) tParam.getMSF()).createInstance(
+            Object fa = tParam.getMSF().createInstance(
                 "com.sun.star.ucb.SimpleFileAccess");
 
             access = UnoRuntime.queryInterface(XSimpleFileAccess.class, fa);
diff --git a/scripting/workben/ifc/scripting/_XScriptSecurity.java b/scripting/workben/ifc/scripting/_XScriptSecurity.java
index de4ca0b693cf..9fb261aa879e 100644
--- a/scripting/workben/ifc/scripting/_XScriptSecurity.java
+++ b/scripting/workben/ifc/scripting/_XScriptSecurity.java
@@ -145,7 +145,7 @@ public class _XScriptSecurity extends MultiMethodTest {
             {
                 checkBox = true;
             }
-            new SecurityDialogUtil( (XMultiServiceFactory) tParam.getMSF(), buttonName, checkBox ).start();
+            new SecurityDialogUtil( tParam.getMSF(), buttonName, checkBox ).start();
         }
         // need to set up dialog utils thread first
         int storageId = getStorageId(location);
@@ -200,7 +200,7 @@ public class _XScriptSecurity extends MultiMethodTest {
     {
         String result = "";
         try {
-        Object oProv = ((XMultiServiceFactory) tParam.getMSF()).createInstance(
+        Object oProv = tParam.getMSF().createInstance(
             "com.sun.star.configuration.ConfigurationProvider" );
 
         XMultiServiceFactory xProv = UnoRuntime.queryInterface(XMultiServiceFactory.class, oProv);
@@ -241,7 +241,7 @@ public class _XScriptSecurity extends MultiMethodTest {
     {
         boolean success=false;
         try {
-        Object oProv = ((XMultiServiceFactory) tParam.getMSF()).createInstance(
+        Object oProv = tParam.getMSF().createInstance(
             "com.sun.star.configuration.ConfigurationProvider" );
 
         XMultiServiceFactory xProv = UnoRuntime.queryInterface(XMultiServiceFactory.class, oProv);
@@ -351,7 +351,7 @@ public class _XScriptSecurity extends MultiMethodTest {
         XSimpleFileAccess access = null;
 
         try {
-            Object fa = ((XMultiServiceFactory)tParam.getMSF()).createInstance(
+            Object fa = tParam.getMSF().createInstance(
                 "com.sun.star.ucb.SimpleFileAccess");
 
             access = UnoRuntime.queryInterface(XSimpleFileAccess.class, fa);
@@ -364,7 +364,7 @@ public class _XScriptSecurity extends MultiMethodTest {
 
     private XModel loadDocument(String name) {
         XModel model = null;
-        SOfficeFactory factory = SOfficeFactory.getFactory((XMultiServiceFactory) tParam.getMSF());
+        SOfficeFactory factory = SOfficeFactory.getFactory(tParam.getMSF());
 
         String fullname = util.utils.getFullTestURL(name);
 
diff --git a/scripting/workben/ifc/scripting/_XScriptStorageManager.java b/scripting/workben/ifc/scripting/_XScriptStorageManager.java
index ea2b483010bd..cac901fd5c09 100644
--- a/scripting/workben/ifc/scripting/_XScriptStorageManager.java
+++ b/scripting/workben/ifc/scripting/_XScriptStorageManager.java
@@ -241,7 +241,7 @@ public class _XScriptStorageManager extends MultiMethodTest {
         XSimpleFileAccess access = null;
 
         try {
-            Object fa = ((XMultiServiceFactory) tParam.getMSF()).createInstance(
+            Object fa = tParam.getMSF().createInstance(
                 "com.sun.star.ucb.SimpleFileAccess");
 
             access = UnoRuntime.queryInterface(XSimpleFileAccess.class, fa);
diff --git a/scripting/workben/mod/_scripting/Dispatch.java b/scripting/workben/mod/_scripting/Dispatch.java
index f23a64fccdba..0da82a410b28 100644
--- a/scripting/workben/mod/_scripting/Dispatch.java
+++ b/scripting/workben/mod/_scripting/Dispatch.java
@@ -53,7 +53,7 @@ public class Dispatch extends TestCase {
         URL dispatchURL = null;
         try {
 
-            XMultiServiceFactory xMSF = (XMultiServiceFactory) tParam.getMSF();
+            XMultiServiceFactory xMSF = tParam.getMSF();
             SOfficeFactory SOF = null;
             SOF = SOfficeFactory.getFactory( xMSF );
             String docPath = util.utils.getFullTestURL( "ExampleSpreadSheetLatest.sxc" );
@@ -64,7 +64,7 @@ public class Dispatch extends TestCase {
             oObj = ( XInterface )xMSF.createInstanceWithArguments( "com.sun.star.comp.ScriptProtocolHandler", new Object[] { frame } );
 
             XURLTransformer xParser=UnoRuntime.queryInterface(XURLTransformer.class,
-                ((XMultiServiceFactory)tParam.getMSF()).createInstance
+                tParam.getMSF().createInstance
                     ("com.sun.star.util.URLTransformer"));
             // Because it's an in/out parameter we must use an array of
             // URL objects.
diff --git a/scripting/workben/mod/_scripting/Function.java b/scripting/workben/mod/_scripting/Function.java
index ef697a916825..5b1d857c6fe0 100644
--- a/scripting/workben/mod/_scripting/Function.java
+++ b/scripting/workben/mod/_scripting/Function.java
@@ -48,7 +48,7 @@ public class Function extends TestCase {
         log.println("creating test environment");
         try {
 
-            XMultiServiceFactory xMSF = (XMultiServiceFactory) tParam.getMSF();
+            XMultiServiceFactory xMSF = tParam.getMSF();
             SOfficeFactory SOF = null;
             SOF = SOfficeFactory.getFactory( xMSF );
             String docPath = util.utils.getFullTestURL(doc);
diff --git a/scripting/workben/mod/_scripting/FunctionProvider.java b/scripting/workben/mod/_scripting/FunctionProvider.java
index 4c5cd0bcfff5..a5ae0ef3c6a5 100644
--- a/scripting/workben/mod/_scripting/FunctionProvider.java
+++ b/scripting/workben/mod/_scripting/FunctionProvider.java
@@ -42,7 +42,7 @@ public class FunctionProvider extends TestCase {
     log.println("creating test environment");
         try {
 
-            XMultiServiceFactory xMSF = (XMultiServiceFactory) tParam.getMSF();
+            XMultiServiceFactory xMSF = tParam.getMSF();
 
             Object xInterface = xMSF.createInstance( "com.sun.star.frame.Desktop" );
             XDesktop dtop = UnoRuntime.queryInterface( XDesktop.class,
diff --git a/scripting/workben/mod/_scripting/ScriptInfo.java b/scripting/workben/mod/_scripting/ScriptInfo.java
index f822fd5cb329..344e990ae65f 100644
--- a/scripting/workben/mod/_scripting/ScriptInfo.java
+++ b/scripting/workben/mod/_scripting/ScriptInfo.java
@@ -69,7 +69,7 @@ public class ScriptInfo extends TestCase {
         XInterface oObj = null;
         XSimpleFileAccess access = null;
         try {
-            XMultiServiceFactory xMSF = (XMultiServiceFactory) tParam.getMSF();
+            XMultiServiceFactory xMSF = tParam.getMSF();
             Object xInterface =
                 xMSF.createInstance( "com.sun.star.ucb.SimpleFileAccess" );
             access = UnoRuntime.queryInterface( XSimpleFileAccess.class, xInterface );
diff --git a/scripting/workben/mod/_scripting/ScriptRuntimeManager.java b/scripting/workben/mod/_scripting/ScriptRuntimeManager.java
index 48946738b614..f288e7bcfeb9 100644
--- a/scripting/workben/mod/_scripting/ScriptRuntimeManager.java
+++ b/scripting/workben/mod/_scripting/ScriptRuntimeManager.java
@@ -39,7 +39,7 @@ public class ScriptRuntimeManager extends TestCase {
         XInterface oObj = null;
 
         try {
-            oObj = (XInterface) ((XMultiServiceFactory)Param.getMSF()).createInstance
+            oObj = (XInterface) Param.getMSF().createInstance
                 ("drafts.com.sun.star.script.framework.runtime.ScriptRuntimeManager");
         } catch (com.sun.star.uno.Exception e) {
             throw new StatusException("Can't create object environment", e) ;
diff --git a/scripting/workben/mod/_scripting/ScriptStorage.java b/scripting/workben/mod/_scripting/ScriptStorage.java
index 3cdff81f4562..3666a187992a 100644
--- a/scripting/workben/mod/_scripting/ScriptStorage.java
+++ b/scripting/workben/mod/_scripting/ScriptStorage.java
@@ -66,7 +66,7 @@ public class ScriptStorage extends TestCase {
         XInterface oObj = null;
         XSimpleFileAccess access = null;
         try {
-            XMultiServiceFactory xMSF = (XMultiServiceFactory) tParam.getMSF();
+            XMultiServiceFactory xMSF = tParam.getMSF();
             Object xInterface =
                 xMSF.createInstance( "com.sun.star.ucb.SimpleFileAccess" );
             access = UnoRuntime.queryInterface( XSimpleFileAccess.class, xInterface );
diff --git a/scripting/workben/mod/_scripting/ScriptStorageManager.java b/scripting/workben/mod/_scripting/ScriptStorageManager.java
index aa7843a758e0..596fe4133b52 100644
--- a/scripting/workben/mod/_scripting/ScriptStorageManager.java
+++ b/scripting/workben/mod/_scripting/ScriptStorageManager.java
@@ -41,7 +41,7 @@ public class ScriptStorageManager extends TestCase {
     Object oInterface = null;
 
     try {
-            XMultiServiceFactory xMSF = (XMultiServiceFactory) Param.getMSF();
+            XMultiServiceFactory xMSF = Param.getMSF();
             XPropertySet xProp = UnoRuntime.queryInterface(
                                                 XPropertySet.class, xMSF);
             // get context