java: simplify the getMSF() methods

Change-Id: Ib459799f4a3224f8c9683ac4b6cf37982d2077a3
Reviewed-on: https://gerrit.libreoffice.org/13406Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

comphelper/qa/complex/comphelper/Map.java

@@ -495,8 +495,7 @@ public class Map
 
     private static XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java

@@ -138,8 +138,7 @@ public class SequenceOutputStreamUnitTest
 
     private static XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

dbaccess/qa/complex/dbaccess/TestCase.java

@@ -207,10 +207,9 @@ public abstract class TestCase
     }
 
 
-    protected XMultiServiceFactory getMSF()
+    protected final XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
 

extensions/qa/complex/extensions/OfficeResourceLoader.java

@@ -107,8 +107,7 @@ public class OfficeResourceLoader
 
     private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

filter/qa/complex/filter/misc/FinalizedMandatoryTest.java

@@ -323,8 +323,7 @@ public class FinalizedMandatoryTest
 
     private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

filter/qa/complex/filter/misc/TypeDetection6FileFormat.java

@@ -116,10 +116,9 @@ public class TypeDetection6FileFormat
         return (XInterface) oInterface;
     }
 
-        private XMultiServiceFactory getMSF()
+    private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

forms/qa/complex/forms/CheckOGroupBoxModel.java

@@ -177,8 +177,7 @@ public class CheckOGroupBoxModel
 
     private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

framework/qa/complex/ModuleManager/CheckXModuleManager.java

@@ -309,8 +309,7 @@ public class CheckXModuleManager
 
     private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

framework/qa/complex/XUserInputInterception/EventTest.java

@@ -533,8 +533,7 @@ public class EventTest {
 
     private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

framework/qa/complex/api_internal/CheckAPI.java

@@ -191,12 +191,9 @@ public class CheckAPI  {
     }
 
 
-
-
     private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

framework/qa/complex/broken_document/LoadDocument.java

@@ -85,12 +85,9 @@ public class LoadDocument {
 
     }
 
-
-
-  private XMultiServiceFactory getMSF()
+    private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java

@@ -325,8 +325,7 @@ public class CheckContextMenuInterceptor
 
     private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

framework/qa/complex/desktop/DesktopTerminate.java

@@ -136,8 +136,7 @@ public class DesktopTerminate
 
     private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

framework/qa/complex/dispatches/checkdispatchapi.java

@@ -435,8 +435,7 @@ public class checkdispatchapi
 
     private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java

@@ -71,10 +71,9 @@ public class GetServiceWhileDisposingOffice
     }
 
 
-       private XMultiServiceFactory getMSF()
+    private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

framework/qa/complex/framework/autosave/AutoSave.java

@@ -429,8 +429,7 @@ public class AutoSave
 
     private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

framework/qa/complex/imageManager/CheckImageManager.java

@@ -178,8 +178,7 @@ public class CheckImageManager  {
 
     private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java

@@ -549,8 +549,7 @@ public class CheckXComponentLoader
 
     private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

framework/qa/complex/path_substitution/PathSubstitutionTest.java

@@ -272,8 +272,7 @@ public class PathSubstitutionTest
 
     private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

linguistic/qa/complex/linguistic/HangulHanjaConversion.java

@@ -323,8 +323,7 @@ XComponent xDoc = DesktopTools.loadDoc(xMSF, FileToLoad,
 
     private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

qadevOOo/qa/complex/junitskeleton/Skeleton.java

@@ -160,8 +160,7 @@ public class Skeleton
 
     private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

sfx2/qa/complex/sfx2/DocumentMetadataAccess.java

@@ -1233,8 +1233,7 @@ public class DocumentMetadataAccess
 
     private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java

@@ -240,10 +240,9 @@ public class GlobalEventBroadcaster {
         }
     }
 
-        private XMultiServiceFactory getMSF()
+    private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

sot/qa/complex/olesimplestorage/OLESimpleStorageUnitTest.java

@@ -63,8 +63,7 @@ public class OLESimpleStorageUnitTest
 
     private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

svl/qa/complex/ConfigItems/CheckConfigItems.java

@@ -132,10 +132,9 @@ public class CheckConfigItems
     }
 
 
-       private XMultiServiceFactory getMSF()
+    private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

svl/qa/complex/passwordcontainer/PasswordContainerUnitTest.java

@@ -63,8 +63,7 @@ public class PasswordContainerUnitTest {
 
     private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

toolkit/qa/complex/toolkit/AccessibleStatusBar.java

@@ -57,11 +57,9 @@ public class AccessibleStatusBar {
 
     private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
-
     /**
     * Sleeps for 0.5 sec. to allow StarOffice to react on <code>
     * reset</code> call.

toolkit/qa/complex/toolkit/AccessibleStatusBarItem.java

@@ -83,8 +83,7 @@ public class AccessibleStatusBarItem {
 
     private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     /**

ucb/qa/complex/tdoc/CheckContentProvider.java

@@ -354,8 +354,7 @@ public class CheckContentProvider {
 
     private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

ucb/qa/complex/tdoc/CheckTransientDocumentsContent.java

@@ -132,10 +132,9 @@ public class CheckTransientDocumentsContent {
 
     }
 
-     private XMultiServiceFactory getMSF()
+    private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java

@@ -140,10 +140,9 @@ public class CheckTransientDocumentsContentProvider {
 
     }
 
-     private XMultiServiceFactory getMSF()
+    private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java

@@ -156,8 +156,7 @@ public class CheckTransientDocumentsDocumentContent {
 
     private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

unotools/qa/complex/tempfile/TempFileUnitTest.java

@@ -70,8 +70,7 @@ public class TempFileUnitTest
 
     private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

unoxml/qa/complex/unoxml/RDFRepositoryTest.java

@@ -843,10 +843,9 @@ public class RDFRepositoryTest
         public void setString(String i_Str) { m_Text = i_Str; }
     }
 
-        private XMultiServiceFactory getMSF()
+    private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

vcl/qa/complex/memCheck/CheckMemoryUsage.java

@@ -537,8 +537,7 @@ public class CheckMemoryUsage
 
     private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections

vcl/qa/complex/persistent_window_states/PersistentWindowTest.java

@@ -360,10 +360,9 @@ public class PersistentWindowTest
 
 
 
-        private XMultiServiceFactory getMSF()
+    private XMultiServiceFactory getMSF()
     {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
+        return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
     }
 
     // setup and close connections