java: remove ((unnecessary)) parentheses

Change-Id: I39fbe3a260c8dbfc203662c54eec4db064b88195

46 files changed, 71 insertions, 81 deletions

diff --git a/qadevOOo/runner/complexlib/ComplexTestCase.java b/qadevOOo/runner/complexlib/ComplexTestCase.java
index 56bc0b986198..4ece6ae2b610 100644
--- a/qadevOOo/runner/complexlib/ComplexTestCase.java
+++ b/qadevOOo/runner/complexlib/ComplexTestCase.java
@@ -119,7 +119,7 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest
                 int posLeftParenthesis = entryName.indexOf('(');
                 if (posLeftParenthesis != -1)
                 {
-                    String sParameter = (entryName.substring(posLeftParenthesis + 1, entryName.indexOf(')')));
+                    String sParameter = entryName.substring(posLeftParenthesis + 1, entryName.indexOf(')'));
                     mTestMethodName = entryName;
                     parameter = new String[] { sParameter };
                     entryName = entryName.substring(0, posLeftParenthesis);
diff --git a/qadevOOo/runner/helper/BuildEnvTools.java b/qadevOOo/runner/helper/BuildEnvTools.java
index 2c10aa70cad7..b967ee7f5872 100644
--- a/qadevOOo/runner/helper/BuildEnvTools.java
+++ b/qadevOOo/runner/helper/BuildEnvTools.java
@@ -83,7 +83,7 @@ public class BuildEnvTools {
             error = true;
         }
 
-        mCygwin = (param.getBool(PropertyName.CYGWIN));
+        mCygwin = param.getBool(PropertyName.CYGWIN);
 
         if (error) {
             throw new ParameterNotFoundException(msg);
diff --git a/qadevOOo/runner/util/InstCreator.java b/qadevOOo/runner/util/InstCreator.java
index de40b07c03b1..d517f0cd1e8c 100644
--- a/qadevOOo/runner/util/InstCreator.java
+++ b/qadevOOo/runner/util/InstCreator.java
@@ -88,7 +88,7 @@ public class InstCreator implements XInstCreator {
             XFootnotesSupplier oTTS = UnoRuntime.queryInterface(
                                 XFootnotesSupplier.class, xParent );
 
-            return( oTTS.getFootnotes() );
+            return oTTS.getFootnotes();
         }
 
         if ( iDsc instanceof TextSectionDsc ) {
diff --git a/qadevOOo/runner/util/ValueChanger.java b/qadevOOo/runner/util/ValueChanger.java
index 008b98295f8d..ec796aec5757 100644
--- a/qadevOOo/runner/util/ValueChanger.java
+++ b/qadevOOo/runner/util/ValueChanger.java
@@ -153,7 +153,7 @@ public class ValueChanger {
             com.sun.star.style.TabAlign TA1 = com.sun.star.style.TabAlign.CENTER;
             com.sun.star.style.TabAlign TA2 = com.sun.star.style.TabAlign.RIGHT;
 
-            if ((TSold.Alignment).equals(TA1))
+            if (TSold.Alignment.equals(TA1))
                 TS.Alignment = TA2;
             else
                 TS.Alignment = TA1;
diff --git a/qadevOOo/runner/util/utils.java b/qadevOOo/runner/util/utils.java
index dc019a4fcbfb..2ca7351db781 100644
--- a/qadevOOo/runner/util/utils.java
+++ b/qadevOOo/runner/util/utils.java
@@ -537,7 +537,7 @@ public class utils {
     public static boolean isVoid(Object aObject) {
         if (aObject instanceof com.sun.star.uno.Any) {
             com.sun.star.uno.Any oAny = (com.sun.star.uno.Any) aObject;
-            return (oAny.getType().getTypeName().equals("void"));
+            return oAny.getType().getTypeName().equals("void");
         } else {
             return false;
         }
diff --git a/qadevOOo/tests/java/ifc/awt/_XControl.java b/qadevOOo/tests/java/ifc/awt/_XControl.java
index 1dd1da4361f2..0f3c06a25e71 100644
--- a/qadevOOo/tests/java/ifc/awt/_XControl.java
+++ b/qadevOOo/tests/java/ifc/awt/_XControl.java
@@ -158,7 +158,7 @@ public class _XControl extends MultiMethodTest {
         requiredMethod("setModel()");
         XControlModel the_model = (XControlModel) tEnv.getObjRelation("MODEL");
         XControlModel get = oObj.getModel();
-        boolean res = (get.equals(the_model));
+        boolean res = get.equals(the_model);
         if (!res) {
             log.println("getting: "+get.toString());
             log.println("expected: "+the_model.toString());
diff --git a/qadevOOo/tests/java/ifc/beans/_XIntrospection.java b/qadevOOo/tests/java/ifc/beans/_XIntrospection.java
index c8c96edbc8b6..79d7d1767dbd 100644
--- a/qadevOOo/tests/java/ifc/beans/_XIntrospection.java
+++ b/qadevOOo/tests/java/ifc/beans/_XIntrospection.java
@@ -44,7 +44,7 @@ public class _XIntrospection extends MultiMethodTest {
     public void _inspect() {
        boolean result = true;
        XIntrospectionAccess xIA = oObj.inspect(oObj);
-       result = (xIA.hasMethod("acquire",1));
+       result = xIA.hasMethod("acquire",1);
        tRes.tested("inspect()",result);
     }
 
diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java b/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java
index 80b96398e0dc..c74f93d7fac8 100644
--- a/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java
+++ b/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java
@@ -155,8 +155,7 @@ public class _XMultiPropertyStates extends MultiMethodTest {
             the_first[0] = propName;
             log.println("Setting " + propName + " to default");
             oObj.setPropertiesToDefault(the_first);
-            result = (oObj.getPropertyStates(the_first)[0].equals
-                (PropertyState.DEFAULT_VALUE));
+            result = oObj.getPropertyStates(the_first)[0].equals(PropertyState.DEFAULT_VALUE);
         } catch (com.sun.star.beans.UnknownPropertyException e) {
             log.println("some properties seem to be unknown: " + e.toString());
         }
diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertyState.java b/qadevOOo/tests/java/ifc/beans/_XPropertyState.java
index b7df9cc7c23a..ca7337a7417a 100644
--- a/qadevOOo/tests/java/ifc/beans/_XPropertyState.java
+++ b/qadevOOo/tests/java/ifc/beans/_XPropertyState.java
@@ -119,7 +119,7 @@ public class _XPropertyState extends MultiMethodTest {
             boolean result = true ;
             String localName = pName;
             if (localName == null) {
-                localName = (propertySetInfo.getProperties()[0]).Name;
+                localName = propertySetInfo.getProperties()[0].Name;
             }
             try {
                 propDef = oObj.getPropertyDefault(localName);
@@ -147,7 +147,7 @@ public class _XPropertyState extends MultiMethodTest {
 
             String localName = pName;
             if (localName == null) {
-                localName = (propertySetInfo.getProperties()[0]).Name;
+                localName = propertySetInfo.getProperties()[0].Name;
             }
 
             try {
@@ -175,7 +175,7 @@ public class _XPropertyState extends MultiMethodTest {
 
             String localName = pName;
             if (localName == null) {
-                localName = (propertySetInfo.getProperties()[0]).Name;
+                localName = propertySetInfo.getProperties()[0].Name;
             }
 
             try {
diff --git a/qadevOOo/tests/java/ifc/chart/_XDiagram.java b/qadevOOo/tests/java/ifc/chart/_XDiagram.java
index 3d02e7399924..de51ea2e1082 100644
--- a/qadevOOo/tests/java/ifc/chart/_XDiagram.java
+++ b/qadevOOo/tests/java/ifc/chart/_XDiagram.java
@@ -73,7 +73,7 @@ public class _XDiagram extends MultiMethodTest {
 
         String stype = oObj.getDiagramType();
         log.println("Current Diagram Type is " + stype);
-        result = (stype.startsWith("com.sun.star.chart."));
+        result = stype.startsWith("com.sun.star.chart.");
 
         tRes.tested("getDiagramType()", result);
     }
diff --git a/qadevOOo/tests/java/ifc/connection/_XAcceptor.java b/qadevOOo/tests/java/ifc/connection/_XAcceptor.java
index d8f7610654da..686f09a9ead4 100644
--- a/qadevOOo/tests/java/ifc/connection/_XAcceptor.java
+++ b/qadevOOo/tests/java/ifc/connection/_XAcceptor.java
@@ -125,8 +125,7 @@ public class _XAcceptor extends MultiMethodTest {
 
         // creating services required
         try {
-            Object oConnector = (tParam.getMSF()).
-                createInstance("com.sun.star.connection.Connector") ;
+            Object oConnector = tParam.getMSF().createInstance("com.sun.star.connection.Connector") ;
 
             xConnector = UnoRuntime.queryInterface
                 (XConnector.class, oConnector) ;
diff --git a/qadevOOo/tests/java/ifc/i18n/_XCalendar.java b/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
index 102bf7fc9b28..e04595adbb8c 100644
--- a/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
+++ b/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
@@ -324,7 +324,7 @@ public class _XCalendar extends MultiMethodTest {
                 log.println("*** " + lang + " ... FAILED ***");
                 log.println(error);
             }
-            res &= (error.equals(""));
+            res &= error.equals("");
         }
 
         tRes.tested("setValue()", res);
diff --git a/qadevOOo/tests/java/ifc/i18n/_XLocaleData.java b/qadevOOo/tests/java/ifc/i18n/_XLocaleData.java
index d94daef71f99..e7060dcb2aae 100644
--- a/qadevOOo/tests/java/ifc/i18n/_XLocaleData.java
+++ b/qadevOOo/tests/java/ifc/i18n/_XLocaleData.java
@@ -233,7 +233,7 @@ public class _XLocaleData extends MultiMethodTest {
         for (int i=0;i<7;i++) {
             Implementation[] impl = oObj.getCollatorImplementations(getLocale(i));
             for (int j=0;j<impl.length;j++) {
-                if ((impl[j].unoID.equals(""))) {
+                if (impl[j].unoID.equals("")) {
                     printit = true;
                 }
                 res &= (!impl[j].unoID.equals(""));
@@ -258,7 +258,7 @@ public class _XLocaleData extends MultiMethodTest {
         for (int i=0;i<7;i++) {
             String[] str = oObj.getSearchOptions(getLocale(i));
             for (int j=0;j<str.length;j++) {
-                if ((str[j].equals(""))) {
+                if (str[j].equals("")) {
                     printit = true;
                 }
                 res &= (!str[j].equals(""));
@@ -283,7 +283,7 @@ public class _XLocaleData extends MultiMethodTest {
         for (int i=0;i<7;i++) {
             String[] str = oObj.getCollationOptions(getLocale(i));
             for (int j=0;j<str.length;j++) {
-                if ((str[j].equals(""))) {
+                if (str[j].equals("")) {
                     printit = true;
                 }
                 res &= (!str[j].equals(""));
@@ -308,7 +308,7 @@ public class _XLocaleData extends MultiMethodTest {
         for (int i=0;i<7;i++) {
             String[] str = oObj.getTransliterations(getLocale(i));
             for (int j=0;j<str.length;j++) {
-                if ((str[j].equals(""))) {
+                if (str[j].equals("")) {
                     printit = true;
                 }
                 res &= (!str[j].equals(""));
@@ -355,7 +355,7 @@ public class _XLocaleData extends MultiMethodTest {
         for (int i=0;i<7;i++) {
             String[] str = oObj.getReservedWord(getLocale(i));
             for (int j=0;j<str.length;j++) {
-                if ((str[j].equals(""))) {
+                if (str[j].equals("")) {
                     printit = true;
                 }
                 res &= (!str[j].equals(""));
diff --git a/qadevOOo/tests/java/ifc/io/_XPersistObject.java b/qadevOOo/tests/java/ifc/io/_XPersistObject.java
index 46b7a765b625..083d0f71c692 100644
--- a/qadevOOo/tests/java/ifc/io/_XPersistObject.java
+++ b/qadevOOo/tests/java/ifc/io/_XPersistObject.java
@@ -160,7 +160,7 @@ public class _XPersistObject extends MultiMethodTest {
 
                 persCopy.read(iStream);
 
-                bResult = ( persCopy.getServiceName().equals(sname) );
+                bResult = persCopy.getServiceName().equals(sname);
 
             }
 
diff --git a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java
index 1051ce8c5bd6..a69e99251580 100644
--- a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java
+++ b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java
@@ -123,7 +123,7 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest {
         try{
             String filter = "\"Identifier\" = 'BOR02b'";
             xComposer.setFilter(filter);
-            tRes.tested("getFilter()", (oObj.getFilter().equals(filter)));
+            tRes.tested("getFilter()", oObj.getFilter().equals(filter));
 
         } catch (com.sun.star.sdbc.SQLException e){
             log.println("unexpected Exception: " + e.toString());
@@ -154,7 +154,7 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest {
             PropertyValue[][] aStructuredFilter = oObj.getStructuredFilter();
             xComposer.setFilter("");
             xComposer.setStructuredFilter(aStructuredFilter);
-            tRes.tested("getStructuredFilter()", (oObj.getFilter().equals(complexFilter)));
+            tRes.tested("getStructuredFilter()", oObj.getFilter().equals(complexFilter));
 
         } catch (com.sun.star.sdbc.SQLException e){
             log.println("unexpected Exception: " + e.toString());
@@ -173,7 +173,7 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest {
         try{
             String group = "\"Identifier\"";
             xComposer.setGroup(group);
-            tRes.tested("getGroup()", (oObj.getGroup().equals(group)));
+            tRes.tested("getGroup()", oObj.getGroup().equals(group));
 
         } catch (com.sun.star.sdbc.SQLException e){
             log.println("unexpected Exception: " + e.toString());
@@ -210,8 +210,7 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest {
         try{
             String clause = "\"Identifier\" = 'BOR02b'";
             xComposer.setHavingClause(clause);
-            tRes.tested("getHavingClause()", (
-                                        oObj.getHavingClause().equals(clause)));
+            tRes.tested("getHavingClause()", oObj.getHavingClause().equals(clause));
 
         } catch (com.sun.star.sdbc.SQLException e){
             log.println("unexpected Exception: " + e.toString());
@@ -242,7 +241,7 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest {
            xComposer.setHavingClause("");
            xComposer.setStructuredHavingClause(aStructuredHaving);
            tRes.tested("getStructuredHavingClause()",
-                                (oObj.getHavingClause().equals(complexFilter)));
+                                oObj.getHavingClause().equals(complexFilter));
 
         } catch (com.sun.star.sdbc.SQLException e){
             log.println("unexpected Exception: " + e.toString());
@@ -258,7 +257,7 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest {
         try{
             String order = "\"Identifier\"";
             xComposer.setOrder(order);
-            tRes.tested("getOrder()", (oObj.getOrder().equals(order)));
+            tRes.tested("getOrder()", oObj.getOrder().equals(order));
 
         } catch (com.sun.star.sdbc.SQLException e){
             log.println("unexpected Exception: " + e.toString());
diff --git a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java
index 2134a87eb18a..717d0672d3ae 100644
--- a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java
+++ b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java
@@ -128,7 +128,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest {
         try{
             String filter = "\"Identifier\" = 'BOR02b'";
             oObj.setFilter(filter);
-            tRes.tested("setFilter()", (xQueryAna.getFilter().equals(filter)));
+            tRes.tested("setFilter()", xQueryAna.getFilter().equals(filter));
 
         } catch (SQLException e){
             log.println("unexpected Exception: " + e.toString());
@@ -152,7 +152,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest {
             PropertyValue[][] aStructuredFilter = xQueryAna.getStructuredFilter();
             oObj.setFilter("");
             oObj.setStructuredFilter(aStructuredFilter);
-            tRes.tested("setStructuredFilter()", (xQueryAna.getFilter().equals(complexFilter)));
+            tRes.tested("setStructuredFilter()", xQueryAna.getFilter().equals(complexFilter));
 
         } catch (SQLException e){
             log.println("unexpected Exception: " + e.toString());
@@ -312,7 +312,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest {
         try{
             String group = "\"Identifier\"";
             oObj.setGroup(group);
-            tRes.tested("setGroup()", (xQueryAna.getGroup().equals(group)));
+            tRes.tested("setGroup()", xQueryAna.getGroup().equals(group));
 
         } catch (SQLException e){
             log.println("unexpected Exception: " + e.toString());
@@ -330,8 +330,8 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest {
         try{
             String clause = "\"Identifier\" = 'BOR02b'";
             oObj.setHavingClause(clause);
-            tRes.tested("setHavingClause()", (
-                                   xQueryAna.getHavingClause().equals(clause)));
+            tRes.tested("setHavingClause()",
+                                   xQueryAna.getHavingClause().equals(clause));
 
         } catch (SQLException e){
             log.println("unexpected Exception: " + e.toString());
@@ -367,7 +367,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest {
            oObj.setHavingClause("");
            oObj.setStructuredHavingClause(aStructuredHaving);
            tRes.tested("setStructuredHavingClause()",
-                           (xQueryAna.getHavingClause().equals(complexFilter)));
+                           xQueryAna.getHavingClause().equals(complexFilter));
 
         } catch (SQLException e){
             log.println("unexpected Exception: " + e.toString());
@@ -509,7 +509,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest {
         try{
             String order = "\"Identifier\"";
             oObj.setOrder(order);
-            tRes.tested("setOrder()", (xQueryAna.getOrder().equals(order)));
+            tRes.tested("setOrder()", xQueryAna.getOrder().equals(order));
 
         } catch (SQLException e){
             log.println("unexpected Exception: " + e.toString());
diff --git a/qadevOOo/tests/java/ifc/sdbc/_XWarningsSupplier.java b/qadevOOo/tests/java/ifc/sdbc/_XWarningsSupplier.java
index dde20034f968..1758ccb1b5f4 100644
--- a/qadevOOo/tests/java/ifc/sdbc/_XWarningsSupplier.java
+++ b/qadevOOo/tests/java/ifc/sdbc/_XWarningsSupplier.java
@@ -116,7 +116,7 @@ public class _XWarningsSupplier extends MultiMethodTest {
         try {
             oObj.clearWarnings();
             Object warns = oObj.getWarnings();
-            res = (utils.isVoid(warns));
+            res = utils.isVoid(warns);
         } catch (SQLException e) {
             log.println("Exception occurred :");
             e.printStackTrace(log);
diff --git a/qadevOOo/tests/java/ifc/text/_XFootnote.java b/qadevOOo/tests/java/ifc/text/_XFootnote.java
index 0bb4057802bf..acd7fa5f8f0c 100644
--- a/qadevOOo/tests/java/ifc/text/_XFootnote.java
+++ b/qadevOOo/tests/java/ifc/text/_XFootnote.java
@@ -85,7 +85,7 @@ public class _XFootnote extends MultiMethodTest {
         String res = oObj.getLabel();
 
         log.println("verify setLabel result");
-        result = (res.equals(str));
+        result = res.equals(str);
         if (result) {
             log.println(" ... setLabel() - OK");
         }
diff --git a/qadevOOo/tests/java/ifc/text/_XPagePrintable.java b/qadevOOo/tests/java/ifc/text/_XPagePrintable.java
index a7239f819280..7268118dd3dc 100644
--- a/qadevOOo/tests/java/ifc/text/_XPagePrintable.java
+++ b/qadevOOo/tests/java/ifc/text/_XPagePrintable.java
@@ -95,7 +95,7 @@ public class _XPagePrintable extends MultiMethodTest {
         Boolean newlandscape = Boolean.valueOf(!landscape.booleanValue());
         PrintSettings[8].Value = newlandscape;
         oObj.setPagePrintSettings(PrintSettings);
-        res = (oObj.getPagePrintSettings()[8].Value.equals(newlandscape));
+        res = oObj.getPagePrintSettings()[8].Value.equals(newlandscape);
 
         tRes.tested("setPagePrintSettings()",res);
     }
diff --git a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java
index 321d2901950b..039658e1dfea 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java
@@ -192,7 +192,7 @@ public class ODatasourceBrowser extends TestCase {
         }
 
         // get a soffice factory object
-        SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF()));
+        SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
 
         log.println("creating a text document");
         xTextDoc = SOF.createTextDoc(null);
diff --git a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
index f6797763ebd5..c3fd3f829ac6 100644
--- a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
+++ b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
@@ -216,7 +216,7 @@ public class GenericModelTest extends TestCase {
     @Override
     protected void initialize(TestParameters tParam, PrintWriter log) throws Exception {
         log.println("creating a textdocument");
-        m_xTextDoc = WriterTools.createTextDoc((tParam.getMSF()));
+        m_xTextDoc = WriterTools.createTextDoc(tParam.getMSF());
         m_ConnectionColsed = false;
         debug = tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE);
         m_propertiesToSet.clear();
@@ -392,7 +392,7 @@ public class GenericModelTest extends TestCase {
         utils.copyFile(xMSF, sourceTestDB, destTestDB);
 
         m_dbTools = new DBTools( xMSF );
-        String tmpDir = utils.getOfficeTemp((xMSF));
+        String tmpDir = utils.getOfficeTemp(xMSF);
 
         DBTools.DataSourceInfo srcInf = m_dbTools.newDataSourceInfo();
         srcInf.URL = "sdbc:dbase:" + DBTools.dirToUrl(tmpDir);
diff --git a/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java b/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java
index 2bb3f35d2b51..f95a2340d4d8 100644
--- a/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java
@@ -91,7 +91,7 @@ public class OCheckBoxControl extends TestCase {
      */
     @Override
     protected void initialize ( TestParameters Param, PrintWriter log) throws Exception {
-        SOfficeFactory SOF = SOfficeFactory.getFactory( (Param.getMSF()) );
+        SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF() );
         log.println( "creating a textdocument" );
         xTextDoc = SOF.createTextDoc( null );
     }
diff --git a/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java b/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java
index 010948537d4b..1b5fe16d670b 100644
--- a/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java
@@ -95,7 +95,7 @@ public class OComboBoxControl extends TestCase {
      */
     @Override
     protected void initialize(TestParameters Param, PrintWriter log) throws Exception {
-        SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF()));
+        SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
 
         log.println("creating a textdocument");
         xTextDoc = SOF.createTextDoc(null);
diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
index d8845e5f5c7f..77fde0139689 100644
--- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
+++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
@@ -229,7 +229,7 @@ public class ODatabaseForm extends TestCase {
 
     @Override
     protected void initialize(TestParameters tParam, PrintWriter log) throws Exception {
-        tmpDir = utils.getOfficeTemp((tParam.getMSF()));
+        tmpDir = utils.getOfficeTemp(tParam.getMSF());
 
         origDB = util.utils.getFullTestDocName("TestDB/testDB.dbf");
 
@@ -296,7 +296,7 @@ public class ODatabaseForm extends TestCase {
                 oldF = utils.getFullURL(origDB);
                 newF = utils.getOfficeTemp(tParam.getMSF()) + tableName +
                        ".dbf";
-            } while (!utils.tryOverwriteFile((tParam.getMSF()), oldF, newF) &&
+            } while (!utils.tryOverwriteFile(tParam.getMSF(), oldF, newF) &&
                      (uniqueSuffix++ < 50));
         }
     }
@@ -322,7 +322,7 @@ public class ODatabaseForm extends TestCase {
         }
 
         log.println("creating a text document");
-        xTextDoc = WriterTools.createTextDoc((Param.getMSF()));
+        xTextDoc = WriterTools.createTextDoc(Param.getMSF());
 
         //initialize test table
         if (isMySQLDB) {
@@ -439,11 +439,8 @@ public class ODatabaseForm extends TestCase {
         formLoader.load();
 
         try {
-            oObj = (XForm) AnyConverter.toObject(new Type(XForm.class),
-                                                 (FormTools.getForms(
-                                                         WriterTools.getDrawPage(
-                                                                 xTextDoc)))
-                                                     .getByName("MyForm"));
+            Object temp1 = FormTools.getForms( WriterTools.getDrawPage(xTextDoc) ).getByName("MyForm");
+            oObj = (XForm) AnyConverter.toObject(new Type(XForm.class), temp1);
 
             XPropertySet xSetProp = UnoRuntime.queryInterface(
                                             XPropertySet.class, oObj);
diff --git a/qadevOOo/tests/java/mod/_forms/ODateControl.java b/qadevOOo/tests/java/mod/_forms/ODateControl.java
index d80597b12982..7d4dfc9e4c18 100644
--- a/qadevOOo/tests/java/mod/_forms/ODateControl.java
+++ b/qadevOOo/tests/java/mod/_forms/ODateControl.java
@@ -94,7 +94,7 @@ public class ODateControl extends TestCase {
      */
     @Override
     protected void initialize(TestParameters Param, PrintWriter log) throws Exception {
-        SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF()));
+        SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
 
         log.println("creating a textdocument");
         xTextDoc = SOF.createTextDoc(null);
diff --git a/qadevOOo/tests/java/mod/_forms/OEditControl.java b/qadevOOo/tests/java/mod/_forms/OEditControl.java
index 4b233ca86347..ae231ace5365 100644
--- a/qadevOOo/tests/java/mod/_forms/OEditControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OEditControl.java
@@ -95,7 +95,7 @@ public class OEditControl extends TestCase {
      */
     @Override
     protected void initialize(TestParameters Param, PrintWriter log) throws Exception {
-        SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF()));
+        SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
 
         log.println("creating a textdocument");
         xTextDoc = SOF.createTextDoc(null);
diff --git a/qadevOOo/tests/java/mod/_forms/OFileControlModel.java b/qadevOOo/tests/java/mod/_forms/OFileControlModel.java
index 247d56a4a3d8..994e62123e6d 100644
--- a/qadevOOo/tests/java/mod/_forms/OFileControlModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OFileControlModel.java
@@ -94,7 +94,7 @@ public class OFileControlModel extends TestCase {
      */
     @Override
     protected void initialize(TestParameters tParam, PrintWriter log) throws Exception {
-        SOfficeFactory SOF = SOfficeFactory.getFactory((tParam.getMSF()));
+        SOfficeFactory SOF = SOfficeFactory.getFactory(tParam.getMSF());
         log.println("creating a draw document");
         xDrawDoc = SOF.createDrawDoc(null);
     }
diff --git a/qadevOOo/tests/java/mod/_forms/OFormattedControl.java b/qadevOOo/tests/java/mod/_forms/OFormattedControl.java
index 9924e4c1d0e8..11793b31d320 100644
--- a/qadevOOo/tests/java/mod/_forms/OFormattedControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OFormattedControl.java
@@ -91,7 +91,7 @@ public class OFormattedControl extends TestCase {
      */
     @Override
     protected void initialize(TestParameters Param, PrintWriter log) throws Exception {
-        SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF()));
+        SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
 
         log.println("creating a textdocument");
         xTextDoc = SOF.createTextDoc(null);
diff --git a/qadevOOo/tests/java/mod/_forms/OFormsCollection.java b/qadevOOo/tests/java/mod/_forms/OFormsCollection.java
index 293fcbbf77ed..f608b5d0c7cf 100644
--- a/qadevOOo/tests/java/mod/_forms/OFormsCollection.java
+++ b/qadevOOo/tests/java/mod/_forms/OFormsCollection.java
@@ -77,7 +77,7 @@ public class OFormsCollection extends TestCase {
     @Override
     protected void initialize(TestParameters tParam, PrintWriter log) throws Exception {
         log.println("creating a draw document");
-        xDrawDoc = DrawTools.createDrawDoc((tParam.getMSF()));
+        xDrawDoc = DrawTools.createDrawDoc(tParam.getMSF());
     }
 
     /**
diff --git a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java
index 6995574d6b42..bc9b964fa6b0 100644
--- a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java
@@ -229,7 +229,7 @@ class OGridControlModelold extends TestCase {
     */
     @Override
     protected void initialize(TestParameters tParam, PrintWriter log) throws Exception {
-        SOfficeFactory SOF = SOfficeFactory.getFactory((tParam.getMSF()));
+        SOfficeFactory SOF = SOfficeFactory.getFactory(tParam.getMSF());
         log.println("creating a draw document");
         xDrawDoc = SOF.createDrawDoc(null);
     }
diff --git a/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java b/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java
index fd6f571df05a..dea7c00583da 100644
--- a/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java
@@ -73,7 +73,7 @@ public class OGroupBoxControl extends TestCase {
      */
     @Override
     protected void initialize(TestParameters Param, PrintWriter log) throws Exception {
-        SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF()));
+        SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
 
         log.println("creating a textdocument");
         xTextDoc = SOF.createTextDoc(null);
diff --git a/qadevOOo/tests/java/mod/_forms/OHiddenModel.java b/qadevOOo/tests/java/mod/_forms/OHiddenModel.java
index 7b64604d71a3..388447f505b9 100644
--- a/qadevOOo/tests/java/mod/_forms/OHiddenModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OHiddenModel.java
@@ -91,7 +91,7 @@ public class OHiddenModel extends TestCase {
      */
     @Override
     protected void initialize(TestParameters tParam, PrintWriter log) throws Exception {
-        SOfficeFactory SOF = SOfficeFactory.getFactory((tParam.getMSF()));
+        SOfficeFactory SOF = SOfficeFactory.getFactory(tParam.getMSF());
 
         log.println("creating a draw document");
         xDrawDoc = SOF.createDrawDoc(null);
@@ -136,7 +136,7 @@ public class OHiddenModel extends TestCase {
         log.println("creating a test environment");
 
         // get a soffice factory object
-        SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF()));
+        SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
         String objName = "HiddenControl";
         XInterface ctrl = SOF.createControl(xDrawDoc, objName);
 
diff --git a/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java b/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java
index 11e67319361e..1f55ac59ec16 100644
--- a/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java
@@ -78,7 +78,7 @@ public class OImageButtonControl extends TestCase {
      */
     @Override
     protected void initialize(TestParameters Param, PrintWriter log) throws Exception {
-        SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF()));
+        SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
 
         log.println("creating a textdocument");
         xTextDoc = SOF.createTextDoc(null);
diff --git a/qadevOOo/tests/java/mod/_forms/OImageControlControl.java b/qadevOOo/tests/java/mod/_forms/OImageControlControl.java
index a13246adc1a8..d859264e1a45 100644
--- a/qadevOOo/tests/java/mod/_forms/OImageControlControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OImageControlControl.java
@@ -79,7 +79,7 @@ public class OImageControlControl extends TestCase {
      */
     @Override
     protected void initialize(TestParameters Param, PrintWriter log) throws Exception {
-        SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF()));
+        SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
 
         log.println("creating a textdocument");
         xTextDoc = SOF.createTextDoc(null);
diff --git a/qadevOOo/tests/java/mod/_forms/OListBoxControl.java b/qadevOOo/tests/java/mod/_forms/OListBoxControl.java
index da867ae2cc17..03dac5b1a20b 100644
--- a/qadevOOo/tests/java/mod/_forms/OListBoxControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OListBoxControl.java
@@ -47,7 +47,7 @@ public class OListBoxControl extends TestCase {
 
     @Override
     protected void initialize ( TestParameters Param, PrintWriter log) throws Exception {
-        SOfficeFactory SOF = SOfficeFactory.getFactory( (Param.getMSF()) );
+        SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF() );
         log.println( "creating a textdocument" );
         xTextDoc = SOF.createTextDoc( null );
     }
diff --git a/qadevOOo/tests/java/mod/_forms/ONumericControl.java b/qadevOOo/tests/java/mod/_forms/ONumericControl.java
index f8aa38d974a9..843e5c8a9f3f 100644
--- a/qadevOOo/tests/java/mod/_forms/ONumericControl.java
+++ b/qadevOOo/tests/java/mod/_forms/ONumericControl.java
@@ -94,7 +94,7 @@ public class ONumericControl extends TestCase {
      */
     @Override
     protected void initialize(TestParameters Param, PrintWriter log) throws Exception {
-        SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF()));
+        SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
 
         log.println("creating a textdocument");
         xTextDoc = SOF.createTextDoc(null);
diff --git a/qadevOOo/tests/java/mod/_forms/OPatternControl.java b/qadevOOo/tests/java/mod/_forms/OPatternControl.java
index 80d4b5bebc9d..4c67dabd96ff 100644
--- a/qadevOOo/tests/java/mod/_forms/OPatternControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OPatternControl.java
@@ -94,7 +94,7 @@ public class OPatternControl extends TestCase {
      */
     @Override
     protected void initialize(TestParameters Param, PrintWriter log) throws Exception {
-        SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF()));
+        SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
 
         log.println("creating a textdocument");
         xTextDoc = SOF.createTextDoc(null);
diff --git a/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java b/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java
index 7c7ea558906a..0fd3ce626d81 100644
--- a/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java
+++ b/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java
@@ -82,7 +82,7 @@ public class ORadioButtonControl extends TestCase {
      */
     @Override
     protected void initialize(TestParameters Param, PrintWriter log) throws Exception {
-        SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF()));
+        SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
 
         log.println("creating a textdocument");
         xTextDoc = SOF.createTextDoc(null);
diff --git a/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java b/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java
index 76a951bb48ef..ddd5d209899d 100644
--- a/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java
@@ -42,7 +42,7 @@ public class OScrollBarModel extends TestCase {
     protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception {
 
         log.println( "creating a textdocument" );
-        xTextDoc = WriterTools.createTextDoc((tParam.getMSF()));
+        xTextDoc = WriterTools.createTextDoc(tParam.getMSF());
     }
 
     /**
diff --git a/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java b/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java
index d586a849720f..0a3ec02c6155 100644
--- a/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java
@@ -42,7 +42,7 @@ public class OSpinButtonModel extends TestCase {
     protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception {
 
         log.println( "creating a textdocument" );
-        xTextDoc = WriterTools.createTextDoc((tParam.getMSF()));
+        xTextDoc = WriterTools.createTextDoc(tParam.getMSF());
     }
 
     /**
diff --git a/qadevOOo/tests/java/mod/_forms/OTimeControl.java b/qadevOOo/tests/java/mod/_forms/OTimeControl.java
index 9e0486a0064b..375174149dc8 100644
--- a/qadevOOo/tests/java/mod/_forms/OTimeControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OTimeControl.java
@@ -95,7 +95,7 @@ public class OTimeControl extends TestCase {
      */
     @Override
     protected void initialize(TestParameters Param, PrintWriter log) throws Exception {
-        SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF()));
+        SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
 
         log.println("creating a textdocument");
         xTextDoc = SOF.createTextDoc(null);
@@ -217,7 +217,7 @@ public class OTimeControl extends TestCase {
         textComp.addTextListener(listener);
         tEnv.addObjRelation("TestTextListener", listener);
 
-        FormTools.switchDesignOf((Param.getMSF()), xTextDoc);
+        FormTools.switchDesignOf(Param.getMSF(), xTextDoc);
         util.utils.waitForEventIdle(Param.getMSF());
 
         return tEnv;
diff --git a/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java b/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java
index 29a9d0a87002..176d17e39d9a 100644
--- a/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java
+++ b/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java
@@ -147,8 +147,7 @@ public class SdXCustomPresentationAccess extends TestCase {
 
         // INDEX : _XNameContainer
         log.println( "adding XNameContainerINDEX as mod relation to environment" );
-        tEnv.addObjRelation("XNameContainerINDEX",
-            (Integer.valueOf(THRCNT)).toString());
+        tEnv.addObjRelation("XNameContainerINDEX", Integer.valueOf(THRCNT).toString());
 
         // INSTANCEn : _XNameContainer; _XNameReplace
         log.println( "adding INSTANCEn as mod relation to environment" );
diff --git a/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java b/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java
index cc4d673f7b90..99bf4e08bd26 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java
@@ -257,7 +257,7 @@ public class SwXMailMerge extends TestCase {
 
             String tmpDatabaseFile = tmpDatabaseUrl + databaseName + ".odb";
             System.out.println("try to delete '"+tmpDatabaseFile+"'");
-            utils.deleteFile((Param.getMSF()), tmpDatabaseFile);
+            utils.deleteFile(Param.getMSF(), tmpDatabaseFile);
 
 
             tmpDatabaseUrl = "sdbc:dbase:file:///" + tmpDatabaseUrl ;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java b/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java
index 9a887af483ea..50fc0c532a1c 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java
@@ -117,7 +117,7 @@ public class SwXTextPortion extends TestCase {
         XEnumeration oEnum = oEnumA.createEnumeration();
 
         int n = 0;
-        while ((oEnum.hasMoreElements())) {
+        while (oEnum.hasMoreElements()) {
             param = (XInterface) AnyConverter.toObject(new Type(
                     XInterface.class), oEnum.nextElement());
             log.println("Element Nr.: " + n);
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java b/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java
index 5956041a1d4e..b5cf80e3033b 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java
@@ -115,7 +115,7 @@ public class SwXTextPortionEnumeration extends TestCase {
                 XEnumerationAccess.class, oText);
         XEnumeration oEnum = oEnumA.createEnumeration();
 
-        while ((oEnum.hasMoreElements())) {
+        while (oEnum.hasMoreElements()) {
             param = (XInterface) AnyConverter.toObject(new Type(
                     XInterface.class), oEnum.nextElement());
         }
diff --git a/qadevOOo/tests/java/mod/_toolkit/TabController.java b/qadevOOo/tests/java/mod/_toolkit/TabController.java
index b7708046de8b..7f361567f893 100644
--- a/qadevOOo/tests/java/mod/_toolkit/TabController.java
+++ b/qadevOOo/tests/java/mod/_toolkit/TabController.java
@@ -91,11 +91,8 @@ public class TabController extends TestCase {
         XForm form = null;
 
         try {
-            form = (XForm) AnyConverter.toObject(new Type(XForm.class),
-                                                 (FormTools.getForms(
-                                                         WriterTools.getDrawPage(
-                                                                 xTextDoc)))
-                                                     .getByName("MyForm"));
+            Object temp = FormTools.getForms( WriterTools.getDrawPage(xTextDoc) ).getByName("MyForm");
+            form = (XForm) AnyConverter.toObject(new Type(XForm.class), temp);
         } catch (Exception e) {
             log.println("Couldn't get Form");
             e.printStackTrace(log);