java: add @Override annotation to overriding methods

Change-Id: I086964c6f6ce52c60c52b6dbc445d3c21d22c80a

37 files changed, 110 insertions, 1 deletions

diff --git a/toolkit/test/accessibility/AccTreeNode.java b/toolkit/test/accessibility/AccTreeNode.java
index ab673ed7bdc4..73eb9a757e29 100644
--- a/toolkit/test/accessibility/AccTreeNode.java
+++ b/toolkit/test/accessibility/AccTreeNode.java
@@ -75,6 +75,7 @@ class AccTreeNode
         object.  This is done by replacing every handler by a new one.  An
         update method at each handler would be better of course.
     */
+    @Override
     public void update ()
     {
         for (int i=0; i<maHandlers.size(); i++)
@@ -165,6 +166,7 @@ class AccTreeNode
         return aDescriptor;
     }
 
+    @Override
     public int getChildCount()
     {
         int nChildCount = 0;
@@ -177,6 +179,7 @@ class AccTreeNode
     }
 
     /** iterate over handlers until the child is found */
+    @Override
     public AccessibleTreeNode getChild (int nIndex)
         throws IndexOutOfBoundsException
     {
@@ -200,6 +203,7 @@ class AccTreeNode
         return null;
     }
 
+    @Override
     public AccessibleTreeNode getChildNoCreate (int nIndex)
         throws IndexOutOfBoundsException
     {
@@ -223,6 +227,7 @@ class AccTreeNode
         return null;
     }
 
+    @Override
     public boolean removeChild (int nIndex)
         throws IndexOutOfBoundsException
     {
@@ -251,6 +256,7 @@ class AccTreeNode
     }
 
 
+    @Override
     public int indexOf (AccessibleTreeNode aNode)
     {
         int nBaseIndex = 0;
@@ -272,11 +278,13 @@ class AccTreeNode
 
     /** this node is a leaf if have no handlers, or is those
             handlers show no children */
+    @Override
     public boolean isLeaf()
     {
         return (maHandlers.size() == 0);
     }
 
+    @Override
     public boolean equals (Object aOther)
     {
         return (this == aOther) || (aOther!=null && aOther.equals(mxContext));
@@ -298,6 +306,7 @@ class AccTreeNode
         }
     }
 
+    @Override
     public void performAction( int nIndex )
     {
         if( nIndex >= 0 )
diff --git a/toolkit/test/accessibility/AccessibilityTree.java b/toolkit/test/accessibility/AccessibilityTree.java
index aa8ab1da4e4d..091209e349c9 100644
--- a/toolkit/test/accessibility/AccessibilityTree.java
+++ b/toolkit/test/accessibility/AccessibilityTree.java
@@ -234,10 +234,15 @@ public class AccessibilityTree
         {
             maTree=aTree;
         }
+        @Override
         public void mousePressed(MouseEvent e) { popupTrigger(e); }
+        @Override
         public void mouseClicked(MouseEvent e) { popupTrigger(e); }
+        @Override
         public void mouseEntered(MouseEvent e) { popupTrigger(e); }
+        @Override
         public void mouseExited(MouseEvent e) { popupTrigger(e); }
+        @Override
         public void mouseReleased(MouseEvent e) { popupTrigger(e); }
 
         public boolean popupTrigger( MouseEvent e )
@@ -359,12 +364,14 @@ public class AccessibilityTree
     /** expand all nodes */
     class AllExpander extends Expander
     {
+        @Override
         public boolean expand(Object aObject) { return true; }
     }
 
     /** expand all nodes with accessibility roles > 100 */
     class ShapeExpander extends Expander
     {
+        @Override
         public boolean expand (Object aObject)
         {
             if (aObject instanceof AccTreeNode)
diff --git a/toolkit/test/accessibility/AccessibilityTreeModel.java b/toolkit/test/accessibility/AccessibilityTreeModel.java
index 875a4c1b7cf9..623507a70e5a 100644
--- a/toolkit/test/accessibility/AccessibilityTreeModel.java
+++ b/toolkit/test/accessibility/AccessibilityTreeModel.java
@@ -87,6 +87,7 @@ public class AccessibilityTreeModel
 
 
 
+    @Override
     public synchronized void setRoot (AccessibleTreeNode aRoot)
     {
         if (getRoot() == null)
@@ -95,6 +96,7 @@ public class AccessibilityTreeModel
         {
             lock ();
             maNodeMap.ForEach (new NodeMapCallback () {
+                    @Override
                     public void Apply (AccTreeNode aNode)
                     {
                         if (maCanvas != null)
@@ -119,6 +121,7 @@ public class AccessibilityTreeModel
     /** Delegate the request to the parent and then register listeners at
         the child and add the child to the canvas.
     */
+    @Override
     public Object getChild (Object aParent, int nIndex)
     {
         AccessibleTreeNode aChild = (AccessibleTreeNode)super.getChild (aParent, nIndex);
@@ -132,6 +135,7 @@ public class AccessibilityTreeModel
         return aChild;
     }
 
+    @Override
     public Object getChildNoCreate (Object aParent, int nIndex)
     {
         AccessibleTreeNode aChild = (AccessibleTreeNode)super.getChildNoCreate (aParent, nIndex);
diff --git a/toolkit/test/accessibility/AccessibilityWorkBench.java b/toolkit/test/accessibility/AccessibilityWorkBench.java
index ea9e624210e0..e466f568204c 100644
--- a/toolkit/test/accessibility/AccessibilityWorkBench.java
+++ b/toolkit/test/accessibility/AccessibilityWorkBench.java
@@ -103,7 +103,8 @@ public class AccessibilityWorkBench
         maAccessibilityTree.getComponent().addTreeSelectionListener (this);
 
         addWindowListener (new WindowAdapter ()
-            { public void windowClosing (WindowEvent e)
+            { @Override
+            public void windowClosing (WindowEvent e)
                   { System.exit(0); }
             });
 
diff --git a/toolkit/test/accessibility/AccessibleActionHandler.java b/toolkit/test/accessibility/AccessibleActionHandler.java
index e30627c6801d..4abfb09ccaac 100644
--- a/toolkit/test/accessibility/AccessibleActionHandler.java
+++ b/toolkit/test/accessibility/AccessibleActionHandler.java
@@ -24,6 +24,7 @@ import com.sun.star.lang.IndexOutOfBoundsException;
 class AccessibleActionHandler
     extends NodeHandler
 {
+    @Override
     public NodeHandler createHandler (XAccessibleContext xContext)
     {
         XAccessibleAction xEComponent =
@@ -51,6 +52,7 @@ class AccessibleActionHandler
             XAccessibleAction.class, aParent.getContext());
     }
 
+    @Override
     public AccessibleTreeNode createChild (
         AccessibleTreeNode aParent,
         int nIndex)
diff --git a/toolkit/test/accessibility/AccessibleActionNode.java b/toolkit/test/accessibility/AccessibleActionNode.java
index f4dc4f541704..fcb029b4d3cc 100644
--- a/toolkit/test/accessibility/AccessibleActionNode.java
+++ b/toolkit/test/accessibility/AccessibleActionNode.java
@@ -32,12 +32,14 @@ class AccessibleActionNode
         mnActionIndex = nActionIndex;
     }
 
+    @Override
     public String[] getActions ()
     {
         return new String[] {"Perform Action"};
     }
 
     /** perform action */
+    @Override
     public void performAction (int nIndex)
     {
         if (nIndex != 0)
diff --git a/toolkit/test/accessibility/AccessibleCellHandler.java b/toolkit/test/accessibility/AccessibleCellHandler.java
index c3a8ab91b689..6ba28a1411b9 100644
--- a/toolkit/test/accessibility/AccessibleCellHandler.java
+++ b/toolkit/test/accessibility/AccessibleCellHandler.java
@@ -24,6 +24,7 @@ import com.sun.star.accessibility.XAccessible;
 
 class AccessibleCellHandler extends NodeHandler
 {
+    @Override
     public NodeHandler createHandler (XAccessibleContext xContext)
     {
         AccessibleCellHandler aCellHandler = null;
@@ -59,6 +60,7 @@ class AccessibleCellHandler extends NodeHandler
             XAccessibleTable.class, aObject);
     }
 
+    @Override
     public AccessibleTreeNode createChild (AccessibleTreeNode aParent, int nIndex)
     {
         AccessibleTreeNode aChild = null;
diff --git a/toolkit/test/accessibility/AccessibleComponentHandler.java b/toolkit/test/accessibility/AccessibleComponentHandler.java
index 2c4476417893..23125fd32b63 100644
--- a/toolkit/test/accessibility/AccessibleComponentHandler.java
+++ b/toolkit/test/accessibility/AccessibleComponentHandler.java
@@ -25,6 +25,7 @@ class AccessibleComponentHandler
     extends NodeHandler
 {
 
+    @Override
     public NodeHandler createHandler (XAccessibleContext xContext)
     {
         XAccessibleComponent xComponent =
@@ -47,6 +48,7 @@ class AccessibleComponentHandler
             maChildList.setSize (6);
     }
 
+    @Override
     public AccessibleTreeNode createChild (AccessibleTreeNode aParent, int nIndex)
     {
         AccessibleTreeNode aChild = null;
@@ -109,6 +111,7 @@ class AccessibleComponentHandler
         return aChild;
     }
 
+    @Override
     public void update (AccessibleTreeNode aNode)
     {
         maChildList.clear();
diff --git a/toolkit/test/accessibility/AccessibleContextHandler.java b/toolkit/test/accessibility/AccessibleContextHandler.java
index 71fa7982a771..a6f32efdd786 100644
--- a/toolkit/test/accessibility/AccessibleContextHandler.java
+++ b/toolkit/test/accessibility/AccessibleContextHandler.java
@@ -26,6 +26,7 @@ class AccessibleContextHandler
 {
     protected int nChildrenCount;
 
+    @Override
     public NodeHandler createHandler (XAccessibleContext xContext)
     {
         if (xContext != null)
@@ -46,6 +47,7 @@ class AccessibleContextHandler
             maChildList.setSize (4);
     }
 
+    @Override
     public AccessibleTreeNode createChild (AccessibleTreeNode aParent, int nIndex)
     {
         XAccessibleContext xContext = null;
diff --git a/toolkit/test/accessibility/AccessibleEditableTextHandler.java b/toolkit/test/accessibility/AccessibleEditableTextHandler.java
index 8fb8b843c3d8..fa9b0d521217 100644
--- a/toolkit/test/accessibility/AccessibleEditableTextHandler.java
+++ b/toolkit/test/accessibility/AccessibleEditableTextHandler.java
@@ -23,6 +23,7 @@ import com.sun.star.accessibility.XAccessibleEditableText;
 
 class AccessibleEditableTextHandler extends NodeHandler
 {
+    @Override
     public NodeHandler createHandler (XAccessibleContext xContext)
     {
         XAccessibleEditableText xText =
@@ -50,6 +51,7 @@ class AccessibleEditableTextHandler extends NodeHandler
             XAccessibleEditableText.class, aNode.getContext());
     }
 
+    @Override
     public AccessibleTreeNode createChild (AccessibleTreeNode aParent, int nIndex)
     {
         return new StringNode ("XAccessibleEditableText is supported", aParent);
diff --git a/toolkit/test/accessibility/AccessibleExtendedComponentHandler.java b/toolkit/test/accessibility/AccessibleExtendedComponentHandler.java
index fe0bb855ed7d..4adb6274078c 100644
--- a/toolkit/test/accessibility/AccessibleExtendedComponentHandler.java
+++ b/toolkit/test/accessibility/AccessibleExtendedComponentHandler.java
@@ -24,6 +24,7 @@ import com.sun.star.accessibility.XAccessibleExtendedComponent;
 class AccessibleExtendedComponentHandler
     extends NodeHandler
 {
+    @Override
     public NodeHandler createHandler (XAccessibleContext xContext)
     {
         XAccessibleExtendedComponent xEComponent =
@@ -53,6 +54,7 @@ class AccessibleExtendedComponentHandler
     }
 
 
+    @Override
     public AccessibleTreeNode createChild (AccessibleTreeNode aParent, int nIndex)
     {
         AccessibleTreeNode aChild = null;
diff --git a/toolkit/test/accessibility/AccessibleHyperlinkHandler.java b/toolkit/test/accessibility/AccessibleHyperlinkHandler.java
index e1869a59ee99..d46288e529cd 100644
--- a/toolkit/test/accessibility/AccessibleHyperlinkHandler.java
+++ b/toolkit/test/accessibility/AccessibleHyperlinkHandler.java
@@ -23,6 +23,7 @@ import com.sun.star.accessibility.XAccessibleHyperlink;
 
 class AccessibleHyperlinkHandler extends AccessibleTreeHandler
 {
+    @Override
     public NodeHandler createHandler (XAccessibleContext xContext)
     {
         XAccessibleHyperlink xLink =
@@ -52,6 +53,7 @@ class AccessibleHyperlinkHandler extends AccessibleTreeHandler
         return xHyperlink;
     }
 
+    @Override
     public AccessibleTreeNode getChild (AccessibleTreeNode aParent, int nIndex)
     {
         return new StringNode ("interface XAccessibleHyperlink is supported", aParent);
diff --git a/toolkit/test/accessibility/AccessibleHypertextHandler.java b/toolkit/test/accessibility/AccessibleHypertextHandler.java
index adcd19827a1e..cba62589d201 100644
--- a/toolkit/test/accessibility/AccessibleHypertextHandler.java
+++ b/toolkit/test/accessibility/AccessibleHypertextHandler.java
@@ -23,6 +23,7 @@ import com.sun.star.accessibility.XAccessibleHypertext;
 
 class AccessibleHypertextHandler extends AccessibleTreeHandler
 {
+    @Override
     public NodeHandler createHandler (XAccessibleContext xContext)
     {
         XAccessibleHypertext xText =
@@ -52,6 +53,7 @@ class AccessibleHypertextHandler extends AccessibleTreeHandler
         return xHypertext;
     }
 
+    @Override
     public AccessibleTreeNode getChild (AccessibleTreeNode aParent, int nIndex)
     {
         return new StringNode ("interface XAccessibleHypertext is supported", aParent);
diff --git a/toolkit/test/accessibility/AccessibleImageHandler.java b/toolkit/test/accessibility/AccessibleImageHandler.java
index f9c40998dc03..cec93c55e97f 100644
--- a/toolkit/test/accessibility/AccessibleImageHandler.java
+++ b/toolkit/test/accessibility/AccessibleImageHandler.java
@@ -23,6 +23,7 @@ import com.sun.star.accessibility.XAccessibleImage;
 
 class AccessibleImageHandler extends NodeHandler
 {
+    @Override
     public NodeHandler createHandler (XAccessibleContext xContext)
     {
         XAccessibleImage xImage =
@@ -50,6 +51,7 @@ class AccessibleImageHandler extends NodeHandler
             XAccessibleImage.class, aNode.getContext());
     }
 
+    @Override
     public AccessibleTreeNode createChild (AccessibleTreeNode aParent, int nIndex)
     {
         if (aParent instanceof AccTreeNode)
diff --git a/toolkit/test/accessibility/AccessibleRelationHandler.java b/toolkit/test/accessibility/AccessibleRelationHandler.java
index 6882f2648f71..884f0493c7cd 100644
--- a/toolkit/test/accessibility/AccessibleRelationHandler.java
+++ b/toolkit/test/accessibility/AccessibleRelationHandler.java
@@ -28,6 +28,7 @@ import tools.NameProvider;
 class AccessibleRelationHandler
     extends NodeHandler
 {
+    @Override
     public NodeHandler createHandler( XAccessibleContext xContext )
     {
         AccessibleRelationHandler aHandler = null;
@@ -51,6 +52,7 @@ class AccessibleRelationHandler
             maChildList.setSize( 1 );
     }
 
+    @Override
     public AccessibleTreeNode createChild( AccessibleTreeNode aParent,
                                            int nIndex )
     {
diff --git a/toolkit/test/accessibility/AccessibleSelectionHandler.java b/toolkit/test/accessibility/AccessibleSelectionHandler.java
index 4791444d5a6a..546bd6913941 100644
--- a/toolkit/test/accessibility/AccessibleSelectionHandler.java
+++ b/toolkit/test/accessibility/AccessibleSelectionHandler.java
@@ -27,6 +27,7 @@ import com.sun.star.lang.IndexOutOfBoundsException;
 class AccessibleSelectionHandler
     extends NodeHandler
 {
+    @Override
     public NodeHandler createHandler( XAccessibleContext xContext )
     {
         XAccessibleSelection xSelection =
@@ -46,6 +47,7 @@ class AccessibleSelectionHandler
             maChildList.setSize( 2 );
     }
 
+    @Override
     public AccessibleTreeNode createChild( AccessibleTreeNode aParent,
                                            int nIndex )
     {
@@ -120,6 +122,7 @@ class AccessibleSelectionHandler
     }
 
 
+    @Override
     public String[] getActions (AccessibleTreeNode aNode)
     {
         if( aNode instanceof AccTreeNode )
@@ -134,6 +137,7 @@ class AccessibleSelectionHandler
         return new String[0];
     }
 
+    @Override
     public void performAction (AccessibleTreeNode aNode, int nIndex)
     {
         new SelectionDialog( (AccTreeNode)aNode ).show();
diff --git a/toolkit/test/accessibility/AccessibleTableHandler.java b/toolkit/test/accessibility/AccessibleTableHandler.java
index 372c2cb5a26f..9ec6ccb2de7d 100644
--- a/toolkit/test/accessibility/AccessibleTableHandler.java
+++ b/toolkit/test/accessibility/AccessibleTableHandler.java
@@ -23,6 +23,7 @@ import com.sun.star.accessibility.XAccessibleTable;
 
 class AccessibleTableHandler extends NodeHandler
 {
+    @Override
     public NodeHandler createHandler (XAccessibleContext xContext)
     {
         XAccessibleTable xTable =
@@ -50,6 +51,7 @@ class AccessibleTableHandler extends NodeHandler
             XAccessibleTable.class, aObject);
     }
 
+    @Override
     public AccessibleTreeNode createChild (AccessibleTreeNode aParent, int nIndex)
     {
         AccessibleTreeNode aChild = null;
diff --git a/toolkit/test/accessibility/AccessibleTextHandler.java b/toolkit/test/accessibility/AccessibleTextHandler.java
index ff424a9f8d76..6fc9b832eed0 100644
--- a/toolkit/test/accessibility/AccessibleTextHandler.java
+++ b/toolkit/test/accessibility/AccessibleTextHandler.java
@@ -51,6 +51,7 @@ import javax.swing.text.JTextComponent;
 
 class AccessibleTextHandler extends NodeHandler
 {
+    @Override
     public NodeHandler createHandler (XAccessibleContext xContext)
     {
         XAccessibleText xText = UnoRuntime.queryInterface (
@@ -71,6 +72,7 @@ class AccessibleTextHandler extends NodeHandler
             maChildList.setSize (8);
     }
 
+    @Override
     public AccessibleTreeNode createChild (AccessibleTreeNode aParent, int nIndex)
     {
         AccessibleTreeNode aChild = null;
@@ -379,6 +381,7 @@ class AccessibleTextHandler extends NodeHandler
         new String[] { "select...", "copy...",
                        "cut...", "paste...", "edit...", "format..." };
 
+    @Override
     public String[] getActions (AccessibleTreeNode aNode)
     {
         XAccessibleEditableText xEText = null;
@@ -388,6 +391,7 @@ class AccessibleTextHandler extends NodeHandler
         return (xEText == null) ? aTextActions : aEditableTextActions;
     }
 
+    @Override
     public void performAction (AccessibleTreeNode aNode, int nIndex)
     {
         if ( ! (aNode instanceof AccTreeNode))
@@ -404,6 +408,7 @@ class AccessibleTextHandler extends NodeHandler
                                                 "Select range:",
                                                 "select" )
                     {
+                        @Override
                         boolean action(
                             JTextComponent aText, AccTreeNode aNode )
                             throws IndexOutOfBoundsException
@@ -419,6 +424,7 @@ class AccessibleTextHandler extends NodeHandler
                                                 "Select range and copy:",
                                                 "copy" )
                     {
+                        @Override
                         boolean action(
                             JTextComponent aText, AccTreeNode aNode )
                             throws IndexOutOfBoundsException
@@ -434,6 +440,7 @@ class AccessibleTextHandler extends NodeHandler
                                                 "Select range and cut:",
                                                 "cut" )
                     {
+                        @Override
                         boolean action(
                             JTextComponent aText, AccTreeNode aNode )
                             throws IndexOutOfBoundsException
@@ -449,6 +456,7 @@ class AccessibleTextHandler extends NodeHandler
                                                 "Place Caret and paste:",
                                                 "paste" )
                     {
+                        @Override
                         boolean action(
                             JTextComponent aText, AccTreeNode aNode )
                             throws IndexOutOfBoundsException
@@ -602,6 +610,7 @@ class TextEditDialog extends TextActionDialog
         super( aNode, sExplanation, sButtonText );
     }
 
+    @Override
     protected void init( String sExplanation,
                          String sText,
                          String sButtonText )
@@ -612,6 +621,7 @@ class TextEditDialog extends TextActionDialog
 
 
     /** edit the text */
+    @Override
     boolean action( JTextComponent aText, AccTreeNode aNode )
     {
         // is this text editable? if not, fudge you and return
@@ -694,6 +704,7 @@ class TextAttributeDialog extends TextActionDialog
     private JCheckBox aBold, aUnderline, aItalics;
     private Color aForeground, aBackground;
 
+    @Override
     protected void init( String sExplanation,
                          String sText,
                          String sButtonText )
@@ -767,6 +778,7 @@ class TextAttributeDialog extends TextActionDialog
 
 
     /** edit the text */
+    @Override
     boolean action( JTextComponent aText, AccTreeNode aNode )
         throws IndexOutOfBoundsException
     {
diff --git a/toolkit/test/accessibility/AccessibleTreeCellRenderer.java b/toolkit/test/accessibility/AccessibleTreeCellRenderer.java
index 43705abb055e..c46058c551da 100644
--- a/toolkit/test/accessibility/AccessibleTreeCellRenderer.java
+++ b/toolkit/test/accessibility/AccessibleTreeCellRenderer.java
@@ -44,6 +44,7 @@ public class AccessibleTreeCellRenderer
         maChangedLines = new ArrayList<Boolean> ();
     }
 
+    @Override
     public Component getTreeCellRendererComponent (
         JTree tree,
         Object value,
diff --git a/toolkit/test/accessibility/AccessibleTreeHandler.java b/toolkit/test/accessibility/AccessibleTreeHandler.java
index a6945a532079..5f9830f6574c 100644
--- a/toolkit/test/accessibility/AccessibleTreeHandler.java
+++ b/toolkit/test/accessibility/AccessibleTreeHandler.java
@@ -30,6 +30,7 @@ class AccessibleTreeHandler
 {
     protected XAccessibleContext mxContext;
 
+    @Override
     public NodeHandler createHandler (XAccessibleContext xContext)
     {
         if (xContext != null)
@@ -57,6 +58,7 @@ class AccessibleTreeHandler
             }
     }
 
+    @Override
     public AccessibleTreeNode createChild (AccessibleTreeNode aParent, int nIndex)
     {
         AccessibleTreeNode aChild = null;
@@ -117,6 +119,7 @@ class AccessibleTreeHandler
     /** Update only the child count node.  Trust on other ways to update the
         accessible children.
     */
+    @Override
     public void update (AccessibleTreeNode aNode)
     {
         synchronized (maChildList)
diff --git a/toolkit/test/accessibility/AccessibleTreeNode.java b/toolkit/test/accessibility/AccessibleTreeNode.java
index c9d3a6b51446..9398385df714 100644
--- a/toolkit/test/accessibility/AccessibleTreeNode.java
+++ b/toolkit/test/accessibility/AccessibleTreeNode.java
@@ -102,6 +102,7 @@ class AccessibleTreeNode
         return true;
     }
 
+    @Override
     public String toString()
     {
         return maDisplayObject.toString();
diff --git a/toolkit/test/accessibility/AccessibleUNOHandler.java b/toolkit/test/accessibility/AccessibleUNOHandler.java
index a516ba3dde76..353cca482f8c 100644
--- a/toolkit/test/accessibility/AccessibleUNOHandler.java
+++ b/toolkit/test/accessibility/AccessibleUNOHandler.java
@@ -29,6 +29,7 @@ import com.sun.star.uno.Type;
 class AccessibleUNOHandler
     extends NodeHandler
 {
+    @Override
     public NodeHandler createHandler (XAccessibleContext xContext)
     {
         if (xContext == null)
@@ -62,6 +63,7 @@ class AccessibleUNOHandler
         return xTypeProvider;
     }
 
+    @Override
     public AccessibleTreeNode createChild (AccessibleTreeNode aParent,
                                            int nIndex)
     {
diff --git a/toolkit/test/accessibility/Canvas.java b/toolkit/test/accessibility/Canvas.java
index 13458a69787a..d815f9df3ff1 100644
--- a/toolkit/test/accessibility/Canvas.java
+++ b/toolkit/test/accessibility/Canvas.java
@@ -208,6 +208,7 @@ class Canvas
     }
 
 
+    @Override
     public void paintComponent (Graphics g)
     {
         synchronized (g)
diff --git a/toolkit/test/accessibility/CanvasShape.java b/toolkit/test/accessibility/CanvasShape.java
index 266da3bbb6f5..41d82b1230c7 100644
--- a/toolkit/test/accessibility/CanvasShape.java
+++ b/toolkit/test/accessibility/CanvasShape.java
@@ -292,6 +292,7 @@ class CanvasShape
         return mxComponent;
     }
 
+    @Override
     public String toString ()
     {
         return ">"+msName+", "+msDescription+" +"+maPosition.x+"+"+maPosition.y
diff --git a/toolkit/test/accessibility/ChildEventHandler.java b/toolkit/test/accessibility/ChildEventHandler.java
index b39a1568ecb8..3a3eb5af30ff 100644
--- a/toolkit/test/accessibility/ChildEventHandler.java
+++ b/toolkit/test/accessibility/ChildEventHandler.java
@@ -34,6 +34,7 @@ class ChildEventHandler
             XAccessible.class, aEvent.NewValue);
     }
 
+    @Override
     public void PrintOldAndNew (PrintStream out)
     {
         if (mxOldChild != null)
@@ -42,6 +43,7 @@ class ChildEventHandler
             out.println ("   adding child " + mxNewChild);
     }
 
+    @Override
     public void Process ()
     {
         // Insertion and removal of children should be mutually exclusive.
diff --git a/toolkit/test/accessibility/ContextEventHandler.java b/toolkit/test/accessibility/ContextEventHandler.java
index a9095e05c314..12ffd0648ce6 100644
--- a/toolkit/test/accessibility/ContextEventHandler.java
+++ b/toolkit/test/accessibility/ContextEventHandler.java
@@ -32,6 +32,7 @@ class ContextEventHandler
         super (aEvent, aTreeModel);
     }
 
+    @Override
     public void PrintOldAndNew (PrintStream out)
     {
         switch (mnEventId)
@@ -61,6 +62,7 @@ class ContextEventHandler
 
     }
 
+    @Override
     public void Process ()
     {
         maTreeModel.updateNode (mxEventSource, AccessibleContextHandler.class);
diff --git a/toolkit/test/accessibility/GeometryEventHandler.java b/toolkit/test/accessibility/GeometryEventHandler.java
index 1c2fea0f8b36..c55ee3acc4b1 100644
--- a/toolkit/test/accessibility/GeometryEventHandler.java
+++ b/toolkit/test/accessibility/GeometryEventHandler.java
@@ -28,11 +28,13 @@ class GeometryEventHandler
         super (aEvent, aTreeModel);
     }
 
+    @Override
     public void PrintOldAndNew (PrintStream out)
     {
         out.println ("   children not relevant");
     }
 
+    @Override
     public void Process ()
     {
         AccTreeNode aNode = maTreeModel.updateNode (mxEventSource,
diff --git a/toolkit/test/accessibility/HelpWindow.java b/toolkit/test/accessibility/HelpWindow.java
index 4d15114874ce..13d2beb0a315 100644
--- a/toolkit/test/accessibility/HelpWindow.java
+++ b/toolkit/test/accessibility/HelpWindow.java
@@ -89,6 +89,7 @@ class HelpWindow
             maFrame = new JFrame ();
             maFrame.addWindowListener (new WindowAdapter ()
                 {
+                    @Override
                     public void windowClosing (WindowEvent e)
                     {
                         maInstance = null;
diff --git a/toolkit/test/accessibility/MessageArea.java b/toolkit/test/accessibility/MessageArea.java
index d0a1094cb6b4..bce68273ffa4 100644
--- a/toolkit/test/accessibility/MessageArea.java
+++ b/toolkit/test/accessibility/MessageArea.java
@@ -106,6 +106,7 @@ public class MessageArea
 
 
 
+    @Override
     public void paintComponent (Graphics g)
     {
         synchronized (g)
diff --git a/toolkit/test/accessibility/TableEventHandler.java b/toolkit/test/accessibility/TableEventHandler.java
index c5f157cc950f..09a3adbbc308 100644
--- a/toolkit/test/accessibility/TableEventHandler.java
+++ b/toolkit/test/accessibility/TableEventHandler.java
@@ -29,6 +29,7 @@ class TableEventHandler
         super (aEvent, aTreeModel);
     }
 
+    @Override
     public void PrintOldAndNew (PrintStream out)
     {
         switch (mnEventId)
@@ -47,6 +48,7 @@ class TableEventHandler
         }
     }
 
+    @Override
     public void Process ()
     {
         maTreeModel.updateNode (mxEventSource, AccessibleTableHandler.class);
diff --git a/toolkit/test/accessibility/VectorNode.java b/toolkit/test/accessibility/VectorNode.java
index 2a63b81dad0d..68cfbfd66844 100644
--- a/toolkit/test/accessibility/VectorNode.java
+++ b/toolkit/test/accessibility/VectorNode.java
@@ -40,28 +40,33 @@ class VectorNode
         maChildren.add (aChild);
     }
 
+    @Override
     public int getChildCount ()
     {
         return maChildren.size();
     }
 
+    @Override
     public AccessibleTreeNode getChild (int nIndex)
         throws IndexOutOfBoundsException
     {
         return maChildren.get(nIndex);
     }
 
+    @Override
     public boolean removeChild (int nIndex)
         throws IndexOutOfBoundsException
     {
         return maChildren.remove (nIndex) != null;
     }
 
+    @Override
     public int indexOf (AccessibleTreeNode aNode)
     {
         return maChildren.indexOf (aNode);
     }
 
+    @Override
     public boolean isLeaf()
     {
         return maChildren.isEmpty();
diff --git a/toolkit/test/accessibility/ov/ContextView.java b/toolkit/test/accessibility/ov/ContextView.java
index 36d03694bbfe..e3144ccb37b2 100644
--- a/toolkit/test/accessibility/ov/ContextView.java
+++ b/toolkit/test/accessibility/ov/ContextView.java
@@ -92,6 +92,7 @@ public class ContextView
         add (maRole, constraints);
     }
 
+    @Override
     public void Update ()
     {
         if (mxContext == null)
@@ -108,6 +109,7 @@ public class ContextView
         }
     }
 
+    @Override
     public String GetTitle ()
     {
         return ("Context");
@@ -115,6 +117,7 @@ public class ContextView
 
     /** Listen for changes regarding displayed values.
     */
+    @Override
     public void notifyEvent (AccessibleEventObject aEvent)
     {
         switch (aEvent.EventId)
diff --git a/toolkit/test/accessibility/ov/FocusView.java b/toolkit/test/accessibility/ov/FocusView.java
index fa87ef5a7d92..00a9258ad534 100644
--- a/toolkit/test/accessibility/ov/FocusView.java
+++ b/toolkit/test/accessibility/ov/FocusView.java
@@ -78,6 +78,7 @@ public class FocusView
     /** Additionally to the context store a reference to the
         XAccessibleComponent interface.
     */
+    @Override
     public void SetObject (XAccessibleContext xObject)
     {
         mxComponent = UnoRuntime.queryInterface(
@@ -85,12 +86,14 @@ public class FocusView
         super.SetObject (xObject);
     }
 
+    @Override
     synchronized public void Destroy ()
     {
         super.Destroy();
         maGrabFocus.removeActionListener (this);
     }
 
+    @Override
     synchronized public void Update ()
     {
         if (mxContext == null)
@@ -110,6 +113,7 @@ public class FocusView
         }
     }
 
+    @Override
     public String GetTitle ()
     {
         return ("Focus");
@@ -123,6 +127,7 @@ public class FocusView
         }
     }
 
+    @Override
     public void notifyEvent (AccessibleEventObject aEvent)
     {
         System.out.println (aEvent);
diff --git a/toolkit/test/accessibility/ov/ListeningObjectView.java b/toolkit/test/accessibility/ov/ListeningObjectView.java
index dd9291fe8231..32bde199d9f6 100644
--- a/toolkit/test/accessibility/ov/ListeningObjectView.java
+++ b/toolkit/test/accessibility/ov/ListeningObjectView.java
@@ -40,6 +40,7 @@ abstract class ListeningObjectView
     /** Add this object as event listener at the broadcasting
         accessible object.
     */
+    @Override
     public void SetObject (XAccessibleContext xContext)
     {
         super.SetObject (xContext);
@@ -54,6 +55,7 @@ abstract class ListeningObjectView
     /** Remove this object as event listener from the broadcasting
         accessible object.
     */
+    @Override
     public void Destroy ()
     {
         super.Destroy ();
diff --git a/toolkit/test/accessibility/ov/SelectionView.java b/toolkit/test/accessibility/ov/SelectionView.java
index e6a06d7593c6..0d84579eb844 100644
--- a/toolkit/test/accessibility/ov/SelectionView.java
+++ b/toolkit/test/accessibility/ov/SelectionView.java
@@ -70,6 +70,7 @@ class SelectionView
         Layout();
     }
 
+    @Override
     public String GetTitle ()
     {
         return "Selection";
@@ -127,6 +128,7 @@ class SelectionView
     }
 
 
+    @Override
     public void SetObject (XAccessibleContext xContext)
     {
         mxSelection = UnoRuntime.queryInterface(
@@ -135,6 +137,7 @@ class SelectionView
     }
 
 
+    @Override
     public void Update ()
     {
         maChildrenSelector.removeAll ();
@@ -228,6 +231,7 @@ class SelectionView
     }
 
 
+    @Override
     public void notifyEvent (AccessibleEventObject aEvent)
     {
         if (aEvent.EventId == AccessibleEventId.SELECTION_CHANGED)
diff --git a/toolkit/test/accessibility/ov/StateSetView.java b/toolkit/test/accessibility/ov/StateSetView.java
index ce0a3ff8582e..a2a7c2632f01 100644
--- a/toolkit/test/accessibility/ov/StateSetView.java
+++ b/toolkit/test/accessibility/ov/StateSetView.java
@@ -88,11 +88,13 @@ public class StateSetView
 
 
 
+    @Override
     public String GetTitle ()
     {
         return ("StateSet");
     }
 
+    @Override
     public void notifyEvent (AccessibleEventObject aEvent)
     {
         if (aEvent.EventId == AccessibleEventId.STATE_CHANGED)
@@ -146,6 +148,7 @@ public static class StateSetAllView
         setMinimumSize (new Dimension(200,80));
     }
 
+    @Override
     public void paintChildren (Graphics g)
     {
         synchronized (g)
@@ -237,6 +240,7 @@ public static class StateSetSetView
     }
 
 
+    @Override
     synchronized public void Update ()
     {
         XAccessibleStateSet xStateSet = mxContext.getAccessibleStateSet();
diff --git a/toolkit/test/accessibility/ov/TextView.java b/toolkit/test/accessibility/ov/TextView.java
index c93e6086e2f4..a38b426b2cf1 100644
--- a/toolkit/test/accessibility/ov/TextView.java
+++ b/toolkit/test/accessibility/ov/TextView.java
@@ -84,6 +84,7 @@ public class TextView
     /** Additionally to the context store a reference to the
         XAccessibleText interface.
     */
+    @Override
     public void SetObject (XAccessibleContext xObject)
     {
         mxText = UnoRuntime.queryInterface(
@@ -91,11 +92,13 @@ public class TextView
         super.SetObject (xObject);
     }
 
+    @Override
     synchronized public void Destroy ()
     {
         super.Destroy();
     }
 
+    @Override
     synchronized public void Update ()
     {
         if (mxText == null)
@@ -110,11 +113,13 @@ public class TextView
         }
     }
 
+    @Override
     public String GetTitle ()
     {
         return ("Text");
     }
 
+    @Override
     public void notifyEvent (AccessibleEventObject aEvent)
     {
         System.out.println (aEvent);