harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r465481 - /incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/
Date Thu, 19 Oct 2006 04:41:12 GMT
Author: ndbeyer
Date: Wed Oct 18 21:41:06 2006
New Revision: 465481

URL: http://svn.apache.org/viewvc?view=rev&rev=465481
Log:
Cleanup compiler warnings.

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AWTTestCase.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTButtonTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTCanvasTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTCheckboxMenuItemTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTCheckboxTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTChoiceTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTComponentTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTContainerTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTDialogTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTFrameTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTLabelTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTListChildTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTListTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTMenuBarTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTMenuComponentTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTMenuItemTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTMenuTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTPanelTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTPopupMenuTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTScrollBarTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTScrollPaneTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTTextAreaTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTTextComponentTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTTextFieldTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTWindowTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/BasicStrokeTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/BorderLayoutRTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/BorderLayoutTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ButtonTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/CanvasRTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/CardLayoutRTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/CardLayoutTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/CheckboxGroupTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/CheckboxTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ChoiceTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ColorRTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ComponentRTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ComponentSerialize.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ComponentTest.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AWTTestCase.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AWTTestCase.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AWTTestCase.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AWTTestCase.java Wed Oct 18 21:41:06 2006
@@ -33,7 +33,7 @@
     /**
      * Exception thrown from Runnable (test code).
      */
-    protected Throwable exception = null;
+    protected Throwable exception;
 
     public AWTTestCase() {
         super();
@@ -51,6 +51,7 @@
     /**
      * @see TestCase#runBare()
      */
+    @Override
     public void runBare() throws Throwable {
         // Wrap the test-method to be run in the event dispatch thread.
         EventQueue.invokeAndWait(new Runnable() {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTButtonTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTButtonTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTButtonTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTButtonTest.java Wed Oct 18 21:41:06 2006
@@ -40,10 +40,7 @@
     private ActionEvent action;
     private Robot robot;
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AccessibleAWTButtonTest.class);
-    }
-
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         button = new Button();

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTCanvasTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTCanvasTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTCanvasTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTCanvasTest.java Wed Oct 18 21:41:06 2006
@@ -38,13 +38,7 @@
     private PropertyChangeEvent lastPropEvent;
     private Robot robot;
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AccessibleAWTCanvasTest.class);
-    }
-
-    /*
-     * @see TestCase#setUp()
-     */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         robot = new Robot();
@@ -57,13 +51,6 @@
             }
 
         };
-    }
-
-    /*
-     * @see TestCase#tearDown()
-     */
-    protected void tearDown() throws Exception {
-        super.tearDown();
     }
 
     public final void testAccessibleAWTCanvas() {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTCheckboxMenuItemTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTCheckboxMenuItemTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTCheckboxMenuItemTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTCheckboxMenuItemTest.java Wed Oct 18 21:41:06 2006
@@ -36,20 +36,13 @@
     AccessibleValue value;
     AccessibleAction action;
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AccessibleAWTCheckboxMenuItemTest.class);
-    }
-
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         item = new CheckboxMenuItem();
         ac = item.getAccessibleContext();
         action = ac.getAccessibleAction();
         value = ac.getAccessibleValue();
-    }
-
-    protected void tearDown() throws Exception {
-        super.tearDown();
     }
 
     /*

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTCheckboxTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTCheckboxTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTCheckboxTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTCheckboxTest.java Wed Oct 18 21:41:06 2006
@@ -40,26 +40,18 @@
  */
 public class AccessibleAWTCheckboxTest extends TestCase {
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AccessibleAWTCheckboxTest.class);
-    }
-
     private Checkbox checkbox;
     private AccessibleContext ac;
-    private ItemEvent event;
     private PropertyChangeEvent lastPropEvent;
-
     private PropertyChangeListener propListener;
-    /*
-     * @see TestCase#setUp()
-     */
+
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         checkbox = new Checkbox();
         assertEquals(0, checkbox.getItemListeners().length);
         ac = checkbox.getAccessibleContext();
         assertSame(ac, checkbox.getItemListeners()[0]);
-        event = null;
         lastPropEvent = null;
         assertNotNull(ac);
 
@@ -69,13 +61,6 @@
                 lastPropEvent = pce;
             }
         };
-    }
-
-    /*
-     * @see TestCase#tearDown()
-     */
-    protected void tearDown() throws Exception {
-        super.tearDown();
     }
 
     public final void testGetAccessibleAction() {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTChoiceTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTChoiceTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTChoiceTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTChoiceTest.java Wed Oct 18 21:41:06 2006
@@ -34,25 +34,12 @@
     Choice choice;
     AccessibleContext ac;
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AccessibleAWTChoiceTest.class);
-    }
-
-    /*
-     * @see TestCase#setUp()
-     */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         choice = new Choice();
         ac = choice.getAccessibleContext();
         assertNotNull(ac);
-    }
-
-    /*
-     * @see TestCase#tearDown()
-     */
-    protected void tearDown() throws Exception {
-        super.tearDown();
     }
 
     public final void testGetAccessibleAction() {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTComponentTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTComponentTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTComponentTest.java Wed Oct 18 21:41:06 2006
@@ -38,9 +38,11 @@
 /**
  * AccessibleAWTComponentTest
  */
+@SuppressWarnings("serial")
 public class AccessibleAWTComponentTest extends TestCase {
 
     private class MyComponent extends Component implements Accessible {
+        @Override
         public void requestFocus() {
             methodCalled = true;
             super.requestFocus();
@@ -54,13 +56,8 @@
     private PropertyChangeEvent lastPropEvent;
     private FocusEvent lastFocusEvent;
     protected boolean methodCalled;
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AccessibleAWTComponentTest.class);
-    }
 
-    /*
-     * @see TestCase#setUp()
-     */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         comp = new MyComponent();
@@ -89,13 +86,6 @@
         };
     }
 
-    /*
-     * @see TestCase#tearDown()
-     */
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
     public final void testGetAccessibleChildrenCount() {
         assertEquals("No accessible children", 0,
                      aComponent.getAccessibleChildrenCount());
@@ -301,6 +291,7 @@
         assertNotSame(loc, aComponent.getLocation());
     }
 
+    @SuppressWarnings("deprecation")
     public final void testGetLocationOnScreen() {
         Frame f = new Frame();
         f.setLayout(null);
@@ -336,6 +327,7 @@
         assertTrue(aComponent.isFocusTraversable());
     }
 
+    @SuppressWarnings("deprecation")
     public final void testIsShowing() {
         assertFalse(aComponent.isShowing());
         Frame f = new Frame();

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTContainerTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTContainerTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTContainerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTContainerTest.java Wed Oct 18 21:41:06 2006
@@ -21,7 +21,6 @@
 package java.awt;
 
 import java.awt.Container.AccessibleAWTContainer;
-import java.awt.event.ContainerListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 
@@ -33,16 +32,17 @@
 /**
  * AccessibleAWTContainerTest
  */
+@SuppressWarnings("serial")
 public class AccessibleAWTContainerTest extends TestCase {
 
     private AccessibleAWTContainer aContainer;
     private Container container;
     private PropertyChangeListener propListener;
-    private ContainerListener contListener;
     private PropertyChangeEvent lastPropEvent;
 
     private class MyContainer extends Container implements Accessible {
         AccessibleAWTContainer aac;
+        @Override
         public AccessibleContext getAccessibleContext() {
             if (aac == null) {
                 aac = new AccessibleAWTContainer(){};
@@ -54,6 +54,7 @@
 
     private class MyComponent extends Component implements Accessible {
         AccessibleAWTComponent aac;
+        @Override
         public AccessibleContext getAccessibleContext() {
             if (aac == null) {
                 aac = new AccessibleAWTComponent(){};
@@ -70,6 +71,7 @@
     /*
      * @see TestCase#setUp()
      */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         container = new MyContainer();
@@ -88,6 +90,7 @@
     /*
      * @see TestCase#tearDown()
      */
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
     }
@@ -139,6 +142,7 @@
         assertNull(aContainer.getAccessibleChild(1));
     }
 
+    @SuppressWarnings("deprecation")
     public final void testGetAccessibleAt() {
         container.setSize(100, 100);
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTDialogTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTDialogTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTDialogTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTDialogTest.java Wed Oct 18 21:41:06 2006
@@ -38,13 +38,7 @@
     private Dialog dialog;
     private Frame frame;
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AccessibleAWTDialogTest.class);
-    }
-
-    /*
-     * @see TestCase#setUp()
-     */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         frame = new Frame();
@@ -52,9 +46,7 @@
         ac = dialog.getAccessibleContext();
     }
 
-    /*
-     * @see TestCase#tearDown()
-     */
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
         if ((frame != null) && frame.isDisplayable()) {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTFrameTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTFrameTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTFrameTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTFrameTest.java Wed Oct 18 21:41:06 2006
@@ -37,22 +37,14 @@
     AccessibleContext ac;
     private Frame frame;
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AccessibleAWTFrameTest.class);
-    }
-
-    /*
-     * @see TestCase#setUp()
-     */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         frame = new Frame();
         ac = frame.getAccessibleContext();
     }
 
-    /*
-     * @see TestCase#tearDown()
-     */
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
         if ((frame != null) && frame.isDisplayable()) {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTLabelTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTLabelTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTLabelTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTLabelTest.java Wed Oct 18 21:41:06 2006
@@ -32,13 +32,7 @@
     Label label;
     AccessibleContext ac;
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AccessibleAWTLabelTest.class);
-    }
-
-    /*
-     * @see TestCase#setUp()
-     */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         label = new Label();
@@ -46,12 +40,6 @@
         assertNotNull(ac);
     }
 
-    /*
-     * @see TestCase#tearDown()
-     */
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
 
     public final void testGetAccessibleName() {
         assertEquals("", ac.getAccessibleName());

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTListChildTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTListChildTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTListChildTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTListChildTest.java Wed Oct 18 21:41:06 2006
@@ -23,14 +23,11 @@
 import java.awt.List.AccessibleAWTList;
 import java.awt.List.AccessibleAWTList.AccessibleAWTListChild;
 import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
 import java.util.Locale;
-
 import javax.accessibility.AccessibleComponent;
 import javax.accessibility.AccessibleContext;
 import javax.accessibility.AccessibleRole;
 import javax.accessibility.AccessibleState;
-
 import junit.framework.TestCase;
 
 /**
@@ -42,16 +39,9 @@
     AccessibleContext ac;
     AccessibleContext ac1, ac2, ac3;
     AccessibleComponent aComp1, aComp2, aComp3;
-    private FocusListener focusListener;
     protected FocusEvent lastFocusEvent;
-    private Robot robot;
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AccessibleAWTListChildTest.class);
-    }
 
-    /*
-     * @see TestCase#setUp()
-     */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         list = new List();
@@ -66,27 +56,6 @@
         ac3 = ac.getAccessibleChild(2).getAccessibleContext();
         aComp3 = ac3.getAccessibleComponent();
         lastFocusEvent = null;
-        focusListener = new FocusListener () {
-
-            public void focusGained(FocusEvent fe) {
-                lastFocusEvent = fe;
-
-            }
-
-            public void focusLost(FocusEvent fe) {
-                lastFocusEvent = fe;
-
-            }
-
-        };
-        robot = new Robot();
-    }
-
-    /*
-     * @see TestCase#tearDown()
-     */
-    protected void tearDown() throws Exception {
-        super.tearDown();
     }
 
     public final void testGetAccessibleChildrenCount() {
@@ -198,6 +167,7 @@
         assertNull(aComp2.getLocation());
     }
 
+    @SuppressWarnings("deprecation")
     public final void testGetLocationOnScreen() {
         assertNull(aComp1.getLocationOnScreen());
         Frame f = new Frame();
@@ -240,6 +210,7 @@
         assertFalse(aComp3.isFocusTraversable());
     }
 
+    @SuppressWarnings("deprecation")
     public final void testIsShowing() {
         assertFalse(aComp3.isShowing());
         Frame f = new Frame();

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTListTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTListTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTListTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTListTest.java Wed Oct 18 21:41:06 2006
@@ -22,14 +22,11 @@
 
 import java.awt.List.AccessibleAWTList;
 import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
 import javax.accessibility.Accessible;
 import javax.accessibility.AccessibleContext;
 import javax.accessibility.AccessibleRole;
 import javax.accessibility.AccessibleSelection;
 import javax.accessibility.AccessibleState;
-
 import junit.framework.TestCase;
 
 /**
@@ -38,34 +35,14 @@
 public class AccessibleAWTListTest extends TestCase {
     List list;
     AccessibleContext ac;
-    private PropertyChangeListener propListener;
     protected PropertyChangeEvent lastPropEvent;
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AccessibleAWTListTest.class);
-    }
-
-    /*
-     * @see TestCase#setUp()
-     */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         list = new List();
         ac = list.getAccessibleContext();
         assertNotNull(ac);
-        propListener = new PropertyChangeListener() {
-
-            public void propertyChange(PropertyChangeEvent pce) {
-                lastPropEvent = pce;
-            }
-        };
-    }
-
-    /*
-     * @see TestCase#tearDown()
-     */
-    protected void tearDown() throws Exception {
-        super.tearDown();
     }
 
     public final void testGetAccessibleChildrenCount() {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTMenuBarTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTMenuBarTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTMenuBarTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTMenuBarTest.java Wed Oct 18 21:41:06 2006
@@ -34,24 +34,11 @@
     MenuBar menubar;
     AccessibleContext ac;
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AccessibleAWTMenuBarTest.class);
-    }
-
-    /*
-     * @see TestCase#setUp()
-     */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         menubar = new MenuBar();
         ac = menubar.getAccessibleContext();
-    }
-
-    /*
-     * @see TestCase#tearDown()
-     */
-    protected void tearDown() throws Exception {
-        super.tearDown();
     }
 
     public final void testAccessibleAWTMenuBar() {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTMenuComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTMenuComponentTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTMenuComponentTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTMenuComponentTest.java Wed Oct 18 21:41:06 2006
@@ -33,10 +33,12 @@
 /**
  * AccessibleAWTMenuComponentTest
  */
+@SuppressWarnings("serial")
 public class AccessibleAWTMenuComponentTest extends TestCase {
 
     class MyMenuComponent extends MenuComponent implements Accessible {
         AccessibleContext ac;
+        @Override
         public AccessibleContext getAccessibleContext() {
             if (ac == null) {
                 ac = new AccessibleAWTMenuComponent(){};
@@ -48,25 +50,12 @@
     private MenuComponent menuComp;
     private AccessibleAWTMenuComponent aMenuComp;
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AccessibleAWTMenuComponentTest.class);
-    }
-
-    /*
-     * @see TestCase#setUp()
-     */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         menuComp = new MyMenuComponent();
         aMenuComp = (AccessibleAWTMenuComponent) menuComp.getAccessibleContext();
 //        aMenuComp = menuComp.new AccessibleAWTMenuComponent(){};
-    }
-
-    /*
-     * @see TestCase#tearDown()
-     */
-    protected void tearDown() throws Exception {
-        super.tearDown();
     }
 
     public final void testAccessibleAWTMenuComponent() {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTMenuItemTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTMenuItemTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTMenuItemTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTMenuItemTest.java Wed Oct 18 21:41:06 2006
@@ -43,13 +43,7 @@
     private Robot robot;
     private ActionListener actionListener;
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AccessibleAWTMenuItemTest.class);
-    }
-
-    /*
-     * @see TestCase#setUp()
-     */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         item = new MenuItem();
@@ -63,13 +57,6 @@
                 event = ae;
             }
         };
-    }
-
-    /*
-     * @see TestCase#tearDown()
-     */
-    protected void tearDown() throws Exception {
-        super.tearDown();
     }
 
     public final void testAccessibleAWTMenuItem() {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTMenuTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTMenuTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTMenuTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTMenuTest.java Wed Oct 18 21:41:06 2006
@@ -31,18 +31,11 @@
     Menu menu;
     AccessibleContext ac;
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AccessibleAWTMenuTest.class);
-    }
-
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         menu = new Menu();
         ac = menu.getAccessibleContext();
-    }
-
-    protected void tearDown() throws Exception {
-        super.tearDown();
     }
 
     /*

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTPanelTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTPanelTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTPanelTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTPanelTest.java Wed Oct 18 21:41:06 2006
@@ -34,24 +34,11 @@
     Panel panel;
     AccessibleContext ac;
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AccessibleAWTPanelTest.class);
-    }
-
-    /*
-     * @see TestCase#setUp()
-     */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         panel = new Panel();
         ac = panel.getAccessibleContext();
-    }
-
-    /*
-     * @see TestCase#tearDown()
-     */
-    protected void tearDown() throws Exception {
-        super.tearDown();
     }
 
     public final void testGetAccessibleRole() {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTPopupMenuTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTPopupMenuTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTPopupMenuTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTPopupMenuTest.java Wed Oct 18 21:41:06 2006
@@ -31,18 +31,11 @@
     PopupMenu popup;
     AccessibleContext ac;
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AccessibleAWTPopupMenuTest.class);
-    }
-
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         popup = new PopupMenu();
         ac = popup.getAccessibleContext();
-    }
-
-    protected void tearDown() throws Exception {
-        super.tearDown();
     }
 
     /*

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTScrollBarTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTScrollBarTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTScrollBarTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTScrollBarTest.java Wed Oct 18 21:41:06 2006
@@ -37,24 +37,11 @@
     Scrollbar scrollbar;
     AccessibleContext ac;
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AccessibleAWTScrollBarTest.class);
-    }
-
-    /*
-     * @see TestCase#setUp()
-     */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         scrollbar = new Scrollbar();
         ac = scrollbar.getAccessibleContext();
-    }
-
-    /*
-     * @see TestCase#tearDown()
-     */
-    protected void tearDown() throws Exception {
-        super.tearDown();
     }
 
     public final void testGetAccessibleRole() {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTScrollPaneTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTScrollPaneTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTScrollPaneTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTScrollPaneTest.java Wed Oct 18 21:41:06 2006
@@ -35,13 +35,7 @@
     private ScrollPane scrollpane;
     private AccessibleContext ac;
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AccessibleAWTScrollPaneTest.class);
-    }
-
-    /*
-     * @see TestCase#setUp()
-     */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         scrollpane = new ScrollPane();

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTTextAreaTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTTextAreaTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTTextAreaTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTTextAreaTest.java Wed Oct 18 21:41:06 2006
@@ -30,10 +30,7 @@
     TextArea textArea;
     AccessibleAWTTextArea aTextArea;
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AccessibleAWTTextAreaTest.class);
-    }
-
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         textArea = new TextArea();
@@ -42,10 +39,6 @@
                    instanceof AccessibleAWTTextArea);
     }
 
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
     /*
      * Test method for 'java.awt.TextArea.AccessibleAWTTextArea.getAccessibleStateSet()'
      */
@@ -53,14 +46,6 @@
         AccessibleState state = AccessibleState.MULTI_LINE;
         assertTrue("text area is multi-line text",
                    aTextArea.getAccessibleStateSet().contains(state));
-
-    }
-
-    /*
-     * Test method for 'java.awt.TextArea.AccessibleAWTTextArea.AccessibleAWTTextArea(TextArea)'
-     */
-    public void testAccessibleAWTTextArea() {
-        assertTrue(aTextArea instanceof AccessibleAWTTextArea);
 
     }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTTextComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTTextComponentTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTTextComponentTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTTextComponentTest.java Wed Oct 18 21:41:06 2006
@@ -32,20 +32,13 @@
     TextComponent textComp;
     AccessibleAWTTextComponent aTextComp;
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AccessibleAWTTextComponentTest.class);
-    }
-
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         textComp = new TextField();
         aTextComp = textComp.new AccessibleAWTTextComponent();
         assertTrue(textComp.getAccessibleContext()
                    instanceof AccessibleAWTTextComponent);
-    }
-
-    protected void tearDown() throws Exception {
-        super.tearDown();
     }
 
     /*

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTTextFieldTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTTextFieldTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTTextFieldTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTTextFieldTest.java Wed Oct 18 21:41:06 2006
@@ -30,10 +30,7 @@
     TextField textField;
     AccessibleAWTTextField aTextField;
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AccessibleAWTTextFieldTest.class);
-    }
-
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         textField = new TextField();
@@ -41,10 +38,6 @@
         assertTrue(textField.getAccessibleContext() instanceof AccessibleAWTTextField);
     }
 
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
     /*
      * Test method for 'java.awt.TextField.AccessibleAWTTextField.getAccessibleStateSet()'
      */
@@ -52,14 +45,6 @@
         AccessibleState state = AccessibleState.SINGLE_LINE;
         assertTrue("text field is a single-line text",
                    aTextField.getAccessibleStateSet().contains(state));
-    }
-
-    /*
-     * Test method for 'java.awt.TextField.AccessibleAWTTextField.AccessibleAWTTextField(TextField)'
-     */
-    public void testAccessibleAWTTextField() {
-        assertTrue(aTextField instanceof AccessibleAWTTextField);
-
     }
 
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTWindowTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTWindowTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTWindowTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/AccessibleAWTWindowTest.java Wed Oct 18 21:41:06 2006
@@ -39,13 +39,7 @@
     private Frame frame;
     private Robot robot;
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AccessibleAWTWindowTest.class);
-    }
-
-    /*
-     * @see TestCase#setUp()
-     */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         frame = new Frame();
@@ -54,9 +48,7 @@
         robot = new Robot();
     }
 
-    /*
-     * @see TestCase#tearDown()
-     */
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
         if ((frame != null) && frame.isDisplayable()) {
@@ -68,6 +60,7 @@
         assertSame(AccessibleRole.WINDOW, ac.getAccessibleRole());
     }
 
+    @SuppressWarnings("deprecation")
     public final void testGetAccessibleStateSet() {
         frame.show();
         window.setFocusable(true);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/BasicStrokeTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/BasicStrokeTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/BasicStrokeTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/BasicStrokeTest.java Wed Oct 18 21:41:06 2006
@@ -47,6 +47,7 @@
         super(name);
     }
 
+    @Override
     protected void setUp() throws Exception {
         String basePath = System.getProperty("TEST_SRC_DIR");
         assertNotNull(basePath, "Parameter TEST_SRC_DIR not defined");
@@ -60,9 +61,6 @@
         if (OUTPUT) {
             new File(outputPath).mkdirs();
         }
-    }
-
-    protected void tearDown() throws Exception {
     }
 
     public void testCreate() {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/BorderLayoutRTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/BorderLayoutRTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/BorderLayoutRTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/BorderLayoutRTest.java Wed Oct 18 21:41:06 2006
@@ -28,10 +28,7 @@
     BorderLayout layout;
     private Dimension maxSize;
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(BorderLayoutRTest.class);
-    }
-
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         emptyContainer = new Container();

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/BorderLayoutTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/BorderLayoutTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/BorderLayoutTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/BorderLayoutTest.java Wed Oct 18 21:41:06 2006
@@ -20,6 +20,7 @@
  */
 package java.awt;
 
+@SuppressWarnings("serial")
 public class BorderLayoutTest extends AWTTestCase {
 
     class TestButton extends Button {
@@ -33,10 +34,11 @@
 
     private final int MIN_SIZE = 50;
     private final int PREF_SIZE = 100;
-    private TestButton n, s, w, c, e;
+    private final TestButton n, s, w, c, e;
     private BorderLayout layout;
     private Frame frame;
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
 
@@ -46,6 +48,7 @@
         frame.setVisible(true);
     }
 
+    @Override
     protected void tearDown() throws Exception {
         frame.dispose();
 
@@ -60,10 +63,6 @@
         c = new TestButton("c", min, pref);
         w = new TestButton("w", min, pref);
         e = new TestButton("e", min, pref);
-    }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(BorderLayoutTest.class);
     }
 
     public final void testBorderLayoutintint() {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ButtonTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ButtonTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ButtonTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ButtonTest.java Wed Oct 18 21:41:06 2006
@@ -28,6 +28,7 @@
 
 import junit.framework.TestCase;
 
+@SuppressWarnings("serial")
 public class ButtonTest extends TestCase {
 
     class TestButton extends Button {
@@ -42,15 +43,12 @@
     private TestButton button;
     private boolean eventProcessed;
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         button = new TestButton("Button");        
     }
 
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
     public void testButton() {
         button = new TestButton();
 
@@ -64,19 +62,18 @@
     public void testGetSetLabel() {
         button.setLabel(null);
         assertNull(button.getLabel());
-        Dimension nullSize = button.getPreferredSize();
 
         button.setLabel("Button");
         assertTrue(button.getLabel().equals("Button"));
     }
 
     public void testGetSetActionCommand() {
-        assertTrue(button.getActionCommand() == "Button");
+        assertTrue(button.getActionCommand().equals("Button"));
         button.setLabel(null);
         assertNull(button.getActionCommand());
 
         button.setActionCommand("Button Command");
-        assertTrue(button.getActionCommand() == "Button Command");
+        assertTrue(button.getActionCommand().equals("Button Command"));
     }
 
     public void testAddGetRemoveActionListener() {
@@ -96,6 +93,7 @@
     public void testProcessEvent() {
         eventProcessed = false;
         button.addKeyListener(new KeyAdapter() {
+            @Override
             public void keyPressed(KeyEvent a0) {
                 eventProcessed = true;
             }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/CanvasRTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/CanvasRTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/CanvasRTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/CanvasRTest.java Wed Oct 18 21:41:06 2006
@@ -31,9 +31,4 @@
         assertNull(c.getName());
 
     }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(CanvasRTest.class);
-    }
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/CardLayoutRTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/CardLayoutRTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/CardLayoutRTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/CardLayoutRTest.java Wed Oct 18 21:41:06 2006
@@ -28,10 +28,7 @@
     CardLayout layout;
     private Dimension maxSize;
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(CardLayoutRTest.class);
-    }
-
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         emptyContainer = new Container();

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/CardLayoutTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/CardLayoutTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/CardLayoutTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/CardLayoutTest.java Wed Oct 18 21:41:06 2006
@@ -20,6 +20,7 @@
  */
 package java.awt;
 
+@SuppressWarnings("serial")
 public class CardLayoutTest extends AWTTestCase {
 
     class TestButton extends Button {
@@ -33,10 +34,11 @@
 
     private final int MIN_SIZE = 50;
     private final int PREF_SIZE = 100;
-    private TestButton b1, b2, b3, b4, b5, b6;
+    private final TestButton b1, b2, b3, b4, b5, b6;
     private CardLayout layout;
     private Frame frame;
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
 
@@ -46,6 +48,7 @@
         frame.setVisible(true);
     }
 
+    @Override
     protected void tearDown() throws Exception {
         frame.dispose();
 
@@ -106,6 +109,7 @@
         assertTrue(layout.getLayoutAlignmentY(frame) == Component.CENTER_ALIGNMENT);
     }
 
+    @SuppressWarnings("deprecation")
     public void testAddLayoutComponentComponentObject() {
         Container c = new Container();
         c.setSize(1, 2);
@@ -128,6 +132,7 @@
         assertTrue(notString);
     }
 
+    @SuppressWarnings("deprecation")
     public void testRemoveLayoutComponent() {
         Container c = new Container();
         c.setSize(13, 13);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/CheckboxGroupTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/CheckboxGroupTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/CheckboxGroupTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/CheckboxGroupTest.java Wed Oct 18 21:41:06 2006
@@ -28,21 +28,13 @@
 public class CheckboxGroupTest extends TestCase {
 
     CheckboxGroup group;
-    /*
-     * @see TestCase#setUp()
-     */
+
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         group = new CheckboxGroup();
     }
 
-    /*
-     * @see TestCase#tearDown()
-     */
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
     public final void testCheckboxGroup() {
         assertNotNull(group);
         assertNull(group.getSelectedCheckbox());
@@ -62,10 +54,12 @@
 
     }
 
+    @SuppressWarnings("deprecation")
     public final void testGetCurrent() {
         assertNull(group.getCurrent());
     }
 
+    @SuppressWarnings("deprecation")
     public final void testSetCurrent() {
         Checkbox cb1 = new Checkbox();
         Checkbox cb2 = new Checkbox();

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/CheckboxTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/CheckboxTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/CheckboxTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/CheckboxTest.java Wed Oct 18 21:41:06 2006
@@ -28,6 +28,7 @@
 /**
  * CheckboxTest
  */
+@SuppressWarnings("serial")
 public class CheckboxTest extends TestCase {
 
     class TestCheckbox extends Checkbox {
@@ -54,6 +55,7 @@
             super(arg0, arg1, arg2);
         }
 
+        @Override
         public void paint(Graphics g) {
             super.paint(g);
             EventQueue.invokeLater(new Runnable() {
@@ -69,6 +71,7 @@
     /*
      * @see TestCase#setUp()
      */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();        
         checkbox = new TestCheckbox("Checkbox");
@@ -77,6 +80,7 @@
     /*
      * @see TestCase#tearDown()
      */
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
     }
@@ -125,7 +129,6 @@
     public void testGetSetLabel() {
         checkbox.setLabel(null);
         assertNull(checkbox.getLabel());
-        Dimension nullSize = checkbox.getPreferredSize();
 
         String text = "Checkbox";
         checkbox.setLabel(text);
@@ -191,7 +194,7 @@
     }
 
     public void testGetListenersClass() {
-        Class cls = ItemListener.class;
+        Class<ItemListener> cls = ItemListener.class;
         assertEquals(0, checkbox.getListeners(cls).length);
 
         ItemListener listener = new ItemListener() {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ChoiceTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ChoiceTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ChoiceTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ChoiceTest.java Wed Oct 18 21:41:06 2006
@@ -36,26 +36,13 @@
     private Choice choice;
     private boolean eventProcessed;
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(ChoiceTest.class);
-    }
-
-    /*
-     * @see TestCase#setUp()
-     */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         choice = new Choice();
         eventProcessed = false;
     }
 
-    /*
-     * @see TestCase#tearDown()
-     */
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
     public final void testAddNotify() {
         Frame f = new Frame("");
         f.add(choice);
@@ -87,6 +74,7 @@
     public final void testProcessEvent() {
         eventProcessed = false;
         choice.addKeyListener(new KeyAdapter() {
+            @Override
             public void keyReleased(KeyEvent ke) {
                 eventProcessed = true;
             }
@@ -100,7 +88,7 @@
         assertEquals(0, choice.getListeners(KeyListener.class).length);
         KeyAdapter listener = new KeyAdapter(){};
         choice.addKeyListener(listener);
-        Class clazz =  KeyListener.class;
+        Class<KeyListener> clazz =  KeyListener.class;
         assertEquals(1, choice.getListeners(clazz).length);
         assertEquals(listener, choice.getListeners(clazz)[0]);
         choice.removeKeyListener(listener);
@@ -270,6 +258,7 @@
         assertTrue(npe);
     }
 
+    @SuppressWarnings("deprecation")
     public final void testCountItems() {
         assertEquals(0, choice.countItems());
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ColorRTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ColorRTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ColorRTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ColorRTest.java Wed Oct 18 21:41:06 2006
@@ -30,7 +30,4 @@
         assertEquals(c.brighter(), new Color(255, 0, 255));
     }
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(ColorRTest.class);
-    }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ComponentRTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ComponentRTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ComponentRTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ComponentRTest.java Wed Oct 18 21:41:06 2006
@@ -25,6 +25,7 @@
 
 import junit.framework.TestCase;
 
+@SuppressWarnings("serial")
 public class ComponentRTest extends TestCase {
     private static PropertyChangeEvent lastEvent;
 
@@ -39,6 +40,7 @@
 
     public final void testFirePropertyChange() {
         Component comp = new Component(){
+            @Override
             public void firePropertyChange(String s, Object o1, Object o2) {
                 // consuming object property change
              }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ComponentSerialize.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ComponentSerialize.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ComponentSerialize.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ComponentSerialize.java Wed Oct 18 21:41:06 2006
@@ -30,11 +30,8 @@
 public class ComponentSerialize extends TestCase {
 
 
+    @SuppressWarnings("serial")
     static final class MyComponent extends Component {}
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(ComponentSerialize.class);
-    }
 
     public void testAll() throws IOException, ClassNotFoundException {
         writeAndRead(new MyComponent());

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ComponentTest.java?view=diff&rev=465481&r1=465480&r2=465481
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ComponentTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ComponentTest.java Wed Oct 18 21:41:06 2006
@@ -37,6 +37,7 @@
 
 import junit.framework.TestCase;
 
+@SuppressWarnings("serial")
 public class ComponentTest extends TestCase {
     Robot robot;
 
@@ -46,29 +47,35 @@
     public class SimpleContainer extends Container {
     }
     /* more complex component for [deprecated] event testing */
+    @SuppressWarnings("deprecation")
     class MyComponent extends Canvas {
 
+        @Override
         public boolean gotFocus(Event evt, Object what) {
             synchronized(robot) {
                 return callback(evt);
             }
         }
+        @Override
         public boolean lostFocus(Event evt, Object what) {
             synchronized(robot) {
                 return callback(evt);
             }
         }
+        @Override
         public boolean keyDown(Event evt, int key) {
             synchronized(robot) {
                 return callback(evt);                
             }
         }
+        @Override
         public boolean keyUp(Event evt, int key) {
             synchronized(robot) {                
                 return callback(evt);
             }
         }
 
+        @Override
         public void paint(Graphics g) {
             super.paint(g);
             g.setColor(Color.GREEN);
@@ -80,7 +87,9 @@
             });
         }
     }
+    @SuppressWarnings("deprecation")
     class MoveResizeComponent extends SimpleComponent {
+        @Override
         public void reshape(int x, int y, int w, int h) {
             assertTrue(methodCalled);
             assertTrue(setBoundsCalled);
@@ -88,6 +97,7 @@
             reshapeCalled = true;
             super.reshape(x, y, w, h);
         }
+        @Override
         public void setBounds(int x, int y, int w, int h) {
             assertTrue(methodCalled);
             assertFalse(setBoundsCalled);
@@ -95,13 +105,16 @@
             super.setBounds(x, y, w, h);
         }
     }
+    @SuppressWarnings("deprecation")
     class MyButton extends Button {
+        @Override
         public boolean  action(Event evt, Object arg1) {
             synchronized(robot) {
                 return callback(evt);
             }
         }
 
+        @Override
         public void paint(Graphics g) {
             super.paint(g);
             EventQueue.invokeLater(new Runnable() {
@@ -111,14 +124,17 @@
             });
         }
     }
+    @SuppressWarnings("deprecation")
     class MyFrame extends Frame {
 
+        @Override
         public boolean handleEvent(Event evt) {
             synchronized (robot) {
                 return callback(evt);
             }
         }
 
+        @Override
         public void paint(Graphics g) {
             super.paint(g);
             g.setColor(Color.BLUE);
@@ -136,7 +152,7 @@
     boolean paintFlag;
     boolean listenerCalled, parentListenerCalled;
 
-    private static Map oldEventsMap = new HashMap(); //<int, boolean> key: Event id, value: if listener was called
+    private static final Map<Integer, Event> oldEventsMap = new HashMap<Integer, Event>(); //<int, boolean> key: Event id, value: if listener was called
 
     boolean methodCalled, setBoundsCalled, reshapeCalled;
     String propName;
@@ -152,7 +168,7 @@
     Object oldValue, newValue, src;
     int waitTime = 3000; //time to wait for events in ms
     private Event event; //saved last deprecated Event object
-    private int nRetries = 3; //number of times to repeat [robot] actions
+    private final int nRetries = 3; //number of times to repeat [robot] actions
 
     public static void main(String[] args) {
         junit.textui.TestRunner.run(ComponentTest.class);
@@ -171,6 +187,7 @@
         return null;
     }
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         tc = new SimpleComponent();
@@ -186,6 +203,7 @@
     /*
      * @see TestCase#tearDown()
      */
+    @Override
     protected void tearDown() throws Exception {
 
         if (frame != null) {
@@ -291,19 +309,19 @@
     }
 
     public final void testGetFocusTraversalKeys() {
-        Set testSet = Collections.EMPTY_SET;
+        Set<AWTKeyStroke> testSet = Collections.emptySet();
         assertEquals(testSet, tc.getFocusTraversalKeys(KeyboardFocusManager.UP_CYCLE_TRAVERSAL_KEYS));
-        Set forSet = tc.getFocusTraversalKeys(KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS);
-        testSet = new HashSet();
+        Set<AWTKeyStroke> forSet = tc.getFocusTraversalKeys(KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS);
+        testSet = new HashSet<AWTKeyStroke>();
         testSet.add(AWTKeyStroke.getAWTKeyStroke(KeyEvent.VK_TAB, 0));
-        testSet.add(AWTKeyStroke.getAWTKeyStroke(KeyEvent.VK_TAB, KeyEvent.CTRL_DOWN_MASK));
+        testSet.add(AWTKeyStroke.getAWTKeyStroke(KeyEvent.VK_TAB, InputEvent.CTRL_DOWN_MASK));
         assertEquals(testSet, forSet);
     }
 
     public final void testSetFocusTraversalKeys() {
         int keysID = KeyboardFocusManager.UP_CYCLE_TRAVERSAL_KEYS;
         assertFalse(tc.areFocusTraversalKeysSet(keysID));
-        Set upSet = new HashSet();
+        Set<AWTKeyStroke> upSet = new HashSet<AWTKeyStroke>();
         upSet.add(AWTKeyStroke.getAWTKeyStroke(KeyEvent.VK_SPACE, 0));
         tc.setFocusTraversalKeys(keysID, upSet);
         assertTrue(tc.areFocusTraversalKeysSet(keysID));
@@ -313,9 +331,9 @@
     public final void testAreFocusTraversalKeysSet() {
         int id = KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS;
         assertFalse(tc.areFocusTraversalKeysSet(id));
-        Set testSet = new HashSet();
+        Set<AWTKeyStroke> testSet = new HashSet<AWTKeyStroke>();
         testSet.add(AWTKeyStroke.getAWTKeyStroke(KeyEvent.VK_TAB, 0));
-        testSet.add(AWTKeyStroke.getAWTKeyStroke(KeyEvent.VK_TAB, KeyEvent.CTRL_DOWN_MASK));
+        testSet.add(AWTKeyStroke.getAWTKeyStroke(KeyEvent.VK_TAB, InputEvent.CTRL_DOWN_MASK));
         tc.setFocusTraversalKeys(id, testSet);
         assertTrue(tc.areFocusTraversalKeysSet(id));
 
@@ -371,17 +389,19 @@
         actionEvt.modifiers = Event.ALT_MASK;
         checkOldEvent(actionEvt);
     }
-
+   @SuppressWarnings("deprecation")
     public final void testMouseDownUp() {
 
         myTestComp = new MyComponent() {
+            @Override
             public boolean mouseDown(Event evt, int arg1, int arg2) {
                 synchronized(robot) {
                     return callback(evt);
                 }
           }
 
-          public boolean mouseUp(Event evt, int arg1, int arg2) {
+          @Override
+        public boolean mouseUp(Event evt, int arg1, int arg2) {
               synchronized(robot) {
                   return callback(evt);
               }
@@ -418,15 +438,17 @@
         checkOldEvent(mouseEvt);
 
     }
-
+   @SuppressWarnings("deprecation")
     public final void testMouseEnterExit() {
 
         myTestComp = new MyComponent () {
+            @Override
             public boolean mouseEnter(Event evt, int arg1, int arg2) {
                 synchronized(robot) {
                     return callback(evt);
                 }
             }
+            @Override
             public boolean mouseExit(Event evt, int arg1, int arg2) {
                 synchronized(robot) {
                     return callback(evt);
@@ -476,15 +498,17 @@
         assertEquals(Event.META_MASK, event.modifiers);
 
     }
-
+    @SuppressWarnings("deprecation")
     public final void testMouseDragMove() {
         int eventId = Event.MOUSE_MOVE;
         myTestComp = new MyComponent() {
+            @Override
             public boolean mouseMove(Event evt, int arg1, int arg2) {
                 synchronized(robot) {
                     return callback(evt);
                 }
             }
+            @Override
             public boolean mouseDrag(Event evt, int arg1, int arg2) {
                 synchronized(robot) {
                     return callback(evt);
@@ -829,13 +853,13 @@
         checkPropertyFields("focusTraversalKeysEnabled", tc, new Boolean(false));
 
         cleanPropertyFields();
-        Set keys = Collections.EMPTY_SET;
+        Set<AWTKeyStroke> keys = Collections.emptySet();
         tc.setFocusTraversalKeys(KeyboardFocusManager.UP_CYCLE_TRAVERSAL_KEYS,
                                  keys);
         checkPropertyFields("upCycleFocusTraversalKeys", tc, keys);
         assertNull(oldValue);
-        keys = new HashSet();
-        keys.add(AWTKeyStroke.getAWTKeyStroke(KeyEvent.VK_ESCAPE, KeyEvent.CTRL_DOWN_MASK));
+        keys = new HashSet<AWTKeyStroke>();
+        keys.add(AWTKeyStroke.getAWTKeyStroke(KeyEvent.VK_ESCAPE, InputEvent.CTRL_DOWN_MASK));
         cleanPropertyFields();
         tc.setFocusTraversalKeys(KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS, keys);
         checkPropertyFields("forwardFocusTraversalKeys", tc, keys);
@@ -849,7 +873,7 @@
 
         cleanPropertyFields();
         keys.clear();
-        keys.add(AWTKeyStroke.getAWTKeyStroke(KeyEvent.VK_F12, KeyEvent.ALT_DOWN_MASK));
+        keys.add(AWTKeyStroke.getAWTKeyStroke(KeyEvent.VK_F12, InputEvent.ALT_DOWN_MASK));
         tc.setFocusTraversalKeys(KeyboardFocusManager.UP_CYCLE_TRAVERSAL_KEYS, keys);
         checkPropertyFields("upCycleFocusTraversalKeys", tc, keys);
 
@@ -949,9 +973,10 @@
         assertSame(Boolean.TRUE, newValue);
         assertSame(Boolean.FALSE, oldValue);
     }
-
+    @SuppressWarnings("deprecation")
     public final void testBounds() {
         Component comp = new SimpleComponent () {
+            @Override
             public Rectangle bounds() {
                 methodCalled = true;
                 return super.bounds();
@@ -965,19 +990,22 @@
         assertNotSame(r, r1);
         assertEquals(r, r1);
     }
-
+    @SuppressWarnings("deprecation")
     public final void testDisableEnable() {
         Component comp = new SimpleComponent () {
+            @Override
             public void disable() {
                 assertTrue(methodCalled);//called from enable(boolean)
                 methodCalled = true;
                 super.disable();
             }
+            @Override
             public void enable(boolean b) {
                 assertFalse(methodCalled);
                 methodCalled = true;
                 super.enable(b);
             }
+            @Override
             public void enable() {
                 assertTrue(methodCalled);//called from enable(boolean)
                 methodCalled = true;
@@ -995,19 +1023,22 @@
         assertTrue(methodCalled);
         assertTrue(comp.isEnabled());
     }
-
+    @SuppressWarnings("deprecation")
     public final void testHideShow() {
         Component comp = new SimpleComponent () {
+            @Override
             public void hide() {
                 assertTrue(methodCalled);//called from enable(boolean)
                 methodCalled = true;
                 super.hide();
             }
+            @Override
             public void show(boolean b) {
                 assertFalse(methodCalled);
                 methodCalled = true;
                 super.show(b);
             }
+            @Override
             public void show() {
                 assertTrue(methodCalled);//called from enable(boolean)
                 methodCalled = true;
@@ -1025,9 +1056,10 @@
         assertTrue(methodCalled);
         assertTrue(comp.isVisible());
     }
-
+    @SuppressWarnings("deprecation")
     public final void testInside() {
         Component comp = new SimpleComponent () {
+            @Override
             public boolean inside(int x, int y) {
                 methodCalled = true;
                 return super.inside(x, y);
@@ -1043,9 +1075,10 @@
         assertTrue(comp.contains(p));
         assertTrue(methodCalled);
     }
-
+    @SuppressWarnings("deprecation")
     public final void testIsFocusTraversable() {
         Component comp = new SimpleComponent () {
+            @Override
             public boolean isFocusTraversable() {
                 methodCalled = true;
                 return super.isFocusTraversable();
@@ -1055,9 +1088,10 @@
         assertTrue(comp.isFocusable());
         assertTrue(methodCalled);
     }
-
+    @SuppressWarnings("deprecation")
     public final void testLayout() {
         Component comp = new SimpleComponent () {
+            @Override
             public void layout() {
                 methodCalled = true;
                 super.layout();
@@ -1068,9 +1102,10 @@
         assertTrue(methodCalled);
 
     }
-
+    @SuppressWarnings("deprecation")
     public final void testLocate() {
         Component comp = new SimpleComponent () {
+            @Override
             public Component locate(int x, int y) {
                 methodCalled = true;
                 return super.locate(x, y);
@@ -1085,9 +1120,10 @@
         assertNull(comp.getComponentAt(p));
 
     }
-
+    @SuppressWarnings("deprecation")
     public final void testLocation() {
         Component comp = new SimpleComponent () {
+            @Override
             public Point location() {
                 methodCalled = true;
                 return super.location();
@@ -1100,9 +1136,10 @@
         assertEquals(p, comp.getLocation());
         assertTrue(methodCalled);
     }
-
+    @SuppressWarnings("deprecation")
     public final void testMinimumSize() {
         Component comp = new SimpleComponent () {
+            @Override
             public Dimension minimumSize() {
                 methodCalled = true;
                 return super.minimumSize();
@@ -1119,15 +1156,17 @@
         assertNotSame(size, minSize);
         assertEquals(size, minSize);
     }
-
+    @SuppressWarnings("deprecation")
     public final void testPreferredSize() {
         assertEquals(new Dimension(), tc.getPreferredSize());
         final Dimension minSize = new Dimension(5, 15);
         Component comp = new SimpleComponent () {
+            @Override
             public Dimension preferredSize() {
                 methodCalled = true;
                 return super.preferredSize();
             }
+            @Override
             public Dimension minimumSize() {
                 return minSize;
             }
@@ -1140,9 +1179,10 @@
         assertEquals(minSize, prefSize);
 
     }
-
+    @SuppressWarnings("deprecation")
     public final void testSize() {
         Component comp = new SimpleComponent () {
+            @Override
             public Dimension size() {
                 methodCalled = true;
                 return super.size();
@@ -1156,9 +1196,10 @@
         comp.setSize(size);
         assertEquals(size, comp.getSize());
     }
-
+    @SuppressWarnings("deprecation")
     public final void testReshape() {
         Component comp = new SimpleComponent () {
+            @Override
             public void reshape(int x, int y, int w, int h) {
                 methodCalled = true;
                 super.reshape(x, y, w, h);
@@ -1170,9 +1211,10 @@
         assertTrue(methodCalled);
         assertEquals(rect, comp.getBounds());
     }
-
+    @SuppressWarnings("deprecation")
     public final void testMove() {
         Component comp = new MoveResizeComponent () {
+            @Override
             public void move(int x, int y) {
                 assertFalse(methodCalled);
                 assertFalse(setBoundsCalled);
@@ -1188,9 +1230,10 @@
         assertTrue(reshapeCalled);
         assertEquals(p, comp.getLocation());
     }
-
+    @SuppressWarnings("deprecation")
     public final void testResizeIntInt() {
         Component comp = new MoveResizeComponent () {
+            @Override
             public void resize(int x, int y) {
                 assertFalse(methodCalled);
                 assertFalse(setBoundsCalled);
@@ -1205,9 +1248,10 @@
         assertTrue(reshapeCalled);
         assertEquals(new Dimension(10, 20), comp.getSize());
     }
-
+    @SuppressWarnings("deprecation")
     public final void testResizeDimension() {
         Component comp = new SimpleComponent () {
+            @Override
             public void resize(Dimension size) {
                 assertFalse(methodCalled);
                 assertFalse(setBoundsCalled);
@@ -1215,6 +1259,7 @@
                 methodCalled = true;
                 super.resize(size);
             }
+            @Override
             public void resize(int w, int h) {
                 assertTrue(methodCalled);
                 assertTrue(setBoundsCalled);
@@ -1222,6 +1267,7 @@
                 reshapeCalled = true;
                 super.resize(w, h);
             }
+            @Override
             public void setSize(int w, int h) {
                 assertTrue(methodCalled);
                 assertFalse(setBoundsCalled);
@@ -1237,9 +1283,10 @@
         assertTrue(reshapeCalled);
         assertEquals(size, comp.getSize());
     }
-
+    @SuppressWarnings("deprecation")
     public final void testNextFocus() {
         Component comp = new SimpleComponent () {
+            @Override
             public void nextFocus() {
                 methodCalled = true;
                 super.nextFocus();
@@ -1250,7 +1297,7 @@
         comp.transferFocus();
         assertTrue(methodCalled);
     }
-
+    @SuppressWarnings("deprecation")
     public final void testGetPeer() {
         frame = new Frame();
         Object peer = frame.getPeer();



Mime
View raw message