java:simplify boolean return expressions

Change-Id: I18c1573b7237aab88999877eec3cea41ca211c1d

4 files changed, 5 insertions, 40 deletions

diff --git a/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java b/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java
index ab739aeb3595..16bdfeeb6b6d 100644
--- a/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java
+++ b/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java
@@ -123,11 +123,7 @@ public class JavaSystemBackend implements XSingleLayerStratum, XTypeProvider,
      * @see com.sun.star.lang.XServiceInfo
      */
     public boolean supportsService(String serviceName) {
-        if (serviceName.equals(__serviceName)) {
-            return true;
-        }
-
-        return false;
+        return serviceName.equals(__serviceName);
     }
 
     /**
diff --git a/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java b/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java
index 875b21cab7e0..77e243670cee 100644
--- a/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java
+++ b/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java
@@ -287,9 +287,7 @@ public class MyPersistObject implements XPersistObject, XTypeProvider,
      * @see com.sun.star.lang.XServiceInfo
      */
     public boolean supportsService(String serviceName) {
-        if(serviceName.equals(__serviceName))
-            return true;
-        return false;
+        return  serviceName.equals(__serviceName);
     }
 
     /**
diff --git a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
index 40e75d4c7434..bcc659e57824 100644
--- a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
+++ b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
@@ -181,33 +181,8 @@ public class CheckModuleAPI extends ComplexTestCase
     }
     private boolean doesQaUnoApiFolderExist(String srcRoot, String _sModul)
     {
-        if (getQaUnoApiPath(srcRoot, _sModul) != null)
-        {
-            return true;
-        }
-        return false;
-    }
-/*
- private boolean doesQaUnoApiFolderExist(File srcRoot)
-    {
-        final FolderFilter qaFilter = new FolderFilter("qa");
-        final File[] qaTree = srcRoot.listFiles(qaFilter);
-        if (qaTree != null)
-        {
-            for (int j = 0; j < qaTree.length; j++)
-            {
-                final File qaFolder = qaTree[j];
-                final FolderFilter apiFilter = new FolderFilter("unoapi");
-                final File[] apiTree = qaFolder.listFiles(apiFilter);
-                if (apiTree != null && apiTree.length > 0)
-                {
-                    return true;
-                }
-            }
-        }
-        return false;
+        return getQaUnoApiPath(srcRoot, _sModul) != null;
     }
-*/
 
     private String[] getAllModuleCommand()
     {
diff --git a/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java b/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java
index e3b388b8dcbd..2a371500e128 100644
--- a/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java
+++ b/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java
@@ -132,13 +132,9 @@ public class _SpreadsheetDocumentSettings extends MultiPropertyTest {
         }
 
         public boolean hasForbiddenCharacters(Locale rLocale) {
-            if (rLocale.Country.equals(locale.Country) &&
+            return rLocale.Country.equals(locale.Country) &&
                     rLocale.Language.equals(locale.Language) &&
-                    rLocale.Variant.equals(locale.Variant)) {
-                return true;
-            }
-
-            return false;
+                    rLocale.Variant.equals(locale.Variant);
         }
     }
 }
\ No newline at end of file