java: remove unnecessary return statements

found by PMD

Change-Id: I3d150421948d17eaed34fac2b1a212da34288d1a

17 files changed, 0 insertions, 54 deletions

diff --git a/qadevOOo/runner/util/utils.java b/qadevOOo/runner/util/utils.java
index e06664aaa117..6ccc181bbbfe 100644
--- a/qadevOOo/runner/util/utils.java
+++ b/qadevOOo/runner/util/utils.java
@@ -211,7 +211,6 @@ public class utils {
             //create the directory
             new_dir.mkdirs();
         }
-        return;
     }
 
 
diff --git a/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java
index 94ee21466660..564f5f1023d3 100644
--- a/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java
@@ -150,7 +150,6 @@ public class _XFastPropertySet extends MultiMethodTest {
             e.printStackTrace(log);
             tRes.tested("getFastPropertyValue()",false);
         }
-        return;
     }
 
 
diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java
index a47758a26ffc..1ea2fab40c46 100644
--- a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java
@@ -334,8 +334,6 @@ public class _XMultiPropertySet extends MultiMethodTest {
         testPropsNames = new String[nr];
         for (int i=0; i<nr; i++) testPropsNames[i] = ST.nextToken();
         testPropsAmount = nr;
-        return;
-
     }
 
     /**
diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java b/qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java
index bfffa27d5384..965013336898 100644
--- a/qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java
+++ b/qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java
@@ -89,7 +89,6 @@ public class _XPropertyAccess extends MultiMethodTest {
         }
 
         tRes.tested("getPropertyValues()", ok );
-        return;
     }
 
     /**
@@ -219,8 +218,6 @@ public class _XPropertyAccess extends MultiMethodTest {
         }
 
         tRes.tested("setPropertyValues()", ok);
-        return;
-
     }
 
 }    /// finish class XPropertyAccess
diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java b/qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java
index 53274d15cffc..e60b257c1813 100644
--- a/qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java
+++ b/qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java
@@ -211,7 +211,6 @@ public class _XPropertyContainer extends MultiMethodTest {
         ok &= test;
 
         tRes.tested("addProperty()", ok );
-        return;
     }
 
     /**
@@ -294,7 +293,6 @@ public class _XPropertyContainer extends MultiMethodTest {
         }
 
         tRes.tested("removeProperty()", ok );
-        return;
     }
 
 
diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XPropertySet.java
index 17ab69014769..630983caa9bd 100644
--- a/qadevOOo/tests/java/ifc/beans/_XPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XPropertySet.java
@@ -133,9 +133,6 @@ public class _XPropertySet extends MultiMethodTest {
             tRes.tested("getPropertySetInfo()", true );
             getPropsToTest(propertySetInfo);
         }
-
-        return;
-
     } // end of getPropertySetInfo()
 
     /**
@@ -194,9 +191,6 @@ public class _XPropertySet extends MultiMethodTest {
             }
             tRes.tested("addPropertyChangeListener()", !error);
         }
-
-        return;
-
     } // end of addPropertyChangeListener()
 
     /**
@@ -254,9 +248,6 @@ public class _XPropertySet extends MultiMethodTest {
             }
             tRes.tested("addVetoableChangeListener()",!error);
         }
-
-        return;
-
     } // end of addVetoableChangeListener()
 
 
@@ -322,9 +313,6 @@ public class _XPropertySet extends MultiMethodTest {
             }
             tRes.tested("setPropertyValue()",!error);
         } //endif
-
-        return;
-
     } // end of setPropertyValue()
 
     /**
@@ -390,8 +378,6 @@ public class _XPropertySet extends MultiMethodTest {
             }
             tRes.tested("getPropertyValue()", !error) ;
         }
-
-        return;
     }
 
     /**
@@ -464,9 +450,6 @@ public class _XPropertySet extends MultiMethodTest {
             }
             tRes.tested("removePropertyChangeListener()",!error);
         }
-
-        return;
-
     } // end of removePropertyChangeListener()
 
 
@@ -539,9 +522,6 @@ public class _XPropertySet extends MultiMethodTest {
             }
             tRes.tested("removeVetoableChangeListener()",!error);
         }
-
-        return;
-
     } // end of removeVetoableChangeListener()
 
     /**
diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertySetInfo.java b/qadevOOo/tests/java/ifc/beans/_XPropertySetInfo.java
index fd47b8bf63e5..dc6ad368f7cb 100644
--- a/qadevOOo/tests/java/ifc/beans/_XPropertySetInfo.java
+++ b/qadevOOo/tests/java/ifc/beans/_XPropertySetInfo.java
@@ -49,7 +49,6 @@ public class _XPropertySetInfo extends MultiMethodTest {
         Property[] properties = oObj.getProperties();
         IsThere = properties[0];
         tRes.tested("getProperties()", ( properties != null ));
-        return;
     }
 
     /**
@@ -88,7 +87,6 @@ public class _XPropertySetInfo extends MultiMethodTest {
             result = true;
         }
         tRes.tested("getPropertyByName()", result);
-        return;
     }
 
     /**
diff --git a/qadevOOo/tests/java/ifc/container/_XEnumeration.java b/qadevOOo/tests/java/ifc/container/_XEnumeration.java
index a0b44df7c870..dfa2d52a84be 100644
--- a/qadevOOo/tests/java/ifc/container/_XEnumeration.java
+++ b/qadevOOo/tests/java/ifc/container/_XEnumeration.java
@@ -89,7 +89,6 @@ public class _XEnumeration extends MultiMethodTest {
             result &= locResult;
         }
         tRes.tested("hasMoreElements()", result);
-        return;
     } // end hasMoreElements
 
     /**
@@ -119,9 +118,6 @@ public class _XEnumeration extends MultiMethodTest {
         }
 
         tRes.tested("nextElement()", result);
-
-        return;
-
     } // end NextElement
 
 } //end XEnumeration
diff --git a/qadevOOo/tests/java/ifc/container/_XEnumerationAccess.java b/qadevOOo/tests/java/ifc/container/_XEnumerationAccess.java
index a676aca0a42e..d5d1573efdbb 100644
--- a/qadevOOo/tests/java/ifc/container/_XEnumerationAccess.java
+++ b/qadevOOo/tests/java/ifc/container/_XEnumerationAccess.java
@@ -40,7 +40,6 @@ public class _XEnumerationAccess extends MultiMethodTest{
         log.println( "createing Enumeration" );
         XEnumeration oEnum = oObj.createEnumeration();
         tRes.tested( "createEnumeration()", oEnum != null );
-        return;
     } // end createEnumeration()
 }  // finish class _XEnumerationAccess
 
diff --git a/qadevOOo/tests/java/ifc/container/_XNameAccess.java b/qadevOOo/tests/java/ifc/container/_XNameAccess.java
index 54cf37006ebc..f5489e1ba07a 100644
--- a/qadevOOo/tests/java/ifc/container/_XNameAccess.java
+++ b/qadevOOo/tests/java/ifc/container/_XNameAccess.java
@@ -44,7 +44,6 @@ public class _XNameAccess extends MultiMethodTest {
 
         result = (Names != null);
         tRes.tested("getElementNames()", result);
-        return;
     } // end getElementNames()
 
     /**
@@ -86,8 +85,6 @@ public class _XNameAccess extends MultiMethodTest {
     result &= loc_result;
 
     tRes.tested("hasByName()", result);
-
-        return;
     } // end hasByName()
 
 
@@ -145,9 +142,6 @@ public class _XNameAccess extends MultiMethodTest {
 
         result &= loc_result;
         tRes.tested("getByName()", result);
-
-        return;
-
     } // end getByName()
 } /// finished class _XNameAccess
 
diff --git a/qadevOOo/tests/java/ifc/container/_XNameContainer.java b/qadevOOo/tests/java/ifc/container/_XNameContainer.java
index 9ab9692bdf3a..ea2ab3ea3e7e 100644
--- a/qadevOOo/tests/java/ifc/container/_XNameContainer.java
+++ b/qadevOOo/tests/java/ifc/container/_XNameContainer.java
@@ -241,8 +241,6 @@ public class _XNameContainer extends MultiMethodTest {
         }
 
         tRes.tested("removeByName()", result);
-
-        return;
     } // end removeByName()
 } //XNameContainer
 
diff --git a/qadevOOo/tests/java/ifc/form/_XReset.java b/qadevOOo/tests/java/ifc/form/_XReset.java
index 9df6a70b6425..f61c114acdbc 100644
--- a/qadevOOo/tests/java/ifc/form/_XReset.java
+++ b/qadevOOo/tests/java/ifc/form/_XReset.java
@@ -162,9 +162,6 @@ public class _XReset extends MultiMethodTest {
          shortWait();
          tRes.tested("removeResetListener()", !approveReset[0] && !resetted[0]);
          //removing the second listener here may avoid crashing the office
-
-         return;
-
     } // finished _removeResetListener()
 
     /**
diff --git a/qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java b/qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java
index d33772b10622..a3008c2543c3 100644
--- a/qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java
+++ b/qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java
@@ -207,8 +207,6 @@ public class _XValidatableFormComponent extends MultiMethodTest
             testPropsNames[i] = ST.nextToken();
 
         testPropsAmount = nr;
-
-        return;
     }
 
     protected class MyListener implements XFormComponentValidityListener
diff --git a/qadevOOo/tests/java/ifc/frame/_XComponentLoader.java b/qadevOOo/tests/java/ifc/frame/_XComponentLoader.java
index b5efcabbe44c..8422b8682448 100644
--- a/qadevOOo/tests/java/ifc/frame/_XComponentLoader.java
+++ b/qadevOOo/tests/java/ifc/frame/_XComponentLoader.java
@@ -141,7 +141,6 @@ public class _XComponentLoader extends MultiMethodTest {
         }
 
         tRes.tested("loadComponentFromURL()", result);
-        return;
     }
 
 }
diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java b/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java
index aebc5e4c3c86..3cc7c17186c6 100644
--- a/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java
+++ b/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java
@@ -149,7 +149,6 @@ public class _XDispatchProvider extends MultiMethodTest {
         }
 
         tRes.tested("queryDispatches()", true);
-        return;
     }
 
 }
diff --git a/qadevOOo/tests/java/ifc/lang/_XComponent.java b/qadevOOo/tests/java/ifc/lang/_XComponent.java
index 657f80086501..184f6ccad2ab 100644
--- a/qadevOOo/tests/java/ifc/lang/_XComponent.java
+++ b/qadevOOo/tests/java/ifc/lang/_XComponent.java
@@ -94,8 +94,6 @@ public class _XComponent extends MultiMethodTest {
 
         oObj.addEventListener( listener1 );
         oObj.addEventListener( listener2 );
-
-        return;
     } // finished _addEventListener()
 
     /**
diff --git a/qadevOOo/tests/java/ifc/util/_XReplaceDescriptor.java b/qadevOOo/tests/java/ifc/util/_XReplaceDescriptor.java
index f6dd59847340..98249a9dbffa 100644
--- a/qadevOOo/tests/java/ifc/util/_XReplaceDescriptor.java
+++ b/qadevOOo/tests/java/ifc/util/_XReplaceDescriptor.java
@@ -58,7 +58,6 @@ public class _XReplaceDescriptor extends MultiMethodTest {
         oObj.setReplaceString("XReplaceDescriptor");
         String cmpReplaceStr = oObj.getReplaceString();
         tRes.tested("setReplaceString()", !(cmpReplaceStr.equals(oldReplaceStr)));
-        return;
     }
 
 }  // finish class _XReplaceDescriptor