java: remove some unnecessary interfaces

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

5 files changed, 23 insertions, 91 deletions

diff --git a/qadevOOo/runner/convwatch/FilenameHelper.java b/qadevOOo/runner/convwatch/FilenameHelper.java
index 56a3b5dda65a..ffe462209520 100644
--- a/qadevOOo/runner/convwatch/FilenameHelper.java
+++ b/qadevOOo/runner/convwatch/FilenameHelper.java
@@ -16,30 +16,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-/**
- * Helper class to hold a Filename or a FileURL
- * Something like File in Java,
- * with some more extensions direct to ConvWatch and its name conventions
- *
- *
- */
 package convwatch;
 
 import helper.URLHelper;
 import helper.StringHelper;
 
-interface Filenamer
-{
-    String getSuffix();
-    String getFileURL();
-    String getAbsoluteSystemFilename();
-    String getFilename();
-    String getSystemPath();
-}
-
-
-
-abstract class FilenameHelper_impl implements Filenamer
+/**
+ * Helper class to hold a Filename or a FileURL
+ * Something like File in Java,
+ * with some more extensions direct to ConvWatch and its name conventions
+ */
+abstract class FilenameHelper_impl
 {
     private String fs;                                   // file separator like '/'
     private String m_sPath;
diff --git a/qadevOOo/runner/graphical/EnhancedComplexTestCase.java b/qadevOOo/runner/graphical/EnhancedComplexTestCase.java
index 6f61d4f90a5b..758edda3c711 100644
--- a/qadevOOo/runner/graphical/EnhancedComplexTestCase.java
+++ b/qadevOOo/runner/graphical/EnhancedComplexTestCase.java
@@ -19,13 +19,18 @@
 package graphical;
 
 import complexlib.ComplexTestCase;
+
 import java.io.File;
 import java.io.FileFilter;
 import java.util.ArrayList;
 
-abstract public class EnhancedComplexTestCase extends ComplexTestCase implements IDocument
+abstract public class EnhancedComplexTestCase extends ComplexTestCase
 {
 
+    /**
+     * Call this for each document
+     */
+    protected abstract void checkOneFile(String _sDocument, String _sResult, ParameterHelper _aParams) throws OfficeException;
 
 private void callEntry(String _sEntry, ParameterHelper _aParam)
 {
diff --git a/qadevOOo/runner/graphical/IDocument.java b/qadevOOo/runner/graphical/IDocument.java
deleted file mode 100644
index 99105b3d0582..000000000000
--- a/qadevOOo/runner/graphical/IDocument.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package graphical;
-
-public interface IDocument
-{
-    /**
-     * Call this for each document
-     */
-    void checkOneFile(String _sDocument, String _sResult, ParameterHelper _aParams) throws OfficeException;
-}
diff --git a/qadevOOo/runner/helper/CwsDataExchangeImpl.java b/qadevOOo/runner/helper/CwsDataExchangeImpl.java
index 3af899f97dcb..d9887e1b74c5 100644
--- a/qadevOOo/runner/helper/CwsDataExchangeImpl.java
+++ b/qadevOOo/runner/helper/CwsDataExchangeImpl.java
@@ -22,16 +22,15 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.util.ArrayList;
 import lib.TestParameters;
-import share.CwsDataExchange;
 import share.LogWriter;
 import util.PropertyName;
 import util.utils;
 
 /**
- * Implementation of the interface CwsDataExchange
- * @see share.CwsDataExchange
+ * Exchange information to the EIS database
+ *
  */
-public class CwsDataExchangeImpl implements CwsDataExchange
+public class CwsDataExchangeImpl
 {
 
     private final TestParameters param;
@@ -47,6 +46,10 @@ public class CwsDataExchangeImpl implements CwsDataExchange
         mDebug = param.getBool(PropertyName.DEBUG_IS_ACTIVE);
     }
 
+    /**
+     * Returns all module names which are added to the specified childworkspace
+     * @return a String array of all added modules
+     */
     public ArrayList<String> getModules()
     {
         // the cwstouched command send its version information to StdErr.
@@ -97,6 +100,10 @@ public class CwsDataExchangeImpl implements CwsDataExchange
         return moduleNames;
     }
 
+    /**
+     * Set the test status of cws related UnoAPI tests to the EIS dabase
+     * @param status the status of the UnoAPI test
+     */
     public void setUnoApiCwsStatus(boolean status)
     {
 
diff --git a/qadevOOo/runner/share/CwsDataExchange.java b/qadevOOo/runner/share/CwsDataExchange.java
deleted file mode 100644
index c59c54c87248..000000000000
--- a/qadevOOo/runner/share/CwsDataExchange.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package share;
-
-import java.util.ArrayList;
-
-/**
- * Exchange information to the EIS database
- *
- */
-public interface CwsDataExchange {
-
-    /**
-     * Retunrs all module names which are added to the specified childworkspace
-     * @return a String array of all added modules
-     */
-    ArrayList<String> getModules();
-
-    /**
-     * Set the test status of cws related UnoAPI tests to the EIS dabase
-     * @param status the status of the UnoAPI test
-     */
-    void setUnoApiCwsStatus(boolean status);
-}