java: add @Override annotation to overriding methods

Change-Id: I086964c6f6ce52c60c52b6dbc445d3c21d22c80a

282 files changed, 494 insertions, 2 deletions

diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleAction.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleAction.java
index 30dfb2f818aa..bc0de990ced7 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleAction.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleAction.java
@@ -151,6 +151,7 @@ public class _XAccessibleAction extends lib.MultiMethodTest {
     /**
     * Forces environment recreation.
     */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java
index 66237639a555..54dc72284519 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java
@@ -608,6 +608,7 @@ public class _XAccessibleComponent extends MultiMethodTest {
     /**
      * Restores initial component text.
      */
+    @Override
     protected void after() {
         if (tEnv.getObjRelation("Destroy") != null) {
             disposeEnvironment();
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java
index bfcee4da18f1..927658b69bbb 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java
@@ -53,6 +53,7 @@ public class _XAccessibleContext extends MultiMethodTest {
     private XAccessible parent = null;
 
     // temporary while accessibility package is in com.sun.star
+    @Override
     protected String getTestedClassName() {
         return className;
     }
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText.java
index 654cb7af295a..8e8d4e9ba2c6 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText.java
@@ -72,7 +72,8 @@ public class _XAccessibleEditableText extends MultiMethodTest {
       * Retrieves object relation. Stores initial component text
       * for restoding it in <code>after</code>.
       */
-     protected void before() {
+     @Override
+    protected void before() {
         Boolean b = (Boolean)
             tEnv.getObjRelation("XAccessibleEditableText.hasAttr");
         if (b != null) {
@@ -527,6 +528,7 @@ public class _XAccessibleEditableText extends MultiMethodTest {
     /**
      * Restores initial component text.
      */
+    @Override
     protected void after() {
         oObj.setText(initialText);
     }
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java
index 1c345dd51542..62e2aac1f3e6 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java
@@ -87,6 +87,7 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest {
      * Retrieves relation.
      * @throws StatusException If the relation is not found.
      */
+    @Override
     public void before() {
         prod = (EventProducer) tEnv.getObjRelation("EventProducer") ;
         if (prod == null) {
@@ -193,6 +194,7 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest {
     /**
     * Forces environment recreation.
     */
+    @Override
     protected void after() {
         if (destroy) disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java
index a79282d895ea..de8787871b8f 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java
@@ -61,6 +61,7 @@ public class _XAccessibleSelection extends MultiMethodTest {
     protected boolean OneAlwaysSelected = false;
 
     // temporary while accessibility package is in com.sun.star
+    @Override
     protected String getTestedClassName() {
         return className;
     }
@@ -71,6 +72,7 @@ public class _XAccessibleSelection extends MultiMethodTest {
      * @see com.sun.star.accessibility.XAccessibleContext
      * @see ifc.accessibility._XAccessibleContext
      */
+    @Override
     protected void before() {
         xAC = UnoRuntime.queryInterface(
                       XAccessibleContext.class, oObj);
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java
index f237d60cbc28..ee2400f44813 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java
@@ -58,6 +58,7 @@ public class _XAccessibleTable extends MultiMethodTest {
     XAccessibleSelection xASel = null;
     XAccessibleContext xACont = null;
 
+    @Override
     protected void before() {
         xASel = UnoRuntime.queryInterface(XAccessibleSelection.class, oObj);
         if (xASel == null) {
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java
index da2ddc37f8ab..da9e379b32b0 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java
@@ -79,6 +79,7 @@ public class _XAccessibleText extends MultiMethodTest {
      * Retrieves a string representation of the component's text.
      * The length of retrieved string must be greater than zero.
      */
+    @Override
     protected void before() {
         Object xat = tEnv.getObjRelation("XAccessibleText");
 
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java
index 9116fb3fc030..783ba99252a4 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java
@@ -53,6 +53,7 @@ public class _XAccessibleValue extends MultiMethodTest {
     private Object val = null;
     XAccessibleValue anotherFromGroup = null;
 
+    @Override
     protected void before() {
         anotherFromGroup = (XAccessibleValue)tEnv.getObjRelation(
             "XAccessibleValue.anotherFromGroup");
@@ -336,6 +337,7 @@ public class _XAccessibleValue extends MultiMethodTest {
     /**
      * Disposes test environment.
      */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlButtonModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlButtonModel.java
index 8415b12957d1..4951d40382e1 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlButtonModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlButtonModel.java
@@ -42,6 +42,7 @@ public class _UnoControlButtonModel extends MultiPropertyTest {
     * Redefined method returns value, that differs from property value.
     */
     protected PropertyTester ColorTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             if (util.ValueComparer.equalValue(oldValue, new Integer(17)))
                 return new Integer(25);
@@ -54,6 +55,7 @@ public class _UnoControlButtonModel extends MultiPropertyTest {
     * Redefined method returns value, that differs from property value.
     */
     protected PropertyTester BoolTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             if (util.ValueComparer.equalValue(oldValue, new Boolean(true)))
                 return new Boolean(false);
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlCheckBoxModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlCheckBoxModel.java
index 152350dde606..b9c2d926e6eb 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlCheckBoxModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlCheckBoxModel.java
@@ -43,6 +43,7 @@ public class _UnoControlCheckBoxModel extends MultiPropertyTest {
     * Redefined method returns value, that differs from property value.
     */
     protected PropertyTester ColorTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             if (util.ValueComparer.equalValue(oldValue, new Integer(17)))
                 return new Integer(25);
@@ -57,6 +58,7 @@ public class _UnoControlCheckBoxModel extends MultiPropertyTest {
     */
     public void _BackgroundColor() {
         testProperty("BackgroundColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(1234) : null ;
             }
@@ -69,6 +71,7 @@ public class _UnoControlCheckBoxModel extends MultiPropertyTest {
     */
     public void _Tabstop() {
         testProperty("Tabstop", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 if (utils.isVoid(old)) return new Boolean(true) ;
                 else return null ;
@@ -82,6 +85,7 @@ public class _UnoControlCheckBoxModel extends MultiPropertyTest {
     */
     public void _TextColor() {
         testProperty("TextColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 if (utils.isVoid(old)) return new Integer(12345) ;
                 else return null ;
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlComboBoxModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlComboBoxModel.java
index 1b707165ddfc..13674faea5f7 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlComboBoxModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlComboBoxModel.java
@@ -51,6 +51,7 @@ public class _UnoControlComboBoxModel extends MultiPropertyTest {
     */
     public void _BackgroundColor() {
         testProperty("BackgroundColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(1234) : null ;
             }
@@ -63,6 +64,7 @@ public class _UnoControlComboBoxModel extends MultiPropertyTest {
     */
     public void _BorderColor() {
         testProperty("BorderColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(1234) : null ;
             }
@@ -75,6 +77,7 @@ public class _UnoControlComboBoxModel extends MultiPropertyTest {
     */
     public void _TextColor() {
         testProperty("TextColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(4321) : null ;
             }
@@ -87,6 +90,7 @@ public class _UnoControlComboBoxModel extends MultiPropertyTest {
     */
     public void _Tabstop() {
         testProperty("Tabstop", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Boolean(true) : null ;
             }
@@ -108,6 +112,7 @@ public class _UnoControlComboBoxModel extends MultiPropertyTest {
     * Redefined method returns value, that differs from property value.
     */
     protected PropertyTester ColorTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             if (util.ValueComparer.equalValue(oldValue, new Integer(17)))
                 return new Integer(25);
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlContainerModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlContainerModel.java
index dfb2f275de2a..92d820caf1f0 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlContainerModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlContainerModel.java
@@ -42,6 +42,7 @@ public class _UnoControlContainerModel extends MultiPropertyTest {
     * Redefined method returns value, that differs from property value.
     */
     protected PropertyTester ColorTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             if (util.ValueComparer.equalValue(oldValue, new Integer(17)))
                 return new Integer(25);
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlCurrencyFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlCurrencyFieldModel.java
index a776520ca430..17bc0a67b987 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlCurrencyFieldModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlCurrencyFieldModel.java
@@ -54,6 +54,7 @@ public class _UnoControlCurrencyFieldModel extends MultiPropertyTest {
     */
     public void _BackgroundColor() {
         testProperty("BackgroundColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String prop, Object old) {
                 return utils.isVoid(old) ? new Integer(6543) : null ;
             }
@@ -66,6 +67,7 @@ public class _UnoControlCurrencyFieldModel extends MultiPropertyTest {
     */
     public void _Tabstop() {
         testProperty("Tabstop", new PropertyTester() {
+            @Override
             protected Object getNewValue(String prop, Object old) {
                 return utils.isVoid(old) ? new Boolean(true) : null ;
             }
@@ -78,6 +80,7 @@ public class _UnoControlCurrencyFieldModel extends MultiPropertyTest {
     */
     public void _BorderColor() {
         testProperty("BorderColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(1234) : null ;
             }
@@ -90,6 +93,7 @@ public class _UnoControlCurrencyFieldModel extends MultiPropertyTest {
     */
     public void _TextColor() {
         testProperty("TextColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String prop, Object old) {
                 return utils.isVoid(old) ? new Integer(123) : null ;
             }
@@ -102,6 +106,7 @@ public class _UnoControlCurrencyFieldModel extends MultiPropertyTest {
     */
     public void _TextLineColor() {
         testProperty("TextLineColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String prop, Object old) {
                 return utils.isVoid(old) ? new Integer(123) : null ;
             }
@@ -114,6 +119,7 @@ public class _UnoControlCurrencyFieldModel extends MultiPropertyTest {
     */
     public void _Value() {
         testProperty("Value", new PropertyTester() {
+            @Override
             protected Object getNewValue(String prop, Object old) {
                 return utils.isVoid(old) ? new Double(777) :
                     super.getNewValue(prop, old) ;
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlDateFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlDateFieldModel.java
index 4134afe1bd31..a9f8626754b0 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlDateFieldModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlDateFieldModel.java
@@ -53,6 +53,7 @@ public class _UnoControlDateFieldModel extends MultiPropertyTest {
     */
     public void _BackgroundColor() {
         testProperty("BackgroundColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String prop, Object old) {
                 return utils.isVoid(old) ? new Integer(6543) : null ;
             }
@@ -65,6 +66,7 @@ public class _UnoControlDateFieldModel extends MultiPropertyTest {
     */
     public void _BorderColor() {
         testProperty("BorderColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(1234) : null ;
             }
@@ -78,6 +80,7 @@ public class _UnoControlDateFieldModel extends MultiPropertyTest {
     */
     public void _Date() {
         testProperty("Date", new PropertyTester() {
+            @Override
             protected Object getNewValue(String prop, Object old) {
                 return utils.isVoid(old) ? new Integer(6543) :
                     super.getNewValue(prop, old) ;
@@ -91,6 +94,7 @@ public class _UnoControlDateFieldModel extends MultiPropertyTest {
     */
     public void _Tabstop() {
         testProperty("Tabstop", new PropertyTester() {
+            @Override
             protected Object getNewValue(String prop, Object old) {
                 return utils.isVoid(old) ? new Boolean(true) : null ;
             }
@@ -103,6 +107,7 @@ public class _UnoControlDateFieldModel extends MultiPropertyTest {
     */
     public void _TextColor() {
         testProperty("TextColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String prop, Object old) {
                 return utils.isVoid(old) ? new Integer(123) : null ;
             }
@@ -113,6 +118,7 @@ public class _UnoControlDateFieldModel extends MultiPropertyTest {
     * Redefined method returns value, that differs from property value.
     */
     protected PropertyTester ColorTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             if (util.ValueComparer.equalValue(oldValue, new Integer(17)))
                 return new Integer(25);
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlDialogModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlDialogModel.java
index 1dc8e5e5b1c0..7d4216d39cd3 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlDialogModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlDialogModel.java
@@ -45,6 +45,7 @@ public class _UnoControlDialogModel extends MultiPropertyTest {
     */
     public void _BackgroundColor() {
         testProperty("BackgroundColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(4321) : null ;
             }
@@ -57,6 +58,7 @@ public class _UnoControlDialogModel extends MultiPropertyTest {
     */
     public void _TextColor() {
         testProperty("TextColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(4321) : null ;
             }
@@ -69,6 +71,7 @@ public class _UnoControlDialogModel extends MultiPropertyTest {
     */
     public void _TextLineColor() {
         testProperty("TextLineColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(4321) : null ;
             }
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlEditModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlEditModel.java
index f09d727855b0..4820a9163cad 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlEditModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlEditModel.java
@@ -55,6 +55,7 @@ public class _UnoControlEditModel extends MultiPropertyTest {
     */
     public void _BackgroundColor() {
         testProperty("BackgroundColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(1234) : null ;
             }
@@ -67,6 +68,7 @@ public class _UnoControlEditModel extends MultiPropertyTest {
     */
     public void _BorderColor() {
         testProperty("BorderColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(1234) : null ;
             }
@@ -79,6 +81,7 @@ public class _UnoControlEditModel extends MultiPropertyTest {
     */
     public void _TextColor() {
         testProperty("TextColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(4321) : null ;
             }
@@ -91,6 +94,7 @@ public class _UnoControlEditModel extends MultiPropertyTest {
     */
     public void _Tabstop() {
         testProperty("Tabstop", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Boolean(true) : null ;
             }
@@ -101,6 +105,7 @@ public class _UnoControlEditModel extends MultiPropertyTest {
     * Redefined method returns value, that differs from property value.
     */
     protected PropertyTester ColorTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             if (util.ValueComparer.equalValue(oldValue, new Integer(17)))
                 return new Integer(25);
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlFileControlModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlFileControlModel.java
index d55e56e4ab48..97354b886738 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlFileControlModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlFileControlModel.java
@@ -51,6 +51,7 @@ public class _UnoControlFileControlModel extends MultiPropertyTest {
     */
     public void _BackgroundColor() {
         testProperty("BackgroundColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(1234) : null ;
             }
@@ -63,6 +64,7 @@ public class _UnoControlFileControlModel extends MultiPropertyTest {
     */
     public void _BorderColor() {
         testProperty("BorderColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(1234) : null ;
             }
@@ -75,6 +77,7 @@ public class _UnoControlFileControlModel extends MultiPropertyTest {
     */
     public void _TextColor() {
         testProperty("TextColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(4321) : null ;
             }
@@ -87,6 +90,7 @@ public class _UnoControlFileControlModel extends MultiPropertyTest {
     */
     public void _TextLineColor() {
         testProperty("TextLineColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(4321) : null ;
             }
@@ -99,6 +103,7 @@ public class _UnoControlFileControlModel extends MultiPropertyTest {
     */
     public void _Tabstop() {
         testProperty("Tabstop", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Boolean(true) : null ;
             }
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlFixedLineModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlFixedLineModel.java
index 6167caf4d086..52bf9fd262c8 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlFixedLineModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlFixedLineModel.java
@@ -46,6 +46,7 @@ public class _UnoControlFixedLineModel extends MultiPropertyTest {
     */
     public void _TextColor() {
         testProperty("TextColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(4321) : null ;
             }
@@ -58,6 +59,7 @@ public class _UnoControlFixedLineModel extends MultiPropertyTest {
     */
     public void _TextLineColor() {
         testProperty("TextLineColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(4321) : null ;
             }
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlFixedTextModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlFixedTextModel.java
index 889d8aaa86f1..dd4ee692761a 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlFixedTextModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlFixedTextModel.java
@@ -48,6 +48,7 @@ public class _UnoControlFixedTextModel extends MultiPropertyTest {
     */
     public void _BackgroundColor() {
         testProperty("BackgroundColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(1234) : null ;
             }
@@ -60,6 +61,7 @@ public class _UnoControlFixedTextModel extends MultiPropertyTest {
     */
     public void _BorderColor() {
         testProperty("BorderColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(1234) : null ;
             }
@@ -72,6 +74,7 @@ public class _UnoControlFixedTextModel extends MultiPropertyTest {
     */
     public void _TextColor() {
         testProperty("TextColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(4321) : null ;
             }
@@ -82,6 +85,7 @@ public class _UnoControlFixedTextModel extends MultiPropertyTest {
     * Redefined method returns value, that differs from property value.
     */
     protected PropertyTester ColorTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             if (util.ValueComparer.equalValue(oldValue, new Integer(17)))
                 return new Integer(25);
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java
index 61471d9c7bc0..ae22942e0138 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java
@@ -59,6 +59,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest {
     *
     */
     protected PropertyTester ControlTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             if (util.ValueComparer.equalValue(oldValue,
                         "com.sun.star.form.control.FormattedField"))
@@ -82,6 +83,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest {
     */
     public void _BorderColor() {
         testProperty("BorderColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(1234) : null ;
             }
@@ -94,6 +96,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest {
     */
     public void _TextColor() {
         testProperty("TextColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object v) {
                 return utils.isVoid(v) ? new Integer(123) :
                     super.getNewValue(p,v) ;
@@ -107,6 +110,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest {
     */
     public void _TextLineColor() {
         testProperty("TextLineColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object v) {
                 return utils.isVoid(v) ? new Integer(123) :
                     super.getNewValue(p,v) ;
@@ -120,6 +124,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest {
     */
     public void _BackgroundColor() {
         testProperty("BackgroundColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object v) {
                 return utils.isVoid(v) ? new Integer(123) :
                     super.getNewValue(p,v) ;
@@ -149,6 +154,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest {
     */
     public void _EffectiveMax() {
         testProperty("EffectiveMax", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object v) {
                 return utils.isVoid(v) ? new Double(123.8) :
                     super.getNewValue(p,v) ;
@@ -162,6 +168,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest {
     */
     public void _FormatsSupplier() {
         testProperty("FormatsSupplier", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object v) {
                 Object newValue = null;
                 try {
@@ -179,6 +186,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest {
     */
     public void _EffectiveMin() {
         testProperty("EffectiveMin", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object v) {
                 return utils.isVoid(v) ? new Double(0.1) :
                     super.getNewValue(p,v) ;
@@ -192,6 +200,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest {
     */
     public void _FormatKey() {
         testProperty("FormatKey", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object v) {
                 return utils.isVoid(v) ? new Integer(0) :
                     super.getNewValue(p,v) ;
@@ -205,6 +214,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest {
     */
     public void _StrictFromat() {
         testProperty("StrictFromat", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object v) {
                 return utils.isVoid(v) ? new Boolean(true) :
                     super.getNewValue(p,v) ;
@@ -218,6 +228,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest {
     */
     public void _Tabstop() {
         testProperty("Tabstop", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object v) {
                 return utils.isVoid(v) ? new Boolean(true) :
                     null ;
@@ -231,6 +242,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest {
     */
     public void _Text() {
         testProperty("Text", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object v) {
                 return utils.isVoid(v) ? "UnoControlFormattedFieldModel" :
                     super.getNewValue(p,v) ;
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlGroupBoxModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlGroupBoxModel.java
index e330485bd669..965b96aa2eb5 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlGroupBoxModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlGroupBoxModel.java
@@ -44,6 +44,7 @@ public class _UnoControlGroupBoxModel extends MultiPropertyTest {
     */
     public void _TextColor() {
         testProperty("TextColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(4321) :
                     super.getNewValue(p, old) ;
@@ -55,6 +56,7 @@ public class _UnoControlGroupBoxModel extends MultiPropertyTest {
     * Redefined method returns value, that differs from property value.
     */
     protected PropertyTester ColorTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             if (util.ValueComparer.equalValue(oldValue, new Integer(17)))
                 return new Integer(25);
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlImageControlModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlImageControlModel.java
index d2cdbb4cabb8..518644321931 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlImageControlModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlImageControlModel.java
@@ -42,6 +42,7 @@ public class _UnoControlImageControlModel extends MultiPropertyTest {
     * Custom <code>PropertyTester</code> used in <code>ImageURL</code> test.
     */
     protected PropertyTester URLTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue)
                 throws java.lang.IllegalArgumentException {
             if (oldValue.equals(util.utils.getFullTestURL("space-metal.jpg")))
@@ -64,6 +65,7 @@ public class _UnoControlImageControlModel extends MultiPropertyTest {
     */
     public void _BackgroundColor() {
         testProperty("BackgroundColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String propName, Object oldValue) {
                 return utils.isVoid(oldValue) ? new Integer(8945) :
                     super.getNewValue(propName, oldValue) ;
@@ -77,6 +79,7 @@ public class _UnoControlImageControlModel extends MultiPropertyTest {
     */
     public void _BorderColor() {
         testProperty("BorderColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(1234) : null ;
             }
@@ -89,6 +92,7 @@ public class _UnoControlImageControlModel extends MultiPropertyTest {
     */
     public void _Tabstop() {
         testProperty("Tabstop", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object v) {
                 return utils.isVoid(v) ? new Boolean(true) :
                     null ;
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlListBoxModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlListBoxModel.java
index 4f97111aaa2c..49c1377e4012 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlListBoxModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlListBoxModel.java
@@ -51,6 +51,7 @@ public class _UnoControlListBoxModel extends MultiPropertyTest {
     */
     public void _BackgroundColor() {
         testProperty("BackgroundColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(1234) : null ;
             }
@@ -63,6 +64,7 @@ public class _UnoControlListBoxModel extends MultiPropertyTest {
     */
     public void _BorderColor() {
         testProperty("BorderColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(1234) : null ;
             }
@@ -75,6 +77,7 @@ public class _UnoControlListBoxModel extends MultiPropertyTest {
     */
     public void _TextColor() {
         testProperty("TextColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(4321) : null ;
             }
@@ -87,6 +90,7 @@ public class _UnoControlListBoxModel extends MultiPropertyTest {
     */
     public void _Tabstop() {
         testProperty("Tabstop", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Boolean(true) : null ;
             }
@@ -97,6 +101,7 @@ public class _UnoControlListBoxModel extends MultiPropertyTest {
     * Redefined method returns value, that differs from property value.
     */
     protected PropertyTester ColorTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             if (util.ValueComparer.equalValue(oldValue, new Integer(17)))
                 return new Integer(25);
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlNumericFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlNumericFieldModel.java
index d2860168f206..724ac84e975d 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlNumericFieldModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlNumericFieldModel.java
@@ -54,6 +54,7 @@ public class _UnoControlNumericFieldModel extends MultiPropertyTest {
     */
     public void _BackgroundColor() {
         testProperty("BackgroundColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(1234) : null ;
             }
@@ -66,6 +67,7 @@ public class _UnoControlNumericFieldModel extends MultiPropertyTest {
     */
     public void _BorderColor() {
         testProperty("BorderColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(1234) : null ;
             }
@@ -78,6 +80,7 @@ public class _UnoControlNumericFieldModel extends MultiPropertyTest {
     */
     public void _TextColor() {
         testProperty("TextColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(4321) : null ;
             }
@@ -90,6 +93,7 @@ public class _UnoControlNumericFieldModel extends MultiPropertyTest {
     */
     public void _TextLineColor() {
         testProperty("TextLineColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(4321) : null ;
             }
@@ -102,6 +106,7 @@ public class _UnoControlNumericFieldModel extends MultiPropertyTest {
     */
     public void _Tabstop() {
         testProperty("Tabstop", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Boolean(true) : null ;
             }
@@ -114,6 +119,7 @@ public class _UnoControlNumericFieldModel extends MultiPropertyTest {
     */
     public void _Value() {
         testProperty("Value", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Double(234.89) :
                     super.getNewValue(p, old) ;
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlPatternFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlPatternFieldModel.java
index ca6f8a93b9a3..0cbd17cd9d40 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlPatternFieldModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlPatternFieldModel.java
@@ -50,6 +50,7 @@ public class _UnoControlPatternFieldModel extends MultiPropertyTest {
     */
     public void _BackgroundColor() {
         testProperty("BackgroundColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(1234) : null ;
             }
@@ -62,6 +63,7 @@ public class _UnoControlPatternFieldModel extends MultiPropertyTest {
     */
     public void _BorderColor() {
         testProperty("BorderColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(1234) : null ;
             }
@@ -74,6 +76,7 @@ public class _UnoControlPatternFieldModel extends MultiPropertyTest {
     */
     public void _TextColor() {
         testProperty("TextColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(4321) : null ;
             }
@@ -86,6 +89,7 @@ public class _UnoControlPatternFieldModel extends MultiPropertyTest {
     */
     public void _TextLineColor() {
         testProperty("TextLineColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(4321) : null ;
             }
@@ -98,6 +102,7 @@ public class _UnoControlPatternFieldModel extends MultiPropertyTest {
     */
     public void _Tabstop() {
         testProperty("Tabstop", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Boolean(true) : null ;
             }
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlProgressBarModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlProgressBarModel.java
index a60a40192862..cc1bca447949 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlProgressBarModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlProgressBarModel.java
@@ -48,6 +48,7 @@ public class _UnoControlProgressBarModel extends MultiPropertyTest {
     */
     public void _BackgroundColor() {
         testProperty("BackgroundColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(1234) : null ;
             }
@@ -60,6 +61,7 @@ public class _UnoControlProgressBarModel extends MultiPropertyTest {
     */
     public void _FillColor() {
         testProperty("FillColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(4321) : null ;
             }
@@ -72,6 +74,7 @@ public class _UnoControlProgressBarModel extends MultiPropertyTest {
     */
     public void _ProgressValue() {
         testProperty("ProgressValue", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(10) : null ;
             }
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlRadioButtonModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlRadioButtonModel.java
index 5d8faa2158b5..84302c1484a4 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlRadioButtonModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlRadioButtonModel.java
@@ -45,6 +45,7 @@ public class _UnoControlRadioButtonModel extends MultiPropertyTest {
     */
     public void _TextColor() {
         testProperty("TextColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(4321) : null ;
             }
@@ -57,6 +58,7 @@ public class _UnoControlRadioButtonModel extends MultiPropertyTest {
     */
     public void _Tabstop() {
         testProperty("Tabstop", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Boolean(true) : null ;
             }
@@ -67,6 +69,7 @@ public class _UnoControlRadioButtonModel extends MultiPropertyTest {
     * Redefined method returns value, that differs from property value.
     */
     protected PropertyTester ColorTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             if (util.ValueComparer.equalValue(oldValue, new Integer(17)))
                 return new Integer(25);
@@ -90,6 +93,7 @@ public class _UnoControlRadioButtonModel extends MultiPropertyTest {
     */
     public void _BackgroundColor() {
         testProperty("BackgroundColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(1234) : null ;
             }
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlScrollBarModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlScrollBarModel.java
index c503adc3c379..77d75160716e 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlScrollBarModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlScrollBarModel.java
@@ -49,6 +49,7 @@ public class _UnoControlScrollBarModel extends MultiPropertyTest {
     */
     public void _BackgroundColor() {
         testProperty("BackgroundColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(32768) : null ;
             }
@@ -61,6 +62,7 @@ public class _UnoControlScrollBarModel extends MultiPropertyTest {
     */
     public void _BorderColor() {
         testProperty("BorderColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(1234) : null ;
             }
@@ -73,6 +75,7 @@ public class _UnoControlScrollBarModel extends MultiPropertyTest {
     */
     public void _SymbolColor() {
         testProperty("SymbolColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(65324) : null ;
             }
@@ -85,6 +88,7 @@ public class _UnoControlScrollBarModel extends MultiPropertyTest {
     */
     public void _ScrollValue() {
         testProperty("ScrollValue", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(10) : new Integer(15) ;
             }
@@ -97,6 +101,7 @@ public class _UnoControlScrollBarModel extends MultiPropertyTest {
     */
     public void _VisibleSize() {
         testProperty("VisibleSize", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(10) : null ;
             }
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlSpinButtonModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlSpinButtonModel.java
index d48ff910cbbb..7c4fd15a288f 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlSpinButtonModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlSpinButtonModel.java
@@ -29,6 +29,7 @@ public class _UnoControlSpinButtonModel extends MultiPropertyTest {
     */
     public void _BackgroundColor() {
         testProperty("BackgroundColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(32768) : null ;
             }
@@ -41,6 +42,7 @@ public class _UnoControlSpinButtonModel extends MultiPropertyTest {
     */
     public void _BorderColor() {
         testProperty("BorderColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(1234) : null ;
             }
@@ -53,6 +55,7 @@ public class _UnoControlSpinButtonModel extends MultiPropertyTest {
     */
     public void _SymbolColor() {
         testProperty("SymbolColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(65324) : null ;
             }
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlTimeFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlTimeFieldModel.java
index 013ec9c5262c..13824c0da596 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlTimeFieldModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlTimeFieldModel.java
@@ -58,6 +58,7 @@ public class _UnoControlTimeFieldModel extends MultiPropertyTest {
     */
     public void _BackgroundColor() {
         testProperty("BackgroundColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(1234) : null ;
             }
@@ -70,6 +71,7 @@ public class _UnoControlTimeFieldModel extends MultiPropertyTest {
     */
     public void _BorderColor() {
         testProperty("BorderColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(1234) : null ;
             }
@@ -82,6 +84,7 @@ public class _UnoControlTimeFieldModel extends MultiPropertyTest {
     */
     public void _TextColor() {
         testProperty("TextColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(4321) : null ;
             }
@@ -94,6 +97,7 @@ public class _UnoControlTimeFieldModel extends MultiPropertyTest {
      */
     public void _TextLineColor() {
         testProperty("TextLineColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(4321) : null ;
             }
@@ -106,6 +110,7 @@ public class _UnoControlTimeFieldModel extends MultiPropertyTest {
     */
     public void _Time() {
         testProperty("Time", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(4321) :
                     super.getNewValue(p, old) ;
@@ -119,6 +124,7 @@ public class _UnoControlTimeFieldModel extends MultiPropertyTest {
     */
     public void _Tabstop() {
         testProperty("Tabstop", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Boolean(true) : null ;
             }
diff --git a/qadevOOo/tests/java/ifc/awt/_XDataTransferProviderAccess.java b/qadevOOo/tests/java/ifc/awt/_XDataTransferProviderAccess.java
index 6e40508f556f..54c273a708e5 100644
--- a/qadevOOo/tests/java/ifc/awt/_XDataTransferProviderAccess.java
+++ b/qadevOOo/tests/java/ifc/awt/_XDataTransferProviderAccess.java
@@ -57,6 +57,7 @@ public class _XDataTransferProviderAccess extends MultiMethodTest {
     * Retrieves object relations.
     * @throws StatusException If one of relations not found.
     */
+    @Override
     public void before() {
         win = (XWindow) tEnv.getObjRelation
             ("XDataTransferProviderAccess.XWindow") ;
diff --git a/qadevOOo/tests/java/ifc/awt/_XDialog.java b/qadevOOo/tests/java/ifc/awt/_XDialog.java
index 8f5eeefd0f06..8b9f6aa527b7 100644
--- a/qadevOOo/tests/java/ifc/awt/_XDialog.java
+++ b/qadevOOo/tests/java/ifc/awt/_XDialog.java
@@ -141,6 +141,7 @@ public class _XDialog extends MultiMethodTest {
     /**
     * Disposes object environment.
     */
+    @Override
     public void after() {
         disposeEnvironment() ;
     }
diff --git a/qadevOOo/tests/java/ifc/awt/_XImageProducer.java b/qadevOOo/tests/java/ifc/awt/_XImageProducer.java
index 681a46a831c7..70b4d9322e04 100644
--- a/qadevOOo/tests/java/ifc/awt/_XImageProducer.java
+++ b/qadevOOo/tests/java/ifc/awt/_XImageProducer.java
@@ -95,6 +95,7 @@ public class _XImageProducer extends MultiMethodTest {
     /**
     * Creates a new XImageConsumer implementation.
     */
+    @Override
     public void before() {
         consumer = new TestImageConsumer(log) ;
     }
diff --git a/qadevOOo/tests/java/ifc/awt/_XItemListener.java b/qadevOOo/tests/java/ifc/awt/_XItemListener.java
index f8def1598a50..8bd31ed04ba8 100644
--- a/qadevOOo/tests/java/ifc/awt/_XItemListener.java
+++ b/qadevOOo/tests/java/ifc/awt/_XItemListener.java
@@ -70,6 +70,7 @@ public class _XItemListener extends MultiMethodTest {
     * Retrieves object relation.
     * @throws StatusException If the relation not found.
     */
+    @Override
     public void before() {
         itemListener = (TestItemListener) tEnv.getObjRelation("TestItemListener") ;
         if (itemListener == null)
diff --git a/qadevOOo/tests/java/ifc/awt/_XListBox.java b/qadevOOo/tests/java/ifc/awt/_XListBox.java
index e8c128025678..7d49ee226a50 100644
--- a/qadevOOo/tests/java/ifc/awt/_XListBox.java
+++ b/qadevOOo/tests/java/ifc/awt/_XListBox.java
@@ -103,6 +103,7 @@ public class _XListBox extends MultiMethodTest {
     * Retrieves object relations.
     * @throws StatusException If one of relations not found.
     */
+    @Override
     public void before() {
         itemCount = oObj.getItemCount();
     }
diff --git a/qadevOOo/tests/java/ifc/awt/_XTextComponent.java b/qadevOOo/tests/java/ifc/awt/_XTextComponent.java
index cce6b8cdecf0..ae8de12c7efa 100644
--- a/qadevOOo/tests/java/ifc/awt/_XTextComponent.java
+++ b/qadevOOo/tests/java/ifc/awt/_XTextComponent.java
@@ -75,6 +75,7 @@ public class _XTextComponent extends MultiMethodTest {
     * Retrieves object relation, then sets flag 'num' to 'true'
     * if relation is not null.
     */
+    @Override
     public void before() {
         if (tEnv.getObjRelation("XTextComponent.onlyNumbers") != null)
             num = true;
diff --git a/qadevOOo/tests/java/ifc/awt/_XTextListener.java b/qadevOOo/tests/java/ifc/awt/_XTextListener.java
index 632422e9bf8f..ded65478433d 100644
--- a/qadevOOo/tests/java/ifc/awt/_XTextListener.java
+++ b/qadevOOo/tests/java/ifc/awt/_XTextListener.java
@@ -72,6 +72,7 @@ public class _XTextListener extends MultiMethodTest {
     * Retrieves object relation.
     * @throws StatusException If the relation not found.
     */
+    @Override
     public void before() {
         textListener = (TestTextListener)
             tEnv.getObjRelation("TestTextListener");
@@ -110,6 +111,7 @@ public class _XTextListener extends MultiMethodTest {
     /**
     * Forces environment recreation.
     */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/awt/_XTopWindow.java b/qadevOOo/tests/java/ifc/awt/_XTopWindow.java
index 3c9cf9e5ba2b..290f4de21670 100644
--- a/qadevOOo/tests/java/ifc/awt/_XTopWindow.java
+++ b/qadevOOo/tests/java/ifc/awt/_XTopWindow.java
@@ -95,6 +95,7 @@ public class _XTopWindow extends MultiMethodTest {
     XTextDocument aTextDoc = null;
 
 
+    @Override
     protected void before() {
         aTextDoc = util.WriterTools.createTextDoc(tParam.getMSF());
     }
@@ -181,6 +182,7 @@ public class _XTopWindow extends MultiMethodTest {
     /**
      * Disposes the document created in <code>before</code> method.
      */
+    @Override
     protected void after() {
         aTextDoc.dispose();
     }
diff --git a/qadevOOo/tests/java/ifc/awt/_XUnoControlContainer.java b/qadevOOo/tests/java/ifc/awt/_XUnoControlContainer.java
index 451c1d7852c3..daf791ede429 100644
--- a/qadevOOo/tests/java/ifc/awt/_XUnoControlContainer.java
+++ b/qadevOOo/tests/java/ifc/awt/_XUnoControlContainer.java
@@ -51,6 +51,7 @@ public class _XUnoControlContainer extends MultiMethodTest {
      * This method gets the object relations.
      *
      */
+    @Override
     protected void before() {
 
         tabControl1 = (XTabController) tEnv.getObjRelation("TABCONTROL1");
diff --git a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java
index 9b3a2b54a709..7440670bf68e 100644
--- a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java
+++ b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java
@@ -93,6 +93,7 @@ public class _XUserInputInterception extends MultiMethodTest {
     /** get the object rlation XUserInputInterception.XModel from the
      * test environment
      */
+    @Override
     protected void before() {
         log.print("try to get object relation 'XUserInputInterception.XModel': ");
         m_XModel = (XModel)tEnv.getObjRelation("XUserInputInterception.XModel");
@@ -235,6 +236,7 @@ public class _XUserInputInterception extends MultiMethodTest {
     /**
     * Forces environment recreation.
     */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
@@ -432,6 +434,7 @@ public class _XUserInputInterception extends MultiMethodTest {
          *    </LI>
          * </UL>
          */
+        @Override
         public void run(){
 
             switch (this.eventType){
diff --git a/qadevOOo/tests/java/ifc/awt/_XView.java b/qadevOOo/tests/java/ifc/awt/_XView.java
index 36fda94fd470..a7858d037dc5 100644
--- a/qadevOOo/tests/java/ifc/awt/_XView.java
+++ b/qadevOOo/tests/java/ifc/awt/_XView.java
@@ -126,6 +126,7 @@ public class _XView extends MultiMethodTest {
     /**
     * Forces environment recreation.
     */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeNode.java b/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeNode.java
index 75060dc1b36b..1c8cd3c1be29 100644
--- a/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeNode.java
+++ b/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeNode.java
@@ -51,6 +51,7 @@ public class _XMutableTreeNode extends MultiMethodTest {
         public XMutableTreeNode createNode(String name);
     }
 
+    @Override
     public void before(){
         nodeCreator = (XMutableTreeNodeCreator) tEnv.getObjRelation("XMutableTreeNodeCreator");
         if (nodeCreator == null){
diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java b/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java
index 0a939d78287b..ff19b9cac4f2 100644
--- a/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java
+++ b/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java
@@ -203,6 +203,7 @@ public class _XTreeControl extends MultiMethodTest {
         mTreeNodeEdit2 = false;
     }
 
+    @Override
     public void before(){
         mXNode = (XMutableTreeNode) tEnv.getObjRelation("XTreeControl_Node");
         if (mXNode == null) {
diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XTreeDataModel.java b/qadevOOo/tests/java/ifc/awt/tree/_XTreeDataModel.java
index dc81150b8907..92e1d56714fc 100644
--- a/qadevOOo/tests/java/ifc/awt/tree/_XTreeDataModel.java
+++ b/qadevOOo/tests/java/ifc/awt/tree/_XTreeDataModel.java
@@ -102,6 +102,7 @@ public class _XTreeDataModel extends MultiMethodTest {
 
     }
 
+    @Override
     public void before(){
         mListenerEvent = (XTreeDataModelListenerEvent) tEnv.getObjRelation("XTreeDataModelListenerEvent");
         if (mListenerEvent == null) {
diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java b/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java
index a425cf590f43..498a9ecb7019 100644
--- a/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java
+++ b/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java
@@ -53,6 +53,7 @@ public class _XTreeNode extends MultiMethodTest {
     String msNodeGraphicURL = null;
 
 
+    @Override
     public void before(){
         msDisplayValue = (String) tEnv.getObjRelation("XTreeNode_DisplayValue");
         if (msDisplayValue == null){
diff --git a/qadevOOo/tests/java/ifc/beans/_XExactName.java b/qadevOOo/tests/java/ifc/beans/_XExactName.java
index e33435e530ad..ab8f6f96572d 100644
--- a/qadevOOo/tests/java/ifc/beans/_XExactName.java
+++ b/qadevOOo/tests/java/ifc/beans/_XExactName.java
@@ -74,6 +74,7 @@ public class _XExactName extends MultiMethodTest {
      * Checking if the Object relation expectedName is given
      * throw a StatusException if not.
      */
+    @Override
     protected void before() {
         expectedName = (String) tEnv.getObjRelation("expectedName");
 
diff --git a/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java
index 6ee8c0c611c9..c30fc2bcfbc0 100644
--- a/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java
@@ -62,7 +62,8 @@ public class _XFastPropertySet extends MultiMethodTest {
     /**
      * Retrieves relation.
      */
-     protected void before() {
+     @Override
+    protected void before() {
         exclude = (Set<String>) tEnv.getObjRelation("XFastPropertySet.ExcludeProps") ;
         if (exclude == null) {
             exclude = new java.util.HashSet<String>() ;
diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java
index 9fe62d5442f5..7b000c059a2e 100644
--- a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java
@@ -76,6 +76,7 @@ public class _XMultiPropertySet extends MultiMethodTest {
     /**
     * Initializes some fields.
     */
+    @Override
     public void before() {
         exclProps = (Set<String>) tEnv.getObjRelation("XMultiPropertySet.ExcludeProps");
         if (exclProps == null) exclProps = new HashSet<String>(0);
@@ -354,6 +355,7 @@ public class _XMultiPropertySet extends MultiMethodTest {
     /*
     * Does nothing.
     */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java b/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java
index bbe5fa1916ba..81836c2c9b26 100644
--- a/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java
+++ b/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java
@@ -49,6 +49,7 @@ public class _XMultiPropertyStates extends MultiMethodTest {
     private PropertyState[] states = null;
     private String[] names = null;
 
+    @Override
     public void before() {
         names = (String[]) tEnv.getObjRelation("PropertyNames");
         if (names == null) {
diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java b/qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java
index 0a7d55aa2cad..0b05dbea4fe4 100644
--- a/qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java
+++ b/qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java
@@ -55,6 +55,7 @@ public class _XPropertyAccess extends MultiMethodTest {
      * checks if the object relation <CODE>XPropertyAccess.propertyToChange</CODE>
      * is available
      */
+    @Override
     public void before() {
         propertyToChange = (PropertyValue) tEnv.getObjRelation("XPropertyAccess.propertyToChange");
         if (propertyToChange == null) {
diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java b/qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java
index 5befa68df01b..53274d15cffc 100644
--- a/qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java
+++ b/qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java
@@ -55,6 +55,7 @@ public class _XPropertyContainer extends MultiMethodTest {
      * checks if the object relation <CODE>XPropertyAccess.propertyNotRemovable</CODE>
      * is available
      */
+    @Override
     public void before() {
         propertyNotRemovable = (String) tEnv.getObjRelation("XPropertyContainer.propertyNotRemovable");
         if (propertyNotRemovable == null) {
diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XPropertySet.java
index a31542c19330..17ab69014769 100644
--- a/qadevOOo/tests/java/ifc/beans/_XPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XPropertySet.java
@@ -657,6 +657,7 @@ public class _XPropertySet extends MultiMethodTest {
     /**
     * Forces environment recreation.
     */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertyState.java b/qadevOOo/tests/java/ifc/beans/_XPropertyState.java
index babc1c463fa1..046e1ef30220 100644
--- a/qadevOOo/tests/java/ifc/beans/_XPropertyState.java
+++ b/qadevOOo/tests/java/ifc/beans/_XPropertyState.java
@@ -69,6 +69,7 @@ public class _XPropertyState extends MultiMethodTest {
         * @throws StatusException If <code>XPropertySet</code> is not
         * implemented by object.
         */
+        @Override
         public void before() throws StatusException {
             oPS = UnoRuntime.queryInterface( XPropertySet.class, oObj );
             if (oPS == null)
@@ -256,6 +257,7 @@ public class _XPropertyState extends MultiMethodTest {
             tRes.tested("setPropertyToDefault()", result);
         }
 
+        @Override
         public void after() {
             disposeEnvironment() ;
         }
diff --git a/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java
index 5d38019a41d6..8b5bb5c0b4c8 100644
--- a/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java
@@ -56,6 +56,7 @@ public class _XTolerantMultiPropertySet extends MultiMethodTest {
      * to get the direct properties<br>
      * Throws a lib StatusException if the Component doesn't support XPropertySet or XPropertyState
      */
+    @Override
     public void before() {
         PS = UnoRuntime.queryInterface(XPropertySet.class,
                                                       tEnv.getTestObject());
diff --git a/qadevOOo/tests/java/ifc/bridge/_XBridge.java b/qadevOOo/tests/java/ifc/bridge/_XBridge.java
index cbae96813c40..4e1833284461 100644
--- a/qadevOOo/tests/java/ifc/bridge/_XBridge.java
+++ b/qadevOOo/tests/java/ifc/bridge/_XBridge.java
@@ -60,6 +60,7 @@ public class _XBridge extends MultiMethodTest {
     * Retrieves object relations.
     * @throws StatusException If one of relations not found.
     */
+    @Override
     public void before() {
         args = (Object[])tEnv.getObjRelation("XInitialization.args");
 
@@ -131,6 +132,7 @@ public class _XBridge extends MultiMethodTest {
     /**
     * Disposes object environment.
     */
+    @Override
     public void after() {
         disposeEnvironment() ;
     }
diff --git a/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java b/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java
index 4f983612c216..f61eb5457f21 100644
--- a/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java
+++ b/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java
@@ -50,6 +50,7 @@ public class _XBridgeFactory extends MultiMethodTest {
     /**
      * Interrupts the acceptor after test is finished
      */
+    @Override
     protected void after() {
         acceptorThread.acc.stopAccepting();
         if (acceptorThread.isAlive()) {
@@ -86,6 +87,7 @@ public class _XBridgeFactory extends MultiMethodTest {
         /**
         * Call <code>accept()</code> method.
         */
+        @Override
         public void run() {
             try {
                 acceptedCall = acc.accept(connectString);
diff --git a/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java b/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java
index 22e191fe01a5..15acdcd47b44 100644
--- a/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java
+++ b/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java
@@ -107,6 +107,7 @@ public class _XUnoUrlResolver extends MultiMethodTest {
             this.connectString = connectString;
         }
 
+        @Override
         public void run() {
             try {
                 // create a connection
diff --git a/qadevOOo/tests/java/ifc/chart/_BarDiagram.java b/qadevOOo/tests/java/ifc/chart/_BarDiagram.java
index 601b6e0e570a..5b546774bf9b 100644
--- a/qadevOOo/tests/java/ifc/chart/_BarDiagram.java
+++ b/qadevOOo/tests/java/ifc/chart/_BarDiagram.java
@@ -60,6 +60,7 @@ public class _BarDiagram extends MultiPropertyTest {
     * Retrieves object relations and prepares a chart document.
     * @throws StatusException if one of relations not found.
     */
+    @Override
     protected void before() {
         log.println("Setting Diagram type to BarDiagram");
         doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC");
@@ -98,11 +99,13 @@ public class _BarDiagram extends MultiPropertyTest {
     /**
     * Sets the old diagram for a chart document.
     */
+    @Override
     protected void after() {
         doc.setDiagram(oldDiagram);
     }
 
     protected PropertyTester LineTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue)
                 throws java.lang.IllegalArgumentException {
             int a = 0;
diff --git a/qadevOOo/tests/java/ifc/chart/_Chart3DBarProperties.java b/qadevOOo/tests/java/ifc/chart/_Chart3DBarProperties.java
index 99bb00065ddb..a255ae217414 100644
--- a/qadevOOo/tests/java/ifc/chart/_Chart3DBarProperties.java
+++ b/qadevOOo/tests/java/ifc/chart/_Chart3DBarProperties.java
@@ -50,6 +50,7 @@ public class _Chart3DBarProperties extends MultiPropertyTest {
     * Retrieves object relations and prepares a chart document.
     * @throws StatusException if one of relations not found.
     */
+    @Override
     protected void before() {
         log.println("Setting Diagram type to BarDiagram");
         XChartDocument doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC");
@@ -87,6 +88,7 @@ public class _Chart3DBarProperties extends MultiPropertyTest {
     /**
     * Sets the diagram back to 2D as 2D rendering is much faster for the following tests.
     */
+    @Override
     protected void after() {
         log.println("Setting Diagram back to 2D");
         XChartDocument doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC");
diff --git a/qadevOOo/tests/java/ifc/chart/_ChartAxis.java b/qadevOOo/tests/java/ifc/chart/_ChartAxis.java
index dfd9bacc1288..e4932e7e021b 100644
--- a/qadevOOo/tests/java/ifc/chart/_ChartAxis.java
+++ b/qadevOOo/tests/java/ifc/chart/_ChartAxis.java
@@ -145,6 +145,7 @@ public class _ChartAxis extends MultiPropertyTest {
     }
 
     protected PropertyTester StepMainTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue)
                 throws java.lang.IllegalArgumentException {
             Double ValueToSet = (Double) ValueChanger.changePValue(oldValue);
diff --git a/qadevOOo/tests/java/ifc/chart/_ChartAxisYSupplier.java b/qadevOOo/tests/java/ifc/chart/_ChartAxisYSupplier.java
index 0253e8c34cfe..62eb9748fbba 100644
--- a/qadevOOo/tests/java/ifc/chart/_ChartAxisYSupplier.java
+++ b/qadevOOo/tests/java/ifc/chart/_ChartAxisYSupplier.java
@@ -49,6 +49,7 @@ public class _ChartAxisYSupplier extends MultiPropertyTest {
     * Retrieves object relations and prepares a chart document.
     * @throws StatusException if one of relations not found.
     */
+    @Override
     protected void before() {
         XChartDocument doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC");
         if (doc == null) throw new StatusException(Status.failed
diff --git a/qadevOOo/tests/java/ifc/chart/_ChartAxisZSupplier.java b/qadevOOo/tests/java/ifc/chart/_ChartAxisZSupplier.java
index 42ba8b17af78..33e2e8afec10 100644
--- a/qadevOOo/tests/java/ifc/chart/_ChartAxisZSupplier.java
+++ b/qadevOOo/tests/java/ifc/chart/_ChartAxisZSupplier.java
@@ -52,6 +52,7 @@ public class _ChartAxisZSupplier extends MultiPropertyTest {
     * Retrieves object relations and prepares a chart document.
     * @throws StatusException if one of relations not found.
     */
+    @Override
     protected void before() {
         log.println("Setting Diagram type to BarDiagram");
         XChartDocument doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC");
@@ -186,6 +187,7 @@ public class _ChartAxisZSupplier extends MultiPropertyTest {
     /**
     * Forces environment recreation.
     */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/chart/_ChartDataPointProperties.java b/qadevOOo/tests/java/ifc/chart/_ChartDataPointProperties.java
index 7f7c878ab934..acf8e50b19bc 100644
--- a/qadevOOo/tests/java/ifc/chart/_ChartDataPointProperties.java
+++ b/qadevOOo/tests/java/ifc/chart/_ChartDataPointProperties.java
@@ -54,6 +54,7 @@ public class _ChartDataPointProperties extends MultiPropertyTest {
     * Retrieves object relations and prepares a chart document.
     * @throws StatusException if one of relations not found.
     */
+    @Override
     protected void before() {
         log.println("Setting Diagram type to LineDiagram");
         XChartDocument doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC");
@@ -68,6 +69,7 @@ public class _ChartDataPointProperties extends MultiPropertyTest {
     }
 
     protected PropertyTester URLTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue)
                 throws java.lang.IllegalArgumentException {
             return utils.getFullTestURL("space-metal.jpg");
diff --git a/qadevOOo/tests/java/ifc/chart/_ChartStatistics.java b/qadevOOo/tests/java/ifc/chart/_ChartStatistics.java
index d7f3be6cf9e4..3abbcc03cb14 100644
--- a/qadevOOo/tests/java/ifc/chart/_ChartStatistics.java
+++ b/qadevOOo/tests/java/ifc/chart/_ChartStatistics.java
@@ -52,6 +52,7 @@ public class _ChartStatistics extends MultiPropertyTest {
     * Retrieves object relations and prepares a chart document.
     * @throws StatusException if one of relations not found.
     */
+    @Override
     protected void before() {
         log.println("Setting Diagram type to LineDiagram");
         XChartDocument doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC");
diff --git a/qadevOOo/tests/java/ifc/chart/_ChartTableAddressSupplier.java b/qadevOOo/tests/java/ifc/chart/_ChartTableAddressSupplier.java
index 4165d5bdef3d..f3cf71a2500c 100644
--- a/qadevOOo/tests/java/ifc/chart/_ChartTableAddressSupplier.java
+++ b/qadevOOo/tests/java/ifc/chart/_ChartTableAddressSupplier.java
@@ -40,6 +40,7 @@ public class _ChartTableAddressSupplier extends MultiPropertyTest {
     */
     public void _SeriesAddresses() {
         testProperty("SeriesAddresses", new PropertyTester() {
+            @Override
             protected Object getNewValue(String propName, Object oldValue) {
                 ChartSeriesAddress[] addr = (ChartSeriesAddress[]) oldValue ;
                 ChartSeriesAddress[] newAddr = null ;
diff --git a/qadevOOo/tests/java/ifc/chart/_ChartTitle.java b/qadevOOo/tests/java/ifc/chart/_ChartTitle.java
index cb32e34bf974..29078ec3fb6d 100644
--- a/qadevOOo/tests/java/ifc/chart/_ChartTitle.java
+++ b/qadevOOo/tests/java/ifc/chart/_ChartTitle.java
@@ -37,6 +37,7 @@ public class _ChartTitle extends MultiPropertyTest {
     */
     public void _TextRotation() {
         testProperty("TextRotation", new PropertyTester() {
+            @Override
             protected Object getNewValue(String propName, Object oldValue) {
                 Object ValueToSet = ValueChanger.changePValue(oldValue);
                 int ro = ((Integer) ValueToSet).intValue() * 100;
diff --git a/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisXSupplier.java b/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisXSupplier.java
index 10b1345a6248..9cbcd9ed0d0e 100644
--- a/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisXSupplier.java
+++ b/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisXSupplier.java
@@ -52,6 +52,7 @@ public class _ChartTwoAxisXSupplier extends MultiPropertyTest {
     * Retrieves object relations and prepares a chart document.
     * @throws StatusException if one of relations not found.
     */
+    @Override
     protected void before() {
         log.println("Setting Diagram type to BarDiagram");
         doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC");
@@ -91,6 +92,7 @@ public class _ChartTwoAxisXSupplier extends MultiPropertyTest {
     /**
     * Sets the old diagram for a chart document.
     */
+    @Override
     protected void after() {
         doc.setDiagram(oldDiagram);
     }
diff --git a/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisYSupplier.java b/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisYSupplier.java
index 1333c6011b89..588242ad6a3d 100644
--- a/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisYSupplier.java
+++ b/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisYSupplier.java
@@ -52,6 +52,7 @@ public class _ChartTwoAxisYSupplier extends MultiPropertyTest {
     * Retrieves object relations and prepares a chart document.
     * @throws StatusException if one of relations not found.
     */
+    @Override
     protected void before() {
         log.println("Setting Diagram type to BarDiagram");
         doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC");
@@ -91,6 +92,7 @@ public class _ChartTwoAxisYSupplier extends MultiPropertyTest {
     /**
     * Sets the old diagram for a chart document.
     */
+    @Override
     protected void after() {
         doc.setDiagram(oldDiagram);
     }
diff --git a/qadevOOo/tests/java/ifc/chart/_Diagram.java b/qadevOOo/tests/java/ifc/chart/_Diagram.java
index 3ab90b84784c..ea4fe01ca420 100644
--- a/qadevOOo/tests/java/ifc/chart/_Diagram.java
+++ b/qadevOOo/tests/java/ifc/chart/_Diagram.java
@@ -46,6 +46,7 @@ public class _Diagram extends MultiPropertyTest {
     * Retrieves object relations and prepares a chart document.
     * @throws StatusException if one of relations not found.
     */
+    @Override
     protected void before() {
         log.println("Setting Diagram type to LineDiagram");
         XChartDocument doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC");
diff --git a/qadevOOo/tests/java/ifc/chart/_Dim3DDiagram.java b/qadevOOo/tests/java/ifc/chart/_Dim3DDiagram.java
index 0288aeb6cbf5..512bb0016c59 100644
--- a/qadevOOo/tests/java/ifc/chart/_Dim3DDiagram.java
+++ b/qadevOOo/tests/java/ifc/chart/_Dim3DDiagram.java
@@ -45,6 +45,7 @@ public class _Dim3DDiagram extends MultiPropertyTest {
     * Retrieves object relations and prepares a chart document.
     * @throws StatusException if one of relations not found.
     */
+    @Override
     protected void before() {
         log.println("Setting Diagram type to LineDiagram");
         XChartDocument doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC");
diff --git a/qadevOOo/tests/java/ifc/chart/_LineDiagram.java b/qadevOOo/tests/java/ifc/chart/_LineDiagram.java
index 4632bc8f9e66..20c99b952c09 100644
--- a/qadevOOo/tests/java/ifc/chart/_LineDiagram.java
+++ b/qadevOOo/tests/java/ifc/chart/_LineDiagram.java
@@ -62,6 +62,7 @@ public class _LineDiagram extends MultiPropertyTest {
     * Retrieves object relations.
     * @throws StatusException If one of relations not found.
     */
+    @Override
     protected void before() {
         log.println("Setting Diagram type to LineDiagram");
         doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC");
@@ -80,11 +81,13 @@ public class _LineDiagram extends MultiPropertyTest {
     /**
     * Sets the old diagram for a chart document.
     */
+    @Override
     protected void after() {
         doc.setDiagram(oldDiagram);
     }
 
     protected PropertyTester URLTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue)
                 throws java.lang.IllegalArgumentException {
             if (oldValue.equals(util.utils.getFullTestURL("space-metal.jpg")))
@@ -94,6 +97,7 @@ public class _LineDiagram extends MultiPropertyTest {
     } ;
 
     protected PropertyTester SymbolTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue)
                 throws java.lang.IllegalArgumentException {
 
@@ -106,6 +110,7 @@ public class _LineDiagram extends MultiPropertyTest {
     } ;
 
     protected PropertyTester SplineTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue)
                 throws java.lang.IllegalArgumentException {
 
diff --git a/qadevOOo/tests/java/ifc/chart/_StackableDiagram.java b/qadevOOo/tests/java/ifc/chart/_StackableDiagram.java
index bb7a36080197..9fbb2bed273e 100644
--- a/qadevOOo/tests/java/ifc/chart/_StackableDiagram.java
+++ b/qadevOOo/tests/java/ifc/chart/_StackableDiagram.java
@@ -52,6 +52,7 @@ public class _StackableDiagram extends MultiPropertyTest {
     * Retrieves object relations and prepares a chart document.
     * @throws StatusException if one of relations not found.
     */
+    @Override
     protected void before() {
         log.println("Setting Diagram type to LineDiagram");
         doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC");
@@ -71,6 +72,7 @@ public class _StackableDiagram extends MultiPropertyTest {
     /**
     * Sets the old diagram for a chart document.
     */
+    @Override
     protected void after() {
         doc.setDiagram(oldDiagram);
     }
diff --git a/qadevOOo/tests/java/ifc/chart/_StockDiagram.java b/qadevOOo/tests/java/ifc/chart/_StockDiagram.java
index d54a0e7aab44..32c0200241d0 100644
--- a/qadevOOo/tests/java/ifc/chart/_StockDiagram.java
+++ b/qadevOOo/tests/java/ifc/chart/_StockDiagram.java
@@ -52,6 +52,7 @@ public class _StockDiagram extends MultiPropertyTest {
     * Retrieves object relations and prepares a chart document.
     * @throws StatusException if one of relations not found.
     */
+    @Override
     protected void before() {
         log.println("Setting Diagram type to StockDiagram");
         doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC");
@@ -70,6 +71,7 @@ public class _StockDiagram extends MultiPropertyTest {
     /**
     * Sets the old diagram for a chart document.
     */
+    @Override
     protected void after() {
         doc.setDiagram(oldDiagram);
     }
diff --git a/qadevOOo/tests/java/ifc/chart/_XChartData.java b/qadevOOo/tests/java/ifc/chart/_XChartData.java
index e928453e0b30..c0a4bc3c7be5 100644
--- a/qadevOOo/tests/java/ifc/chart/_XChartData.java
+++ b/qadevOOo/tests/java/ifc/chart/_XChartData.java
@@ -149,6 +149,7 @@ public class _XChartData extends MultiMethodTest {
     /**
     * Forces environment recreation.
     */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java b/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java
index 5233db64848d..14e811efd67a 100644
--- a/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java
+++ b/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java
@@ -49,6 +49,7 @@ public class _XChartDataArray extends MultiMethodTest {
     private boolean mbExcludeSetRowAndSetColumn = false;
     private String msExcludeMessage;
 
+    @Override
     protected void before() {
         Object o = tEnv.getObjRelation("CRDESC");
         if (o != null) {
@@ -216,6 +217,7 @@ public class _XChartDataArray extends MultiMethodTest {
         tRes.tested("getData()", bResult);
     }
 
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/chart/_XDiagram.java b/qadevOOo/tests/java/ifc/chart/_XDiagram.java
index b1fbbf83ab97..3d02e7399924 100644
--- a/qadevOOo/tests/java/ifc/chart/_XDiagram.java
+++ b/qadevOOo/tests/java/ifc/chart/_XDiagram.java
@@ -53,6 +53,7 @@ public class _XDiagram extends MultiMethodTest {
     * Retrieves object relations.
     * @throws StatusException If one of relations not found.
     */
+    @Override
     public void before() {
         rowamount = (Integer)tEnv.getObjRelation("ROWAMOUNT");
         if (rowamount == null) throw new StatusException(Status.failed
diff --git a/qadevOOo/tests/java/ifc/chart/_XTwoAxisYSupplier.java b/qadevOOo/tests/java/ifc/chart/_XTwoAxisYSupplier.java
index 909c4d853646..bc88bdc72945 100644
--- a/qadevOOo/tests/java/ifc/chart/_XTwoAxisYSupplier.java
+++ b/qadevOOo/tests/java/ifc/chart/_XTwoAxisYSupplier.java
@@ -53,6 +53,7 @@ public class _XTwoAxisYSupplier extends MultiMethodTest {
     /**
     * Forces object environment recreation.
     */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XBackendEntities.java b/qadevOOo/tests/java/ifc/configuration/backend/_XBackendEntities.java
index e23a515ebf73..5ed64c292105 100644
--- a/qadevOOo/tests/java/ifc/configuration/backend/_XBackendEntities.java
+++ b/qadevOOo/tests/java/ifc/configuration/backend/_XBackendEntities.java
@@ -28,6 +28,7 @@ public class _XBackendEntities extends MultiMethodTest {
     String adm = "";
     public XBackendEntities oObj;
 
+    @Override
     public void before() {
         adm = (String) tEnv.getObjRelation("NoAdmin");
     }
diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XSchema.java b/qadevOOo/tests/java/ifc/configuration/backend/_XSchema.java
index 2ebea13d2c74..597d245efbd1 100644
--- a/qadevOOo/tests/java/ifc/configuration/backend/_XSchema.java
+++ b/qadevOOo/tests/java/ifc/configuration/backend/_XSchema.java
@@ -33,6 +33,7 @@ public class _XSchema extends MultiMethodTest {
     XSchemaHandlerImpl xSchemaHandlerImpl = new XSchemaHandlerImpl();
     String filename = null;
 
+    @Override
     protected void before() {
         filename = (String)tEnv.getObjRelation("ParsedFileName");
     }
diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java b/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java
index 8f1daf4b5a39..6e86d034c3e6 100644
--- a/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java
+++ b/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java
@@ -30,6 +30,7 @@ public class _XUpdateHandler extends MultiMethodTest {
     public XUpdateHandler oObj;
     protected XLayerHandlerImpl xLayerHandler = null;
 
+    @Override
     public void before() {
         xLayerHandler = (XLayerHandlerImpl) tEnv.getObjRelation("LayerHandler");
 
diff --git a/qadevOOo/tests/java/ifc/connection/_XAcceptor.java b/qadevOOo/tests/java/ifc/connection/_XAcceptor.java
index b98337070245..09ff4c65a421 100644
--- a/qadevOOo/tests/java/ifc/connection/_XAcceptor.java
+++ b/qadevOOo/tests/java/ifc/connection/_XAcceptor.java
@@ -73,6 +73,7 @@ public class _XAcceptor extends MultiMethodTest {
         /**
         * Call <code>accept()</code> method.
         */
+        @Override
         public void run() {
             try {
                 acceptedCall = acc.accept(connectString) ;
@@ -92,6 +93,7 @@ public class _XAcceptor extends MultiMethodTest {
     /**
     * Retrieves object relation.
     */
+    @Override
     public void before() throws StatusException {
         connectString = (String)
             tEnv.getObjRelation("XAcceptor.connectStr") ;
diff --git a/qadevOOo/tests/java/ifc/connection/_XConnector.java b/qadevOOo/tests/java/ifc/connection/_XConnector.java
index fa1d9b074d92..d9ac5b10c529 100644
--- a/qadevOOo/tests/java/ifc/connection/_XConnector.java
+++ b/qadevOOo/tests/java/ifc/connection/_XConnector.java
@@ -71,6 +71,7 @@ public class _XConnector extends MultiMethodTest {
         /**
         * Call <code>accept()</code> method.
         */
+        @Override
         public void run() {
             try {
                 acceptedCall = acc.accept(connectString) ;
@@ -90,6 +91,7 @@ public class _XConnector extends MultiMethodTest {
     /**
     * Retrieves object relation.
     */
+    @Override
     public void before() throws StatusException {
         connectString = (String)
             tEnv.getObjRelation("XConnector.connectStr") ;
diff --git a/qadevOOo/tests/java/ifc/container/_XContainer.java b/qadevOOo/tests/java/ifc/container/_XContainer.java
index d63ba7d22eb9..b7c987d4e1d3 100644
--- a/qadevOOo/tests/java/ifc/container/_XContainer.java
+++ b/qadevOOo/tests/java/ifc/container/_XContainer.java
@@ -80,6 +80,7 @@ public class _XContainer extends MultiMethodTest {
     * @throws StatusException If one of relations not found or
     * object doesn't implement <code>XNameContainer</code> interface.
     */
+    @Override
     public void before() throws StatusException {
         // do this test with a different object
         Object altObj = tEnv.getObjRelation("XContainer.AlternateObject");
diff --git a/qadevOOo/tests/java/ifc/container/_XContainerQuery.java b/qadevOOo/tests/java/ifc/container/_XContainerQuery.java
index c1034d34b407..5e8748ba11ac 100644
--- a/qadevOOo/tests/java/ifc/container/_XContainerQuery.java
+++ b/qadevOOo/tests/java/ifc/container/_XContainerQuery.java
@@ -61,6 +61,7 @@ public class _XContainerQuery extends MultiMethodTest {
     * Retrieves object relations
     * @throws StatusException If one of relations not found.
     */
+    @Override
     public void before() throws StatusException {
 
         m_querySequenze = (NamedValue[]) tEnv.getObjRelation(
diff --git a/qadevOOo/tests/java/ifc/container/_XNameReplace.java b/qadevOOo/tests/java/ifc/container/_XNameReplace.java
index 1c2d96dfdc23..92e7c220f0a2 100644
--- a/qadevOOo/tests/java/ifc/container/_XNameReplace.java
+++ b/qadevOOo/tests/java/ifc/container/_XNameReplace.java
@@ -165,6 +165,7 @@ public class _XNameReplace extends MultiMethodTest {
     /**
     * Forces object environment recreation.
     */
+    @Override
     public void after() {
         disposeEnvironment() ;
     }
diff --git a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java b/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java
index f7edef2c0525..d486472f76e1 100644
--- a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java
+++ b/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java
@@ -82,6 +82,7 @@ public class _XClipboard extends MultiMethodTest {
     /**
      * Initially sets the content of the clipboard.
      */
+    @Override
     public void before() {
         oObj.setContents(myTransferable1 = new MyTransferable(),
                 myOwner = new MyOwner());
diff --git a/qadevOOo/tests/java/ifc/document/_XDocumentInsertable.java b/qadevOOo/tests/java/ifc/document/_XDocumentInsertable.java
index ccfb7af52b87..2b208e4537a7 100644
--- a/qadevOOo/tests/java/ifc/document/_XDocumentInsertable.java
+++ b/qadevOOo/tests/java/ifc/document/_XDocumentInsertable.java
@@ -99,6 +99,7 @@ public class _XDocumentInsertable extends MultiMethodTest {
      * @throws StatusException If neither relation found nor
      * <code>XTextRange</code> interface is queried.
      */
+    @Override
     public void before() {
         checker = (InsertChecker)
             tEnv.getObjRelation("XDocumentInsertable.Checker") ;
@@ -181,6 +182,7 @@ public class _XDocumentInsertable extends MultiMethodTest {
     /**
     * Forces environment recreation.
     */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/document/_XExporter.java b/qadevOOo/tests/java/ifc/document/_XExporter.java
index cb5f1d9a0b84..067f8b5d5f89 100644
--- a/qadevOOo/tests/java/ifc/document/_XExporter.java
+++ b/qadevOOo/tests/java/ifc/document/_XExporter.java
@@ -49,6 +49,7 @@ public class _XExporter extends MultiMethodTest {
     * Retrieves object relations.
     * @throws StatusException If one of relations not found.
     */
+    @Override
     public void before() {
         source = (XComponent) tEnv.getObjRelation("SourceDocument") ;
 
diff --git a/qadevOOo/tests/java/ifc/document/_XFilter.java b/qadevOOo/tests/java/ifc/document/_XFilter.java
index 9fbc130cdc56..9908c452cda3 100644
--- a/qadevOOo/tests/java/ifc/document/_XFilter.java
+++ b/qadevOOo/tests/java/ifc/document/_XFilter.java
@@ -71,6 +71,7 @@ public class _XFilter extends MultiMethodTest {
     * therefore the methods of this interface will be skipped
     * in this case
     */
+    @Override
     public void before() {
         String name = tEnv.getTestCase().getObjectName();
         if (name.indexOf("Importer")>0) {
@@ -93,6 +94,7 @@ public class _XFilter extends MultiMethodTest {
         catch (com.sun.star.lang.IllegalArgumentException e) {}
     }
 
+    @Override
     public void after() {
         if (dummy) {
             throw new StatusException(Status.skipped(true));
@@ -163,6 +165,7 @@ public class _XFilter extends MultiMethodTest {
             this.Filter = Filter ;
         }
 
+        @Override
         public void run() {
             filterRes = Filter.filter(mdesc);
         }
diff --git a/qadevOOo/tests/java/ifc/document/_XTypeDetection.java b/qadevOOo/tests/java/ifc/document/_XTypeDetection.java
index 0a7ac45e652e..9550e3b076d2 100644
--- a/qadevOOo/tests/java/ifc/document/_XTypeDetection.java
+++ b/qadevOOo/tests/java/ifc/document/_XTypeDetection.java
@@ -49,6 +49,7 @@ public class _XTypeDetection extends MultiMethodTest {
     /**
      * Get the document URL.
      */
+    @Override
     public void before() {
         docURL = utils.getFullTestURL("XTypeDetection.sxw");
         bookmarkURL =  (String) tEnv.getObjRelation("XTypeDetection.bookmarkDoc");
diff --git a/qadevOOo/tests/java/ifc/drawing/_AreaShapeDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_AreaShapeDescriptor.java
index ca8b166c5bbe..1bee620985f3 100644
--- a/qadevOOo/tests/java/ifc/drawing/_AreaShapeDescriptor.java
+++ b/qadevOOo/tests/java/ifc/drawing/_AreaShapeDescriptor.java
@@ -22,6 +22,7 @@ import lib.MultiPropertyTest;
 
 public class _AreaShapeDescriptor extends MultiPropertyTest {
 
+    @Override
     protected boolean compare(Object ob1, Object ob2) {
 
         return super.compare(ob1, ob2);
@@ -29,6 +30,7 @@ public class _AreaShapeDescriptor extends MultiPropertyTest {
     }
 
     protected PropertyTester URLTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue)
                 throws java.lang.IllegalArgumentException {
             if (oldValue.equals(util.utils.getFullTestURL("space-metal.jpg")))
@@ -38,6 +40,7 @@ public class _AreaShapeDescriptor extends MultiPropertyTest {
     } ;
 
     protected PropertyTester StringTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue)
                 throws java.lang.IllegalArgumentException {
             if (oldValue.equals(str1))
diff --git a/qadevOOo/tests/java/ifc/drawing/_ConnectorShape.java b/qadevOOo/tests/java/ifc/drawing/_ConnectorShape.java
index 750c307e09b3..d338126d7f79 100644
--- a/qadevOOo/tests/java/ifc/drawing/_ConnectorShape.java
+++ b/qadevOOo/tests/java/ifc/drawing/_ConnectorShape.java
@@ -35,6 +35,7 @@ import com.sun.star.drawing.XShape;
 public class _ConnectorShape extends MultiPropertyTest {
     public XShape[] conShapes = null;
 
+    @Override
     protected void before() {
         conShapes = (XShape[]) tEnv.getObjRelation("XConnectorShape.Shapes");
     }
diff --git a/qadevOOo/tests/java/ifc/drawing/_ConnectorShapeDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_ConnectorShapeDescriptor.java
index bbb0f69949a9..99f974b494a6 100644
--- a/qadevOOo/tests/java/ifc/drawing/_ConnectorShapeDescriptor.java
+++ b/qadevOOo/tests/java/ifc/drawing/_ConnectorShapeDescriptor.java
@@ -22,6 +22,7 @@ import lib.MultiPropertyTest;
 
 public class _ConnectorShapeDescriptor extends MultiPropertyTest {
 
+    @Override
     protected boolean compare(Object ob1, Object ob2) {
 
         return super.compare(ob1, ob2);
diff --git a/qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java b/qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java
index 86d546cdcf0e..d9f7f3c31361 100644
--- a/qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java
+++ b/qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java
@@ -45,6 +45,7 @@ public class _DrawingDocumentDrawView extends MultiPropertyTest {
     XDrawPage drawPage = null;
     static String test_name = "For DrawingDocumentDrawView";
 
+    @Override
     protected void before() {
         drawPage = (XDrawPage)tEnv.getObjRelation("DrawPage");
         XNamed xNamed = UnoRuntime.queryInterface(XNamed.class, drawPage);
@@ -56,10 +57,12 @@ public class _DrawingDocumentDrawView extends MultiPropertyTest {
     * and compares draw pages.
     */
     protected PropertyTester CurPageTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             return drawPage;
         }
 
+        @Override
         protected boolean compare(Object obj1, Object obj2) {
             XNamed named1 = UnoRuntime.queryInterface(XNamed.class, obj1);
             XNamed named2 = UnoRuntime.queryInterface(XNamed.class, obj2);
@@ -76,6 +79,7 @@ public class _DrawingDocumentDrawView extends MultiPropertyTest {
             return res;
         }
 
+        @Override
         protected String toString(Object obj) {
             XNamed named = UnoRuntime.queryInterface(XNamed.class, obj);
             String res = (named == null) ? "null" : named.getName();
diff --git a/qadevOOo/tests/java/ifc/drawing/_FillProperties.java b/qadevOOo/tests/java/ifc/drawing/_FillProperties.java
index 93d2e9bf5e88..50f7a76406f5 100644
--- a/qadevOOo/tests/java/ifc/drawing/_FillProperties.java
+++ b/qadevOOo/tests/java/ifc/drawing/_FillProperties.java
@@ -63,6 +63,7 @@ public class _FillProperties extends MultiPropertyTest {
      */
     protected PropertyTester URLTester = new PropertyTester() {
 
+        @Override
         protected Object getNewValue(String propName, Object oldValue)
                 throws java.lang.IllegalArgumentException {
             if (oldValue.equals(util.utils.getFullTestURL("space-metal.jpg"))) {
@@ -77,6 +78,7 @@ public class _FillProperties extends MultiPropertyTest {
      */
     protected PropertyTester StringTester = new PropertyTester() {
 
+        @Override
         protected Object getNewValue(String propName, Object oldValue)
                 throws java.lang.IllegalArgumentException {
             if (oldValue.equals(str1)) {
@@ -91,6 +93,7 @@ public class _FillProperties extends MultiPropertyTest {
      */
     protected PropertyTester BitmapTester = new PropertyTester() {
 
+        @Override
         protected Object getNewValue(String propName, Object oldValue)
                 throws java.lang.IllegalArgumentException {
             if (util.ValueComparer.equalValue(oldValue, the_bitmap)) {
diff --git a/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShape.java b/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShape.java
index 124a534fa172..3d49bcb05f11 100644
--- a/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShape.java
+++ b/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShape.java
@@ -59,6 +59,7 @@ public class _GraphicObjectShape extends MultiPropertyTest {
      * Property tester which changes URL.
      */
     protected PropertyTester URLTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             if (oldValue.equals(util.utils.getFullTestURL("space-metal.jpg")))
                 return util.utils.getFullTestURL("crazy-blue.jpg"); else
@@ -71,6 +72,7 @@ public class _GraphicObjectShape extends MultiPropertyTest {
      * It also uses two object relations with bitmaps.
      */
     protected PropertyTester BitmapTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue){
             XBitmap aBitmap1=(XBitmap) tEnv.getObjRelation("Bitmap1");
             XBitmap aBitmap2=(XBitmap) tEnv.getObjRelation("Bitmap2");
@@ -85,6 +87,7 @@ public class _GraphicObjectShape extends MultiPropertyTest {
      * Property tester which returns new <code>XIndexAccess</code> object.
      */
     protected PropertyTester ImapTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             return set;
         }
diff --git a/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShapeDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShapeDescriptor.java
index f604a801ef6a..830a065d4eec 100644
--- a/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShapeDescriptor.java
+++ b/qadevOOo/tests/java/ifc/drawing/_GraphicObjectShapeDescriptor.java
@@ -24,6 +24,7 @@ import com.sun.star.awt.XBitmap;
 
 public class _GraphicObjectShapeDescriptor extends MultiPropertyTest {
 
+    @Override
     protected boolean compare(Object ob1, Object ob2) {
 
         return super.compare(ob1, ob2);
@@ -31,6 +32,7 @@ public class _GraphicObjectShapeDescriptor extends MultiPropertyTest {
     }
 
     protected PropertyTester URLTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue)
                 throws java.lang.IllegalArgumentException {
             if (oldValue.equals(util.utils.getFullTestURL("space-metal.jpg")))
@@ -40,6 +42,7 @@ public class _GraphicObjectShapeDescriptor extends MultiPropertyTest {
     } ;
 
     protected PropertyTester BitmapTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue)
                 throws java.lang.IllegalArgumentException {
             XBitmap aBitmap1=(XBitmap) tEnv.getObjRelation("Bitmap1");
diff --git a/qadevOOo/tests/java/ifc/drawing/_LineProperties.java b/qadevOOo/tests/java/ifc/drawing/_LineProperties.java
index 6944b103b0d5..d37d6506ddcd 100644
--- a/qadevOOo/tests/java/ifc/drawing/_LineProperties.java
+++ b/qadevOOo/tests/java/ifc/drawing/_LineProperties.java
@@ -49,6 +49,7 @@ public class _LineProperties extends MultiPropertyTest {
      * only predefined String values.
      */
     protected PropertyTester LineTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue)
                 throws java.lang.IllegalArgumentException {
             if (oldValue.equals("Arrow"))
diff --git a/qadevOOo/tests/java/ifc/drawing/_RotationDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_RotationDescriptor.java
index 791b0b4670fd..863f4246ae20 100644
--- a/qadevOOo/tests/java/ifc/drawing/_RotationDescriptor.java
+++ b/qadevOOo/tests/java/ifc/drawing/_RotationDescriptor.java
@@ -37,6 +37,7 @@ public class _RotationDescriptor extends MultiPropertyTest {
      * Custom tester which increases value by 200
      */
     protected PropertyTester drawMeasureTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             int val = ((Integer)oldValue).intValue() ;
             return new Integer(val + 200) ;
diff --git a/qadevOOo/tests/java/ifc/drawing/_ShadowDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_ShadowDescriptor.java
index c973977a42ab..ec95fea71632 100644
--- a/qadevOOo/tests/java/ifc/drawing/_ShadowDescriptor.java
+++ b/qadevOOo/tests/java/ifc/drawing/_ShadowDescriptor.java
@@ -22,6 +22,7 @@ import lib.MultiPropertyTest;
 
 public class _ShadowDescriptor extends MultiPropertyTest {
 
+    @Override
     protected boolean compare(Object ob1, Object ob2) {
 
         return super.compare(ob1, ob2);
diff --git a/qadevOOo/tests/java/ifc/drawing/_Shape.java b/qadevOOo/tests/java/ifc/drawing/_Shape.java
index ca8380976028..8150098386aa 100644
--- a/qadevOOo/tests/java/ifc/drawing/_Shape.java
+++ b/qadevOOo/tests/java/ifc/drawing/_Shape.java
@@ -54,6 +54,7 @@ public class _Shape extends MultiPropertyTest {
      * Custom tester which switches between two styles.
      */
     protected PropertyTester StyleTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue)
                 throws java.lang.IllegalArgumentException {
             if (util.ValueComparer.equalValue(oldValue,style1))
@@ -67,6 +68,7 @@ public class _Shape extends MultiPropertyTest {
      * Strings ('layout' and 'controls').
      */
     protected PropertyTester StringTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue)
                 throws java.lang.IllegalArgumentException {
             if (util.ValueComparer.equalValue(oldValue,"layout"))
diff --git a/qadevOOo/tests/java/ifc/drawing/_Text.java b/qadevOOo/tests/java/ifc/drawing/_Text.java
index 104643619e72..9ffffab6ee3f 100644
--- a/qadevOOo/tests/java/ifc/drawing/_Text.java
+++ b/qadevOOo/tests/java/ifc/drawing/_Text.java
@@ -22,6 +22,7 @@ import lib.MultiPropertyTest;
 
 public class _Text extends MultiPropertyTest {
 
+    @Override
     protected boolean compare(Object ob1, Object ob2) {
 
         return super.compare(ob1, ob2);
diff --git a/qadevOOo/tests/java/ifc/drawing/_XConnectorShape.java b/qadevOOo/tests/java/ifc/drawing/_XConnectorShape.java
index 814a3be49f71..ef9395f33c89 100644
--- a/qadevOOo/tests/java/ifc/drawing/_XConnectorShape.java
+++ b/qadevOOo/tests/java/ifc/drawing/_XConnectorShape.java
@@ -60,6 +60,7 @@ public class _XConnectorShape extends MultiMethodTest {
      * @throw StatusException If the relation is not found or shapes don't
      * support <code>XConnectableShape</code> interface.
      */
+    @Override
     public void before() {
         log.println("No shapes implementing XConnectableShape still found.");
         XShape[] shapes = (XShape[])
diff --git a/qadevOOo/tests/java/ifc/form/_DataAwareControlModel.java b/qadevOOo/tests/java/ifc/form/_DataAwareControlModel.java
index 8fda3b0ae4b5..190e736d984d 100644
--- a/qadevOOo/tests/java/ifc/form/_DataAwareControlModel.java
+++ b/qadevOOo/tests/java/ifc/form/_DataAwareControlModel.java
@@ -105,9 +105,11 @@ public class _DataAwareControlModel extends MultiPropertyTest {
             ("DataAwareControlModel.NewFieldName") ;
         final String newVal = relVal == null ? "Address" : relVal ;
         testProperty("DataField", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object oldVal) {
                 return newVal ;
             }
+            @Override
             protected void checkResult(String propName, Object oldValue,
                 Object newValue, Object resValue, Exception exception)
                 throws java.lang.Exception{
@@ -142,6 +144,7 @@ public class _DataAwareControlModel extends MultiPropertyTest {
         final XInterface xTextLabel = (XInterface)tEnv.getObjRelation("LC");
 
         testProperty("LabelControl", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object oldVal) {
                 if (utils.isVoid(oldVal)) return xTextLabel ;
                 else return super.getNewValue("LabelControl",oldVal);
@@ -152,6 +155,7 @@ public class _DataAwareControlModel extends MultiPropertyTest {
     /**
     * Forces environment recreateation.
     */
+    @Override
     public void after() {
         disposeEnvironment() ;
     }
diff --git a/qadevOOo/tests/java/ifc/form/_XApproveActionBroadcaster.java b/qadevOOo/tests/java/ifc/form/_XApproveActionBroadcaster.java
index b27997b8e027..a0c9185f3071 100644
--- a/qadevOOo/tests/java/ifc/form/_XApproveActionBroadcaster.java
+++ b/qadevOOo/tests/java/ifc/form/_XApproveActionBroadcaster.java
@@ -90,6 +90,7 @@ public class _XApproveActionBroadcaster extends MultiMethodTest {
     /**
     * Just log output
     */
+    @Override
     protected void after() {
         log.println("Skipping all XApproveActionBroadcaster methods, since they"
                 + " need user interaction");
diff --git a/qadevOOo/tests/java/ifc/form/_XChangeBroadcaster.java b/qadevOOo/tests/java/ifc/form/_XChangeBroadcaster.java
index 54bf166cb843..4bce8dcab931 100644
--- a/qadevOOo/tests/java/ifc/form/_XChangeBroadcaster.java
+++ b/qadevOOo/tests/java/ifc/form/_XChangeBroadcaster.java
@@ -100,6 +100,7 @@ public class _XChangeBroadcaster extends MultiMethodTest {
      * @throw StatusException If neither relation is found nor interface
      * is queried.
      */
+    @Override
     public void before() {
         xText = UnoRuntime.queryInterface(XTextComponent.class,oObj);
         changer = (Changer) tEnv.getObjRelation("XChangeBroadcaster.Changer") ;
diff --git a/qadevOOo/tests/java/ifc/form/_XDatabaseParameterBroadcaster.java b/qadevOOo/tests/java/ifc/form/_XDatabaseParameterBroadcaster.java
index 4868f75f29e5..4a9a8524b2ad 100644
--- a/qadevOOo/tests/java/ifc/form/_XDatabaseParameterBroadcaster.java
+++ b/qadevOOo/tests/java/ifc/form/_XDatabaseParameterBroadcaster.java
@@ -52,6 +52,7 @@ public class _XDatabaseParameterBroadcaster extends MultiMethodTest {
      * Get the object relation 'ParameterListenerChecker' and
      * set the log inside of the implementation.
      */
+    @Override
     protected void before() {
         listenerChecker = (CheckParameterListener)
                         tEnv.getObjRelation("ParameterListenerChecker");
@@ -85,6 +86,7 @@ public class _XDatabaseParameterBroadcaster extends MultiMethodTest {
         tRes.tested("removeParameterListener()", listenerChecker.checkListener());
     }
 
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/form/_XLoadable.java b/qadevOOo/tests/java/ifc/form/_XLoadable.java
index 9106a3ecd609..ed7bf18270d9 100644
--- a/qadevOOo/tests/java/ifc/form/_XLoadable.java
+++ b/qadevOOo/tests/java/ifc/form/_XLoadable.java
@@ -93,6 +93,7 @@ public class _XLoadable extends MultiMethodTest {
     /**
     * Creates new listener.
     */
+    @Override
     public void before() {
         loadListener = new TestLoadListener(log) ;
     }
@@ -231,6 +232,7 @@ public class _XLoadable extends MultiMethodTest {
         tRes.tested("removeLoadListener()", result) ;
     }
 
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/form/_XSubmit.java b/qadevOOo/tests/java/ifc/form/_XSubmit.java
index 611376f633ba..7cec878a2c03 100644
--- a/qadevOOo/tests/java/ifc/form/_XSubmit.java
+++ b/qadevOOo/tests/java/ifc/form/_XSubmit.java
@@ -174,6 +174,7 @@ public class _XSubmit extends MultiMethodTest {
     /**
     * Forces environment recreation.
     */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java b/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java
index 40a92e50588c..badab75a22f3 100644
--- a/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java
+++ b/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java
@@ -72,6 +72,7 @@ public class _XUpdateBroadcaster extends MultiMethodTest {
     * Retrieves object relations.
     * @throws StatusException If one of relations not found.
     */
+    @Override
     public void before() {
         checker = (UpdateChecker)
             tEnv.getObjRelation("XUpdateBroadcaster.Checker") ;
@@ -230,6 +231,7 @@ public class _XUpdateBroadcaster extends MultiMethodTest {
     /**
     * Forces environment recreation.
     */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/form/component/_CurrencyField.java b/qadevOOo/tests/java/ifc/form/component/_CurrencyField.java
index acb03df2aa32..ae1d7de26fd4 100644
--- a/qadevOOo/tests/java/ifc/form/component/_CurrencyField.java
+++ b/qadevOOo/tests/java/ifc/form/component/_CurrencyField.java
@@ -38,6 +38,7 @@ public class _CurrencyField extends MultiPropertyTest {
     */
     public void _DefaultValue() {
         testProperty("DefaultValue", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return util.utils.isVoid(old) ? new Double(17.5) :
                     super.getNewValue(p, old) ;
diff --git a/qadevOOo/tests/java/ifc/form/component/_DataForm.java b/qadevOOo/tests/java/ifc/form/component/_DataForm.java
index 3b3b4035af3f..4ea3e11ce079 100644
--- a/qadevOOo/tests/java/ifc/form/component/_DataForm.java
+++ b/qadevOOo/tests/java/ifc/form/component/_DataForm.java
@@ -46,6 +46,7 @@ public class _DataForm extends MultiPropertyTest {
     */
     public void _NavigationBarMode() {
         testProperty("NavigationBarMode", new PropertyTester() {
+            @Override
             public String toString(Object obj) {
                 if (util.utils.isVoid(obj)) {
                     return "null";
@@ -63,9 +64,11 @@ public class _DataForm extends MultiPropertyTest {
     */
     public void _Cycle() {
         testProperty("Cycle", new PropertyTester() {
+            @Override
             public Object getNewValue(String propName, Object oldValue) {
                 return TabulatorCycle.CURRENT;
             }
+            @Override
             public String toString(Object obj) {
                 if (util.utils.isVoid(obj))
                     return "null";
diff --git a/qadevOOo/tests/java/ifc/form/component/_DatabaseForm.java b/qadevOOo/tests/java/ifc/form/component/_DatabaseForm.java
index af3114577e28..17121cb990e8 100644
--- a/qadevOOo/tests/java/ifc/form/component/_DatabaseForm.java
+++ b/qadevOOo/tests/java/ifc/form/component/_DatabaseForm.java
@@ -48,6 +48,7 @@ public class _DatabaseForm extends MultiPropertyTest {
     public void _NavigationBarMode() {
         dbg.printPropertyInfo(oObj, "NavigationBarMode");
         testProperty("NavigationBarMode", new PropertyTester() {
+            @Override
             public String toString(Object obj) {
                 if (obj == null) {
                     return "null";
@@ -66,10 +67,12 @@ public class _DatabaseForm extends MultiPropertyTest {
     public void _Cycle() {
         dbg.printPropertyInfo(oObj, "Cycle");
         testProperty("Cycle", new PropertyTester() {
+            @Override
             public Object getNewValue(String propName, Object oldValue) {
                 return TabulatorCycle.CURRENT;
             }
 
+            @Override
             public String toString(Object obj) {
                 if (obj == null) {
                     return "null";
diff --git a/qadevOOo/tests/java/ifc/form/component/_DateField.java b/qadevOOo/tests/java/ifc/form/component/_DateField.java
index 2b357edde6df..b88490bd15e5 100644
--- a/qadevOOo/tests/java/ifc/form/component/_DateField.java
+++ b/qadevOOo/tests/java/ifc/form/component/_DateField.java
@@ -36,6 +36,7 @@ public class _DateField extends MultiPropertyTest {
     */
     public void _DefaultDate() {
         testProperty("DefaultDate", new PropertyTester() {
+            @Override
             protected Object getNewValue(String prop, Object old) {
                 return util.utils.isVoid(old) ? new Integer(20010507) :
                     super.getNewValue(prop, old) ;
diff --git a/qadevOOo/tests/java/ifc/form/component/_GridControl.java b/qadevOOo/tests/java/ifc/form/component/_GridControl.java
index 7a423d62f770..aa146e043e55 100644
--- a/qadevOOo/tests/java/ifc/form/component/_GridControl.java
+++ b/qadevOOo/tests/java/ifc/form/component/_GridControl.java
@@ -42,6 +42,7 @@ public class _GridControl extends MultiPropertyTest {
     */
     public void _RowHeight() {
         testProperty("RowHeight", new PropertyTester() {
+            @Override
             protected Object getNewValue(String prop, Object old) {
                 return util.utils.isVoid(old) ? new Integer(11) :
                     super.getNewValue(prop, old) ;
@@ -55,6 +56,7 @@ public class _GridControl extends MultiPropertyTest {
     */
     public void _Tabstop() {
         testProperty("Tabstop", new PropertyTester() {
+            @Override
             protected Object getNewValue(String prop, Object old) {
                 return util.utils.isVoid(old) ? new Boolean(true) :
                     super.getNewValue(prop, old) ;
@@ -68,6 +70,7 @@ public class _GridControl extends MultiPropertyTest {
     */
     public void _TextColor() {
         testProperty("TextColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String prop, Object old) {
                 return util.utils.isVoid(old) ? new Integer(342) :
                     super.getNewValue(prop, old) ;
@@ -81,6 +84,7 @@ public class _GridControl extends MultiPropertyTest {
     */
     public void _BorderColor() {
         testProperty("BorderColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String prop, Object old) {
                 return util.utils.isVoid(old) ? new Integer(342) :
                     super.getNewValue(prop, old) ;
diff --git a/qadevOOo/tests/java/ifc/form/component/_NavigationToolBar.java b/qadevOOo/tests/java/ifc/form/component/_NavigationToolBar.java
index 3a764df22993..6f75545afc52 100644
--- a/qadevOOo/tests/java/ifc/form/component/_NavigationToolBar.java
+++ b/qadevOOo/tests/java/ifc/form/component/_NavigationToolBar.java
@@ -24,6 +24,7 @@ public class _NavigationToolBar extends MultiPropertyTest {
 
     public void _TextColor() {
         testProperty("TextColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String prop, Object old) {
                 return util.utils.isVoid(old) ? new Integer(20010507) :
                     super.getNewValue(prop, old) ;
@@ -33,6 +34,7 @@ public class _NavigationToolBar extends MultiPropertyTest {
 
     public void _TextLineColor() {
         testProperty("TextLineColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String prop, Object old) {
                 return util.utils.isVoid(old) ? new Integer(20050507) :
                     super.getNewValue(prop, old) ;
diff --git a/qadevOOo/tests/java/ifc/form/component/_NumericField.java b/qadevOOo/tests/java/ifc/form/component/_NumericField.java
index ba6f08be8371..463e780c908f 100644
--- a/qadevOOo/tests/java/ifc/form/component/_NumericField.java
+++ b/qadevOOo/tests/java/ifc/form/component/_NumericField.java
@@ -38,6 +38,7 @@ public class _NumericField extends MultiPropertyTest {
     */
     public void _DefaultValue() {
         testProperty("DefaultValue", new PropertyTester() {
+            @Override
             protected Object getNewValue(String prop, Object old) {
                 return util.utils.isVoid(old) ? new Double(111.11) :
                     super.getNewValue(prop, old) ;
diff --git a/qadevOOo/tests/java/ifc/form/component/_TimeField.java b/qadevOOo/tests/java/ifc/form/component/_TimeField.java
index d924f3ea6d0e..06a924fa08c9 100644
--- a/qadevOOo/tests/java/ifc/form/component/_TimeField.java
+++ b/qadevOOo/tests/java/ifc/form/component/_TimeField.java
@@ -38,6 +38,7 @@ public class _TimeField extends MultiPropertyTest {
     */
     public void _DefaultTime() {
         testProperty("DefaultTime", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return utils.isVoid(old) ? new Integer(4321) :
                     super.getNewValue(p, old) ;
diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatch.java b/qadevOOo/tests/java/ifc/frame/_XDispatch.java
index 7265a4ce2aa1..d1f50fc24171 100644
--- a/qadevOOo/tests/java/ifc/frame/_XDispatch.java
+++ b/qadevOOo/tests/java/ifc/frame/_XDispatch.java
@@ -147,6 +147,7 @@ public class _XDispatch extends MultiMethodTest {
     * Retrieves object relations and creates new listeners.
     * @throws StatusException If one of relations not found.
     */
+    @Override
     public void before() {
         listener = new TestStatusListener(log) ;
         url = (URL) tEnv.getObjRelation("XDispatch.URL") ;
diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java b/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java
index 275b67774b65..aebc5e4c3c86 100644
--- a/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java
+++ b/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java
@@ -51,6 +51,7 @@ public class _XDispatchProvider extends MultiMethodTest {
     /**
     * Retrieves object relation.
     */
+    @Override
     public void before() {
         dispatchUrl = (String) tEnv.getObjRelation("XDispatchProvider.URL") ;
         if (dispatchUrl == null) {
diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchProviderInterception.java b/qadevOOo/tests/java/ifc/frame/_XDispatchProviderInterception.java
index 29ce2a580638..4b72518f8788 100644
--- a/qadevOOo/tests/java/ifc/frame/_XDispatchProviderInterception.java
+++ b/qadevOOo/tests/java/ifc/frame/_XDispatchProviderInterception.java
@@ -89,6 +89,7 @@ public class _XDispatchProviderInterception extends MultiMethodTest {
     /**
     * Cereates new interceptor implementation.
     */
+    @Override
     public void before() {
         interceptor = new TestInterceptor(log) ;
     }
diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java
index 56553fdc0bca..03225e4170e2 100644
--- a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java
+++ b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java
@@ -51,6 +51,7 @@ public class _XDispatchRecorder extends MultiMethodTest {
     URL dispURL = null;
     PropertyValue[] dispArgs = new PropertyValue[0];
 
+    @Override
     protected void before() {
         xFrame = (XFrame) tEnv.getObjRelation("XDispatchRecorder.Frame");
 
diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java
index 81bf327b21f3..f92f366e0683 100644
--- a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java
+++ b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java
@@ -72,6 +72,7 @@ public class _XDispatchRecorderSupplier extends MultiMethodTest {
      * Also a <code>com.sun.star.frame.Desktop</code>
      * service created for obtaining document's frame.
      */
+    @Override
     protected void before() {
         SOfficeFactory SOF = SOfficeFactory.getFactory(tParam.getMSF());
 
@@ -227,6 +228,7 @@ public class _XDispatchRecorderSupplier extends MultiMethodTest {
     /**
      * Disposes the document created in <code>before()</code>
      */
+    @Override
     protected void after() {
         xTextDoc.dispose();
     }
diff --git a/qadevOOo/tests/java/ifc/frame/_XFrame.java b/qadevOOo/tests/java/ifc/frame/_XFrame.java
index f4c79061cfa2..b3cb999fa3d9 100644
--- a/qadevOOo/tests/java/ifc/frame/_XFrame.java
+++ b/qadevOOo/tests/java/ifc/frame/_XFrame.java
@@ -567,6 +567,7 @@ public class _XFrame extends MultiMethodTest {
     /**
     * Forces environment recreation.
     */
+    @Override
     public void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java b/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java
index b5c0416e7fc5..f4e4a1c366f0 100644
--- a/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java
+++ b/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java
@@ -88,6 +88,7 @@ public class _XFrameLoader extends MultiMethodTest {
     * creates their default values. <p>
     * @throws StatusException If one of required relations not found.
     */
+    @Override
     public void before() {
         url = (String) tEnv.getObjRelation("FrameLoader.URL") ;
         frame = (XFrame) tEnv.getObjRelation("FrameLoader.Frame") ;
@@ -182,6 +183,7 @@ public class _XFrameLoader extends MultiMethodTest {
         tRes.tested("cancel()", result) ;
     }
 
+    @Override
     public void after() {
         if (frameSup != null) frameSup.dispose() ;
         frame.dispose();
diff --git a/qadevOOo/tests/java/ifc/frame/_XLayoutManager.java b/qadevOOo/tests/java/ifc/frame/_XLayoutManager.java
index dbe43e261675..2510cfe8fe0a 100644
--- a/qadevOOo/tests/java/ifc/frame/_XLayoutManager.java
+++ b/qadevOOo/tests/java/ifc/frame/_XLayoutManager.java
@@ -34,6 +34,7 @@ public class _XLayoutManager extends MultiMethodTest {
     private XFrame xFrame = null;
     private String sElementName = "private:resource/menubar/myMenu";
 
+    @Override
     public void before() {
         xFrame = (XFrame)tEnv.getObjRelation("XLayoutManager.Frame");
     }
diff --git a/qadevOOo/tests/java/ifc/frame/_XModuleManager.java b/qadevOOo/tests/java/ifc/frame/_XModuleManager.java
index 692215de1297..b5d895d4fa34 100644
--- a/qadevOOo/tests/java/ifc/frame/_XModuleManager.java
+++ b/qadevOOo/tests/java/ifc/frame/_XModuleManager.java
@@ -79,6 +79,7 @@ public class _XModuleManager extends MultiMethodTest {
     private PropertyValue[] xModelSeq = null;
     /** Retrieves object relations. */
 
+    @Override
     public void before() {
 
         xFrameSeq = (PropertyValue[]) tEnv.getObjRelation("XModuleManager.XFrame") ;
diff --git a/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java b/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java
index 7cf64918c89a..650b2dba35c2 100644
--- a/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java
+++ b/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java
@@ -83,6 +83,7 @@ public class _XNotifyingDispatch extends MultiMethodTest {
     * Retrieves object relations and creates new listeners.
     * @throws StatusException If one of relations not found.
     */
+    @Override
     public void before() {
         notificationListener = new TestNotificationListener(log) ;
         url = (URL) tEnv.getObjRelation("XDispatch.URL") ;
diff --git a/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java b/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java
index b4cec85dc79e..be8c32da4cf0 100644
--- a/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java
+++ b/qadevOOo/tests/java/ifc/frame/_XPopupMenuController.java
@@ -27,6 +27,7 @@ import lib.MultiMethodTest;
 public class _XPopupMenuController extends MultiMethodTest {
     public XPopupMenuController oObj = null;
 
+    @Override
     public void before() {
 
     }
diff --git a/qadevOOo/tests/java/ifc/frame/_XStatusListener.java b/qadevOOo/tests/java/ifc/frame/_XStatusListener.java
index 067cd5a89a10..393c0a205bdd 100644
--- a/qadevOOo/tests/java/ifc/frame/_XStatusListener.java
+++ b/qadevOOo/tests/java/ifc/frame/_XStatusListener.java
@@ -26,6 +26,7 @@ public class _XStatusListener extends MultiMethodTest {
     public XStatusListener oObj = null;
 
 
+    @Override
     public void before() {
 
     }
diff --git a/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java b/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java
index 83040fa01f64..2151d77957ba 100644
--- a/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java
+++ b/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java
@@ -70,6 +70,7 @@ public class _XSynchronousFrameLoader extends MultiMethodTest {
      *
      * @throws StatusException If one of required relations not found.
      */
+    @Override
     public void before() {
         url = (String) tEnv.getObjRelation("FrameLoader.URL") ;
         frame = (XFrame) tEnv.getObjRelation("FrameLoader.Frame") ;
@@ -143,6 +144,7 @@ public class _XSynchronousFrameLoader extends MultiMethodTest {
         final boolean[] result = new boolean[1] ;
 
         (new Thread() {
+            @Override
             public void run() {
                 result[0] = oObj.load(descr, frame);
             }
@@ -161,6 +163,7 @@ public class _XSynchronousFrameLoader extends MultiMethodTest {
     /**
      * Disposes document if it was created for frame supplying.
      */
+    @Override
     protected void after() {
         if (frameSup != null) {
             frameSup.dispose();
diff --git a/qadevOOo/tests/java/ifc/frame/_XUIControllerRegistration.java b/qadevOOo/tests/java/ifc/frame/_XUIControllerRegistration.java
index 4455460e3cc5..21a627d7191c 100644
--- a/qadevOOo/tests/java/ifc/frame/_XUIControllerRegistration.java
+++ b/qadevOOo/tests/java/ifc/frame/_XUIControllerRegistration.java
@@ -26,6 +26,7 @@ public class _XUIControllerRegistration extends MultiMethodTest {
     private String aRegisteredController = null;
     private String aController = ".uno:MySecondController";
 
+    @Override
     public void before() {
         aRegisteredController = (String)tEnv.getObjRelation("XUIControllerRegistration.RegisteredController");
     }
diff --git a/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java b/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java
index eb0b72c77794..7c6194d80e2e 100644
--- a/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java
+++ b/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java
@@ -84,6 +84,7 @@ public class _XBreakIterator extends MultiMethodTest {
      * Retrieves object relations.
      * @throws StatusException If one of relations not found.
      */
+    @Override
     protected void before() {
         locale = (Locale)tEnv.getObjRelation("Locale");
         if (locale == null) {
diff --git a/qadevOOo/tests/java/ifc/i18n/_XCalendar.java b/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
index 59c983b8aaa5..43f46d128be0 100644
--- a/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
+++ b/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
@@ -68,6 +68,7 @@ public class _XCalendar extends MultiMethodTest {
     double aOriginalDTime = 0;
     Locale[] installed_locales;
 
+    @Override
     public void before() {
         XLocaleData locData = null;
         try {
@@ -91,6 +92,7 @@ public class _XCalendar extends MultiMethodTest {
      * Restore the changed time during the test to the original value of the
      * machine: has to be correct for the following interface tests.
      */
+    @Override
     public void after() {
         oObj.loadDefaultCalendar(installed_locales[0]);
         oObj.setDateTime(aOriginalDTime);
diff --git a/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java b/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java
index 97acd4013a10..99d26e7b9a0b 100644
--- a/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java
+++ b/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java
@@ -38,6 +38,7 @@ public class _XExtendedCalendar extends MultiMethodTest {
     /**
      * Load a calendar
      */
+    @Override
     public void before() {
         Locale[] installed_locales = null;
         XLocaleData locData = null;
diff --git a/qadevOOo/tests/java/ifc/i18n/_XExtendedTransliteration.java b/qadevOOo/tests/java/ifc/i18n/_XExtendedTransliteration.java
index 29e9edb22186..c96c8e42f72b 100644
--- a/qadevOOo/tests/java/ifc/i18n/_XExtendedTransliteration.java
+++ b/qadevOOo/tests/java/ifc/i18n/_XExtendedTransliteration.java
@@ -29,6 +29,7 @@ public class _XExtendedTransliteration extends MultiMethodTest {
     public XExtendedTransliteration oObj = null;
     private Locale loc = new Locale("en", "US", "") ;
 
+    @Override
     public void before() {
         oObj.loadModule(TransliterationModules.LOWERCASE_UPPERCASE, loc);
     }
diff --git a/qadevOOo/tests/java/ifc/inspection/_XObjectInspector.java b/qadevOOo/tests/java/ifc/inspection/_XObjectInspector.java
index 49d88d9a867d..faf0036f3c60 100644
--- a/qadevOOo/tests/java/ifc/inspection/_XObjectInspector.java
+++ b/qadevOOo/tests/java/ifc/inspection/_XObjectInspector.java
@@ -69,6 +69,7 @@ public class _XObjectInspector extends MultiMethodTest {
      *   <li>XObjectInspector.toInspect</li>
      * </ul>
      */
+    @Override
     public void before() {
 
         oInspect = (Object[]) tEnv.getObjRelation("XObjectInspector.toInspect");
diff --git a/qadevOOo/tests/java/ifc/io/_XActiveDataControl.java b/qadevOOo/tests/java/ifc/io/_XActiveDataControl.java
index a13145edf334..33a2bd09b78e 100644
--- a/qadevOOo/tests/java/ifc/io/_XActiveDataControl.java
+++ b/qadevOOo/tests/java/ifc/io/_XActiveDataControl.java
@@ -232,6 +232,7 @@ public class _XActiveDataControl extends MultiMethodTest {
     /**
      * Disposes the test environment, since it is used.
      */
+    @Override
     public void after() {
         this.disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/io/_XActiveDataSink.java b/qadevOOo/tests/java/ifc/io/_XActiveDataSink.java
index 00d9cf64e37d..ec1dad459570 100644
--- a/qadevOOo/tests/java/ifc/io/_XActiveDataSink.java
+++ b/qadevOOo/tests/java/ifc/io/_XActiveDataSink.java
@@ -53,6 +53,7 @@ public class _XActiveDataSink extends MultiMethodTest {
         /**
         * Take the XInputStream from the environment for setting and getting
     */
+    @Override
     public void before() {
             XInterface x = (XInterface)tEnv.getObjRelation("InputStream");
             iStream = UnoRuntime.queryInterface
@@ -94,6 +95,7 @@ public class _XActiveDataSink extends MultiMethodTest {
                 tRes.tested("getInputStream()", getStream != oldStream) ;
     }
 
+    @Override
     public void after() {
         this.disposeEnvironment() ;
     }
diff --git a/qadevOOo/tests/java/ifc/io/_XActiveDataSource.java b/qadevOOo/tests/java/ifc/io/_XActiveDataSource.java
index a7092aa91ce2..5cd2dd3efa3d 100644
--- a/qadevOOo/tests/java/ifc/io/_XActiveDataSource.java
+++ b/qadevOOo/tests/java/ifc/io/_XActiveDataSource.java
@@ -53,6 +53,7 @@ public class _XActiveDataSource extends MultiMethodTest {
     /**
     * Take the XOutputStream from the environment for setting and getting.
     */
+    @Override
     public void before() {
         XInterface x = (XInterface)tEnv.getObjRelation("OutputStream");
         oStream = UnoRuntime.queryInterface
@@ -88,6 +89,7 @@ public class _XActiveDataSource extends MultiMethodTest {
     /**
     * Forces object environment recreation.
     */
+    @Override
     public void after() {
         this.disposeEnvironment() ;
     }
diff --git a/qadevOOo/tests/java/ifc/io/_XConnectable.java b/qadevOOo/tests/java/ifc/io/_XConnectable.java
index 8c8d061b9c7c..35742e8d4dee 100644
--- a/qadevOOo/tests/java/ifc/io/_XConnectable.java
+++ b/qadevOOo/tests/java/ifc/io/_XConnectable.java
@@ -51,6 +51,7 @@ public class _XConnectable extends MultiMethodTest {
     /**
      * Get another connectable object from object relations.
     */
+    @Override
     public void before() {
         XInterface x = (XInterface)tEnv.getObjRelation("Connectable");
         xConnect = UnoRuntime.queryInterface(
@@ -116,6 +117,7 @@ public class _XConnectable extends MultiMethodTest {
     /**
     * Forces object environment recreation.
     */
+    @Override
     public void after() {
         this.disposeEnvironment() ;
     }
diff --git a/qadevOOo/tests/java/ifc/io/_XDataInputStream.java b/qadevOOo/tests/java/ifc/io/_XDataInputStream.java
index 2671b4baf620..5a3321f541c7 100644
--- a/qadevOOo/tests/java/ifc/io/_XDataInputStream.java
+++ b/qadevOOo/tests/java/ifc/io/_XDataInputStream.java
@@ -76,6 +76,7 @@ public class _XDataInputStream extends MultiMethodTest {
      * data of different types and fills the appropriate variables.
      * @throws StatusException If one of relations not found.
      */
+    @Override
     public void before(){
 
         XInterface x = (XInterface)tEnv.getObjRelation("StreamWriter") ;
@@ -396,6 +397,7 @@ public class _XDataInputStream extends MultiMethodTest {
     /**
      * Forces object environment recreation.
      */
+    @Override
     public void after() {
         try {
             oStream.flush();
diff --git a/qadevOOo/tests/java/ifc/io/_XDataOutputStream.java b/qadevOOo/tests/java/ifc/io/_XDataOutputStream.java
index 90d049cbd05f..51dcff41c2f0 100644
--- a/qadevOOo/tests/java/ifc/io/_XDataOutputStream.java
+++ b/qadevOOo/tests/java/ifc/io/_XDataOutputStream.java
@@ -56,6 +56,7 @@ public class _XDataOutputStream extends MultiMethodTest {
     * If relation or data of some type in stream not found then
     * tests of corresponding methods are skipped.
     */
+    @Override
     public void before() throws RuntimeException {
 
         List<Object> data = (List<Object>) tEnv.getObjRelation("StreamData") ;
@@ -253,6 +254,7 @@ public class _XDataOutputStream extends MultiMethodTest {
     /**
     * Forces object environment recreation.
     */
+    @Override
     public void after() {
         this.disposeEnvironment() ;
     }
diff --git a/qadevOOo/tests/java/ifc/io/_XInputStream.java b/qadevOOo/tests/java/ifc/io/_XInputStream.java
index f60a3c5f43a1..9bfe93b337be 100644
--- a/qadevOOo/tests/java/ifc/io/_XInputStream.java
+++ b/qadevOOo/tests/java/ifc/io/_XInputStream.java
@@ -60,6 +60,7 @@ public class _XInputStream extends MultiMethodTest {
      * Before the test, the stream writer and the data are ecxtracted from
      * the object relations and the data is written to the stream.
      */
+    @Override
     public void before() {
         XInterface x = (XInterface)tEnv.getObjRelation("StreamWriter");
         oStream = UnoRuntime.queryInterface(
@@ -77,6 +78,7 @@ public class _XInputStream extends MultiMethodTest {
      * After the test, the stream writer is closed and the
      * environment is disposed.
      */
+    @Override
     public void after() {
         try {
             oStream.flush();
diff --git a/qadevOOo/tests/java/ifc/io/_XObjectInputStream.java b/qadevOOo/tests/java/ifc/io/_XObjectInputStream.java
index 01235e3d39d8..197a97086629 100644
--- a/qadevOOo/tests/java/ifc/io/_XObjectInputStream.java
+++ b/qadevOOo/tests/java/ifc/io/_XObjectInputStream.java
@@ -158,6 +158,7 @@ public class _XObjectInputStream extends MultiMethodTest {
     /**
     * Forces object environment recreation.
     */
+    @Override
     public void after() {
         this.disposeEnvironment() ;
     }
diff --git a/qadevOOo/tests/java/ifc/io/_XOutputStream.java b/qadevOOo/tests/java/ifc/io/_XOutputStream.java
index 8e53c67def0b..5a3b90e7726b 100644
--- a/qadevOOo/tests/java/ifc/io/_XOutputStream.java
+++ b/qadevOOo/tests/java/ifc/io/_XOutputStream.java
@@ -56,6 +56,7 @@ public class _XOutputStream extends MultiMethodTest {
         public void resetStreams();
     }
 
+    @Override
     protected void before() {
         checker = (StreamChecker)
             tEnv.getObjRelation("XOutputStream.StreamChecker");
@@ -157,6 +158,7 @@ public class _XOutputStream extends MultiMethodTest {
     /**
     * Forces object environment recreation.
     */
+    @Override
     public void after() {
         this.disposeEnvironment() ;
     }
diff --git a/qadevOOo/tests/java/ifc/java/_XJavaThreadRegister_11.java b/qadevOOo/tests/java/ifc/java/_XJavaThreadRegister_11.java
index 2939ac9b690d..0a704fa342a7 100644
--- a/qadevOOo/tests/java/ifc/java/_XJavaThreadRegister_11.java
+++ b/qadevOOo/tests/java/ifc/java/_XJavaThreadRegister_11.java
@@ -38,6 +38,7 @@ import com.sun.star.java.XJavaThreadRegister_11;
 public class _XJavaThreadRegister_11 extends MultiMethodTest {
     public XJavaThreadRegister_11 oObj;
 
+    @Override
     protected void after() {
         log.println("Skipping all XJavaThreadRegister_11 methods, since they"
                 + " can't be tested in the context");
diff --git a/qadevOOo/tests/java/ifc/java/_XJavaVM.java b/qadevOOo/tests/java/ifc/java/_XJavaVM.java
index 040dfbd04fdf..0c8fe92a336f 100644
--- a/qadevOOo/tests/java/ifc/java/_XJavaVM.java
+++ b/qadevOOo/tests/java/ifc/java/_XJavaVM.java
@@ -38,6 +38,7 @@ import com.sun.star.java.XJavaVM;
 public class _XJavaVM extends MultiMethodTest {
     public XJavaVM oObj;
 
+    @Override
     protected void after() {
         log.println("Skipping all XJavaVM methods, since they"
                 + " can't be tested in the context");
diff --git a/qadevOOo/tests/java/ifc/lang/_XComponent.java b/qadevOOo/tests/java/ifc/lang/_XComponent.java
index 66fe850e5ab0..657f80086501 100644
--- a/qadevOOo/tests/java/ifc/lang/_XComponent.java
+++ b/qadevOOo/tests/java/ifc/lang/_XComponent.java
@@ -75,6 +75,7 @@ public class _XComponent extends MultiMethodTest {
      * element.  TODO: Is this needed for anything else, too, or should it be
      * removed?
      */
+    @Override
     protected void before() {
         // do not dispose this component, but parent instead
         altDispose = (XComponent)tEnv.getObjRelation("XComponent.DisposeThis");
@@ -161,6 +162,7 @@ public class _XComponent extends MultiMethodTest {
     /**
     * Forces object recreation.
     */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/lang/_XInitialization.java b/qadevOOo/tests/java/ifc/lang/_XInitialization.java
index c699bd022907..87a80ef26494 100644
--- a/qadevOOo/tests/java/ifc/lang/_XInitialization.java
+++ b/qadevOOo/tests/java/ifc/lang/_XInitialization.java
@@ -92,6 +92,7 @@ public class _XInitialization extends MultiMethodTest {
     /**
     * Disposes object environment.
     */
+    @Override
     public void after() {
         disposeEnvironment() ;
     }
diff --git a/qadevOOo/tests/java/ifc/lang/_XMultiComponentFactory.java b/qadevOOo/tests/java/ifc/lang/_XMultiComponentFactory.java
index 6c627c81a7d4..0b8fdb561fad 100644
--- a/qadevOOo/tests/java/ifc/lang/_XMultiComponentFactory.java
+++ b/qadevOOo/tests/java/ifc/lang/_XMultiComponentFactory.java
@@ -41,6 +41,7 @@ public class _XMultiComponentFactory extends MultiMethodTest {
     public XComponentContext xContext = null;
     private String[] availableServiceNames = null;
 
+    @Override
     public void before(){
         xContext = (XComponentContext)tEnv.getObjRelation("DC");
         availableServiceNames = (String[])tEnv.getObjRelation("XMultiComponentFactory.ServiceNames");
diff --git a/qadevOOo/tests/java/ifc/lang/_XSingleServiceFactory.java b/qadevOOo/tests/java/ifc/lang/_XSingleServiceFactory.java
index 61cdf787cd45..4264e68747d8 100644
--- a/qadevOOo/tests/java/ifc/lang/_XSingleServiceFactory.java
+++ b/qadevOOo/tests/java/ifc/lang/_XSingleServiceFactory.java
@@ -57,6 +57,7 @@ public class _XSingleServiceFactory extends MultiMethodTest {
     public XSingleServiceFactory oObj = null;
     private Class<?>[] mustSupport = null ;
 
+    @Override
     public void before() {
         mustSupport = (Class[]) tEnv.getObjRelation
             ("XSingleServiceFactory.MustSupport") ;
diff --git a/qadevOOo/tests/java/ifc/linguistic2/_XSpellChecker.java b/qadevOOo/tests/java/ifc/linguistic2/_XSpellChecker.java
index 3893aec2bb9f..1645b28bc34d 100644
--- a/qadevOOo/tests/java/ifc/linguistic2/_XSpellChecker.java
+++ b/qadevOOo/tests/java/ifc/linguistic2/_XSpellChecker.java
@@ -41,6 +41,7 @@ public class _XSpellChecker extends MultiMethodTest {
     public XSpellChecker oObj = null;
     XSpellChecker alternative = null;
 
+    @Override
     public void before() {
         alternative = (XSpellChecker) tEnv.getObjRelation("AlternativeChecker");
         if  (alternative == null) throw new StatusException(Status.failed
diff --git a/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java b/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java
index 36c228b448f9..8aa334a8bb1d 100644
--- a/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java
+++ b/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java
@@ -60,6 +60,7 @@ public class _XImplementationLoader extends MultiMethodTest {
     * Retrieves object relations.
     * @throws StatusException If one of relations not found.
     */
+    @Override
     public void before() {
         implLoader = (String) tEnv.getObjRelation("ImplementationLoader") ;
         implUrl = (String) tEnv.getObjRelation("ImplementationUrl") ;
@@ -171,6 +172,7 @@ public class _XImplementationLoader extends MultiMethodTest {
     /**
     * Forces object recreation.
     */
+    @Override
     public void after() {
         this.disposeEnvironment() ;
     }
diff --git a/qadevOOo/tests/java/ifc/presentation/_Presentation.java b/qadevOOo/tests/java/ifc/presentation/_Presentation.java
index 3ac26dc41561..28f8a5aaba3b 100644
--- a/qadevOOo/tests/java/ifc/presentation/_Presentation.java
+++ b/qadevOOo/tests/java/ifc/presentation/_Presentation.java
@@ -64,6 +64,7 @@ public class _Presentation extends MultiPropertyTest {
     }
 
     protected PropertyTester CustomShowTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue)
                 throws java.lang.IllegalArgumentException {
             if ( ((String)oldValue).equals("SecondPresentation") ) {
diff --git a/qadevOOo/tests/java/ifc/presentation/_PresentationView.java b/qadevOOo/tests/java/ifc/presentation/_PresentationView.java
index 3927f81e191b..0846877b1b58 100644
--- a/qadevOOo/tests/java/ifc/presentation/_PresentationView.java
+++ b/qadevOOo/tests/java/ifc/presentation/_PresentationView.java
@@ -26,6 +26,7 @@ public class _PresentationView extends MultiPropertyTest {
      * Property tester which changes DrawPage.
      */
     protected PropertyTester PageTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue)
                 throws java.lang.IllegalArgumentException {
             if (oldValue.equals(tEnv.getObjRelation("FirstPage")))
diff --git a/qadevOOo/tests/java/ifc/qadevooo/_SelfTest.java b/qadevOOo/tests/java/ifc/qadevooo/_SelfTest.java
index 42b70fd89b86..c67dde39b07e 100644
--- a/qadevOOo/tests/java/ifc/qadevooo/_SelfTest.java
+++ b/qadevOOo/tests/java/ifc/qadevooo/_SelfTest.java
@@ -33,6 +33,7 @@ public class _SelfTest extends MultiMethodTest
 
     /**
     */
+    @Override
     public void before()
         {
             log.println("_SelfTest.before()");
@@ -62,6 +63,7 @@ public class _SelfTest extends MultiMethodTest
     /**
     * Forces object environment recreation.
     */
+    @Override
     public void after()
         {
             log.println("_SelfTest.after()");
diff --git a/qadevOOo/tests/java/ifc/registry/_XImplementationRegistration.java b/qadevOOo/tests/java/ifc/registry/_XImplementationRegistration.java
index d2ab01f456cb..7603f8a00594 100644
--- a/qadevOOo/tests/java/ifc/registry/_XImplementationRegistration.java
+++ b/qadevOOo/tests/java/ifc/registry/_XImplementationRegistration.java
@@ -175,6 +175,7 @@ public class _XImplementationRegistration extends MultiMethodTest {
         tRes.tested("revokeImplementation()", true) ;
     }
 
+    @Override
     public void after() {
         this.disposeEnvironment() ;
     }
diff --git a/qadevOOo/tests/java/ifc/registry/_XSimpleRegistry.java b/qadevOOo/tests/java/ifc/registry/_XSimpleRegistry.java
index 1b73af54f9b6..1848429a850d 100644
--- a/qadevOOo/tests/java/ifc/registry/_XSimpleRegistry.java
+++ b/qadevOOo/tests/java/ifc/registry/_XSimpleRegistry.java
@@ -71,6 +71,7 @@ public class _XSimpleRegistry extends MultiMethodTest {
     * Retrieves object relations.
     * @throws StatusException If one of required relations not found.
     */
+    @Override
     protected void before() {
         if (tEnv.getObjRelation("configuration") != null) {
             configuration = true;
diff --git a/qadevOOo/tests/java/ifc/sdb/_DataSource.java b/qadevOOo/tests/java/ifc/sdb/_DataSource.java
index 24c1cb3c1ae2..c190babb6e50 100644
--- a/qadevOOo/tests/java/ifc/sdb/_DataSource.java
+++ b/qadevOOo/tests/java/ifc/sdb/_DataSource.java
@@ -63,6 +63,7 @@ public class _DataSource extends MultiPropertyTest {
             Object oldInfo = oObj.getPropertyValue("Info") ;
 
             testProperty("Info", new PropertyTester() {
+                @Override
                 protected Object getNewValue(String propName, Object oldValue) {
 
                     PropertyValue propUsr = new PropertyValue(),
@@ -140,6 +141,7 @@ public class _DataSource extends MultiPropertyTest {
     */
     public void _NumberFormatsSupplier() {
         testProperty("NumberFormatsSupplier", new PropertyTester() {
+            @Override
             protected Object getNewValue(String propName, Object oldValue) {
                 return null ;
             }
@@ -149,6 +151,7 @@ public class _DataSource extends MultiPropertyTest {
     /**
     * If object test allows to recreate environment it is better to do it.
     */
+    @Override
     public void after() {
         try {
             oObj.setPropertyValue("IsPasswordRequired",new Boolean(false));
diff --git a/qadevOOo/tests/java/ifc/sdb/_RowSet.java b/qadevOOo/tests/java/ifc/sdb/_RowSet.java
index 9a50fbd1f524..d4b9efbf884a 100644
--- a/qadevOOo/tests/java/ifc/sdb/_RowSet.java
+++ b/qadevOOo/tests/java/ifc/sdb/_RowSet.java
@@ -65,12 +65,14 @@ public class _RowSet extends MultiPropertyTest {
     protected class SafeTester extends PropertyTester {
         Object oldValue = null ;
 
+        @Override
         protected Object getNewValue(String prop, Object old) {
             log.println("Testing with SafeTester ...") ;
             oldValue = old ;
             return super.getNewValue(prop, old) ;
         }
 
+        @Override
         protected void checkResult(String propName, Object oldValue,
             Object newValue, Object resValue, Exception exception)
             throws Exception {
@@ -102,6 +104,7 @@ public class _RowSet extends MultiPropertyTest {
      *
      * @see SafeTester
      */
+    @Override
     protected void testProperty(String propName) {
         testProperty(propName, new SafeTester()) ;
     }
@@ -132,6 +135,7 @@ public class _RowSet extends MultiPropertyTest {
     /**
     * Forces environment recreation.
     */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/sdb/_XCompletedExecution.java b/qadevOOo/tests/java/ifc/sdb/_XCompletedExecution.java
index 28c03caf8618..4ff9f65fb211 100644
--- a/qadevOOo/tests/java/ifc/sdb/_XCompletedExecution.java
+++ b/qadevOOo/tests/java/ifc/sdb/_XCompletedExecution.java
@@ -47,6 +47,7 @@ public class _XCompletedExecution extends MultiMethodTest {
         public boolean checkInteractionHandler();
     }
 
+    @Override
     protected void before() {
         checkHandler = (CheckInteractionHandler)
                         tEnv.getObjRelation("InteractionHandlerChecker");
@@ -69,6 +70,7 @@ public class _XCompletedExecution extends MultiMethodTest {
         tRes.tested("executeWithCompletion()", checkHandler.checkInteractionHandler());
     }
 
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/sdb/_XRowSetApproveBroadcaster.java b/qadevOOo/tests/java/ifc/sdb/_XRowSetApproveBroadcaster.java
index 702ed7259af1..8f525182a413 100644
--- a/qadevOOo/tests/java/ifc/sdb/_XRowSetApproveBroadcaster.java
+++ b/qadevOOo/tests/java/ifc/sdb/_XRowSetApproveBroadcaster.java
@@ -117,6 +117,7 @@ public class _XRowSetApproveBroadcaster extends MultiMethodTest {
     /**
     * Tries to retrieve object relation.
     */
+    @Override
     public void before() {
         checker = (RowSetApproveChecker) tEnv.getObjRelation
             ("XRowSetApproveBroadcaster.ApproveChecker") ;
@@ -196,6 +197,7 @@ public class _XRowSetApproveBroadcaster extends MultiMethodTest {
     /**
     * Disposes object environment.
     */
+    @Override
     public void after() {
         disposeEnvironment() ;
     }
diff --git a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java
index f0ff54731561..c822438d9be0 100644
--- a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java
+++ b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java
@@ -61,6 +61,7 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest {
     * </ul> <p>
      * @see com.sun.star.sdb.XSingleSelectQueryComposer
      */
+    @Override
     protected void before() {
 
         xComposer = UnoRuntime.queryInterface(XSingleSelectQueryComposer.class,
diff --git a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java
index b8022140c51b..b79c2f509efa 100644
--- a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java
+++ b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java
@@ -72,6 +72,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest {
      * @see com.sun.star.sdb.XSingleSelectQueryAnalyzer
      * @see com.sun.star.beans.XPropertySet
      */
+    @Override
     protected void before() /* throws Exception*/ {
 
         xQueryAna = UnoRuntime.queryInterface(XSingleSelectQueryAnalyzer.class,
diff --git a/qadevOOo/tests/java/ifc/sdbc/_XCloseable.java b/qadevOOo/tests/java/ifc/sdbc/_XCloseable.java
index 56d149fa74f9..45aa0fa0e676 100644
--- a/qadevOOo/tests/java/ifc/sdbc/_XCloseable.java
+++ b/qadevOOo/tests/java/ifc/sdbc/_XCloseable.java
@@ -76,6 +76,7 @@ public class _XCloseable extends MultiMethodTest {
     /**
     * Forces environment recreation.
     */
+    @Override
     public void after() {
         disposeEnvironment() ;
     }
diff --git a/qadevOOo/tests/java/ifc/sdbc/_XDriver.java b/qadevOOo/tests/java/ifc/sdbc/_XDriver.java
index 7f14518a2dbf..4b0eb147f2ff 100644
--- a/qadevOOo/tests/java/ifc/sdbc/_XDriver.java
+++ b/qadevOOo/tests/java/ifc/sdbc/_XDriver.java
@@ -61,6 +61,7 @@ public class _XDriver extends MultiMethodTest {
     * Retrieves relations.
     * @throw StatusException If any relation not found.
     */
+    @Override
     protected void before() {
         nbu = (String) tEnv.getObjRelation("NoBadURL");
         url = (String)tEnv.getObjRelation("XDriver.URL");
diff --git a/qadevOOo/tests/java/ifc/sdbc/_XDriverManager.java b/qadevOOo/tests/java/ifc/sdbc/_XDriverManager.java
index 0b531c03afbf..57477b4a7189 100644
--- a/qadevOOo/tests/java/ifc/sdbc/_XDriverManager.java
+++ b/qadevOOo/tests/java/ifc/sdbc/_XDriverManager.java
@@ -60,6 +60,7 @@ public class _XDriverManager extends MultiMethodTest {
     /**
      * Retrieves the required object relations.
      */
+    @Override
     protected void before() {
         sdbcURL = (String)tEnv.getObjRelation("SDBC.URL");
         if (sdbcURL == null) {
diff --git a/qadevOOo/tests/java/ifc/sdbc/_XParameters.java b/qadevOOo/tests/java/ifc/sdbc/_XParameters.java
index bead09fd6b8e..5701729ecac3 100644
--- a/qadevOOo/tests/java/ifc/sdbc/_XParameters.java
+++ b/qadevOOo/tests/java/ifc/sdbc/_XParameters.java
@@ -99,6 +99,7 @@ public class _XParameters extends MultiMethodTest {
     /**
     * Gets object relation
     */
+    @Override
     public void before() {
         data = (List<Object>) tEnv.getObjRelation("XParameters.ParamValues") ;
         if (data == null) {
diff --git a/qadevOOo/tests/java/ifc/sdbc/_XResultSet.java b/qadevOOo/tests/java/ifc/sdbc/_XResultSet.java
index c6256a755679..a2114d7d0a6e 100644
--- a/qadevOOo/tests/java/ifc/sdbc/_XResultSet.java
+++ b/qadevOOo/tests/java/ifc/sdbc/_XResultSet.java
@@ -71,6 +71,7 @@ public class _XResultSet extends MultiMethodTest {
      * Positions the cursor to the first row.
      * Forces method tests to be executed in definite order.
      */
+    @Override
     public void before() {
         try {
             oObj.last() ;
@@ -481,6 +482,7 @@ public class _XResultSet extends MultiMethodTest {
      * Moves the cursor to the first row to avoid affection to
      * the following interfaces tests
      */
+    @Override
     public void after() {
         log.println("Finally moving cursor to the first row ...");
         try {
diff --git a/qadevOOo/tests/java/ifc/sdbc/_XResultSetUpdate.java b/qadevOOo/tests/java/ifc/sdbc/_XResultSetUpdate.java
index 8420adcb72d5..b32e93dbdf8c 100644
--- a/qadevOOo/tests/java/ifc/sdbc/_XResultSetUpdate.java
+++ b/qadevOOo/tests/java/ifc/sdbc/_XResultSetUpdate.java
@@ -87,6 +87,7 @@ public class _XResultSetUpdate extends MultiMethodTest {
     * Retrieves relation.
     * @throw StatusException If relation not found.
     */
+    @Override
     public void before() throws StatusException {
         tester = (UpdateTester)tEnv.getObjRelation
             ("XResultSetUpdate.UpdateTester") ;
@@ -245,6 +246,7 @@ public class _XResultSetUpdate extends MultiMethodTest {
     /**
     * Forces environment to be recreated.
     */
+    @Override
     public void after() {
         //disposeEnvironment() ;
     }
diff --git a/qadevOOo/tests/java/ifc/sdbc/_XRow.java b/qadevOOo/tests/java/ifc/sdbc/_XRow.java
index b7d680ef1cca..d681384b9bac 100644
--- a/qadevOOo/tests/java/ifc/sdbc/_XRow.java
+++ b/qadevOOo/tests/java/ifc/sdbc/_XRow.java
@@ -100,6 +100,7 @@ public class _XRow extends MultiMethodTest {
     /**
     * Retrieves object relation first.
     */
+    @Override
     public void before() {
         data = (List<Object>) tEnv.getObjRelation("CurrentRowData") ;
     }
diff --git a/qadevOOo/tests/java/ifc/sdbc/_XRowSet.java b/qadevOOo/tests/java/ifc/sdbc/_XRowSet.java
index 1c77be883789..4d5e4529a39e 100644
--- a/qadevOOo/tests/java/ifc/sdbc/_XRowSet.java
+++ b/qadevOOo/tests/java/ifc/sdbc/_XRowSet.java
@@ -81,6 +81,7 @@ public class _XRowSet extends MultiMethodTest {
     * Retrieves relation.
     * @throw StatusException If relation not found.
     */
+    @Override
     public void before() throws StatusException {
         checker = (_XRowSetApproveBroadcaster.RowSetApproveChecker)
             tEnv.getObjRelation("XRowSetApproveBroadcaster.ApproveChecker") ;
@@ -182,6 +183,7 @@ public class _XRowSet extends MultiMethodTest {
     /**
     * Disposes test environment.
     */
+    @Override
     public void after() {
         disposeEnvironment() ;
     }
diff --git a/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java b/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java
index 9e27da7462f9..9b55ded68714 100644
--- a/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java
+++ b/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java
@@ -98,6 +98,7 @@ public class _XRowUpdate extends MultiMethodTest {
     /**
     * Gets relations.
     */
+    @Override
     public void before() {
         rowData = (List<Object>) tEnv.getObjRelation("CurrentRowData") ;
         if (rowData == null) {
@@ -671,6 +672,7 @@ public class _XRowUpdate extends MultiMethodTest {
     /**
     * Disposes environment.
     */
+    @Override
     public void after() {
         disposeEnvironment() ;
     }
diff --git a/qadevOOo/tests/java/ifc/sdbcx/_XDataDefinitionSupplier.java b/qadevOOo/tests/java/ifc/sdbcx/_XDataDefinitionSupplier.java
index e6aad78638a6..a7c21573956e 100644
--- a/qadevOOo/tests/java/ifc/sdbcx/_XDataDefinitionSupplier.java
+++ b/qadevOOo/tests/java/ifc/sdbcx/_XDataDefinitionSupplier.java
@@ -60,6 +60,7 @@ public class _XDataDefinitionSupplier extends MultiMethodTest {
     * Retrieves relations.
     * @throw StatusException If any relation not found.
     */
+    @Override
     protected void before() {
         url = (String)tEnv.getObjRelation("XDriver.URL");
         if (url == null) {
diff --git a/qadevOOo/tests/java/ifc/sdbcx/_XDeleteRows.java b/qadevOOo/tests/java/ifc/sdbcx/_XDeleteRows.java
index 64287c973139..1e412f27f5c4 100644
--- a/qadevOOo/tests/java/ifc/sdbcx/_XDeleteRows.java
+++ b/qadevOOo/tests/java/ifc/sdbcx/_XDeleteRows.java
@@ -76,6 +76,7 @@ public class _XDeleteRows extends MultiMethodTest {
         tRes.tested("deleteRows()", rowsBefore - 1 == rowsAfter);
     }
 
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/sheet/_DataPilotField.java b/qadevOOo/tests/java/ifc/sheet/_DataPilotField.java
index f16b968082f6..13debc4a32cd 100644
--- a/qadevOOo/tests/java/ifc/sheet/_DataPilotField.java
+++ b/qadevOOo/tests/java/ifc/sheet/_DataPilotField.java
@@ -40,6 +40,7 @@ public class _DataPilotField extends MultiPropertyTest {
      *This class is destined to custom test of property <code>SortInfo</code>.
      */
     protected PropertyTester SortInfoTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             DataPilotFieldSortInfo sortInfo = new DataPilotFieldSortInfo();
         sortInfo.Mode = com.sun.star.sheet.DataPilotFieldSortMode.MANUAL;
@@ -66,6 +67,7 @@ public class _DataPilotField extends MultiPropertyTest {
      *This class is destined to custom test of property <code>LayoutInfo</code>.
      */
     protected PropertyTester LayoutInfoTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             DataPilotFieldLayoutInfo layoutInfo = new DataPilotFieldLayoutInfo();
             layoutInfo.LayoutMode = com.sun.star.sheet.DataPilotFieldLayoutMode.OUTLINE_SUBTOTALS_BOTTOM;
@@ -91,6 +93,7 @@ public class _DataPilotField extends MultiPropertyTest {
      *This class is destined to custom test of property <code>AutoShowInfo</code>.
      */
     protected PropertyTester AutoShowInfoTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             DataPilotFieldAutoShowInfo AutoShowInfo = new DataPilotFieldAutoShowInfo();
             AutoShowInfo.DataField = "Col1";
@@ -116,6 +119,7 @@ public class _DataPilotField extends MultiPropertyTest {
      *This class is destined to custom test of property <code>Reference</code>.
      */
     protected PropertyTester ReferenceTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             DataPilotFieldReference Reference = new DataPilotFieldReference();
             Reference.ReferenceField="Col1";
diff --git a/qadevOOo/tests/java/ifc/sheet/_Scenario.java b/qadevOOo/tests/java/ifc/sheet/_Scenario.java
index ce01ebf4d91d..48efe7a84bb6 100644
--- a/qadevOOo/tests/java/ifc/sheet/_Scenario.java
+++ b/qadevOOo/tests/java/ifc/sheet/_Scenario.java
@@ -24,6 +24,7 @@ import lib.MultiPropertyTest;
 
 
 public class _Scenario extends MultiPropertyTest {
+    @Override
     public void before() {
         oObj = UnoRuntime.queryInterface(XPropertySet.class,
                                                         tEnv.getObjRelation(
diff --git a/qadevOOo/tests/java/ifc/sheet/_SheetLink.java b/qadevOOo/tests/java/ifc/sheet/_SheetLink.java
index 8ab6e186e0b0..503d13a72864 100644
--- a/qadevOOo/tests/java/ifc/sheet/_SheetLink.java
+++ b/qadevOOo/tests/java/ifc/sheet/_SheetLink.java
@@ -38,6 +38,7 @@ public class _SheetLink extends MultiPropertyTest {
      *This class is destined to custom test of property <code>Url</code>.
      */
     protected PropertyTester UrlTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             String newValue = (String) ValueChanger.changePValue(oldValue);
             if ( !newValue.startsWith("file://") ) {
@@ -59,6 +60,7 @@ public class _SheetLink extends MultiPropertyTest {
      *This class is destined to custom test of property <code>Filter</code>.
      */
     protected PropertyTester FilterTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             return "StarCalc 4.0";
         }
diff --git a/qadevOOo/tests/java/ifc/sheet/_Spreadsheet.java b/qadevOOo/tests/java/ifc/sheet/_Spreadsheet.java
index ef8810d4a9e1..369c592a1bcd 100644
--- a/qadevOOo/tests/java/ifc/sheet/_Spreadsheet.java
+++ b/qadevOOo/tests/java/ifc/sheet/_Spreadsheet.java
@@ -36,6 +36,7 @@ public class _Spreadsheet extends MultiPropertyTest {
      *This class is destined to custom test of property <code>PageStyle</code>.
      */
     protected PropertyTester styleTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             String str = "Default";
             String str2= "Report";
diff --git a/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java b/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java
index b2a73a0b4533..e3b388b8dcbd 100644
--- a/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java
+++ b/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java
@@ -53,6 +53,7 @@ public class _SpreadsheetDocumentSettings extends MultiPropertyTest {
      *This class is destined to custom test of property <code>NullDate</code>.
      */
     protected PropertyTester DateTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             Date date = (Date) oldValue;
             Date newDate = new Date((short) (date.Day - 1), date.Month,
@@ -66,10 +67,12 @@ public class _SpreadsheetDocumentSettings extends MultiPropertyTest {
      *This class is destined to custom test of property <code>ForbiddenCharacters</code>.
      */
     protected PropertyTester ChrTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             return new ForbiddenChrTest();
         }
 
+        @Override
         protected boolean compare(Object obj1, Object obj2) {
             Locale loc = new Locale("ru", "RU", "");
             XForbiddenCharacters fc1 = UnoRuntime.queryInterface(
diff --git a/qadevOOo/tests/java/ifc/sheet/_SpreadsheetViewSettings.java b/qadevOOo/tests/java/ifc/sheet/_SpreadsheetViewSettings.java
index 5d3532a69617..5aa4994daf98 100644
--- a/qadevOOo/tests/java/ifc/sheet/_SpreadsheetViewSettings.java
+++ b/qadevOOo/tests/java/ifc/sheet/_SpreadsheetViewSettings.java
@@ -59,6 +59,7 @@ public class _SpreadsheetViewSettings extends MultiPropertyTest {
     /**
     * Forces environment recreation.
     */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField.java b/qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField.java
index 871c3d116e9a..fc21d22263c5 100644
--- a/qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField.java
+++ b/qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField.java
@@ -82,6 +82,7 @@ public class _TableAutoFormatField extends MultiPropertyTest {
     */
     public void _CharFontName() {
         testProperty("CharFontName", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return "Courier".equals(old) ? "Times New Roman" : "Courier" ;
             }
@@ -95,6 +96,7 @@ public class _TableAutoFormatField extends MultiPropertyTest {
     */
     public void _CharLocale() {
         testProperty("CharLocale", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return old == null || ((Locale)old).Language == "de" ?
                     new Locale("es", "ES", "") : new Locale("de", "DE", "") ;
@@ -108,6 +110,7 @@ public class _TableAutoFormatField extends MultiPropertyTest {
     */
     public void _ShadowFormat() {
         testProperty("ShadowFormat", new PropertyTester() {
+            @Override
             protected Object getNewValue(String p, Object old) {
                 return old == null ? new com.sun.star.table.ShadowFormat() :
                     super.getNewValue(p, old) ;
diff --git a/qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster.java b/qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster.java
index d12789cefae8..5d2d15dc6628 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster.java
@@ -72,6 +72,7 @@ public class _XActivationBroadcaster extends MultiMethodTest {
         tRes.tested("removeActivationEventListener()", !listenerCalled);
     }
 
+    @Override
     public void before() {
         xSpreadsheetView = UnoRuntime.queryInterface(
                                    XSpreadsheetView.class,
diff --git a/qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange.java b/qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange.java
index fde204d3ce6a..7fa5a7feccbd 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange.java
@@ -165,6 +165,7 @@ public class _XArrayFormulaRange extends MultiMethodTest {
     /**
     * Forces environment recreation.
     */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/sheet/_XCalculatable.java b/qadevOOo/tests/java/ifc/sheet/_XCalculatable.java
index 7176d388d640..260b452b131c 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XCalculatable.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XCalculatable.java
@@ -35,6 +35,7 @@ public class _XCalculatable extends MultiMethodTest {
      * Get object relation: four cells with values and formulas.
      * @see mod._sc.ScModelObj
      */
+    @Override
     public void before() {
         xCells = (XCell[])tEnv.getObjRelation("XCalculatable.Cells");
         if (xCells == null || xCells.length != 3)
@@ -45,6 +46,7 @@ public class _XCalculatable extends MultiMethodTest {
     /**
      * Restore begin setting
      */
+    @Override
     public void after() {
         // reset to begin value
         oObj.enableAutomaticCalculation(bIsAutomaticCalculationEnabled);
diff --git a/qadevOOo/tests/java/ifc/sheet/_XCellRangesQuery.java b/qadevOOo/tests/java/ifc/sheet/_XCellRangesQuery.java
index d0554788bd42..29705c6e84a9 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XCellRangesQuery.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XCellRangesQuery.java
@@ -65,6 +65,7 @@ public class _XCellRangesQuery extends MultiMethodTest {
     public static final int QUERYROWDIFFERENCES = 5;
     public static final int QUERYVISIBLECELLS = 6;
 
+    @Override
     protected void before() {
         oSheet = (XSpreadsheet) tEnv.getObjRelation("SHEET");
 
@@ -290,6 +291,7 @@ public class _XCellRangesQuery extends MultiMethodTest {
     /**
     * Forces environment recreation.
     */
+    @Override
     protected void after() {
         if(bMakeEntriesAndDispose) {
             disposeEnvironment();
diff --git a/qadevOOo/tests/java/ifc/sheet/_XCellSeries.java b/qadevOOo/tests/java/ifc/sheet/_XCellSeries.java
index 6152d2c243ee..72e078e9c0cb 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XCellSeries.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XCellSeries.java
@@ -36,6 +36,7 @@ public class _XCellSeries extends MultiMethodTest {
     protected boolean forceFillAuto = false;
 
 
+    @Override
     protected void before() {
         oSheet = (XSpreadsheet) tEnv.getObjRelation("SHEET");
 
@@ -229,6 +230,7 @@ public class _XCellSeries extends MultiMethodTest {
     /**
     * Forces environment recreation.
     */
+    @Override
     public void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/sheet/_XDataPilotDescriptor.java b/qadevOOo/tests/java/ifc/sheet/_XDataPilotDescriptor.java
index 99d4856903cf..9fa571f48af6 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XDataPilotDescriptor.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XDataPilotDescriptor.java
@@ -67,6 +67,7 @@ public class _XDataPilotDescriptor extends MultiMethodTest {
     * Retrieves object relations.
     * @throws StatusException If one of relations not found.
     */
+    @Override
     protected void before() {
         Integer amount = (Integer)tEnv.getObjRelation("FIELDSAMOUNT");
         if (amount == null) throw new StatusException(Status.failed
@@ -411,6 +412,7 @@ public class _XDataPilotDescriptor extends MultiMethodTest {
     /**
      * Recreates object(to back old orientations of the fields).
      */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable.java b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable.java
index 959d752f5956..d6db10c87172 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable.java
@@ -53,6 +53,7 @@ public class _XDataPilotTable extends MultiMethodTest {
     XCell xCellForCheck = null;
     CellAddress OutputRange = null;
 
+    @Override
     protected void before() {
         xCellForChange = (XCell)tEnv.getObjRelation("CELLFORCHANGE");
         xCellForCheck = (XCell)tEnv.getObjRelation("CELLFORCHECK");
diff --git a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java
index ff8296aeefd3..9192a1ef38c8 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java
@@ -70,6 +70,7 @@ public class _XDataPilotTable2 extends MultiMethodTest
      */
     private class ResultCellFailure extends com.sun.star.uno.Exception {}
 
+    @Override
     protected void before()
     {
         Object o = tEnv.getObjRelation("DATAPILOTTABLE2");
diff --git a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTables.java b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTables.java
index fa0ea9ad6584..820bd4413340 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTables.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTables.java
@@ -54,6 +54,7 @@ public class _XDataPilotTables extends MultiMethodTest {
     * Retrieves object relations.
     * @throws StatusException If one of relations not found.
     */
+    @Override
     protected void before() {
         oSheet = (XSpreadsheet)tEnv.getObjRelation("SHEET");
         if (oSheet == null) throw new StatusException(Status.failed
diff --git a/qadevOOo/tests/java/ifc/sheet/_XDatabaseRange.java b/qadevOOo/tests/java/ifc/sheet/_XDatabaseRange.java
index 9f1cea195609..f7ea1453c80e 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XDatabaseRange.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XDatabaseRange.java
@@ -64,6 +64,7 @@ public class _XDatabaseRange extends MultiMethodTest {
     * Retrieves object relations.
     * @throws StatusException If one of relations not found.
     */
+    @Override
     protected void before() {
         oldCRA = (CellRangeAddress)tEnv.getObjRelation("DATAAREA");
         if (oldCRA == null) {
@@ -227,6 +228,7 @@ public class _XDatabaseRange extends MultiMethodTest {
         tRes.tested("setDataArea()", true);
     }
 
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java b/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java
index 0996351fc09c..bba15dd95b95 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java
@@ -50,6 +50,7 @@ public class _XDocumentAuditing extends MultiMethodTest {
     String sheetName = null;
     Point pos = null;
 
+    @Override
     public void before() {
         Exception ex = null;
         // get two sheets
@@ -126,6 +127,7 @@ public class _XDocumentAuditing extends MultiMethodTest {
         }
     }
 
+    @Override
     public void after() {
         // switch the automatic refresh back on
         PropertyValue[] props = new PropertyValue[1];
diff --git a/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java b/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java
index 9c5bb63e46df..484edfdd521c 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java
@@ -43,6 +43,7 @@ public class _XEnhancedMouseClickBroadcaster extends MultiMethodTest {
     protected XEnhancedMouseClickHandler listener = new MyListener();
     private XModel docModel = null;
 
+    @Override
     public void before() {
         docModel = UnoRuntime.queryInterface(
                 XModel.class,tEnv.getObjRelation("FirstModel"));
diff --git a/qadevOOo/tests/java/ifc/sheet/_XFormulaQuery.java b/qadevOOo/tests/java/ifc/sheet/_XFormulaQuery.java
index 01d53899a034..7a41fc0603c0 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XFormulaQuery.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XFormulaQuery.java
@@ -40,6 +40,7 @@ public class _XFormulaQuery extends MultiMethodTest {
     private int[] miExpectedDependentValues;
     private int[] miExpectedPrecedentValues;
 
+    @Override
     protected void before() {
         oSheet = (XSpreadsheet)tEnv.getObjRelation("SHEET");
 
@@ -181,6 +182,7 @@ public class _XFormulaQuery extends MultiMethodTest {
     /**
     * Forces environment recreation.
     */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java b/qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java
index d19a94cb85e5..c8c31ac79229 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XGoalSeek.java
@@ -37,6 +37,7 @@ public class _XGoalSeek extends MultiMethodTest {
     CellAddress aFormula = null;
     CellAddress aValue = null;
 
+    @Override
     public void before() {
         Exception ex = null;
         // get two sheets
diff --git a/qadevOOo/tests/java/ifc/sheet/_XMultipleOperation.java b/qadevOOo/tests/java/ifc/sheet/_XMultipleOperation.java
index 8aaede910f0b..4f51db581af4 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XMultipleOperation.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XMultipleOperation.java
@@ -37,6 +37,7 @@ public class _XMultipleOperation extends MultiMethodTest {
     protected XSpreadsheet oSheet = null;
     boolean both = true;
 
+    @Override
     protected void before() {
         oSheet = (XSpreadsheet) tEnv.getObjRelation("SHEET");
 
@@ -167,6 +168,7 @@ public class _XMultipleOperation extends MultiMethodTest {
     /**
      * Restores initial component text.
      */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/sheet/_XNamedRange.java b/qadevOOo/tests/java/ifc/sheet/_XNamedRange.java
index 63bf5515da8b..110a0b03f6bd 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XNamedRange.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XNamedRange.java
@@ -191,6 +191,7 @@ public class _XNamedRange extends MultiMethodTest {
     /**
     * Forces object environment recreation.
     */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/sheet/_XNamedRanges.java b/qadevOOo/tests/java/ifc/sheet/_XNamedRanges.java
index a1505b5138b2..78c867d69d04 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XNamedRanges.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XNamedRanges.java
@@ -66,6 +66,7 @@ public class _XNamedRanges extends MultiMethodTest {
     * Retrieves object relations.
     * @throws StatusException If one of relations not found.
     */
+    @Override
     protected void before() {
         oSheet = (XSpreadsheet)tEnv.getObjRelation("SHEET");
         if (oSheet == null) throw new StatusException(Status.failed
diff --git a/qadevOOo/tests/java/ifc/sheet/_XPrintAreas.java b/qadevOOo/tests/java/ifc/sheet/_XPrintAreas.java
index 720b120afbda..476479edaecf 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XPrintAreas.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XPrintAreas.java
@@ -34,6 +34,7 @@ public class _XPrintAreas extends MultiMethodTest {
     CellRangeAddress titleColumns;
     CellRangeAddress titleRows;
 
+    @Override
     public void before() {
         address = (CellRangeAddress)tEnv.getObjRelation("CellRangeAddress");
         subaddress = (CellRangeAddress)tEnv.getObjRelation("CellRangeSubAddress");
diff --git a/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java b/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java
index 5fb682a45365..7a6b8e8d61a9 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java
@@ -52,6 +52,7 @@ public class _XRangeSelection extends MultiMethodTest {
     public XRangeSelection oObj = null;
     MyRangeSelectionListener aListener = null;
 
+    @Override
     public void before() {
         aListener = new _XRangeSelection.MyRangeSelectionListener(log);
         // workaround for i34499
diff --git a/qadevOOo/tests/java/ifc/sheet/_XScenario.java b/qadevOOo/tests/java/ifc/sheet/_XScenario.java
index 0c45d187f362..4860a7a2dba4 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XScenario.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XScenario.java
@@ -31,6 +31,7 @@ public class _XScenario extends MultiMethodTest {
     String comment = null;
     boolean skipTest = false;
 
+    @Override
     public void before() {
         // testing a scenario containing the whole sheet does not make sense.
         // test is skipped until this interface is implemented somewhere else
diff --git a/qadevOOo/tests/java/ifc/sheet/_XScenarioEnhanced.java b/qadevOOo/tests/java/ifc/sheet/_XScenarioEnhanced.java
index 2a17173ab1f6..162121cf76e6 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XScenarioEnhanced.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XScenarioEnhanced.java
@@ -26,6 +26,7 @@ import lib.MultiMethodTest;
 public class _XScenarioEnhanced extends MultiMethodTest {
     public XScenarioEnhanced oObj = null;
 
+    @Override
     public void before() {
         oObj = UnoRuntime.queryInterface(
                        XScenarioEnhanced.class,
diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java b/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java
index a2084b65de9f..5be2edee32ce 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XSheetAuditing.java
@@ -46,6 +46,7 @@ public class _XSheetAuditing extends MultiMethodTest {
     XDrawPage xDrawPage = null;
     int elementCount = 0;
 
+    @Override
     public void before() {
         address = (CellAddress)tEnv.getObjRelation("XSheetAuditing.CellAddress");
         precedentAddress = (CellAddress)tEnv.getObjRelation("XSheetAuditing.PrecedentCellAddress");
diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetCellRangeContainer.java b/qadevOOo/tests/java/ifc/sheet/_XSheetCellRangeContainer.java
index bf9c813eae40..a852daf67fbd 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XSheetCellRangeContainer.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XSheetCellRangeContainer.java
@@ -44,6 +44,7 @@ public class _XSheetCellRangeContainer extends MultiMethodTest {
     * After method called, the new array of structures 'CellRangeAddress'
     *  is created. Then container is cleared.
     */
+    @Override
     public void before() {
         for ( short i=0; i<=2; i++ ) {
             rAddr[i] = new CellRangeAddress();
@@ -189,6 +190,7 @@ public class _XSheetCellRangeContainer extends MultiMethodTest {
     /**
     * Forces environment recreation.
     */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntries.java b/qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntries.java
index 7c93e77ec7f4..fc631d909579 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntries.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XSheetConditionalEntries.java
@@ -120,6 +120,7 @@ public class _XSheetConditionalEntries extends MultiMethodTest {
     /**
     * Forces object environment recreation.
     */
+    @Override
     protected void after() {
         this.disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetFilterable.java b/qadevOOo/tests/java/ifc/sheet/_XSheetFilterable.java
index d35703041884..793635b0cf22 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XSheetFilterable.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XSheetFilterable.java
@@ -36,6 +36,7 @@ public class _XSheetFilterable extends MultiMethodTest {
     protected XSpreadsheet oSheet;
     protected XSheetFilterDescriptor desc;
 
+    @Override
     protected void before() {
         oSheet = (XSpreadsheet) tEnv.getObjRelation("SHEET");
 
diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetLinkable.java b/qadevOOo/tests/java/ifc/sheet/_XSheetLinkable.java
index 347ea628291c..8494525b40d5 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XSheetLinkable.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XSheetLinkable.java
@@ -32,6 +32,7 @@ public class _XSheetLinkable extends MultiMethodTest {
     String linkUrl = null;
     String linkUrl2 = null;
 
+    @Override
     public void before() {
         // get a document for linking.
         linkUrl = (String)tEnv.getObjRelation("XSheetLinkable.LinkSheet");
diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetOutline.java b/qadevOOo/tests/java/ifc/sheet/_XSheetOutline.java
index 2b73249a12ef..7471ea4a6df4 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XSheetOutline.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XSheetOutline.java
@@ -36,6 +36,7 @@ public class _XSheetOutline extends MultiMethodTest {
     CellRangeAddress address = null;
     CellRangeAddress subaddress = null;
 
+    @Override
     public void before() {
         address = (CellRangeAddress)tEnv.getObjRelation("CellRangeAddress");
         subaddress = (CellRangeAddress)tEnv.getObjRelation("CellRangeSubAddress");
diff --git a/qadevOOo/tests/java/ifc/sheet/_XSpreadsheets.java b/qadevOOo/tests/java/ifc/sheet/_XSpreadsheets.java
index fd048dc9a984..fe7188b4fe38 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XSpreadsheets.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XSpreadsheets.java
@@ -41,6 +41,7 @@ public class _XSpreadsheets extends MultiMethodTest {
     /**
     * Sets the unique number for the current test.
     */
+    @Override
     protected synchronized void before() {
         uniqNumber = uniqCount++;
     }
diff --git a/qadevOOo/tests/java/ifc/sheet/_XSubTotalCalculatable.java b/qadevOOo/tests/java/ifc/sheet/_XSubTotalCalculatable.java
index d34f89f4403f..b84798e995a6 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XSubTotalCalculatable.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XSubTotalCalculatable.java
@@ -33,6 +33,7 @@ public class _XSubTotalCalculatable extends MultiMethodTest {
     protected XSubTotalDescriptor desc;
     protected XSpreadsheet oSheet;
 
+    @Override
     protected void before() {
         oSheet = (XSpreadsheet) tEnv.getObjRelation("SHEET");
 
diff --git a/qadevOOo/tests/java/ifc/sheet/_XSubTotalDescriptor.java b/qadevOOo/tests/java/ifc/sheet/_XSubTotalDescriptor.java
index 9c1975856499..923beaa2103c 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XSubTotalDescriptor.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XSubTotalDescriptor.java
@@ -62,6 +62,7 @@ public class _XSubTotalDescriptor extends MultiMethodTest {
     /**
     * Forces environment recreation.
     */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/sheet/_XUsedAreaCursor.java b/qadevOOo/tests/java/ifc/sheet/_XUsedAreaCursor.java
index 7c8922b97f1d..3ff16306a7a2 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XUsedAreaCursor.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XUsedAreaCursor.java
@@ -120,6 +120,7 @@ public class _XUsedAreaCursor extends MultiMethodTest {
     /**
     * Forces object environment recreation.
     */
+    @Override
     protected void after() {
         this.disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/style/_CharacterProperties.java b/qadevOOo/tests/java/ifc/style/_CharacterProperties.java
index b5f9234657d5..5a6114888f15 100644
--- a/qadevOOo/tests/java/ifc/style/_CharacterProperties.java
+++ b/qadevOOo/tests/java/ifc/style/_CharacterProperties.java
@@ -106,6 +106,7 @@ public class _CharacterProperties extends MultiPropertyTest {
 
     public void _CharHeight() {
         testProperty("CharHeight", new PropertyTester() {
+            @Override
             protected Object getNewValue(String propName, Object old) {
                 if (utils.isVoid(old)) {
                     return new Float(10) ;
@@ -121,6 +122,7 @@ public class _CharacterProperties extends MultiPropertyTest {
      * Switches between two JPG images' URLs.
      */
     protected PropertyTester URLTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             if (oldValue.equals("http://www.sun.com"))
                 return "http://www.openoffice.org"; else
@@ -156,6 +158,7 @@ public class _CharacterProperties extends MultiPropertyTest {
      * between 'Citation' and 'Emphasis' names.
      */
     protected PropertyTester StyleTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             String oStyleName1 = (String) tEnv.getObjRelation("STYLENAME1");
             String oStyleName2 = (String) tEnv.getObjRelation("STYLENAME2");
@@ -178,6 +181,7 @@ public class _CharacterProperties extends MultiPropertyTest {
      * 'Citation' and 'Emphasis' names.
      */
     protected PropertyTester StylesTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             if (utils.isVoid(oldValue) || (oldValue.equals("Standard")))
                 return new String[] {"Citation"}; else
@@ -259,6 +263,7 @@ public class _CharacterProperties extends MultiPropertyTest {
      * Custom tester for the ruby text property.
      */
     protected PropertyTester RubyTextTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue)
                 throws java.lang.IllegalArgumentException {
             if (utils.isVoid(oldValue)) {
diff --git a/qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex.java b/qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex.java
index 61339be56c1a..2582ff8c5bec 100644
--- a/qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex.java
+++ b/qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex.java
@@ -52,6 +52,7 @@ public class _CharacterPropertiesComplex extends MultiPropertyTest {
     /**
     * Forces environment recreation.
     */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/style/_PageProperties.java b/qadevOOo/tests/java/ifc/style/_PageProperties.java
index 929c9ca2b893..9a7f7312ba90 100644
--- a/qadevOOo/tests/java/ifc/style/_PageProperties.java
+++ b/qadevOOo/tests/java/ifc/style/_PageProperties.java
@@ -38,6 +38,7 @@ public class _PageProperties  extends MultiPropertyTest {
      * Switch on Header and Footer properties
      * so all props can be tested.
      */
+    @Override
     protected void before() {
         try {
             oObj.setPropertyValue("HeaderIsOn", Boolean.TRUE);
diff --git a/qadevOOo/tests/java/ifc/style/_PageStyle.java b/qadevOOo/tests/java/ifc/style/_PageStyle.java
index 08fae5901b7c..64503469d1ff 100644
--- a/qadevOOo/tests/java/ifc/style/_PageStyle.java
+++ b/qadevOOo/tests/java/ifc/style/_PageStyle.java
@@ -32,6 +32,7 @@ public class _PageStyle extends _PageProperties {
      * Test is used from _PageProperties
      * @see ifc.style._PageProperties
      */
+    @Override
     public void _PrinterPaperTray() {
         super._PrinterPaperTray();
     }
@@ -41,6 +42,7 @@ public class _PageStyle extends _PageProperties {
      * Test is used from _PageProperties
      * @see ifc.style._PageProperties
      */
+    @Override
     public void _UserDefinedAttributes() {
         super._UserDefinedAttributes();
     }
diff --git a/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java b/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java
index 9f4ba6ad8806..335d8968e6bf 100644
--- a/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java
+++ b/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java
@@ -105,6 +105,7 @@ public class _ParagraphProperties extends MultiPropertyTest {
      * 'Numbering 1' and 'Numbering 2' styles.
      */
     protected PropertyTester NumberingStyleTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue)
                               throws java.lang.IllegalArgumentException {
             if ((oldValue != null) && (oldValue.equals("Numbering 1"))) {
@@ -120,6 +121,7 @@ public class _ParagraphProperties extends MultiPropertyTest {
      * 'Salutation' and 'Heading' styles.
      */
     protected PropertyTester charStyleTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             if (!utils.isVoid(oldValue) && (oldValue.equals("Example"))) {
                 return "Emphasis";
@@ -134,6 +136,7 @@ public class _ParagraphProperties extends MultiPropertyTest {
      * 'Salutation' and 'Heading' styles.
      */
     protected PropertyTester ParaStyleTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             if (!utils.isVoid(oldValue) && (oldValue.equals("Heading"))) {
                 return "Salutation";
@@ -148,6 +151,7 @@ public class _ParagraphProperties extends MultiPropertyTest {
      * 'HTML' and 'Standard' descriptor names.
      */
     protected PropertyTester PageDescTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             if (!util.utils.isVoid(oldValue) &&
                     (oldValue.equals("Default"))) {
@@ -164,6 +168,7 @@ public class _ParagraphProperties extends MultiPropertyTest {
      * be specified. Switches between two different values.
      */
     protected PropertyTester ShortTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             if ((oldValue != null) &&
                     (oldValue.equals(new Short((short) 0)))) {
@@ -180,6 +185,7 @@ public class _ParagraphProperties extends MultiPropertyTest {
      * be specified. Switches between true and false.
      */
     protected PropertyTester BooleanTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             if ((oldValue != null) &&
                     (oldValue.equals(new Boolean(false)))) {
@@ -195,6 +201,7 @@ public class _ParagraphProperties extends MultiPropertyTest {
      * Switches between two JPG images' URLs.
      */
     protected PropertyTester URLTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             if (oldValue.equals(util.utils.getFullTestURL("space-metal.jpg"))) {
                 return util.utils.getFullTestURL("crazy-blue.jpg");
@@ -209,11 +216,13 @@ public class _ParagraphProperties extends MultiPropertyTest {
     /**
      * Creates tester for 'NumberingRules' depending on relation.
      */
+    @Override
     public void before() {
         final Object nRules = tEnv.getObjRelation("NRULES");
 
         if (nRules != null) {
             rules = new PropertyTester() {
+                @Override
                 protected Object getNewValue(String propName, Object oldValue) {
                     return nRules;
                 }
diff --git a/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesAsian.java b/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesAsian.java
index c82b8e0f0d32..b63fa9c2fd63 100644
--- a/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesAsian.java
+++ b/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesAsian.java
@@ -38,6 +38,7 @@ public class _ParagraphPropertiesAsian extends MultiPropertyTest {
      * be specified. Switches between true and false.
      */
     protected PropertyTester BooleanTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             if ((oldValue != null) &&
                     (oldValue.equals(new Boolean(false)))) {
diff --git a/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesComplex.java b/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesComplex.java
index cb250eadac09..a05b4d2946cb 100644
--- a/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesComplex.java
+++ b/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesComplex.java
@@ -30,6 +30,7 @@ public class _ParagraphPropertiesComplex extends MultiPropertyTest {
 
 
     protected PropertyTester WritingModeTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             if ((oldValue != null) && (oldValue.equals(new Short(com.sun.star.text.WritingMode2.LR_TB))))
                 return new Short(com.sun.star.text.WritingMode2.PAGE); else
diff --git a/qadevOOo/tests/java/ifc/style/_XStyle.java b/qadevOOo/tests/java/ifc/style/_XStyle.java
index 3de792261ce1..ce031f9f9e5a 100644
--- a/qadevOOo/tests/java/ifc/style/_XStyle.java
+++ b/qadevOOo/tests/java/ifc/style/_XStyle.java
@@ -50,6 +50,7 @@ public class _XStyle extends MultiMethodTest {
     * Retrieves object relations.
     * @throws StatusException If one of relations not found.
     */
+    @Override
     public void before() {
         oMyStyle = (XStyle) tEnv.getObjRelation("PoolStyle");
         if (oMyStyle == null) throw new StatusException
diff --git a/qadevOOo/tests/java/ifc/table/_CellProperties.java b/qadevOOo/tests/java/ifc/table/_CellProperties.java
index ce45507cb27d..e3fac6674aac 100644
--- a/qadevOOo/tests/java/ifc/table/_CellProperties.java
+++ b/qadevOOo/tests/java/ifc/table/_CellProperties.java
@@ -55,6 +55,7 @@ public class _CellProperties extends MultiPropertyTest {
      */
     public void _CellStyle() {
         testProperty("CellStyle", new PropertyTester() {
+            @Override
             protected Object getNewValue(String name, Object old) {
                 return "Default".equals(old) ? "Result" : "Default" ;
             }
diff --git a/qadevOOo/tests/java/ifc/table/_XAutoFormattable.java b/qadevOOo/tests/java/ifc/table/_XAutoFormattable.java
index 65b518b066f1..6473f17b7380 100644
--- a/qadevOOo/tests/java/ifc/table/_XAutoFormattable.java
+++ b/qadevOOo/tests/java/ifc/table/_XAutoFormattable.java
@@ -119,6 +119,7 @@ public class _XAutoFormattable extends MultiMethodTest {
     /**
     * Forces environment recreation.
     */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/table/_XCellCursor.java b/qadevOOo/tests/java/ifc/table/_XCellCursor.java
index 2c9942cff446..ff7971ad57fc 100644
--- a/qadevOOo/tests/java/ifc/table/_XCellCursor.java
+++ b/qadevOOo/tests/java/ifc/table/_XCellCursor.java
@@ -201,6 +201,7 @@ public class _XCellCursor extends MultiMethodTest {
     /**
     * Forces object environment recreation.
     */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/table/_XCellRange.java b/qadevOOo/tests/java/ifc/table/_XCellRange.java
index e15ae3b8e824..0aab83d76432 100644
--- a/qadevOOo/tests/java/ifc/table/_XCellRange.java
+++ b/qadevOOo/tests/java/ifc/table/_XCellRange.java
@@ -134,6 +134,7 @@ public class _XCellRange extends MultiMethodTest {
     /**
     * Forces environment recreation.
     */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/table/_XTableColumns.java b/qadevOOo/tests/java/ifc/table/_XTableColumns.java
index 49616bbe6cf1..dbe675356d71 100644
--- a/qadevOOo/tests/java/ifc/table/_XTableColumns.java
+++ b/qadevOOo/tests/java/ifc/table/_XTableColumns.java
@@ -52,6 +52,7 @@ public class _XTableColumns extends MultiMethodTest {
     private XCellRange xCellRange = null;
     private int lastColumn = 0;
 
+    @Override
     public void before() {
         xCellRange = (XCellRange)
             tEnv.getObjRelation("XTableColumns.XCellRange") ;
diff --git a/qadevOOo/tests/java/ifc/table/_XTableRows.java b/qadevOOo/tests/java/ifc/table/_XTableRows.java
index 8acb33a5a8f4..2f997860c609 100644
--- a/qadevOOo/tests/java/ifc/table/_XTableRows.java
+++ b/qadevOOo/tests/java/ifc/table/_XTableRows.java
@@ -38,6 +38,7 @@ public class _XTableRows extends MultiMethodTest {
     public XTableRows oObj = null;
     public XCellRange range = null;
 
+    @Override
     public void before() {
         range = (XCellRange) tEnv.getObjRelation("XTableRows.XCellRange");
         if (range==null) {
diff --git a/qadevOOo/tests/java/ifc/task/_XInteractionHandler.java b/qadevOOo/tests/java/ifc/task/_XInteractionHandler.java
index e72bc2256982..bd9748574dec 100644
--- a/qadevOOo/tests/java/ifc/task/_XInteractionHandler.java
+++ b/qadevOOo/tests/java/ifc/task/_XInteractionHandler.java
@@ -61,6 +61,7 @@ public class _XInteractionHandler extends MultiMethodTest {
     * Retrieves an object relation. <p>
     * @throws StatusException If the relation is not found.
     */
+    @Override
     public void before() {
         request = (XInteractionRequest)
             tEnv.getObjRelation("XInteractionHandler.Request") ;
diff --git a/qadevOOo/tests/java/ifc/task/_XJob.java b/qadevOOo/tests/java/ifc/task/_XJob.java
index efa5d5c4ef1c..58800f37ebbc 100644
--- a/qadevOOo/tests/java/ifc/task/_XJob.java
+++ b/qadevOOo/tests/java/ifc/task/_XJob.java
@@ -52,6 +52,7 @@ public class _XJob extends MultiMethodTest {
      * <code>executeArgs</code> [<code>NamedValue[]</code>]
      * @throw StatusException If relations are not found
      */
+    @Override
     public void before() {
         Object[] XJobArgs = (Object[]) tEnv.getObjRelation("XJobArgs") ;
         if (XJobArgs == null)
diff --git a/qadevOOo/tests/java/ifc/text/_BaseFrame.java b/qadevOOo/tests/java/ifc/text/_BaseFrame.java
index 84287802b07a..0852668b2340 100644
--- a/qadevOOo/tests/java/ifc/text/_BaseFrame.java
+++ b/qadevOOo/tests/java/ifc/text/_BaseFrame.java
@@ -86,6 +86,7 @@ public class _BaseFrame extends MultiPropertyTest {
     * Redefined method returns value, that differs from property value.
     */
     protected PropertyTester StringTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             if (str1.equals(oldValue))
                 return str2;
diff --git a/qadevOOo/tests/java/ifc/text/_BaseFrameProperties.java b/qadevOOo/tests/java/ifc/text/_BaseFrameProperties.java
index b409a502fc73..9b0cf03c8855 100644
--- a/qadevOOo/tests/java/ifc/text/_BaseFrameProperties.java
+++ b/qadevOOo/tests/java/ifc/text/_BaseFrameProperties.java
@@ -22,6 +22,7 @@ import lib.MultiPropertyTest;
 
 public class _BaseFrameProperties extends MultiPropertyTest {
     protected PropertyTester FrameTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             Object frame = tEnv.getObjRelation("TextFrame");
 
diff --git a/qadevOOo/tests/java/ifc/text/_BaseIndex.java b/qadevOOo/tests/java/ifc/text/_BaseIndex.java
index c0a3863a7383..37fc8e7863cb 100644
--- a/qadevOOo/tests/java/ifc/text/_BaseIndex.java
+++ b/qadevOOo/tests/java/ifc/text/_BaseIndex.java
@@ -60,6 +60,7 @@ public class _BaseIndex extends MultiPropertyTest {
     * Redefined method returns object, that contains changed property value.
     */
     protected PropertyTester CustomTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             XTextColumns TC = UnoRuntime.queryInterface(
                                       XTextColumns.class, oldValue);
@@ -102,6 +103,7 @@ public class _BaseIndex extends MultiPropertyTest {
             PropertyValue[][] newVal = null;
             PropertyValue[][] oldVal = null;
 
+            @Override
             protected Object getNewValue(String propName, Object oldValue) {
                 XIndexReplace indProp = UnoRuntime.queryInterface(
                                                 XIndexReplace.class, oldValue);
@@ -138,6 +140,7 @@ public class _BaseIndex extends MultiPropertyTest {
                 return indProp;
             }
 
+            @Override
             protected void checkResult(String propName, Object oldValue,
                                        Object newValue, Object resValue,
                                        Exception exception)
diff --git a/qadevOOo/tests/java/ifc/text/_CellProperties.java b/qadevOOo/tests/java/ifc/text/_CellProperties.java
index 95247a02be42..6cefdad8ac12 100644
--- a/qadevOOo/tests/java/ifc/text/_CellProperties.java
+++ b/qadevOOo/tests/java/ifc/text/_CellProperties.java
@@ -72,6 +72,7 @@ public class _CellProperties extends MultiPropertyTest {
     public void _TextSection() {
         log.println("Testing with custom Property tester") ;
         testProperty("TextSection", new PropertyTester() {
+            @Override
             protected Object getNewValue(String propName, Object oldValue) {
                 return tEnv.getObjRelation("CellProperties.TextSection");
             }
@@ -87,6 +88,7 @@ public class _CellProperties extends MultiPropertyTest {
         final Short val2 = new Short( (short) 6 );
         log.println("Testing with custom Property tester") ;
         testProperty("BackColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String propName, Object oldValue) {
                 if ( oldValue.equals(val1) )
                     return val2;
@@ -103,6 +105,7 @@ public class _CellProperties extends MultiPropertyTest {
     public void _BackGraphicURL() {
         log.println("Testing with custom Property tester") ;
         testProperty("BackGraphicURL", new PropertyTester() {
+            @Override
             protected Object getNewValue(String propName, Object oldValue) {
                 if (oldValue.equals(util.utils.getFullTestURL
                         ("space-metal.jpg")))
@@ -120,6 +123,7 @@ public class _CellProperties extends MultiPropertyTest {
     public void _UserDefinedAttributes() {
         log.println("Testing with custom property tester");
         testProperty("UserDefinedAttributes", new PropertyTester() {
+            @Override
             protected Object getNewValue(String propName, Object oldValue) {
                 XNameContainer NC = null;
                 try {
diff --git a/qadevOOo/tests/java/ifc/text/_CellRange.java b/qadevOOo/tests/java/ifc/text/_CellRange.java
index 19b2b86b2a4b..e98b2f791b72 100644
--- a/qadevOOo/tests/java/ifc/text/_CellRange.java
+++ b/qadevOOo/tests/java/ifc/text/_CellRange.java
@@ -55,6 +55,7 @@ public class _CellRange extends MultiPropertyTest {
         final Short val2 = new Short( (short) 6 );
         log.println("Testing with custom Property tester") ;
         testProperty("BackColor", new PropertyTester() {
+            @Override
             protected Object getNewValue(String propName, Object oldValue) {
                 if ( oldValue.equals(val1) )
                     return val2;
@@ -79,6 +80,7 @@ public class _CellRange extends MultiPropertyTest {
     public void _BackGraphicURL() {
         log.println("Testing with custom Property tester") ;
         testProperty("BackGraphicURL", new PropertyTester() {
+            @Override
             protected Object getNewValue(String propName, Object oldValue) {
                 if (oldValue.equals(util.utils.getFullTestURL
                         ("space-metal.jpg")))
diff --git a/qadevOOo/tests/java/ifc/text/_MailMerge.java b/qadevOOo/tests/java/ifc/text/_MailMerge.java
index 9f03a9a1f96f..b3c0e1fe4367 100644
--- a/qadevOOo/tests/java/ifc/text/_MailMerge.java
+++ b/qadevOOo/tests/java/ifc/text/_MailMerge.java
@@ -31,6 +31,7 @@ public class _MailMerge extends MultiPropertyTest {
      * Switches between two valid folders
      */
     protected PropertyTester URLTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             if (oldValue.equals(util.utils.getOfficeTemp(tParam.getMSF())))
                 return util.utils.getFullTestURL(""); else
@@ -43,6 +44,7 @@ public class _MailMerge extends MultiPropertyTest {
      * Switches between two document URLs.
      */
     protected PropertyTester DocumentURLTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
             if (oldValue.equals(util.utils.getFullTestURL("MailMerge.sxw")))
                 return util.utils.getFullTestURL("sForm.sxw"); else
@@ -155,6 +157,7 @@ public class _MailMerge extends MultiPropertyTest {
     /**
     * Forces environment recreation.
     */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/text/_TextColumns.java b/qadevOOo/tests/java/ifc/text/_TextColumns.java
index a1cafda4f456..b6c9868529e9 100644
--- a/qadevOOo/tests/java/ifc/text/_TextColumns.java
+++ b/qadevOOo/tests/java/ifc/text/_TextColumns.java
@@ -48,6 +48,7 @@ public class _TextColumns extends MultiPropertyTest {
     public void _AutomaticDistance() {
         log.println("Testing with custom Property tester") ;
         testProperty("AutomaticDistance", new PropertyTester() {
+            @Override
             protected Object getNewValue(String propName, Object oldValue) {
                 XTextColumns xTC = UnoRuntime.queryInterface
                     (XTextColumns.class,tEnv.getTestObject());
diff --git a/qadevOOo/tests/java/ifc/text/_TextFrame.java b/qadevOOo/tests/java/ifc/text/_TextFrame.java
index 9220b863021f..c501654f4a40 100644
--- a/qadevOOo/tests/java/ifc/text/_TextFrame.java
+++ b/qadevOOo/tests/java/ifc/text/_TextFrame.java
@@ -40,6 +40,7 @@ public class _TextFrame extends MultiPropertyTest {
      * Property tester which switches two shorts.
      */
     protected PropertyTester WModeTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue)
                 throws java.lang.IllegalArgumentException {
             if (oldValue.equals(new Short(com.sun.star.text.WritingMode2.LR_TB)))
diff --git a/qadevOOo/tests/java/ifc/text/_TextGraphicObject.java b/qadevOOo/tests/java/ifc/text/_TextGraphicObject.java
index 924a64583e53..a9edbaa6a2ef 100644
--- a/qadevOOo/tests/java/ifc/text/_TextGraphicObject.java
+++ b/qadevOOo/tests/java/ifc/text/_TextGraphicObject.java
@@ -72,6 +72,7 @@ public class _TextGraphicObject extends MultiPropertyTest {
      * or create a new one if necessary.
      */
     protected PropertyTester PointTester = new PropertyTester() {
+        @Override
         protected Object getNewValue(String propName, Object oldValue)
                               throws java.lang.IllegalArgumentException {
             if (utils.isVoid(oldValue)) {
diff --git a/qadevOOo/tests/java/ifc/text/_TextSection.java b/qadevOOo/tests/java/ifc/text/_TextSection.java
index c4fc53745554..b3e3a34eb265 100644
--- a/qadevOOo/tests/java/ifc/text/_TextSection.java
+++ b/qadevOOo/tests/java/ifc/text/_TextSection.java
@@ -92,6 +92,7 @@ public class _TextSection extends MultiPropertyTest {
     */
     protected PropertyTester TextColumnsTester = new PropertyTester() {
 
+        @Override
         protected Object getNewValue(String propName, Object oldValue) {
         XTextColumns TC = null;
         short val2set = 25;
@@ -108,6 +109,7 @@ public class _TextSection extends MultiPropertyTest {
         return TC;
         }
 
+        @Override
         protected boolean compare(Object obj1, Object obj2) {
             short val1 = 0;
             short val2 = 1;
@@ -122,6 +124,7 @@ public class _TextSection extends MultiPropertyTest {
             return val1 == val2;
         }
 
+        @Override
         protected String toString(Object obj) {
             return "XTextColumns: ColumnCount = "+
                         ((XTextColumns) obj).getColumnCount();
diff --git a/qadevOOo/tests/java/ifc/text/_TextTable.java b/qadevOOo/tests/java/ifc/text/_TextTable.java
index 15dd1b6cfdfa..fac44cdb96fc 100644
--- a/qadevOOo/tests/java/ifc/text/_TextTable.java
+++ b/qadevOOo/tests/java/ifc/text/_TextTable.java
@@ -101,6 +101,7 @@ public class _TextTable extends MultiPropertyTest {
     /**
     * Forces environment recreation.
     */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/text/_XAutoTextGroup.java b/qadevOOo/tests/java/ifc/text/_XAutoTextGroup.java
index 623132bf7d4d..b99fab13b103 100644
--- a/qadevOOo/tests/java/ifc/text/_XAutoTextGroup.java
+++ b/qadevOOo/tests/java/ifc/text/_XAutoTextGroup.java
@@ -74,6 +74,7 @@ public class _XAutoTextGroup extends MultiMethodTest {
      *
      * @throws StatusException if the relation is not found.
      */
+    @Override
     public void before() {
         str = pref + uniq++ ;
         String[] names = oObj.getElementNames() ;
diff --git a/qadevOOo/tests/java/ifc/text/_XMailMergeBroadcaster.java b/qadevOOo/tests/java/ifc/text/_XMailMergeBroadcaster.java
index d0ed25833390..13bd492edacf 100644
--- a/qadevOOo/tests/java/ifc/text/_XMailMergeBroadcaster.java
+++ b/qadevOOo/tests/java/ifc/text/_XMailMergeBroadcaster.java
@@ -69,6 +69,7 @@ public class _XMailMergeBroadcaster extends MultiMethodTest {
      * [<code>XJob</code>]
      * @throw StatusException If relations are not found
      */
+    @Override
     public void before() {
         NamedValue[] executeArgs = (NamedValue[]) tEnv.getObjRelation("executeArgs") ;
         if (executeArgs == null)
diff --git a/qadevOOo/tests/java/ifc/text/_XTextCursor.java b/qadevOOo/tests/java/ifc/text/_XTextCursor.java
index d5c276c06f49..06217abf179c 100644
--- a/qadevOOo/tests/java/ifc/text/_XTextCursor.java
+++ b/qadevOOo/tests/java/ifc/text/_XTextCursor.java
@@ -52,6 +52,7 @@ public class _XTextCursor extends MultiMethodTest {
     /**
      * Stores component's text.
      */
+    @Override
     public void before() {
         oObj.gotoStart(false);
         oObj.gotoEnd(true);
@@ -223,6 +224,7 @@ public class _XTextCursor extends MultiMethodTest {
      * Restores the text of the component to the
      * state it was before this interafce test.
      */
+    @Override
     public void after() {
         oObj.gotoStart(false);
         oObj.gotoEnd(true);
diff --git a/qadevOOo/tests/java/ifc/text/_XTextFieldsSupplier.java b/qadevOOo/tests/java/ifc/text/_XTextFieldsSupplier.java
index 60fe3fb4cd52..e26fefdd62d9 100644
--- a/qadevOOo/tests/java/ifc/text/_XTextFieldsSupplier.java
+++ b/qadevOOo/tests/java/ifc/text/_XTextFieldsSupplier.java
@@ -53,6 +53,7 @@ public class _XTextFieldsSupplier extends MultiMethodTest {
      * Insert some text fields into a cell on the sheet, so this interface test
      * makes sense.
      */
+    @Override
     protected void before() {
         Object o = tEnv.getObjRelation("XTextFieldsSupplier.MAKEENTRY");
         if (o != null && ((Boolean)o).booleanValue()) {
@@ -168,6 +169,7 @@ public class _XTextFieldsSupplier extends MultiMethodTest {
         tRes.tested(method, false);
     }
 
+    @Override
     protected void after() {
         if (mDispose)
             disposeEnvironment();
diff --git a/qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java b/qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java
index cc0924156459..8c4bceb6de14 100644
--- a/qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java
+++ b/qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java
@@ -77,6 +77,7 @@ public class _XTextRangeCompare extends MultiMethodTest {
      * @throws StatusException If neither 'TEXTDOC' nore 'TEXT'
      * relation exists.
      */
+    @Override
     public void before() {
         nameStr = this.getClass().getName();
 
diff --git a/qadevOOo/tests/java/ifc/text/_XTextTable.java b/qadevOOo/tests/java/ifc/text/_XTextTable.java
index 089e2e7943b0..93ac5a9d95f7 100644
--- a/qadevOOo/tests/java/ifc/text/_XTextTable.java
+++ b/qadevOOo/tests/java/ifc/text/_XTextTable.java
@@ -53,6 +53,7 @@ public class _XTextTable extends MultiMethodTest {
 
     String cellNamesList[] = null ;
 
+    @Override
     protected void before() {
         Integer num_row = (Integer)tEnv.getObjRelation("NROW");
         if (num_row == null) {
diff --git a/qadevOOo/tests/java/ifc/text/_XTextTableCursor.java b/qadevOOo/tests/java/ifc/text/_XTextTableCursor.java
index a136d1df8355..4bbea70463db 100644
--- a/qadevOOo/tests/java/ifc/text/_XTextTableCursor.java
+++ b/qadevOOo/tests/java/ifc/text/_XTextTableCursor.java
@@ -276,6 +276,7 @@ public class _XTextTableCursor extends MultiMethodTest {
     /**
      * Forces object environment recreation.
      */
+    @Override
     public void after() {
         disposeEnvironment() ;
     }
diff --git a/qadevOOo/tests/java/ifc/text/_XWordCursor.java b/qadevOOo/tests/java/ifc/text/_XWordCursor.java
index a2506b674d5f..47474472af1e 100644
--- a/qadevOOo/tests/java/ifc/text/_XWordCursor.java
+++ b/qadevOOo/tests/java/ifc/text/_XWordCursor.java
@@ -43,6 +43,7 @@ public class _XWordCursor extends MultiMethodTest {
     /**
      * Moves the cursor to start of the text.
      */
+    @Override
     public void before() {
         oObj.gotoStart(false);
     }
diff --git a/qadevOOo/tests/java/ifc/ucb/_XCachedContentResultSetFactory.java b/qadevOOo/tests/java/ifc/ucb/_XCachedContentResultSetFactory.java
index 9af99156fe95..b6af19b8b7aa 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XCachedContentResultSetFactory.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XCachedContentResultSetFactory.java
@@ -53,6 +53,7 @@ public class _XCachedContentResultSetFactory extends MultiMethodTest {
     * Retrieves object relation.
     * @throws StatusException If relation not found.
     */
+    @Override
     public void before() {
         resSetStub = (XResultSet)
             tEnv.getObjRelation("CachedContentResultSetStub") ;
diff --git a/qadevOOo/tests/java/ifc/ucb/_XCachedContentResultSetStubFactory.java b/qadevOOo/tests/java/ifc/ucb/_XCachedContentResultSetStubFactory.java
index 3b67f04fefa9..5d68f27010fd 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XCachedContentResultSetStubFactory.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XCachedContentResultSetStubFactory.java
@@ -53,6 +53,7 @@ public class _XCachedContentResultSetStubFactory extends MultiMethodTest {
     * Retrieves object relation.
     * @throws StatusException If relation not found.
     */
+    @Override
     public void before() {
         resSet = (XResultSet) tEnv.getObjRelation("ContentResultSet") ;
         if (resSet == null) {
diff --git a/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetFactory.java b/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetFactory.java
index c6a99f23773c..6a7dfe486c53 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetFactory.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetFactory.java
@@ -54,6 +54,7 @@ public class _XCachedDynamicResultSetFactory extends MultiMethodTest {
     * Retrieves object relation.
     * @throws StatusException If relation not found.
     */
+    @Override
     public void before() {
         resSetStub = (XDynamicResultSet)
             tEnv.getObjRelation("CachedDynamicResultSetStub") ;
diff --git a/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetStubFactory.java b/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetStubFactory.java
index db1715d9668a..5d12bc102acd 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetStubFactory.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetStubFactory.java
@@ -58,6 +58,7 @@ public class _XCachedDynamicResultSetStubFactory extends MultiMethodTest {
     * Retrieves object relation.
     * @throws StatusException If relation not found.
     */
+    @Override
     public void before() {
         resSet = (XDynamicResultSet) tEnv.getObjRelation("DynamicResultSet") ;
         if (resSet == null) {
diff --git a/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java b/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java
index b4001e4cbb0a..0ba9a03e9acf 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java
@@ -195,6 +195,7 @@ public class _XCommandProcessor extends MultiMethodTest {
         }
 
         Thread aborter = new Thread() {
+            @Override
             public void run() {
                 for (int i = 0; i < 10; i++) {
                     log.println("try to abort command");
diff --git a/qadevOOo/tests/java/ifc/ucb/_XContentProvider.java b/qadevOOo/tests/java/ifc/ucb/_XContentProvider.java
index 78172ebc0696..7f56233fb9b9 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XContentProvider.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XContentProvider.java
@@ -60,6 +60,7 @@ public class _XContentProvider extends MultiMethodTest {
     * Retrieves object relations.
     * @throws StatusException If one of relations not found.
     */
+    @Override
     public void before() {
         CIF = (XContentIdentifierFactory) tEnv.getObjRelation("FACTORY");
         String tmp = (String) tEnv.getObjRelation("CONTENT1") ;
diff --git a/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java b/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java
index 52d94530f462..fd9cf81b7b36 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java
@@ -92,6 +92,7 @@ public class _XContentProviderManager extends MultiMethodTest {
      * @see #firstContentProvider
      * @see #contentProvider
      */
+    @Override
     public void before() {
         XMultiServiceFactory xMSF = tParam.getMSF();
 
diff --git a/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java b/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java
index e9b41cb1819c..8399a9d25f09 100644
--- a/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java
+++ b/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java
@@ -53,6 +53,7 @@ public class _XContextMenuInterception extends MultiMethodTest {
     private XMultiServiceFactory xMSF = null;
     private Point point = null;
 
+    @Override
     public void before() {
         docModel = UnoRuntime.queryInterface(
                 XModel.class,tEnv.getObjRelation("FirstModel"));
@@ -70,6 +71,7 @@ public class _XContextMenuInterception extends MultiMethodTest {
         utils.shortWait(3000);
     }
 
+    @Override
     public void after() {
         if (xCI != null) {
             oObj.releaseContextMenuInterceptor(xCI);
diff --git a/qadevOOo/tests/java/ifc/ui/_XModuleUIConfigurationManager.java b/qadevOOo/tests/java/ifc/ui/_XModuleUIConfigurationManager.java
index aedb4571b7bc..ec3a14d6b219 100644
--- a/qadevOOo/tests/java/ifc/ui/_XModuleUIConfigurationManager.java
+++ b/qadevOOo/tests/java/ifc/ui/_XModuleUIConfigurationManager.java
@@ -27,6 +27,7 @@ public class _XModuleUIConfigurationManager extends MultiMethodTest {
     public XModuleUIConfigurationManager oObj = null;
     private String resourceUrl = null;
 
+    @Override
     public void before() {
         resourceUrl = (String)tEnv.getObjRelation("XModuleUIConfigurationManager.ResourceURL");
     }
diff --git a/qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java b/qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java
index e4afe2dc8b0f..44682acf33ca 100644
--- a/qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java
+++ b/qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java
@@ -56,6 +56,7 @@ public class _XUIConfiguration extends MultiMethodTest {
      * try to get a listener out of the object relation
      * <CODE>XUIConfiguration.XUIConfigurationListenerImpl</CODE>
      */
+    @Override
     public void before() {
         xListener = (XUIConfigurationListenerImpl)tEnv.getObjRelation(
                         "XUIConfiguration.XUIConfigurationListenerImpl");
@@ -86,6 +87,7 @@ public class _XUIConfiguration extends MultiMethodTest {
     /**
      * Dispose because the UIConfigurationManager has to be recreated
      */
+    @Override
     public void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java
index dc20472b0a61..f57ccc97374e 100644
--- a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java
+++ b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java
@@ -47,6 +47,7 @@ public class _XUIConfigurationManager extends MultiMethodTest {
      * Some stuff before the tests:
      * extract the multi service factory.
      */
+    @Override
     protected void before() {
         mxMSF = tParam.getMSF();
         sShortCutManagerServiceName = (String)tEnv.getObjRelation("XConfigurationManager.ShortCutManager");
diff --git a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationPersistence.java b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationPersistence.java
index fc905e79beba..a7a7b5c43699 100644
--- a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationPersistence.java
+++ b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationPersistence.java
@@ -27,6 +27,7 @@ public class _XUIConfigurationPersistence extends MultiMethodTest {
     public XUIConfigurationPersistence oObj;
     private XStorage xStore = null;
 
+    @Override
     public void before() {
         xStore = (XStorage)tEnv.getObjRelation("XUIConfigurationStorage.Storage");
     }
diff --git a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationStorage.java b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationStorage.java
index 35d4e803c8fc..1e40a0577e95 100644
--- a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationStorage.java
+++ b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationStorage.java
@@ -37,6 +37,7 @@ public class _XUIConfigurationStorage extends MultiMethodTest {
     public XUIConfigurationStorage oObj;
     private XStorage xStore = null;
 
+    @Override
     public void before() {
         xStore = (XStorage)tEnv.getObjRelation("XUIConfigurationStorage.Storage");
     }
diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XControlAccess.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XControlAccess.java
index 63ef27bab1ca..7d6bf621d2aa 100644
--- a/qadevOOo/tests/java/ifc/ui/dialogs/_XControlAccess.java
+++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XControlAccess.java
@@ -56,6 +56,7 @@ public class _XControlAccess extends MultiMethodTest {
      * @throw StatusException if interface is not supported or
      * properties couldn't be get.
      */
+    @Override
     protected void before() {
         xCI = UnoRuntime.queryInterface
             (XControlInformation.class, oObj);
diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java
index 8729566d63a8..f4e573174f0f 100644
--- a/qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java
+++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java
@@ -104,6 +104,7 @@ public class _XExecutableDialog extends MultiMethodTest {
             this.Diag = Diag ;
         }
 
+        @Override
         public void run() {
             try {
                 execRes = Diag.execute();
@@ -126,6 +127,7 @@ public class _XExecutableDialog extends MultiMethodTest {
         }
     }
 
+    @Override
     public void after() {
         if (eThread.isAlive()) {
             log.println("Thread didn't die ... cleaning up");
diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerControlAccess.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerControlAccess.java
index 29d1589c546f..69776dedf646 100644
--- a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerControlAccess.java
+++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerControlAccess.java
@@ -61,6 +61,7 @@ public class _XFilePickerControlAccess extends MultiMethodTest {
     * Retrieves object relations.
     * @throws StatusException If one of relations not found.
     */
+    @Override
     public void before() {
         Short ID = (Short) tEnv.getObjRelation
             ("XFilePickerControlAccess.ControlID") ;
diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java
index 4b4c822a54a1..503baf630a4b 100644
--- a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java
+++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java
@@ -93,6 +93,7 @@ public class _XFilePickerNotifier extends MultiMethodTest {
      * @throw StatusException If object doesn't support <code>XFilePicker</code>
      * interface.
      */
+    @Override
     public void before() {
         fps = UnoRuntime.queryInterface
                 (XFilePicker.class, oObj) ;
@@ -188,6 +189,7 @@ public class _XFilePickerNotifier extends MultiMethodTest {
             this.Diag = Diag ;
         }
 
+        @Override
         public void run() {
             try {
                 execRes = Diag.execute();
diff --git a/qadevOOo/tests/java/ifc/uno/_XNamingService.java b/qadevOOo/tests/java/ifc/uno/_XNamingService.java
index 2e6df574ab9a..e2469d138985 100644
--- a/qadevOOo/tests/java/ifc/uno/_XNamingService.java
+++ b/qadevOOo/tests/java/ifc/uno/_XNamingService.java
@@ -46,6 +46,7 @@ public class _XNamingService extends MultiMethodTest {
     * Retrieves object relation.
     * @throws StatusException If the relation not found.
     */
+    @Override
     public void before() {
         regObject = (XInterface)
             tEnv.getObjRelation("XNamingService.RegisterObject") ;
diff --git a/qadevOOo/tests/java/ifc/util/_PathSettings.java b/qadevOOo/tests/java/ifc/util/_PathSettings.java
index ebf55ed0013c..75bbedd5ceb0 100644
--- a/qadevOOo/tests/java/ifc/util/_PathSettings.java
+++ b/qadevOOo/tests/java/ifc/util/_PathSettings.java
@@ -63,6 +63,7 @@ public class _PathSettings extends MultiPropertyTest {
      */
     public void _UIConfig() {
         testProperty("UIConfig", new PropertyTester() {
+            @Override
             public Object getNewValue(String propName, Object oldVal) {
                 String path = (String) oldVal;
                 if (path == null) path = "";
diff --git a/qadevOOo/tests/java/ifc/util/_XCancellable.java b/qadevOOo/tests/java/ifc/util/_XCancellable.java
index 3c21188d820a..85ab779df5b2 100644
--- a/qadevOOo/tests/java/ifc/util/_XCancellable.java
+++ b/qadevOOo/tests/java/ifc/util/_XCancellable.java
@@ -48,6 +48,7 @@ public class _XCancellable extends MultiMethodTest {
     /**
      * Forces object recreation.
      */
+    @Override
     public void after() {
         disposeEnvironment() ;
     }
diff --git a/qadevOOo/tests/java/ifc/util/_XChangesBatch.java b/qadevOOo/tests/java/ifc/util/_XChangesBatch.java
index e46cc034ca1f..c0e87f3ada97 100644
--- a/qadevOOo/tests/java/ifc/util/_XChangesBatch.java
+++ b/qadevOOo/tests/java/ifc/util/_XChangesBatch.java
@@ -39,6 +39,7 @@ public class _XChangesBatch extends MultiMethodTest {
     /**
      * add a change that can be committed
      */
+    @Override
     protected void before() {
         changeElement = tEnv.getObjRelation("XChangesBatch.ChangeElement");
         originalElement = tEnv.getObjRelation("XChangesBatch.OriginalElement");
diff --git a/qadevOOo/tests/java/ifc/util/_XChangesNotifier.java b/qadevOOo/tests/java/ifc/util/_XChangesNotifier.java
index 263cc2e2c2eb..73592df4e248 100644
--- a/qadevOOo/tests/java/ifc/util/_XChangesNotifier.java
+++ b/qadevOOo/tests/java/ifc/util/_XChangesNotifier.java
@@ -85,6 +85,7 @@ public class _XChangesNotifier extends MultiMethodTest {
      * Before the test: get the 'XChangesNotifier.ChangesBatch' object relation
      * and create the listener.
      */
+    @Override
     protected void before() {
         xBatch = (XChangesBatch)tEnv.getObjRelation("XChangesNotifier.ChangesBatch");
         changeElement = tEnv.getObjRelation("XChangesNotifier.ChangeElement");
diff --git a/qadevOOo/tests/java/ifc/util/_XImportable.java b/qadevOOo/tests/java/ifc/util/_XImportable.java
index 5224cee08a1d..f913375d7e57 100644
--- a/qadevOOo/tests/java/ifc/util/_XImportable.java
+++ b/qadevOOo/tests/java/ifc/util/_XImportable.java
@@ -186,6 +186,7 @@ public class _XImportable extends MultiMethodTest {
     /**
      * Dispose environment.
      */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/util/_XIndent.java b/qadevOOo/tests/java/ifc/util/_XIndent.java
index 9d08387c887b..769b21eb9ac9 100644
--- a/qadevOOo/tests/java/ifc/util/_XIndent.java
+++ b/qadevOOo/tests/java/ifc/util/_XIndent.java
@@ -44,6 +44,7 @@ public class _XIndent extends MultiMethodTest {
     /**
      * Ensures that the ObjRelation PropSet is given.
      */
+    @Override
     public void before() {
         PropSet = (XPropertySet) tEnv.getObjRelation("PropSet");
         if (PropSet == null) {
diff --git a/qadevOOo/tests/java/ifc/util/_XReplaceable.java b/qadevOOo/tests/java/ifc/util/_XReplaceable.java
index 1515d7a53f39..ca3cca6ee7c0 100644
--- a/qadevOOo/tests/java/ifc/util/_XReplaceable.java
+++ b/qadevOOo/tests/java/ifc/util/_XReplaceable.java
@@ -54,6 +54,7 @@ public class _XReplaceable extends MultiMethodTest {
      * the inserted object may influence following tests.
      *
      */
+    @Override
     protected void before() {
         Object o = tEnv.getObjRelation("SEARCHSTRING");
         if (o != null) {
@@ -129,6 +130,7 @@ public class _XReplaceable extends MultiMethodTest {
      * In case the interface itself made the entry to search for, the environment
      * must be disposed
      */
+    @Override
     protected void after() {
         if(mDispose) {
             disposeEnvironment();
diff --git a/qadevOOo/tests/java/ifc/util/_XSearchable.java b/qadevOOo/tests/java/ifc/util/_XSearchable.java
index 6669b322de68..932a47455a88 100644
--- a/qadevOOo/tests/java/ifc/util/_XSearchable.java
+++ b/qadevOOo/tests/java/ifc/util/_XSearchable.java
@@ -57,6 +57,7 @@ public class _XSearchable extends MultiMethodTest {
      * the inserted object may influence following tests.
      *
      */
+    @Override
     protected void before() {
         Object o = tEnv.getObjRelation("SEARCHSTRING");
         if (o != null) {
@@ -166,6 +167,7 @@ public class _XSearchable extends MultiMethodTest {
      * In case the interface itself made the entry to search for, the environment
      * must be disposed
      */
+    @Override
     protected void after() {
         if(mDispose) {
             disposeEnvironment();
diff --git a/qadevOOo/tests/java/ifc/util/_XSortable.java b/qadevOOo/tests/java/ifc/util/_XSortable.java
index 389bd56a8422..dd987cdeff41 100644
--- a/qadevOOo/tests/java/ifc/util/_XSortable.java
+++ b/qadevOOo/tests/java/ifc/util/_XSortable.java
@@ -50,6 +50,7 @@ public class _XSortable extends MultiMethodTest {
     XSortChecker checker = null;
     PropertyValue[] oPV = null;
 
+    @Override
     protected void before() {
         checker = (XSortChecker) tEnv.getObjRelation("SORTCHECKER");
 
@@ -222,6 +223,7 @@ public class _XSortable extends MultiMethodTest {
     /**
     * Forces environment recreation.
     */
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/view/_XFormLayerAccess.java b/qadevOOo/tests/java/ifc/view/_XFormLayerAccess.java
index 12efb5beb220..01228465caea 100644
--- a/qadevOOo/tests/java/ifc/view/_XFormLayerAccess.java
+++ b/qadevOOo/tests/java/ifc/view/_XFormLayerAccess.java
@@ -51,6 +51,7 @@ public class _XFormLayerAccess extends MultiMethodTest {
      * checks if the object relation <CODE>XFormLayerAccess.XForm</CODE>
      * is available
      */
+    @Override
     public void before() {
         xForm = (XForm) tEnv.getObjRelation("XFormLayerAccess.XForm");
         if (xForm == null) {
diff --git a/qadevOOo/tests/java/ifc/view/_XMultiSelectionSupplier.java b/qadevOOo/tests/java/ifc/view/_XMultiSelectionSupplier.java
index 69ed794b2005..f7c334b30c3c 100644
--- a/qadevOOo/tests/java/ifc/view/_XMultiSelectionSupplier.java
+++ b/qadevOOo/tests/java/ifc/view/_XMultiSelectionSupplier.java
@@ -55,6 +55,7 @@ public class _XMultiSelectionSupplier extends MultiMethodTest {
     Object[] selections = null;
     Comparator<Object> ObjCompare = null;
 
+    @Override
     protected void before() {
         selections = (Object[])tEnv.getObjRelation("Selections");
         if (selections == null) {
@@ -65,6 +66,7 @@ public class _XMultiSelectionSupplier extends MultiMethodTest {
         ObjCompare = (Comparator<Object>)tEnv.getObjRelation("Comparer");
     }
 
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/view/_XPrintJobBroadcaster.java b/qadevOOo/tests/java/ifc/view/_XPrintJobBroadcaster.java
index e183545e63f3..813cafca06ae 100644
--- a/qadevOOo/tests/java/ifc/view/_XPrintJobBroadcaster.java
+++ b/qadevOOo/tests/java/ifc/view/_XPrintJobBroadcaster.java
@@ -39,6 +39,7 @@ public class _XPrintJobBroadcaster extends MultiMethodTest {
      * Get an object implementation of the _XPrintJobListener interface from the
      * test environment.
      */
+    @Override
     public void before() {
         listenerImpl = (MyPrintJobListener)tEnv.getObjRelation("XPrintJobBroadcaster.XPrintJobListener");
         if (listenerImpl == null) {
diff --git a/qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java b/qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java
index 28a0288b270b..407130e7f994 100644
--- a/qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java
+++ b/qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java
@@ -53,6 +53,7 @@ public class _XSelectionSupplier extends MultiMethodTest {
     Object[] selections = null;
     Comparator<Object> ObjCompare = null;
 
+    @Override
     protected void before() {
         selections = (Object[])tEnv.getObjRelation("Selections");
         if (selections == null) {
@@ -63,6 +64,7 @@ public class _XSelectionSupplier extends MultiMethodTest {
         ObjCompare = (Comparator<Object>)tEnv.getObjRelation("Comparer");
     }
 
+    @Override
     protected void after() {
         disposeEnvironment();
     }
diff --git a/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java b/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java
index 0e81e5699e89..fa1030a47f5c 100644
--- a/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java
+++ b/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java
@@ -131,6 +131,7 @@ public class _XDocumentHandler extends MultiMethodTest {
     * Retrieves object relations.
     * @throws StatusException If one of relations not found.
     */
+    @Override
     public void before() {
         locator = new DocumentLocator(log) ;
         if (tEnv.getTestCase().getObjectName().equals("XMLSettingsImporter")) {