diff options
Diffstat (limited to 'qadevOOo')
29 files changed, 145 insertions, 157 deletions
diff --git a/qadevOOo/runner/base/TestBase.java b/qadevOOo/runner/base/TestBase.java index c4bc02d01885..0e4d94710198 100644 --- a/qadevOOo/runner/base/TestBase.java +++ b/qadevOOo/runner/base/TestBase.java @@ -25,6 +25,6 @@ import lib.TestParameters; */ public interface TestBase { - public boolean executeTest(TestParameters param); + boolean executeTest(TestParameters param); } diff --git a/qadevOOo/runner/convwatch/FilenameHelper.java b/qadevOOo/runner/convwatch/FilenameHelper.java index 8d7fcb08c755..54a159155e1d 100644 --- a/qadevOOo/runner/convwatch/FilenameHelper.java +++ b/qadevOOo/runner/convwatch/FilenameHelper.java @@ -31,11 +31,11 @@ import helper.StringHelper; interface Filenamer { - public String getSuffix(); - public String getFileURL(); - public String getAbsoluteSystemFilename(); - public String getFilename(); - public String getSystemPath(); + String getSuffix(); + String getFileURL(); + String getAbsoluteSystemFilename(); + String getFilename(); + String getSystemPath(); } diff --git a/qadevOOo/runner/convwatch/PropertyName.java b/qadevOOo/runner/convwatch/PropertyName.java index 4752fb3ad6f2..88269954c977 100644 --- a/qadevOOo/runner/convwatch/PropertyName.java +++ b/qadevOOo/runner/convwatch/PropertyName.java @@ -20,39 +20,39 @@ package convwatch; public interface PropertyName { - final public static String DOC_COMPARATOR_INPUT_PATH = "DOC_COMPARATOR_INPUT_PATH"; - final public static String DOC_COMPARATOR_OUTPUT_PATH = "DOC_COMPARATOR_OUTPUT_PATH"; - final public static String DOC_COMPARATOR_DIFF_PATH = "DOC_COMPARATOR_DIFF_PATH"; - final public static String DOC_COMPARATOR_REFERENCE_PATH = "DOC_COMPARATOR_REFERENCE_PATH"; - final public static String DOC_COMPARATOR_REFERENCE_INPUT_PATH = "DOC_COMPARATOR_REFERENCE_INPUT_PATH"; - final public static String DOC_COMPARATOR_REFERENCE_TYPE = "DOC_COMPARATOR_REFERENCE_CREATOR_TYPE"; - final public static String DOC_COMPARATOR_PRINTER_NAME = "DOC_COMPARATOR_PRINTER_NAME"; - final public static String DOC_COMPARATOR_DEFAULT_XML_FORMAT_APP = "DOC_COMPARATOR_DEFAULT_XML_FORMAT_APP"; - final public static String DOC_COMPARATOR_INCLUDE_SUBDIRS = "DOC_COMPARATOR_INCLUDE_SUBDIRS"; - final public static String DOC_COMPARATOR_PRINT_MAX_PAGE = "DOC_COMPARATOR_PRINT_MAX_PAGE"; - final public static String DOC_COMPARATOR_PRINT_ONLY_PAGE = "DOC_COMPARATOR_PRINT_ONLY_PAGE"; - final public static String DOC_COMPARATOR_GFX_OUTPUT_DPI_RESOLUTION = "DOC_COMPARATOR_GFX_OUTPUT_DPI_RESOLUTION"; - final public static String DOC_COMPARATOR_OVERWRITE_REFERENCE = "DOC_COMPARATOR_OVERWRITE_REFERENCE"; - - final public static String DOC_COMPARATOR_HTML_OUTPUT_PREFIX = "DOC_COMPARATOR_HTML_OUTPUT_PREFIX"; - final public static String DOC_COMPARATOR_GFXCMP_WITH_BORDERMOVE = "DOC_COMPARATOR_GFXCMP_WITH_BORDERMOVE"; - - final public static String DOC_CONVERTER_IMPORT_FILTER_NAME = "DOC_CONVERTER_IMPORT_FILTER_NAME"; - final public static String DOC_CONVERTER_EXPORT_FILTER_NAME = "DOC_CONVERTER_EXPORT_FILTER_NAME"; - final public static String DOC_CONVERTER_OFFICE_PROGRAM = "DOC_CONVERTER_OFFICE_PROGRAM"; - final public static String DOC_CONVERTER_REUSE_OFFICE = "DOC_CONVERTER_REUSE_OFFICE"; - - final public static String DOC_COMPARATOR_LEAVE_OUT_FILES = "DOC_COMPARATOR_LEAVE_OUT_FILES"; - - final public static String DOC_COMPARATOR_DB_INFO_STRING = "DOC_COMPARATOR_DB_INFO_STRING"; - - final public static String TEMPPATH = "TEMPPATH"; + String DOC_COMPARATOR_INPUT_PATH = "DOC_COMPARATOR_INPUT_PATH"; + String DOC_COMPARATOR_OUTPUT_PATH = "DOC_COMPARATOR_OUTPUT_PATH"; + String DOC_COMPARATOR_DIFF_PATH = "DOC_COMPARATOR_DIFF_PATH"; + String DOC_COMPARATOR_REFERENCE_PATH = "DOC_COMPARATOR_REFERENCE_PATH"; + String DOC_COMPARATOR_REFERENCE_INPUT_PATH = "DOC_COMPARATOR_REFERENCE_INPUT_PATH"; + String DOC_COMPARATOR_REFERENCE_TYPE = "DOC_COMPARATOR_REFERENCE_CREATOR_TYPE"; + String DOC_COMPARATOR_PRINTER_NAME = "DOC_COMPARATOR_PRINTER_NAME"; + String DOC_COMPARATOR_DEFAULT_XML_FORMAT_APP = "DOC_COMPARATOR_DEFAULT_XML_FORMAT_APP"; + String DOC_COMPARATOR_INCLUDE_SUBDIRS = "DOC_COMPARATOR_INCLUDE_SUBDIRS"; + String DOC_COMPARATOR_PRINT_MAX_PAGE = "DOC_COMPARATOR_PRINT_MAX_PAGE"; + String DOC_COMPARATOR_PRINT_ONLY_PAGE = "DOC_COMPARATOR_PRINT_ONLY_PAGE"; + String DOC_COMPARATOR_GFX_OUTPUT_DPI_RESOLUTION = "DOC_COMPARATOR_GFX_OUTPUT_DPI_RESOLUTION"; + String DOC_COMPARATOR_OVERWRITE_REFERENCE = "DOC_COMPARATOR_OVERWRITE_REFERENCE"; + + String DOC_COMPARATOR_HTML_OUTPUT_PREFIX = "DOC_COMPARATOR_HTML_OUTPUT_PREFIX"; + String DOC_COMPARATOR_GFXCMP_WITH_BORDERMOVE = "DOC_COMPARATOR_GFXCMP_WITH_BORDERMOVE"; + + String DOC_CONVERTER_IMPORT_FILTER_NAME = "DOC_CONVERTER_IMPORT_FILTER_NAME"; + String DOC_CONVERTER_EXPORT_FILTER_NAME = "DOC_CONVERTER_EXPORT_FILTER_NAME"; + String DOC_CONVERTER_OFFICE_PROGRAM = "DOC_CONVERTER_OFFICE_PROGRAM"; + String DOC_CONVERTER_REUSE_OFFICE = "DOC_CONVERTER_REUSE_OFFICE"; + + String DOC_COMPARATOR_LEAVE_OUT_FILES = "DOC_COMPARATOR_LEAVE_OUT_FILES"; + + String DOC_COMPARATOR_DB_INFO_STRING = "DOC_COMPARATOR_DB_INFO_STRING"; + + String TEMPPATH = "TEMPPATH"; // set this variable to "true" or "yes" and loadComponentFromURL works with property Hidden=false - final public static String OFFICE_VIEWABLE = "OFFICE_VIEWABLE"; + String OFFICE_VIEWABLE = "OFFICE_VIEWABLE"; - final public static String DB_CONNECTION_STRING = "DB_CONNECTION_STRING"; - final public static String CHECK_NEED_TOOLS = "CHECK_NEED_TOOLS"; - final public static String CREATE_DEFAULT = "CREATE_DEFAULT_REFERENCE"; + String DB_CONNECTION_STRING = "DB_CONNECTION_STRING"; + String CHECK_NEED_TOOLS = "CHECK_NEED_TOOLS"; + String CREATE_DEFAULT = "CREATE_DEFAULT_REFERENCE"; } diff --git a/qadevOOo/runner/graphical/IDocument.java b/qadevOOo/runner/graphical/IDocument.java index ef07299d87d1..99105b3d0582 100644 --- a/qadevOOo/runner/graphical/IDocument.java +++ b/qadevOOo/runner/graphical/IDocument.java @@ -23,5 +23,5 @@ public interface IDocument /** * Call this for each document */ - public void checkOneFile(String _sDocument, String _sResult, ParameterHelper _aParams) throws OfficeException; + void checkOneFile(String _sDocument, String _sResult, ParameterHelper _aParams) throws OfficeException; } diff --git a/qadevOOo/runner/graphical/IOffice.java b/qadevOOo/runner/graphical/IOffice.java index 54d8cc24fea4..83094b8aa076 100644 --- a/qadevOOo/runner/graphical/IOffice.java +++ b/qadevOOo/runner/graphical/IOffice.java @@ -23,21 +23,21 @@ public interface IOffice /** * start an Office, if need */ - public void start() throws OfficeException; + void start() throws OfficeException; /** * Load a document by it's Name */ - public void load(String Name) throws OfficeException; + void load(String Name) throws OfficeException; /** * Create a postscript file in the DOC_COMPARATOR_OUTPUT_DIR directory from a loaded document */ - public void storeAsPostscript() throws OfficeException; + void storeAsPostscript() throws OfficeException; /** * Close the background office */ - public void close() throws OfficeException; + void close() throws OfficeException; } diff --git a/qadevOOo/runner/graphical/PropertyName.java b/qadevOOo/runner/graphical/PropertyName.java index 1c25b75003b2..bb71f95c8ed5 100644 --- a/qadevOOo/runner/graphical/PropertyName.java +++ b/qadevOOo/runner/graphical/PropertyName.java @@ -20,20 +20,20 @@ package graphical; public interface PropertyName { - final public static String DOC_COMPARATOR_INPUT_PATH = "DOC_COMPARATOR_INPUT_PATH"; - final public static String DOC_COMPARATOR_OUTPUT_PATH = "DOC_COMPARATOR_OUTPUT_PATH"; - final public static String DOC_COMPARATOR_REFERENCE_TYPE = "DOC_COMPARATOR_REFERENCE_CREATOR_TYPE"; - final public static String DOC_COMPARATOR_PRINTER_NAME = "DOC_COMPARATOR_PRINTER_NAME"; - final public static String DOC_COMPARATOR_INCLUDE_SUBDIRS = "DOC_COMPARATOR_INCLUDE_SUBDIRS"; - final public static String DOC_COMPARATOR_PRINT_MAX_PAGE = "DOC_COMPARATOR_PRINT_MAX_PAGE"; - final public static String DOC_COMPARATOR_PRINT_ONLY_PAGE = "DOC_COMPARATOR_PRINT_ONLY_PAGE"; + String DOC_COMPARATOR_INPUT_PATH = "DOC_COMPARATOR_INPUT_PATH"; + String DOC_COMPARATOR_OUTPUT_PATH = "DOC_COMPARATOR_OUTPUT_PATH"; + String DOC_COMPARATOR_REFERENCE_TYPE = "DOC_COMPARATOR_REFERENCE_CREATOR_TYPE"; + String DOC_COMPARATOR_PRINTER_NAME = "DOC_COMPARATOR_PRINTER_NAME"; + String DOC_COMPARATOR_INCLUDE_SUBDIRS = "DOC_COMPARATOR_INCLUDE_SUBDIRS"; + String DOC_COMPARATOR_PRINT_MAX_PAGE = "DOC_COMPARATOR_PRINT_MAX_PAGE"; + String DOC_COMPARATOR_PRINT_ONLY_PAGE = "DOC_COMPARATOR_PRINT_ONLY_PAGE"; - final public static String DOC_COMPARATOR_OVERWRITE_REFERENCE = "DOC_COMPARATOR_OVERWRITE_REFERENCE"; + String DOC_COMPARATOR_OVERWRITE_REFERENCE = "DOC_COMPARATOR_OVERWRITE_REFERENCE"; - final public static String DOC_COMPARATOR_HTML_OUTPUT_PREFIX = "DOC_COMPARATOR_HTML_OUTPUT_PREFIX"; + String DOC_COMPARATOR_HTML_OUTPUT_PREFIX = "DOC_COMPARATOR_HTML_OUTPUT_PREFIX"; - final public static String OFFICE_VIEWABLE = "OFFICE_VIEWABLE"; + String OFFICE_VIEWABLE = "OFFICE_VIEWABLE"; - final public static String NO_SMALL_PICTURES = "NoSmallPictures"; + String NO_SMALL_PICTURES = "NoSmallPictures"; } diff --git a/qadevOOo/runner/helper/AppProvider.java b/qadevOOo/runner/helper/AppProvider.java index 9e2a726e55c4..e8f77d1f059a 100644 --- a/qadevOOo/runner/helper/AppProvider.java +++ b/qadevOOo/runner/helper/AppProvider.java @@ -27,12 +27,12 @@ public interface AppProvider { /** * Method to get the desired Manager */ - public Object getManager(lib.TestParameters param); + Object getManager(lib.TestParameters param); /** * Method to dispose the desired Manager */ - public boolean disposeManager(lib.TestParameters param); + boolean disposeManager(lib.TestParameters param); /** * Close an office. @@ -41,6 +41,6 @@ public interface AppProvider { * it was running before the test * @return True, if close worked. */ - public boolean closeExistingOffice(lib.TestParameters param, + boolean closeExistingOffice(lib.TestParameters param, boolean closeIfPossible); } diff --git a/qadevOOo/runner/share/ComplexTest.java b/qadevOOo/runner/share/ComplexTest.java index 02abbe099f7e..a7b2412e5685 100644 --- a/qadevOOo/runner/share/ComplexTest.java +++ b/qadevOOo/runner/share/ComplexTest.java @@ -22,9 +22,9 @@ package share; */ public interface ComplexTest { - public String[] getTestMethodNames(); + String[] getTestMethodNames(); - public String getTestObjectName(); + String getTestObjectName(); } diff --git a/qadevOOo/runner/share/CwsDataExchange.java b/qadevOOo/runner/share/CwsDataExchange.java index 3b160a179a24..c59c54c87248 100644 --- a/qadevOOo/runner/share/CwsDataExchange.java +++ b/qadevOOo/runner/share/CwsDataExchange.java @@ -30,11 +30,11 @@ public interface CwsDataExchange { * Retunrs all module names which are added to the specified childworkspace * @return a String array of all added modules */ - public ArrayList<String> getModules(); + ArrayList<String> getModules(); /** * 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); + void setUnoApiCwsStatus(boolean status); } diff --git a/qadevOOo/runner/share/LogWriter.java b/qadevOOo/runner/share/LogWriter.java index 98e2fc11b71f..9edc95407318 100644 --- a/qadevOOo/runner/share/LogWriter.java +++ b/qadevOOo/runner/share/LogWriter.java @@ -23,21 +23,19 @@ public interface LogWriter { /** * Method to print */ - public void println(String msg); + void println(String msg); /** * initialization * */ - - public boolean initialize(share.DescEntry entry, boolean active); + boolean initialize(share.DescEntry entry, boolean active); /** * will mostly be used by outproducers to sum up * the information, maybe write them to a db */ - - public boolean summary(share.DescEntry entry); + boolean summary(share.DescEntry entry); /** @@ -45,7 +43,7 @@ public interface LogWriter { * @see share.Watcher * @return the associated <CODE>Watcher</CODE> */ - public Object getWatcher(); + Object getWatcher(); /** * Set a <CODE>Watcher</CODE> to the <CODE>LogWriter</CODE> @@ -54,6 +52,6 @@ public interface LogWriter { * @see share.Watcher * @param watcher the new <CODE>Watcher</CODE> */ - public void setWatcher(Object watcher); + void setWatcher(Object watcher); } diff --git a/qadevOOo/runner/share/Watcher.java b/qadevOOo/runner/share/Watcher.java index d5780b0e9f3e..07e8e6562404 100644 --- a/qadevOOo/runner/share/Watcher.java +++ b/qadevOOo/runner/share/Watcher.java @@ -23,11 +23,11 @@ public interface Watcher { /** * pings the watcher to check for changes */ - public void ping(); + void ping(); /** * returns the amount of pings */ - public int getPing(); + int getPing(); } diff --git a/qadevOOo/runner/util/PropertyName.java b/qadevOOo/runner/util/PropertyName.java index 4aa864dc4fcc..141fee9e305e 100644 --- a/qadevOOo/runner/util/PropertyName.java +++ b/qadevOOo/runner/util/PropertyName.java @@ -27,90 +27,90 @@ public interface PropertyName { * The AppExecutionCmd contains the full qualified<br> * command to an Application to be started. */ - final public static String APP_EXECUTION_COMMAND = "AppExecutionCommand"; + String APP_EXECUTION_COMMAND = "AppExecutionCommand"; /** * parameter name: "AppKillCommand" */ - final public static String APP_KILL_COMMAND = "AppKillCommand"; + String APP_KILL_COMMAND = "AppKillCommand"; /** * parameter name: "ConnectionString" */ - final public static String CONNECTION_STRING = "ConnectionString"; - final public static String PIPE_CONNECTION_STRING = "PipeConnectionString"; - final public static String USE_PIPE_CONNECTION = "UsePipeConnection"; + String CONNECTION_STRING = "ConnectionString"; + String PIPE_CONNECTION_STRING = "PipeConnectionString"; + String USE_PIPE_CONNECTION = "UsePipeConnection"; /** * parameter name: "TestBase" * The Testbase to be executed by the runner<br> * default is 'java_fat' */ - final public static String TEST_BASE = "TestBase"; + String TEST_BASE = "TestBase"; /** * parameter name: "TestDocumentPath" */ - final public static String TEST_DOCUMENT_PATH = "TestDocumentPath"; + String TEST_DOCUMENT_PATH = "TestDocumentPath"; /** * parameter name: "LoggingIsActive" * 'true' is a log should be written, 'false' elsewhere <br> * these will be provided by the testcases<br> * default is true */ - final public static String LOGGING_IS_ACTIVE = "LoggingIsActive"; + String LOGGING_IS_ACTIVE = "LoggingIsActive"; /** * parameter name: "DebugIsActive" */ - final public static String DEBUG_IS_ACTIVE = "DebugIsActive"; + String DEBUG_IS_ACTIVE = "DebugIsActive"; /** * parameter name: "OutProduceer" * This parameter contains the class used<br> * for Logging */ - final public static String OUT_PRODUCER = "OutProducer"; + String OUT_PRODUCER = "OutProducer"; /** * parameter name: "ShortWait" * Short wait time for the Office: default is 500 milliseconds */ - final public static String SHORT_WAIT= "ShortWait"; + String SHORT_WAIT= "ShortWait"; /** * internal only, no parameter * The OfficeProvider contains the full qualified * class that provides a connection to StarOffice<br> * default is helper.OfficeProvider */ - final public static String OFFICE_PROVIDER = "OfficeProvider"; + String OFFICE_PROVIDER = "OfficeProvider"; /** * internal only, no parameter */ - final public static String OFFICE_WATCHER = "Watcher"; + String OFFICE_WATCHER = "Watcher"; /** * internal only, no parameter * This parameter contains the class used<br> * for Logging */ - final public static String LOG_WRITER = "LogWriter"; + String LOG_WRITER = "LogWriter"; /** * parameter name: "TimeOut"<p> * time out given in milli seconds * This parameter contains the timeout used<br> * by the watcher */ - final public static String TIME_OUT = "TimeOut"; + String TIME_OUT = "TimeOut"; /** * parameter name: "ThreadTimeOut" * This parameter contains the timeout used<br> * by the complex tests */ - final public static String THREAD_TIME_OUT = "ThreadTimeOut"; + String THREAD_TIME_OUT = "ThreadTimeOut"; /** * parameter name: "OfficeCloseTimeOut" * This parameter contains the time which the office could use to close for * itself before it is destroyed. Default is 15000 ms */ - final public static String OFFICE_CLOSE_TIME_OUT = "OfficeCloseTimeOut"; + String OFFICE_CLOSE_TIME_OUT = "OfficeCloseTimeOut"; /** * parameter name: "OperatingSystem" */ - final public static String OPERATING_SYSTEM = "OperatingSystem"; + String OPERATING_SYSTEM = "OperatingSystem"; /** * parameter name: "AutoRestart" * If this parameter is <CODE>true</CODE> the <CODE>OfficeProvider</CODE> tries @@ -118,22 +118,22 @@ public interface PropertyName { * <CODE>AppExecutionCommand</CODE> with useful content if needed. * Default is false. */ - final public static String AUTO_RESTART = "AutoRestart"; + String AUTO_RESTART = "AutoRestart"; /** * parameter name: "NewOfficeInstance" */ - final public static String NEW_OFFICE_INSTANCE = "NewOfficeInstance"; + String NEW_OFFICE_INSTANCE = "NewOfficeInstance"; /** * parameter name: "SRC_ROOT"<p> * path to the source root of OpenOffice.org */ - final public static String SRC_ROOT = "SRC_ROOT"; + String SRC_ROOT = "SRC_ROOT"; /** * parameter name: "Version"<p> * the name of the version to test */ - final public static String VERSION = "Version"; + String VERSION = "Version"; /** * parameter name "Shell"<p> @@ -141,42 +141,42 @@ public interface PropertyName { * This shell is used to run some commands outside of Java * example: /bin/tcsh c:\\myShell\\myShell.exe */ - final public static String SHELL = "Shell"; + String SHELL = "Shell"; /** * parameter name "Cygwin"<p> * If Cygwin is set to TRUE it indicates if the runner runs in a Cygwin * environment */ - final public static String CYGWIN = "Cygwin"; + String CYGWIN = "Cygwin"; /** * parameter name: "NoCwsAttach"<p> * If this parameter is set to "true" , a status of CWS-UnoAPI-Tests was not attached to EIS<p> * @see complex.unoapi.CheckModuleAPI */ - final public static String NO_CWS_ATTACH = "NoCwsAttach"; + String NO_CWS_ATTACH = "NoCwsAttach"; /** * internal only, no parameter */ - final public static String WNTMSCI = "wntmsci"; + String WNTMSCI = "wntmsci"; /** * internal only, no parameter */ - final public static String UNXLNGI = "unxlngi"; + String UNXLNGI = "unxlngi"; /** * internal only, no parameter */ - final public static String UNXSOLS = "unxsols"; + String UNXSOLS = "unxsols"; /** * internal only, no parameter */ - final public static String UNXSOLI = "unxsoli"; + String UNXSOLI = "unxsoli"; /** * internal only, no parameter */ - final public static String UNXMACXI = "unxmacxi"; + String UNXMACXI = "unxmacxi"; /** * can be used to dont backup the user layer, faster office start/stop but less secure default is to backup the user layer */ - final public static String DONT_BACKUP_USERLAYER = "DontBackupUserLayer"; + String DONT_BACKUP_USERLAYER = "DontBackupUserLayer"; } diff --git a/qadevOOo/runner/util/compare/DocComparator.java b/qadevOOo/runner/util/compare/DocComparator.java index 8503fda8254a..f46e46a6012d 100644 --- a/qadevOOo/runner/util/compare/DocComparator.java +++ b/qadevOOo/runner/util/compare/DocComparator.java @@ -20,22 +20,12 @@ package util.compare; import java.io.IOException; -/** - * - * - */ - public interface DocComparator { - public boolean isReferenceExistent() throws IOException; - - - - - + boolean isReferenceExistent() throws IOException; - public boolean isDiffReferenceExistent() throws IOException; + boolean isDiffReferenceExistent() throws IOException; - public boolean compareDiff() throws IOException; + boolean compareDiff() throws IOException; } diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java index 62e2aac1f3e6..e957cc3e6e76 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java @@ -51,7 +51,7 @@ import com.sun.star.uno.UnoRuntime; */ public class _XAccessibleEventBroadcaster extends MultiMethodTest { - public static interface EventProducer { + public interface EventProducer { void fireEvent(); } diff --git a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java index 7440670bf68e..ff0102a89ddf 100644 --- a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java +++ b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java @@ -518,10 +518,10 @@ public class _XUserInputInterception extends MultiMethodTest { private interface EventTriggerType{ /** klick the mouse into the scroll bar*/ - final public static int MOUSE_KLICK_INTO_DOC = 1; + int MOUSE_KLICK_INTO_DOC = 1; /** write some text into a spread sheet*/ - final public static int KEY_TEXT_INTO_DOC = 2; + int KEY_TEXT_INTO_DOC = 2; } } diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeNode.java b/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeNode.java index 1c8cd3c1be29..a231e7f224c7 100644 --- a/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeNode.java +++ b/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeNode.java @@ -47,8 +47,8 @@ public class _XMutableTreeNode extends MultiMethodTest { private XMutableTreeNodeCreator nodeCreator = null; - public static interface XMutableTreeNodeCreator{ - public XMutableTreeNode createNode(String name); + public interface XMutableTreeNodeCreator{ + XMutableTreeNode createNode(String name); } @Override diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java b/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java index ff19b9cac4f2..c6c4b59d88b4 100644 --- a/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java +++ b/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java @@ -87,8 +87,8 @@ public class _XTreeControl extends MultiMethodTest { boolean mTreeNodeEditing2 = false; boolean mTreeNodeEdit2 = false; - public static interface XTreeDataModelListenerEvent{ - public void fireEvent(); + public interface XTreeDataModelListenerEvent{ + void fireEvent(); } public class TreeExpansionListenerImpl1 implements XTreeExpansionListener{ diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XTreeDataModel.java b/qadevOOo/tests/java/ifc/awt/tree/_XTreeDataModel.java index 92e1d56714fc..3c544efd5405 100644 --- a/qadevOOo/tests/java/ifc/awt/tree/_XTreeDataModel.java +++ b/qadevOOo/tests/java/ifc/awt/tree/_XTreeDataModel.java @@ -51,8 +51,8 @@ public class _XTreeDataModel extends MultiMethodTest { boolean mTreeStructureChanged2 = false; - public static interface XTreeDataModelListenerEvent{ - public void fireEvent(); + public interface XTreeDataModelListenerEvent{ + void fireEvent(); } public class myEventListener1 implements XTreeDataModelListener{ diff --git a/qadevOOo/tests/java/ifc/document/_XFilter.java b/qadevOOo/tests/java/ifc/document/_XFilter.java index 9908c452cda3..991ef40b2af9 100644 --- a/qadevOOo/tests/java/ifc/document/_XFilter.java +++ b/qadevOOo/tests/java/ifc/document/_XFilter.java @@ -54,7 +54,7 @@ import com.sun.star.uno.UnoRuntime; */ public class _XFilter extends MultiMethodTest { - public static interface FilterChecker { + public interface FilterChecker { boolean checkFilter() ; } diff --git a/qadevOOo/tests/java/ifc/form/_XChangeBroadcaster.java b/qadevOOo/tests/java/ifc/form/_XChangeBroadcaster.java index 4bce8dcab931..70eccdc4f3a2 100644 --- a/qadevOOo/tests/java/ifc/form/_XChangeBroadcaster.java +++ b/qadevOOo/tests/java/ifc/form/_XChangeBroadcaster.java @@ -70,12 +70,12 @@ public class _XChangeBroadcaster extends MultiMethodTest { * in relation if it doesn't support <code>XTextComponent</code> * interface. It used to change the content of component. */ - public static interface Changer { + public interface Changer { /** * The method must change the component's content to * cause a listener call. */ - public void change() ; + void change() ; } /** diff --git a/qadevOOo/tests/java/ifc/form/_XDatabaseParameterBroadcaster.java b/qadevOOo/tests/java/ifc/form/_XDatabaseParameterBroadcaster.java index 4a9a8524b2ad..384493d588ec 100644 --- a/qadevOOo/tests/java/ifc/form/_XDatabaseParameterBroadcaster.java +++ b/qadevOOo/tests/java/ifc/form/_XDatabaseParameterBroadcaster.java @@ -36,16 +36,16 @@ public class _XDatabaseParameterBroadcaster extends MultiMethodTest { /** * Interface to implement so the call of the listener can be checked. */ - public static interface CheckParameterListener extends XDatabaseParameterListener { + public interface CheckParameterListener extends XDatabaseParameterListener { /** * Set a log of the listener, so messages of the listener get printed * into the file of the interface */ - public void setLog(PrintWriter log); + void setLog(PrintWriter log); /** * Return True, when the listener was called correctly. */ - public boolean checkListener(); + boolean checkListener(); } /** diff --git a/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java b/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java index badab75a22f3..e8cd10a36c1e 100644 --- a/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java +++ b/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java @@ -51,21 +51,21 @@ public class _XUpdateBroadcaster extends MultiMethodTest { * Interface for relation. Updating, committing and checking * if data was committed is object dependent behaviour. */ - public static interface UpdateChecker { + public interface UpdateChecker { /** * Method must make some data update in the object tested. */ - public void update() throws com.sun.star.uno.Exception ; + void update() throws com.sun.star.uno.Exception ; /** * Method must commit data change made by method <code>update</code>. */ - public void commit() throws com.sun.star.uno.Exception ; + void commit() throws com.sun.star.uno.Exception ; /** * Checks if the data committed by <code>commit</code> method * became permanent in data source. * @return <code>true</code> if data was committed. */ - public boolean wasCommited() throws com.sun.star.uno.Exception ; + boolean wasCommited() throws com.sun.star.uno.Exception ; } /** diff --git a/qadevOOo/tests/java/ifc/io/_XOutputStream.java b/qadevOOo/tests/java/ifc/io/_XOutputStream.java index 5a3b90e7726b..01caa6f48d20 100644 --- a/qadevOOo/tests/java/ifc/io/_XOutputStream.java +++ b/qadevOOo/tests/java/ifc/io/_XOutputStream.java @@ -51,9 +51,9 @@ public class _XOutputStream extends MultiMethodTest { StreamChecker checker = null; byte[] data = null; - public static interface StreamChecker { - public XInputStream getInStream(); - public void resetStreams(); + public interface StreamChecker { + XInputStream getInStream(); + void resetStreams(); } @Override diff --git a/qadevOOo/tests/java/ifc/sdb/_XCompletedExecution.java b/qadevOOo/tests/java/ifc/sdb/_XCompletedExecution.java index 4ff9f65fb211..548b86c96b32 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XCompletedExecution.java +++ b/qadevOOo/tests/java/ifc/sdb/_XCompletedExecution.java @@ -35,16 +35,16 @@ public class _XCompletedExecution extends MultiMethodTest { /** * Interface to implement so the call of the listener can be checked. */ - public static interface CheckInteractionHandler extends XInteractionHandler { + public interface CheckInteractionHandler extends XInteractionHandler { /** * Set a log of the listener, so messages of the listener get printed * into the file of the interface */ - public void setLog(PrintWriter log); + void setLog(PrintWriter log); /** * Return True, when the listener was called correctly. */ - public boolean checkInteractionHandler(); + boolean checkInteractionHandler(); } @Override diff --git a/qadevOOo/tests/java/ifc/sdb/_XRowSetApproveBroadcaster.java b/qadevOOo/tests/java/ifc/sdb/_XRowSetApproveBroadcaster.java index 8f525182a413..9ac091b607e1 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XRowSetApproveBroadcaster.java +++ b/qadevOOo/tests/java/ifc/sdb/_XRowSetApproveBroadcaster.java @@ -53,12 +53,12 @@ public class _XRowSetApproveBroadcaster extends MultiMethodTest { * on which <code>XRowSetApproveListener</code>s can react. * @see com.sun.star.sdb.XRowSetApproveListener */ - public static interface RowSetApproveChecker { + public interface RowSetApproveChecker { /** * Moves cursor within row set. Method <code>approveCursorMove</code> * of <code>XRowSetApproveListener</code> must be called. */ - public void moveCursor() ; + void moveCursor() ; /** * Change rows in row set. Method <code>approveRowChange</code> * of <code>XRowSetApproveListener</code> must be called. @@ -66,12 +66,12 @@ public class _XRowSetApproveBroadcaster extends MultiMethodTest { * what type of change was made and how many rows it affected. * @see com.sun.star.sdb.RowChangeEvent */ - public RowChangeEvent changeRow() ; + RowChangeEvent changeRow() ; /** * Change the whole row set. Method <code>approveRowSetChange</code> * of <code>XRowSetApproveListener</code> must be called. */ - public void changeRowSet() ; + void changeRowSet() ; } /** diff --git a/qadevOOo/tests/java/ifc/sdbc/_XResultSetUpdate.java b/qadevOOo/tests/java/ifc/sdbc/_XResultSetUpdate.java index b32e93dbdf8c..3723739107dc 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XResultSetUpdate.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XResultSetUpdate.java @@ -61,26 +61,26 @@ public class _XResultSetUpdate extends MultiMethodTest { * test results. It's implementation must be passed * to this test. */ - public static interface UpdateTester { + public interface UpdateTester { /** * @return Current number of rows. */ - public int rowCount() throws SQLException ; + int rowCount() throws SQLException ; /** * Updates some data in the current row but doesn't commit * changes to the source. */ - public void update() throws SQLException ; + void update() throws SQLException ; /** * Checks if updates made by method <code>update</code> was * committed to the data source. */ - public boolean wasUpdated() throws SQLException ; + boolean wasUpdated() throws SQLException ; /** * Returns current row number. Really it must returns value * < 1 if the current position is on insert row. */ - public int currentRow() throws SQLException ; + int currentRow() throws SQLException ; } /** diff --git a/qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java b/qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java index 44682acf33ca..8b880e67cf7c 100644 --- a/qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java +++ b/qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java @@ -44,11 +44,11 @@ public class _XUIConfiguration extends MultiMethodTest { * <CODE>XUIConfiguration.XUIConfigurationListenerImpl</CODE> * @see com.sun.star.ui.XUIConfigurationListener */ - public static interface XUIConfigurationListenerImpl + public interface XUIConfigurationListenerImpl extends XUIConfigurationListener { - public void reset(); - public void fireEvent(); - public boolean actionWasTriggered(); + void reset(); + void fireEvent(); + boolean actionWasTriggered(); } diff --git a/qadevOOo/tests/java/ifc/util/_XSortable.java b/qadevOOo/tests/java/ifc/util/_XSortable.java index f6a60f740dab..e43c93c16ad9 100644 --- a/qadevOOo/tests/java/ifc/util/_XSortable.java +++ b/qadevOOo/tests/java/ifc/util/_XSortable.java @@ -211,13 +211,13 @@ public class _XSortable extends MultiMethodTest { /** * The interface for sort checking. */ - public static interface XSortChecker { - public void prepareToSort(); + public interface XSortChecker { + void prepareToSort(); - public boolean checkSort(boolean isSortNumbering, + boolean checkSort(boolean isSortNumbering, boolean isSortAscending); - public void setPrintWriter(PrintWriter log); + void setPrintWriter(PrintWriter log); } /** diff --git a/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java b/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java index fa1030a47f5c..177ca2fb5bd7 100644 --- a/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java +++ b/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java @@ -102,7 +102,7 @@ public class _XDocumentHandler extends MultiMethodTest { * This interface implementation must be passed by component test * for checking the whole import process. */ - public static interface ImportChecker { + public interface ImportChecker { /** * Returns <code>true</code> if the XML data was successfully * imported, <code>false</code> in other case. @@ -114,7 +114,7 @@ public class _XDocumentHandler extends MultiMethodTest { * This interface implementation must be passed by component test * for setting a target document to the import process */ - public static interface TargetDocumentSetter { + public interface TargetDocumentSetter { void setTargetDocument(); } |