java: add @Override annotation to overriding methods

Change-Id: I086964c6f6ce52c60c52b6dbc445d3c21d22c80a

73 files changed, 201 insertions, 0 deletions

diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java
index cfd8853f6433..07340ad82f3c 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java
@@ -83,6 +83,7 @@ public class AccessibleButton extends lib.TestCase {
      * window) and finds accessible button 'OK' walking through the
      * accessible component tree.
      */
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XInterface oObj = null;
@@ -158,6 +159,7 @@ public class AccessibleButton extends lib.TestCase {
      * Closes the dialog using accessible button 'OK' found in
      * <code>createTestEnvironment()</code>.
      */
+    @Override
     protected void cleanup(TestParameters Param, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
@@ -175,6 +177,7 @@ public class AccessibleButton extends lib.TestCase {
     /**
      * Opens new writer document.
      */
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         try {
             SOfficeFactory SOF = SOfficeFactory.getFactory(
@@ -198,6 +201,7 @@ public class AccessibleButton extends lib.TestCase {
             this.msf = msf;
         }
 
+        @Override
         public void run() {
             XModel aModel = UnoRuntime.queryInterface(XModel.class,
                                                                xTextDoc);
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java
index 83d4b1caf652..6c90c96f0c93 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java
@@ -88,6 +88,7 @@ public class AccessibleCheckBox extends TestCase {
      * window) and finds first accessible check box walking through the
      * accessible component tree.
      */
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XMultiServiceFactory msf = Param.getMSF();
@@ -182,6 +183,7 @@ public class AccessibleCheckBox extends TestCase {
      * Closes the dialog using accessible button 'Cancel' found in
      * <code>createTestEnvironment()</code>.
      */
+    @Override
     protected void cleanup(TestParameters Param, PrintWriter log) {
         try {
             log.println("closing dialog");
@@ -199,6 +201,7 @@ public class AccessibleCheckBox extends TestCase {
         }
     }
 
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
     }
 
@@ -214,6 +217,7 @@ public class AccessibleCheckBox extends TestCase {
             this.msf = msf;
         }
 
+        @Override
         public void run() {
             XModel aModel = UnoRuntime.queryInterface(XModel.class,
                                                                xTextDoc);
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java
index a2c3fb246300..527770386fe2 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java
@@ -77,6 +77,7 @@ public class AccessibleComboBox extends TestCase {
      * finds AccessibleComboBox walking through the
      * accessible component tree.
      */
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XInterface oObj = null;
@@ -159,6 +160,7 @@ public class AccessibleComboBox extends TestCase {
      * Closes the dialog using accessible button 'Cancel' found in
      * <code>createTestEnvironment()</code>.
      */
+    @Override
     protected void cleanup(TestParameters Param, PrintWriter log) {
         log.println("    closing dialog ");
 
@@ -176,6 +178,7 @@ public class AccessibleComboBox extends TestCase {
     /**
      * Creates writer doc
      */
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         try {
             SOfficeFactory SOF = SOfficeFactory.getFactory(
@@ -199,6 +202,7 @@ public class AccessibleComboBox extends TestCase {
             this.msf = msf;
         }
 
+        @Override
         public void run() {
             XModel aModel = UnoRuntime.queryInterface(XModel.class,
                                                                xTextDoc);
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java
index dd0efb327a79..0823bd120f0b 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java
@@ -69,6 +69,7 @@ public class AccessibleDropDownComboBox extends TestCase {
      * Finds AccessibleDropDownComboBox walking through the
      * accessible component tree of a writer document.
      */
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XInterface oObj = null;
@@ -108,6 +109,7 @@ public class AccessibleDropDownComboBox extends TestCase {
     /**
      * Creates writer document.
      */
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         try {
             SOfficeFactory SOF = SOfficeFactory.getFactory(
@@ -121,6 +123,7 @@ public class AccessibleDropDownComboBox extends TestCase {
     /**
      * Disposes writer document.
      */
+    @Override
     protected void cleanup(TestParameters Param, PrintWriter log) {
         util.DesktopTools.closeDoc(xTextDoc);
     }
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java
index 4f3e88021f0b..0b33fb0b4a03 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java
@@ -68,6 +68,7 @@ public class AccessibleDropDownListBox extends TestCase {
      * Finds AccessibleDropDownListBox walking through the
      * accessible component tree of a writer document.
      */
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XInterface oObj = null;
@@ -109,6 +110,7 @@ public class AccessibleDropDownListBox extends TestCase {
     /**
      * Creates writer document.
      */
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         try {
             SOfficeFactory SOF = SOfficeFactory.getFactory(
@@ -123,6 +125,7 @@ public class AccessibleDropDownListBox extends TestCase {
     /**
      * Disposes writer document.
      */
+    @Override
     protected void cleanup(TestParameters Param, PrintWriter log) {
         util.DesktopTools.closeDoc(xTextDoc);
     }
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java
index bd81276a0b3d..b22dd6b98dd4 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java
@@ -85,6 +85,7 @@ public class AccessibleEdit extends TestCase {
      * button 'Close' (for closing this dialog when disposing)
      * walking through the accessible component tree.
      */
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XInterface oObj = null;
@@ -183,6 +184,7 @@ public class AccessibleEdit extends TestCase {
     /**
      * Closes dialog using action of button 'Close'
      */
+    @Override
     protected void cleanup(TestParameters Param, PrintWriter log) {
         log.println("    Closing dialog ... ");
 
@@ -200,6 +202,7 @@ public class AccessibleEdit extends TestCase {
     /**
      * Creates writer document
      */
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         try {
             SOfficeFactory SOF = SOfficeFactory.getFactory(
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java
index ab5554a6e3ec..0e73f6b97076 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java
@@ -73,6 +73,7 @@ public class AccessibleFixedText extends TestCase {
      * displays it. Then the text's accessible component is
      * obtained.
      */
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XInterface oObj = null;
@@ -177,6 +178,7 @@ public class AccessibleFixedText extends TestCase {
     /**
      * Closes dialog using action of button 'Close'
      */
+    @Override
     protected void cleanup(TestParameters Param, PrintWriter log) {
         log.println("    Closing dialog ... ");
         xWinDlg.dispose();
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java
index 605b976c260a..9839db5ebeb7 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java
@@ -62,6 +62,7 @@ public class AccessibleList extends TestCase {
      * Then the TREE component is found and the 'New Document' tab is
      * selected to make list box visible. After that list box is obtained.
      */
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XInterface oObj = null;
@@ -185,6 +186,7 @@ public class AccessibleList extends TestCase {
     /**
      * Closes dialog using action of button 'Close'
      */
+    @Override
     protected void cleanup(TestParameters Param, PrintWriter log) {
         log.println("    Closing dialog ... ");
 
@@ -202,6 +204,7 @@ public class AccessibleList extends TestCase {
     /**
      * Creates writer document
      */
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         try {
             msf = Param.getMSF();
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java
index e90299444f89..9a77b694fd86 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java
@@ -84,6 +84,7 @@ public class AccessibleListBox extends TestCase {
      * Then the TREE component is found and the 'New Document' tab is
      * selected to make list box visible. After that list box is obtained.
      */
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XInterface oObj = null;
@@ -198,6 +199,7 @@ public class AccessibleListBox extends TestCase {
     /**
      * Closes dialog using action of button 'Close'
      */
+    @Override
     protected void cleanup(TestParameters Param, PrintWriter log) {
         log.println("    Closing dialog ... ");
 
@@ -215,6 +217,7 @@ public class AccessibleListBox extends TestCase {
     /**
      * Creates writer document
      */
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         try {
             SOfficeFactory SOF = SOfficeFactory.getFactory(
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java
index 25f84f4c056b..e2f8debccfca 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java
@@ -82,6 +82,7 @@ public class AccessibleListItem extends TestCase {
      * Then the TREE component is found and the 'New Document' tab is
      * selected to make list box visible. After that listbox item is obtained.
      */
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XInterface oObj = null;
@@ -190,6 +191,7 @@ public class AccessibleListItem extends TestCase {
     /**
      * Closes dialog using action of button 'Close'
      */
+    @Override
     protected void cleanup(TestParameters Param, PrintWriter log) {
         log.println("    Closing dialog ... ");
 
@@ -207,6 +209,7 @@ public class AccessibleListItem extends TestCase {
     /**
      * Creates writer document
      */
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         try {
             SOfficeFactory SOF = SOfficeFactory.getFactory(
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java
index cbebff7874a8..cfde728a1783 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java
@@ -80,6 +80,7 @@ public class AccessibleMenu extends TestCase {
      * Finds accessible component with role <code>MENU</code>
      * walking through the accessible component tree of a document.
      */
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XMultiServiceFactory msf = Param.getMSF();
@@ -156,6 +157,7 @@ public class AccessibleMenu extends TestCase {
         return tEnv;
     }
 
+    @Override
     protected void cleanup(TestParameters Param, PrintWriter log) {
         try {
             util.DesktopTools.closeDoc(xTextDoc);
@@ -167,6 +169,7 @@ public class AccessibleMenu extends TestCase {
     /**
      * Creates a new writer document
      */
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
     }
 
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java
index 9bf61b719ff1..661f2571d84f 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java
@@ -68,6 +68,7 @@ public class AccessibleMenuBar extends TestCase {
      * Finds accessible component with role <code>MENUBAR</code>
      * walking through the accessible component tree of a document.
      */
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         shortWait();
@@ -111,6 +112,7 @@ public class AccessibleMenuBar extends TestCase {
     /**
      * Creates writer document.
      */
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         try {
             SOfficeFactory SOF = SOfficeFactory.getFactory(
@@ -124,6 +126,7 @@ public class AccessibleMenuBar extends TestCase {
     /**
      * Disposes document.
      */
+    @Override
     protected void cleanup(TestParameters Param, PrintWriter log) {
         util.DesktopTools.closeDoc(xTextDoc);
     }
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java
index ef3d4db6fc14..46ff5cda834e 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java
@@ -79,6 +79,7 @@ public class AccessibleMenuItem extends TestCase {
      * Finds first accessible component with role <code>MENUITEM</code>
      * walking through the accessible component tree of a document.
      */
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XInterface oObj = null;
@@ -160,6 +161,7 @@ public class AccessibleMenuItem extends TestCase {
     /**
      * Creates writer document.
      */
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         try {
             msf = Param.getMSF();
@@ -174,6 +176,7 @@ public class AccessibleMenuItem extends TestCase {
     /**
      * Disposes document.
      */
+    @Override
     protected void cleanup(TestParameters Param, PrintWriter log) {
         util.DesktopTools.closeDoc(xTextDoc);
     }
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java
index 5a405b3d6002..66ea499273fc 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java
@@ -70,6 +70,7 @@ public class AccessibleMenuSeparator extends TestCase {
      * and implementation name <code>AccessibleMenuSeparator</code>
      * walking through the accessible component tree of a document.
      */
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         shortWait();
@@ -126,6 +127,7 @@ public class AccessibleMenuSeparator extends TestCase {
     /**
      * Creates writer document.
      */
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         try {
             msf = Param.getMSF();
@@ -140,6 +142,7 @@ public class AccessibleMenuSeparator extends TestCase {
     /**
      * Disposes document.
      */
+    @Override
     protected void cleanup(TestParameters Param, PrintWriter log) {
         util.DesktopTools.closeDoc(xTextDoc);
     }
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java b/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java
index cf2b424c76d7..bfa7ffbed1d7 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java
@@ -53,6 +53,7 @@ public class AccessiblePopupMenu extends TestCase {
     /**
      * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>).
      */
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         UnoRuntime.queryInterface(XDesktop.class,
                                                         DesktopTools.createDesktop(
@@ -63,6 +64,7 @@ public class AccessiblePopupMenu extends TestCase {
      * Disposes the document, if exists, created in
      * <code>createTestEnvironment</code> method.
      */
+    @Override
     protected void cleanup(TestParameters Param, PrintWriter log) {
 
         log.println("release the popup menu");
@@ -107,6 +109,7 @@ public class AccessiblePopupMenu extends TestCase {
      * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
      * @see com.sun.star.accessibility.XAccessibleText
      */
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters tParam,
                                                     PrintWriter log) {
         log.println("creating a test environment");
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java
index 32f9ee052954..3859963faac0 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java
@@ -90,6 +90,7 @@ public class AccessibleRadioButton extends TestCase {
     /**
      * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>).
      */
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         UnoRuntime.queryInterface(XDesktop.class,
                                                         DesktopTools.createDesktop(
@@ -100,6 +101,7 @@ public class AccessibleRadioButton extends TestCase {
      * Closes a Hyperlink dialog, disposes the document, if exists, created in
      * <code>createTestEnvironment</code> method.
      */
+    @Override
     protected void cleanup(TestParameters Param, PrintWriter log) {
         try {
             if (accCloseButton != null) {
@@ -148,6 +150,7 @@ public class AccessibleRadioButton extends TestCase {
      * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
      * @see com.sun.star.accessibility.XAccessibleText
      */
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters tParam,
                                                     PrintWriter log) {
         log.println("creating a test environment");
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java
index a493590b19a4..8b4a2fe1461a 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java
@@ -77,6 +77,7 @@ public class AccessibleScrollBar extends TestCase {
     /**
      * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>).
      */
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         UnoRuntime.queryInterface(XDesktop.class,
                                                         DesktopTools.createDesktop(
@@ -87,6 +88,7 @@ public class AccessibleScrollBar extends TestCase {
      * Disposes the document, if exists, created in
      * <code>createTestEnvironment</code> method.
      */
+    @Override
     protected void cleanup(TestParameters Param, PrintWriter log) {
         log.println("disposing xTextDoc");
 
@@ -114,6 +116,7 @@ public class AccessibleScrollBar extends TestCase {
      * @see ifc.accessibility._XAccessibleEventBroadcaster
      * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
      */
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters tParam,
                                                     PrintWriter log) {
         log.println("creating a test environment");
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java
index 66d029140eba..5d27cb6adf8b 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java
@@ -78,6 +78,7 @@ public class AccessibleStatusBar extends TestCase {
      * Disposes the document, if exists, created in
      * <code>createTestEnvironment</code> method.
      */
+    @Override
     protected void cleanup(TestParameters Param, PrintWriter log) {
         log.println("disposing xTextDoc");
 
@@ -105,6 +106,7 @@ public class AccessibleStatusBar extends TestCase {
      * @see ifc.accessibility._XAccessibleEventBroadcaster
      * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
      */
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters tParam,
                                                     PrintWriter log) {
         log.println("creating a test environment");
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java
index 80d8ae461340..cf6eb04f417a 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java
@@ -77,6 +77,7 @@ public class AccessibleStatusBarItem extends TestCase {
     /**
      * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>).
      */
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         UnoRuntime.queryInterface(XDesktop.class,
                                                         DesktopTools.createDesktop(
@@ -87,6 +88,7 @@ public class AccessibleStatusBarItem extends TestCase {
      * Disposes the document, if exists, created in
      * <code>createTestEnvironment</code> method.
      */
+    @Override
     protected void cleanup(TestParameters Param, PrintWriter log) {
         log.println("disposing xTextDoc");
 
@@ -114,6 +116,7 @@ public class AccessibleStatusBarItem extends TestCase {
      * @see ifc.accessibility._XAccessibleEventBroadcaster
      * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
      */
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters tParam,
                                                     PrintWriter log) {
         log.println("creating a test environment");
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java
index 8387f0ec941e..b602b0d74162 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java
@@ -84,6 +84,7 @@ public class AccessibleTabControl extends TestCase {
     /**
      * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>).
      */
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         UnoRuntime.queryInterface(XDesktop.class,
                                                         DesktopTools.createDesktop(
@@ -94,6 +95,7 @@ public class AccessibleTabControl extends TestCase {
      * Closes an InsertFields dialog, disposes the document, if exists, created in
      * <code>createTestEnvironment</code> method.
      */
+    @Override
     protected void cleanup(TestParameters Param, PrintWriter log) {
         try {
             if (accCloseButton != null) {
@@ -136,6 +138,7 @@ public class AccessibleTabControl extends TestCase {
      * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
      * @see com.sun.star.accessibility.XAccessibleSelection
      */
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters tParam,
                                                     PrintWriter log) {
         log.println("creating a test environment");
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java
index c5a755d18e08..61b4e7dd5665 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java
@@ -80,6 +80,7 @@ public class AccessibleTabPage extends TestCase {
     /**
      * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>).
      */
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         UnoRuntime.queryInterface(XDesktop.class,
                                                         DesktopTools.createDesktop(
@@ -90,6 +91,7 @@ public class AccessibleTabPage extends TestCase {
      * Closes an InsertFields dialog, disposes the document, if exists, created in
      * <code>createTestEnvironment</code> method.
      */
+    @Override
     protected void cleanup(TestParameters Param, PrintWriter log) {
         try {
             if (accCloseButton != null) {
@@ -129,6 +131,7 @@ public class AccessibleTabPage extends TestCase {
      * @see ifc.accessibility._XAccessibleEventBroadcaster
      * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
      */
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters tParam,
                                                     PrintWriter log) {
         log.println("creating a test environment");
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java
index 248ac4410a74..98ccf2e3b132 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java
@@ -68,6 +68,7 @@ public class AccessibleToolBox extends TestCase {
     /**
      * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>).
      */
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         UnoRuntime.queryInterface(XDesktop.class,
                 DesktopTools.createDesktop(
@@ -78,6 +79,7 @@ public class AccessibleToolBox extends TestCase {
      * Disposes the document, if exists, created in
      * <code>createTestEnvironment</code> method.
      */
+    @Override
     protected void cleanup(TestParameters Param, PrintWriter log) {
         log.println("disposing xTextDoc");
 
@@ -106,6 +108,7 @@ public class AccessibleToolBox extends TestCase {
      * @see ifc.accessibility._XAccessibleEventBroadcaster
      * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
      */
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters tParam,
             PrintWriter log) {
         log.println("creating a test environment");
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java
index 22e32670870c..bd6ff32f6c5d 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java
@@ -81,6 +81,7 @@ public class AccessibleToolBoxItem extends TestCase {
     /**
      * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>).
      */
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         UnoRuntime.queryInterface(XDesktop.class,
                                                         DesktopTools.createDesktop(
@@ -91,6 +92,7 @@ public class AccessibleToolBoxItem extends TestCase {
      * Disposes the document, if exists, created in
      * <code>createTestEnvironment</code> method.
      */
+    @Override
     protected void cleanup(TestParameters Param, PrintWriter log) {
         log.println("disposing xTextDoc");
 
@@ -122,6 +124,7 @@ public class AccessibleToolBoxItem extends TestCase {
      * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
      * @see com.sun.star.accessibility.XAccessibleText
      */
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters tParam,
                                                     PrintWriter log) {
         log.println("creating a test environment");
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java
index d755471254ca..2853f6873c3e 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java
@@ -83,6 +83,7 @@ public class AccessibleWindow extends TestCase {
     /**
      * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>).
      */
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         UnoRuntime.queryInterface(XDesktop.class,
                                                         DesktopTools.createDesktop(
@@ -93,6 +94,7 @@ public class AccessibleWindow extends TestCase {
      * Disposes the document, if exists, created in
      * <code>createTestEnvironment</code> method.
      */
+    @Override
     protected void cleanup(TestParameters Param, PrintWriter log) {
         log.println("disposing xTextDoc");
 
@@ -124,6 +126,7 @@ public class AccessibleWindow extends TestCase {
      * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
      * @see com.sun.star.accessibility.XAccessibleText
      */
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters tParam,
                                                     PrintWriter log) {
         log.println("creating a test environment");
diff --git a/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java b/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java
index 751987727042..aaa9f987a781 100644
--- a/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java
@@ -40,6 +40,7 @@ public class MutableTreeDataModel extends TestCase {
     /**
      * Creates StarOffice Writer document.
      */
+    @Override
     protected void initialize(TestParameters tParam, PrintWriter log) {
         log.println("creating a textdocument");
         xTextDoc = WriterTools.createTextDoc(
@@ -49,12 +50,14 @@ public class MutableTreeDataModel extends TestCase {
     /**
      * Disposes StarOffice Writer document.
      */
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     protected synchronized TestEnvironment createTestEnvironment(TestParameters Param,
         PrintWriter log) {
 
diff --git a/qadevOOo/tests/java/mod/_toolkit/MutableTreeNode.java b/qadevOOo/tests/java/mod/_toolkit/MutableTreeNode.java
index c632116fcbfe..ea0d8b1368b4 100644
--- a/qadevOOo/tests/java/mod/_toolkit/MutableTreeNode.java
+++ b/qadevOOo/tests/java/mod/_toolkit/MutableTreeNode.java
@@ -46,6 +46,7 @@ public class MutableTreeNode extends TestCase {
     /**
      * Creates StarOffice Writer document.
      */
+    @Override
     protected void initialize(TestParameters tParam, PrintWriter log) {
         mxMSF = tParam.getMSF();
     }
@@ -53,12 +54,14 @@ public class MutableTreeNode extends TestCase {
     /**
      * Disposes StarOffice Writer document.
      */
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     protected synchronized TestEnvironment createTestEnvironment(TestParameters Param,
         PrintWriter log) {
         XMutableTreeNode xNode;
diff --git a/qadevOOo/tests/java/mod/_toolkit/TabController.java b/qadevOOo/tests/java/mod/_toolkit/TabController.java
index 42eab4b8dbf7..49523a7a8e17 100644
--- a/qadevOOo/tests/java/mod/_toolkit/TabController.java
+++ b/qadevOOo/tests/java/mod/_toolkit/TabController.java
@@ -45,6 +45,7 @@ import util.utils;
 public class TabController extends TestCase {
     private static XTextDocument xTextDoc = null;
 
+    @Override
     protected void initialize(TestParameters param, PrintWriter log) {
         try {
             log.println("creating a textdocument");
@@ -57,11 +58,13 @@ public class TabController extends TestCase {
         }
     }
 
+    @Override
     protected void cleanup(TestParameters param, PrintWriter log) {
         log.println("disposing xTextDoc");
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     public TestEnvironment createTestEnvironment(TestParameters param,
                                                  PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/TabControllerModel.java b/qadevOOo/tests/java/mod/_toolkit/TabControllerModel.java
index 563720abd1ae..ca73fa5aa1fa 100644
--- a/qadevOOo/tests/java/mod/_toolkit/TabControllerModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/TabControllerModel.java
@@ -36,6 +36,7 @@ import util.utils;
 public class TabControllerModel extends TestCase {
     private static XTextDocument xTextDoc;
 
+    @Override
     protected void initialize(TestParameters param, PrintWriter log) {
         try {
             log.println("creating a textdocument");
@@ -47,11 +48,13 @@ public class TabControllerModel extends TestCase {
         }
     }
 
+    @Override
     protected void cleanup(TestParameters param, PrintWriter log) {
         log.println("disposing xTextDoc");
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     public TestEnvironment createTestEnvironment(TestParameters param,
                                                  PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/Toolkit.java b/qadevOOo/tests/java/mod/_toolkit/Toolkit.java
index aeae187dc6de..33b4b4c45051 100644
--- a/qadevOOo/tests/java/mod/_toolkit/Toolkit.java
+++ b/qadevOOo/tests/java/mod/_toolkit/Toolkit.java
@@ -47,6 +47,7 @@ import util.utils;
 public class Toolkit extends TestCase {
     private static XTextDocument xTextDoc;
 
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         SOfficeFactory SOF = SOfficeFactory.getFactory(
                                      Param.getMSF());
@@ -61,6 +62,7 @@ public class Toolkit extends TestCase {
         }
     }
 
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
         util.DesktopTools.closeDoc(xTextDoc);
@@ -70,6 +72,7 @@ public class Toolkit extends TestCase {
     * Creating a Testenvironment for the interfaces to be tested.
     * Creates <code>com.sun.star.awt.Toolkit</code> service.
     */
+    @Override
     public TestEnvironment createTestEnvironment(TestParameters Param,
                                                  PrintWriter log)
                                           throws StatusException {
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java
index ec2dcaf4cf79..4f65ea9f11e8 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java
@@ -48,6 +48,7 @@ public class UnoControlButton extends TestCase {
     private static XTextDocument xTextDoc;
     private static XTextDocument xTD2;
 
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         SOfficeFactory SOF = SOfficeFactory.getFactory(
                                      Param.getMSF());
@@ -64,6 +65,7 @@ public class UnoControlButton extends TestCase {
         }
     }
 
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
@@ -71,6 +73,7 @@ public class UnoControlButton extends TestCase {
         util.DesktopTools.closeDoc(xTD2);
     }
 
+    @Override
     public TestEnvironment createTestEnvironment(TestParameters Param,
                                                  PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlButtonModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlButtonModel.java
index ee8960131b49..8ada3adf21ad 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlButtonModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlButtonModel.java
@@ -37,6 +37,7 @@ public class UnoControlButtonModel extends TestCase {
     /**
     * Creates StarOffice Writer document.
     */
+    @Override
     protected void initialize(TestParameters tParam, PrintWriter log) {
         log.println("creating a textdocument");
         xTextDoc = WriterTools.createTextDoc(
@@ -46,12 +47,14 @@ public class UnoControlButtonModel extends TestCase {
     /**
     * Disposes StarOffice Writer document.
     */
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     protected synchronized TestEnvironment createTestEnvironment(TestParameters Param,
                                                                  PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBox.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBox.java
index d5c863d52316..324c8d808a6b 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBox.java
@@ -49,6 +49,7 @@ public class UnoControlCheckBox extends TestCase {
     private static XTextDocument xTextDoc;
     private static XTextDocument xTD2;
 
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         SOfficeFactory SOF = SOfficeFactory.getFactory(
                                      Param.getMSF());
@@ -65,6 +66,7 @@ public class UnoControlCheckBox extends TestCase {
         }
     }
 
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
@@ -72,6 +74,7 @@ public class UnoControlCheckBox extends TestCase {
         util.DesktopTools.closeDoc(xTD2);
     }
 
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBoxModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBoxModel.java
index 8b0476578f48..192d1470fdd5 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBoxModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBoxModel.java
@@ -37,6 +37,7 @@ public class UnoControlCheckBoxModel extends TestCase {
     /**
     * Creates StarOffice Writer document.
     */
+    @Override
     protected void initialize(TestParameters tParam, PrintWriter log) {
         log.println("creating a textdocument");
         xTextDoc = WriterTools.createTextDoc(
@@ -46,12 +47,14 @@ public class UnoControlCheckBoxModel extends TestCase {
     /**
     * Disposes StarOffice Writer document.
     */
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     protected synchronized TestEnvironment createTestEnvironment(TestParameters Param,
                                                                  PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBox.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBox.java
index f72b5f560816..34ad3f819784 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBox.java
@@ -46,6 +46,7 @@ import com.sun.star.view.XControlAccess;
 public class UnoControlComboBox extends TestCase {
     private static XTextDocument xTextDoc;
 
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF());
 
@@ -59,12 +60,14 @@ public class UnoControlComboBox extends TestCase {
         }
     }
 
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
 util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBoxModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBoxModel.java
index 2a1abf6908cd..7d43ba9adc34 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBoxModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBoxModel.java
@@ -36,6 +36,7 @@ public class UnoControlComboBoxModel extends TestCase {
     /**
     * Creates StarOffice Writer document.
     */
+    @Override
     protected void initialize(TestParameters tParam, PrintWriter log) {
         log.println("creating a textdocument");
         xTextDoc = WriterTools.createTextDoc(
@@ -45,12 +46,14 @@ public class UnoControlComboBoxModel extends TestCase {
     /**
     * Disposes StarOffice Writer document.
     */
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     protected synchronized TestEnvironment createTestEnvironment(TestParameters Param,
                                                                  PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java
index 38fbd61d7287..8701e6a80110 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java
@@ -54,6 +54,7 @@ public class UnoControlContainer extends TestCase {
     private static XControl xCtrl1;
     private static XControl xCtrl2;
 
+    @Override
     protected void initialize(TestParameters param, PrintWriter log) {
         try {
             log.println("creating a textdocument");
@@ -68,6 +69,7 @@ public class UnoControlContainer extends TestCase {
         }
     }
 
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
@@ -75,6 +77,7 @@ public class UnoControlContainer extends TestCase {
         util.DesktopTools.closeDoc(xTD2);
     }
 
+    @Override
     public TestEnvironment createTestEnvironment(TestParameters param,
                                                  PrintWriter log) {
         // create Object Relations -------------------------------------------
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlContainerModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlContainerModel.java
index 0142d93bcc3d..ddd15e450731 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlContainerModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlContainerModel.java
@@ -30,6 +30,7 @@ import util.utils;
 
 
 public class UnoControlContainerModel extends TestCase {
+    @Override
     public TestEnvironment createTestEnvironment(TestParameters param,
                                                  PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyField.java
index e17e9cac4da8..7c511d75019e 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyField.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyField.java
@@ -47,6 +47,7 @@ import util.utils;
 public class UnoControlCurrencyField extends TestCase {
     private static XTextDocument xTextDoc;
 
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         SOfficeFactory SOF = SOfficeFactory.getFactory(
                                      Param.getMSF());
@@ -61,12 +62,14 @@ public class UnoControlCurrencyField extends TestCase {
         }
     }
 
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyFieldModel.java
index 264f5abb3123..a21d810acb86 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyFieldModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyFieldModel.java
@@ -36,6 +36,7 @@ public class UnoControlCurrencyFieldModel extends TestCase {
     /**
     * Creates StarOffice Writer document.
     */
+    @Override
     protected void initialize(TestParameters tParam, PrintWriter log) {
         log.println("creating a textdocument");
         xTextDoc = WriterTools.createTextDoc(
@@ -45,12 +46,14 @@ public class UnoControlCurrencyFieldModel extends TestCase {
     /**
     * Disposes StarOffice Writer document.
     */
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     protected synchronized TestEnvironment createTestEnvironment(TestParameters Param,
                                                                  PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlDateField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlDateField.java
index 8d81569bb6fe..3e6fb99b21a4 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlDateField.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlDateField.java
@@ -49,6 +49,7 @@ public class UnoControlDateField extends TestCase {
     private static XTextDocument xTextDoc;
     private static XTextDocument xTD2;
 
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         SOfficeFactory SOF = SOfficeFactory.getFactory(
                                      Param.getMSF());
@@ -65,6 +66,7 @@ public class UnoControlDateField extends TestCase {
         }
     }
 
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
@@ -72,6 +74,7 @@ public class UnoControlDateField extends TestCase {
         util.DesktopTools.closeDoc(xTD2);
     }
 
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlDateFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlDateFieldModel.java
index aaa5b9856a8f..90c56c8c7a8a 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlDateFieldModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlDateFieldModel.java
@@ -36,6 +36,7 @@ public class UnoControlDateFieldModel extends TestCase {
     /**
     * Creates StarOffice Writer document.
     */
+    @Override
     protected void initialize(TestParameters tParam, PrintWriter log) {
         log.println("creating a textdocument");
         xTextDoc = WriterTools.createTextDoc(
@@ -45,12 +46,14 @@ public class UnoControlDateFieldModel extends TestCase {
     /**
     * Disposes StarOffice Writer document.
     */
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     protected synchronized TestEnvironment createTestEnvironment(TestParameters Param,
                                                                  PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlDialog.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlDialog.java
index edcfe8ec1ea1..c588fd23fdcf 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlDialog.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlDialog.java
@@ -82,6 +82,7 @@ public class UnoControlDialog extends TestCase {
     * for Control, adds to Dialog a button, sets its size and
     * sets the dialog visible. <p>
     */
+    @Override
     public synchronized TestEnvironment createTestEnvironment(TestParameters Param,
                                                               PrintWriter log) {
         XInterface oObj = null;
@@ -221,6 +222,7 @@ public class UnoControlDialog extends TestCase {
         return tEnv;
     } // finish method getTestEnvironment
 
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("Disposing dialog ...");
         xWinDlg.dispose();
@@ -229,6 +231,7 @@ public class UnoControlDialog extends TestCase {
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     protected void initialize(TestParameters tParam, PrintWriter log) {
         SOfficeFactory SOF = SOfficeFactory.getFactory(
                                      tParam.getMSF());
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java
index 32fc7c71cac2..b499032646f3 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java
@@ -70,6 +70,7 @@ public class UnoControlDialogModel extends TestCase {
     *      {@link ifc.io._XPersistObject} </li>
     * </ul>
     */
+    @Override
     protected synchronized TestEnvironment createTestEnvironment(TestParameters Param,
                                                                  PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlEdit.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlEdit.java
index 7886ec93be46..07eb8fe7bedd 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlEdit.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlEdit.java
@@ -47,6 +47,7 @@ import util.utils;
 public class UnoControlEdit extends TestCase {
     private static XTextDocument xTextDoc;
 
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         SOfficeFactory SOF = SOfficeFactory.getFactory(
                                      Param.getMSF());
@@ -61,12 +62,14 @@ public class UnoControlEdit extends TestCase {
         }
     }
 
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlEditModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlEditModel.java
index 8568c629b579..f5cae4650233 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlEditModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlEditModel.java
@@ -36,6 +36,7 @@ public class UnoControlEditModel extends TestCase {
     /**
     * Creates StarOffice Writer document.
     */
+    @Override
     protected void initialize(TestParameters tParam, PrintWriter log) {
         log.println("creating a textdocument");
         xTextDoc = WriterTools.createTextDoc(
@@ -45,12 +46,14 @@ public class UnoControlEditModel extends TestCase {
     /**
     * Disposes StarOffice Writer document.
     */
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     protected synchronized TestEnvironment createTestEnvironment(TestParameters Param,
                                                                  PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControl.java
index d9e696c9fc78..5b3cb2ef005b 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControl.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControl.java
@@ -47,6 +47,7 @@ import util.utils;
 public class UnoControlFileControl extends TestCase {
     private static XTextDocument xTextDoc;
 
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         SOfficeFactory SOF = SOfficeFactory.getFactory(
                                      Param.getMSF());
@@ -61,12 +62,14 @@ public class UnoControlFileControl extends TestCase {
         }
     }
 
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControlModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControlModel.java
index cce999e8df2b..50c89524f59a 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControlModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControlModel.java
@@ -36,6 +36,7 @@ public class UnoControlFileControlModel extends TestCase {
     /**
     * Creates StarOffice Writer document.
     */
+    @Override
     protected void initialize(TestParameters tParam, PrintWriter log) {
         log.println("creating a textdocument");
         xTextDoc = WriterTools.createTextDoc(
@@ -45,12 +46,14 @@ public class UnoControlFileControlModel extends TestCase {
     /**
     * Disposes StarOffice Writer document.
     */
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     public synchronized TestEnvironment createTestEnvironment(TestParameters Param,
                                                               PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedLineModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedLineModel.java
index 5158a29a4b09..489ae468f4b7 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedLineModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedLineModel.java
@@ -64,6 +64,7 @@ public class UnoControlFixedLineModel extends TestCase {
     *      {@link ifc.io._XPersistObject} </li>
     * </ul>
     */
+    @Override
     public synchronized TestEnvironment createTestEnvironment(TestParameters Param,
                                                               PrintWriter log)
         throws StatusException {
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedText.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedText.java
index dce7d7535b45..0649bcb20a46 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedText.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedText.java
@@ -46,6 +46,7 @@ import util.utils;
 public class UnoControlFixedText extends TestCase {
     private static XTextDocument xTextDoc;
 
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         SOfficeFactory SOF = SOfficeFactory.getFactory(
                                      Param.getMSF());
@@ -60,12 +61,14 @@ public class UnoControlFixedText extends TestCase {
         }
     }
 
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedTextModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedTextModel.java
index 93eacd929823..152ab74459fc 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedTextModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedTextModel.java
@@ -36,6 +36,7 @@ public class UnoControlFixedTextModel extends TestCase {
     /**
     * Creates StarOffice Writer document.
     */
+    @Override
     protected void initialize(TestParameters tParam, PrintWriter log) {
         log.println("creating a textdocument");
         xTextDoc = WriterTools.createTextDoc(
@@ -45,12 +46,14 @@ public class UnoControlFixedTextModel extends TestCase {
     /**
     * Disposes StarOffice Writer document.
     */
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     protected synchronized TestEnvironment createTestEnvironment(TestParameters Param,
                                                                  PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedField.java
index e9c5563af172..0cebbfd74aa5 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedField.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedField.java
@@ -48,6 +48,7 @@ import util.utils;
 public class UnoControlFormattedField extends TestCase {
     private static XTextDocument xTextDoc;
 
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         SOfficeFactory SOF = SOfficeFactory.getFactory(
                                      Param.getMSF());
@@ -62,12 +63,14 @@ public class UnoControlFormattedField extends TestCase {
         }
     }
 
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedFieldModel.java
index 4694d7919562..f0c11096638b 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedFieldModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedFieldModel.java
@@ -36,6 +36,7 @@ public class UnoControlFormattedFieldModel extends TestCase {
     /**
     * Creates StarOffice Writer document.
     */
+    @Override
     protected void initialize(TestParameters tParam, PrintWriter log) {
         log.println("creating a textdocument");
         xTextDoc = WriterTools.createTextDoc(
@@ -45,12 +46,14 @@ public class UnoControlFormattedFieldModel extends TestCase {
     /**
     * Disposes StarOffice Writer document.
     */
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     public synchronized TestEnvironment createTestEnvironment(TestParameters Param,
                                                               PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBox.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBox.java
index d4119e2408e6..d26b0a62a377 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBox.java
@@ -46,6 +46,7 @@ import util.utils;
 public class UnoControlGroupBox extends TestCase {
     private static XTextDocument xTextDoc;
 
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         SOfficeFactory SOF = SOfficeFactory.getFactory(
                                      Param.getMSF());
@@ -60,12 +61,14 @@ public class UnoControlGroupBox extends TestCase {
         }
     }
 
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBoxModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBoxModel.java
index b5955de75f16..afa579a724ae 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBoxModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBoxModel.java
@@ -36,6 +36,7 @@ public class UnoControlGroupBoxModel extends TestCase {
     /**
     * Creates StarOffice Writer document.
     */
+    @Override
     protected void initialize(TestParameters tParam, PrintWriter log) {
         log.println("creating a textdocument");
         xTextDoc = WriterTools.createTextDoc(
@@ -45,12 +46,14 @@ public class UnoControlGroupBoxModel extends TestCase {
     /**
     * Disposes StarOffice Writer document.
     */
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     protected synchronized TestEnvironment createTestEnvironment(TestParameters Param,
                                                                  PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControl.java
index 5c0054870921..1bf267dec6d5 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControl.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControl.java
@@ -47,6 +47,7 @@ import util.utils;
 public class UnoControlImageControl extends TestCase {
     private static XTextDocument xTextDoc;
 
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         SOfficeFactory SOF = SOfficeFactory.getFactory(
                                      Param.getMSF());
@@ -61,12 +62,14 @@ public class UnoControlImageControl extends TestCase {
         }
     }
 
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControlModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControlModel.java
index a9a6bebe868f..6efaf71c5cf9 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControlModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControlModel.java
@@ -29,6 +29,7 @@ import util.utils;
 
 
 public class UnoControlImageControlModel extends TestCase {
+    @Override
     protected synchronized TestEnvironment createTestEnvironment(TestParameters Param,
                                                                  PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlListBox.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlListBox.java
index 8ade3fe1d847..089b5ab2e170 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlListBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlListBox.java
@@ -47,6 +47,7 @@ import util.utils;
 public class UnoControlListBox extends TestCase {
     private static XTextDocument xTextDoc;
 
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         SOfficeFactory SOF = SOfficeFactory.getFactory(
                                      Param.getMSF());
@@ -61,12 +62,14 @@ public class UnoControlListBox extends TestCase {
         }
     }
 
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlListBoxModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlListBoxModel.java
index 5b71c36bc585..e12d527a2ae5 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlListBoxModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlListBoxModel.java
@@ -36,6 +36,7 @@ public class UnoControlListBoxModel extends TestCase {
     /**
     * Creates StarOffice Writer document.
     */
+    @Override
     protected void initialize(TestParameters tParam, PrintWriter log) {
         log.println("creating a textdocument");
         xTextDoc = WriterTools.createTextDoc(
@@ -45,12 +46,14 @@ public class UnoControlListBoxModel extends TestCase {
     /**
     * Disposes StarOffice Writer document.
     */
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     protected synchronized TestEnvironment createTestEnvironment(TestParameters Param,
                                                                  PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericField.java
index cc16a49edef0..0fea72e8d8aa 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericField.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericField.java
@@ -47,6 +47,7 @@ import com.sun.star.view.XControlAccess;
 public class UnoControlNumericField extends TestCase {
     private static XTextDocument xTextDoc;
 
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF());
 
@@ -60,6 +61,7 @@ public class UnoControlNumericField extends TestCase {
         }
     }
 
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
@@ -74,6 +76,7 @@ public class UnoControlNumericField extends TestCase {
         }
     }
 
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericFieldModel.java
index 66bf0a4846d0..8a363333ee1c 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericFieldModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericFieldModel.java
@@ -36,6 +36,7 @@ public class UnoControlNumericFieldModel extends TestCase {
     /**
     * Creates StarOffice Writer document.
     */
+    @Override
     protected void initialize(TestParameters tParam, PrintWriter log) {
         log.println("creating a textdocument");
         xTextDoc = WriterTools.createTextDoc(
@@ -45,12 +46,14 @@ public class UnoControlNumericFieldModel extends TestCase {
     /**
     * Disposes StarOffice Writer document.
     */
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     public synchronized TestEnvironment createTestEnvironment(TestParameters Param,
                                                               PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternField.java
index a78384f278b2..a9c2283944ed 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternField.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternField.java
@@ -47,6 +47,7 @@ import util.utils;
 public class UnoControlPatternField extends TestCase {
     private static XTextDocument xTextDoc;
 
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         SOfficeFactory SOF = SOfficeFactory.getFactory(
                                      Param.getMSF());
@@ -61,12 +62,14 @@ public class UnoControlPatternField extends TestCase {
         }
     }
 
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternFieldModel.java
index 1b64fb547aee..40ac0e324092 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternFieldModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternFieldModel.java
@@ -29,6 +29,7 @@ import util.utils;
 
 
 public class UnoControlPatternFieldModel extends TestCase {
+    @Override
     public synchronized TestEnvironment createTestEnvironment(TestParameters Param,
                                                               PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlProgressBarModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlProgressBarModel.java
index 620f9c390aba..998cc03cd96a 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlProgressBarModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlProgressBarModel.java
@@ -62,6 +62,7 @@ public class UnoControlProgressBarModel extends TestCase {
     *      {@link ifc.io._XPersistObject} </li>
     * </ul>
     */
+    @Override
     public synchronized TestEnvironment createTestEnvironment(TestParameters Param,
                                                               PrintWriter log)
         throws StatusException {
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButton.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButton.java
index df039b941be2..0d232ab48fbf 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButton.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButton.java
@@ -46,6 +46,7 @@ import util.utils;
 public class UnoControlRadioButton extends TestCase {
     private static XTextDocument xTextDoc;
 
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         SOfficeFactory SOF = SOfficeFactory.getFactory(
                                      Param.getMSF());
@@ -60,12 +61,14 @@ public class UnoControlRadioButton extends TestCase {
         }
     }
 
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButtonModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButtonModel.java
index 2b9f4888ad3f..2dcc519ecd91 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButtonModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButtonModel.java
@@ -29,6 +29,7 @@ import util.utils;
 
 
 public class UnoControlRadioButtonModel extends TestCase {
+    @Override
     public synchronized TestEnvironment createTestEnvironment(TestParameters Param,
                                                               PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlScrollBarModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlScrollBarModel.java
index 5a47b5065334..38b18bde0945 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlScrollBarModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlScrollBarModel.java
@@ -64,6 +64,7 @@ public class UnoControlScrollBarModel extends TestCase {
     *      {@link ifc.io._XPersistObject} </li>
     * </ul>
     */
+    @Override
     public synchronized TestEnvironment createTestEnvironment(TestParameters Param,
                                                               PrintWriter log)
         throws StatusException {
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeField.java
index 7a8db780dcf6..d7ebd7b7c2b0 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeField.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeField.java
@@ -47,6 +47,7 @@ import util.utils;
 public class UnoControlTimeField extends TestCase {
     private static XTextDocument xTextDoc;
 
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         SOfficeFactory SOF = SOfficeFactory.getFactory(
                                      Param.getMSF());
@@ -61,12 +62,14 @@ public class UnoControlTimeField extends TestCase {
         }
     }
 
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeFieldModel.java
index 4c31d10cab48..96a35e2bb2bb 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeFieldModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeFieldModel.java
@@ -29,6 +29,7 @@ import util.utils;
 
 
 public class UnoControlTimeFieldModel extends TestCase {
+    @Override
     protected synchronized TestEnvironment createTestEnvironment(TestParameters Param,
                                                                  PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java
index b416b10cc981..8f722cb243e9 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java
@@ -51,6 +51,7 @@ import util.utils;
 public class UnoScrollBarControl extends TestCase {
     private static XTextDocument xTextDoc;
 
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         SOfficeFactory SOF = SOfficeFactory.getFactory(
                                      Param.getMSF());
@@ -83,12 +84,14 @@ public class UnoScrollBarControl extends TestCase {
         }
     }
 
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControl.java
index 04ca2b7ee276..843e05c9abca 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControl.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControl.java
@@ -45,18 +45,21 @@ import util.utils;
 public class UnoSpinButtonControl extends TestCase {
     private static XTextDocument xTextDoc;
 
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         log.println("creating a textdocument");
         xTextDoc = WriterTools.createTextDoc(
                            Param.getMSF());
     }
 
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControlModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControlModel.java
index 173da055d942..06dea1740239 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControlModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControlModel.java
@@ -35,6 +35,7 @@ public class UnoSpinButtonControlModel extends TestCase {
     * Creates an instance of the service
     * <code>com.sun.star.awt.UnoControlSpinButtonModel</code>.
     */
+    @Override
     public synchronized TestEnvironment createTestEnvironment(TestParameters Param,
                                                               PrintWriter log)
         throws StatusException {
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java
index fbfce88507e4..9ad723e77751 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java
@@ -51,6 +51,7 @@ public class UnoTreeControl extends TestCase {
     private static XMutableTreeDataModel mXTreeDataModel;
     private static XMultiServiceFactory mxMSF;
 
+    @Override
     protected void initialize(TestParameters Param, PrintWriter log) {
         SOfficeFactory SOF = SOfficeFactory.getFactory(
             Param.getMSF());
@@ -65,9 +66,11 @@ public class UnoTreeControl extends TestCase {
         }
     }
 
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
     }
 
+    @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
         PrintWriter log) {
         String sTreeControlName = "UnoTreeControl-Test";
@@ -261,6 +264,7 @@ public class UnoTreeControl extends TestCase {
             mXDialog = xDialog;
         }
 
+        @Override
         public void run() {
             mXDialog.endExecute();
         }
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoTreeModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoTreeModel.java
index 8350cb980923..7467e9dc5d2f 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoTreeModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoTreeModel.java
@@ -36,6 +36,7 @@ public class UnoTreeModel extends TestCase {
     /**
      * Creates StarOffice Writer document.
      */
+    @Override
     protected void initialize(TestParameters tParam, PrintWriter log) {
         log.println("creating a textdocument");
         xTextDoc = WriterTools.createTextDoc(
@@ -45,12 +46,14 @@ public class UnoTreeModel extends TestCase {
     /**
      * Disposes StarOffice Writer document.
      */
+    @Override
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
 
         util.DesktopTools.closeDoc(xTextDoc);
     }
 
+    @Override
     protected synchronized TestEnvironment createTestEnvironment(TestParameters Param,
         PrintWriter log) {
         XInterface oObj = null;