changeset 55488:e4813eded7cb

8213110: Remove the use of applets in automatic tests Reviewed-by: prr
author serb
date Wed, 27 Feb 2019 18:46:55 -0800
parents d9d9655bb077
children 7c11a7cc7c1d
files test/jdk/ProblemList.txt test/jdk/java/awt/Choice/PopdownGeneratesMouseEvents/PopdownGeneratesMouseEvents.html test/jdk/java/awt/Choice/PopdownGeneratesMouseEvents/PopdownGeneratesMouseEvents.java test/jdk/java/awt/Choice/PopupPosTest/PopupPosTest.html test/jdk/java/awt/Choice/PopupPosTest/PopupPosTest.java test/jdk/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.html test/jdk/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.java test/jdk/java/awt/Component/F10TopToplevel/F10TopToplevel.html test/jdk/java/awt/Component/F10TopToplevel/F10TopToplevel.java test/jdk/java/awt/ComponentOrientation/BorderTest.java test/jdk/java/awt/ComponentOrientation/FlowTest.java test/jdk/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html test/jdk/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.java test/jdk/java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.html test/jdk/java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.java test/jdk/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java test/jdk/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java test/jdk/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest.html test/jdk/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest.java test/jdk/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.html test/jdk/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.java test/jdk/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusSetVisibleTest.java test/jdk/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusToFrontTest.java test/jdk/java/awt/Focus/ChildWindowFocusTest/ChildWindowFocusTest.html test/jdk/java/awt/Focus/ChildWindowFocusTest/ChildWindowFocusTest.java test/jdk/java/awt/Focus/ClearLwQueueBreakTest/ClearLwQueueBreakTest.java test/jdk/java/awt/Focus/CloseDialogActivateOwnerTest/CloseDialogActivateOwnerTest.java test/jdk/java/awt/Focus/ConsumeNextKeyTypedOnModalShowTest/ConsumeNextKeyTypedOnModalShowTest.java test/jdk/java/awt/Focus/ContainerFocusAutoTransferTest/ContainerFocusAutoTransferTest.java test/jdk/java/awt/Focus/DeiconifiedFrameLoosesFocus/DeiconifiedFrameLoosesFocus.html test/jdk/java/awt/Focus/DeiconifiedFrameLoosesFocus/DeiconifiedFrameLoosesFocus.java test/jdk/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java test/jdk/java/awt/Focus/FocusOwnerFrameOnClick/FocusOwnerFrameOnClick.java test/jdk/java/awt/Focus/FocusSubRequestTest/FocusSubRequestTest.html test/jdk/java/awt/Focus/FocusSubRequestTest/FocusSubRequestTest.java test/jdk/java/awt/Focus/FrameJumpingToMouse/FrameJumpingToMouse.java test/jdk/java/awt/Focus/IconifiedFrameFocusChangeTest/IconifiedFrameFocusChangeTest.java test/jdk/java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.html test/jdk/java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.java test/jdk/java/awt/Focus/ModalDialogInitialFocusTest/ModalDialogInitialFocusTest.html test/jdk/java/awt/Focus/ModalDialogInitialFocusTest/ModalDialogInitialFocusTest.java test/jdk/java/awt/Focus/ModalExcludedWindowClickTest/ModalExcludedWindowClickTest.html test/jdk/java/awt/Focus/ModalExcludedWindowClickTest/ModalExcludedWindowClickTest.java test/jdk/java/awt/Focus/NoAutotransferToDisabledCompTest/NoAutotransferToDisabledCompTest.java test/jdk/java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.html test/jdk/java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.java test/jdk/java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.java test/jdk/java/awt/Focus/RequestFocusToDisabledCompTest/RequestFocusToDisabledCompTest.java test/jdk/java/awt/Focus/ResetMostRecentFocusOwnerTest/ResetMostRecentFocusOwnerTest.java test/jdk/java/awt/Focus/RestoreFocusOnDisabledComponentTest/RestoreFocusOnDisabledComponentTest.java test/jdk/java/awt/Focus/ShowFrameCheckForegroundTest/ShowFrameCheckForegroundTest.java test/jdk/java/awt/Focus/ToFrontFocusTest/ToFrontFocus.html test/jdk/java/awt/Focus/ToFrontFocusTest/ToFrontFocus.java test/jdk/java/awt/Focus/WindowInitialFocusTest/WindowInitialFocusTest.html test/jdk/java/awt/Focus/WindowInitialFocusTest/WindowInitialFocusTest.java test/jdk/java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.html test/jdk/java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.java test/jdk/java/awt/Focus/WrongKeyTypedConsumedTest/WrongKeyTypedConsumedTest.java test/jdk/java/awt/FontClass/CreateFont/BigFont.java test/jdk/java/awt/FontClass/CreateFont/bigfont.html test/jdk/java/awt/Frame/DisposeStressTest/DisposeStressTest.html test/jdk/java/awt/Frame/DisposeStressTest/DisposeStressTest.java test/jdk/java/awt/Frame/NonEDT_GUI_DeadlockTest/NonEDT_GUI_Deadlock.html test/jdk/java/awt/Frame/NonEDT_GUI_DeadlockTest/NonEDT_GUI_Deadlock.java test/jdk/java/awt/FullScreen/SetFSWindow/FSFrame.java test/jdk/java/awt/GridBagLayout/GridBagLayoutIpadXYTest/GridBagLayoutIpadXYTest.html test/jdk/java/awt/GridBagLayout/GridBagLayoutIpadXYTest/GridBagLayoutIpadXYTest.java test/jdk/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeForModalDialogTest/ConsumeForModalDialogTest.html test/jdk/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeForModalDialogTest/ConsumeForModalDialogTest.java test/jdk/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeNextMnemonicKeyTypedTest.html test/jdk/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeNextMnemonicKeyTypedTest.java test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.html test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.java test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.html test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.java test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.java test/jdk/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.html test/jdk/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.java test/jdk/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.html test/jdk/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.java test/jdk/java/awt/List/KeyEventsTest/KeyEventsTest.html test/jdk/java/awt/List/KeyEventsTest/KeyEventsTest.java test/jdk/java/awt/Mouse/ExtraMouseClick/ExtraMouseClick.html test/jdk/java/awt/Mouse/ExtraMouseClick/ExtraMouseClick.java test/jdk/java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.html test/jdk/java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.java test/jdk/java/awt/Multiscreen/WindowGCChangeTest/WindowGCChangeTest.html test/jdk/java/awt/Multiscreen/WindowGCChangeTest/WindowGCChangeTest.java test/jdk/java/awt/Window/HandleWindowDestroyTest/HandleWindowDestroyTest.html test/jdk/java/awt/Window/HandleWindowDestroyTest/HandleWindowDestroyTest.java test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.html test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.java test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java test/jdk/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.html test/jdk/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.java test/jdk/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.html test/jdk/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java test/jdk/java/awt/dnd/ImageDecoratedDnDInOut/ImageDecoratedDnDInOut.html test/jdk/java/awt/dnd/ImageDecoratedDnDInOut/ImageDecoratedDnDInOut.java test/jdk/java/awt/dnd/ImageDecoratedDnDNegative/ImageDecoratedDnDNegative.html test/jdk/java/awt/dnd/ImageDecoratedDnDNegative/ImageDecoratedDnDNegative.java test/jdk/java/awt/dnd/InterJVMGetDropSuccessTest/InterJVMGetDropSuccessTest.html test/jdk/java/awt/dnd/InterJVMGetDropSuccessTest/InterJVMGetDropSuccessTest.java test/jdk/java/awt/dnd/NoFormatsCrashTest/NoFormatsCrashTest.html test/jdk/java/awt/dnd/NoFormatsCrashTest/NoFormatsCrashTest.java test/jdk/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.html test/jdk/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.java test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.html test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.java test/jdk/java/awt/event/ComponentEvent/MovedResizedTardyEventTest/MovedResizedTardyEventTest.html test/jdk/java/awt/event/ComponentEvent/MovedResizedTardyEventTest/MovedResizedTardyEventTest.java test/jdk/java/awt/event/KeyEvent/KeyTyped/CtrlASCII.html test/jdk/java/awt/event/KeyEvent/KeyTyped/CtrlASCII.java test/jdk/java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.html test/jdk/java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.java test/jdk/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.html test/jdk/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.java test/jdk/java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.html test/jdk/java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.java test/jdk/java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.html test/jdk/java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.java test/jdk/java/awt/event/MouseEvent/RobotLWTest/RobotLWTest.html test/jdk/java/awt/event/MouseEvent/RobotLWTest/RobotLWTest.java test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.html test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.html test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java test/jdk/javax/imageio/AppletResourceTest.html test/jdk/javax/imageio/AppletResourceTest.java test/jdk/javax/swing/JFrame/4962534/bug4962534.html test/jdk/javax/swing/JFrame/4962534/bug4962534.java test/jdk/javax/swing/JPopupMenu/4634626/bug4634626.html test/jdk/javax/swing/JPopupMenu/4634626/bug4634626.java test/jdk/javax/swing/MultiUIDefaults/4300666/bug4300666.html test/jdk/javax/swing/MultiUIDefaults/4300666/bug4300666.java test/jdk/javax/swing/text/StyledEditorKit/4506788/bug4506788.html test/jdk/javax/swing/text/StyledEditorKit/4506788/bug4506788.java test/jdk/sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.html test/jdk/sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.java
diffstat 141 files changed, 763 insertions(+), 4069 deletions(-) [+]
line wrap: on
line diff
--- a/test/jdk/ProblemList.txt	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/ProblemList.txt	Wed Feb 27 18:46:55 2019 -0800
@@ -114,7 +114,7 @@
 
 # jdk_awt
 
-java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.html 8168389 windows-all,macosx-all
+java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.java 8168389 windows-all,macosx-all
 java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java 8168408 windows-all,macosx-all
 java/awt/Focus/FocusOwnerFrameOnClick/FocusOwnerFrameOnClick.java 8081489 generic-all
 java/awt/Focus/IconifiedFrameFocusChangeTest/IconifiedFrameFocusChangeTest.java 6849364 generic-all
@@ -127,7 +127,7 @@
 java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java 8060176 windows-all,macosx-all
 java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java 8060176 windows-all,macosx-all
 java/awt/dnd/MissingEventsOnModalDialog/MissingEventsOnModalDialogTest.java 8164464 linux-all,macosx-all
-java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.html 8171510 macosx-all
+java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.java 8171510 macosx-all
 javax/swing/dnd/7171812/bug7171812.java 8041447 macosx-all
 java/awt/Focus/ChoiceFocus/ChoiceFocus.java 8169103 windows-all,macosx-all
 java/awt/Focus/ClearLwQueueBreakTest/ClearLwQueueBreakTest.java 8198618 macosx-all
@@ -139,7 +139,7 @@
 java/awt/Focus/ShowFrameCheckForegroundTest/ShowFrameCheckForegroundTest.java 8028701 macosx-all,linux-all
 java/awt/Focus/SimpleWindowActivationTest/SimpleWindowActivationTest.java 8159599 macosx-all
 java/awt/Focus/TypeAhead/TestFocusFreeze.java 8198622 macosx-all
-java/awt/Focus/ToFrontFocusTest/ToFrontFocus.html 7156130 linux-all
+java/awt/Focus/ToFrontFocusTest/ToFrontFocus.java 7156130 linux-all
 java/awt/Focus/WrongKeyTypedConsumedTest/WrongKeyTypedConsumedTest.java 8169096 macosx-all
 java/awt/event/KeyEvent/CorrectTime/CorrectTime.java 6626492 generic-all
 java/awt/EventQueue/6980209/bug6980209.java 8198615 macosx-all
@@ -149,7 +149,7 @@
 java/awt/event/InputEvent/EventWhenTest/EventWhenTest.java 8168646 generic-all
 java/awt/KeyboardFocusmanager/TypeAhead/EnqueueWithDialogButtonTest/EnqueueWithDialogButtonTest.java 8198623 macosx-all
 java/awt/KeyboardFocusmanager/TypeAhead/FreezeTest/FreezeTest.java 8198623 macosx-all
-java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html 8198626 macosx-all
+java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.java 8198626 macosx-all
 java/awt/Mixing/AWT_Mixing/HierarchyBoundsListenerMixingTest.java 8049405 macosx-all
 java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java 8048171 generic-all
 java/awt/Mixing/AWT_Mixing/JMenuBarOverlapping.java 8159451 linux-all,windows-all,macosx-all
@@ -166,7 +166,7 @@
 java/awt/Toolkit/RealSync/Test.java 6849383 macosx-all
 java/awt/LightweightComponent/LightweightEventTest/LightweightEventTest.java 8159252 windows-all
 java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java 8203047 macosx-all
-java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html 8073636 macosx-all
+java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.java 8073636 macosx-all
 java/awt/FullScreen/FullScreenInsets/FullScreenInsets.java 7019055 windows-all,linux-all
 java/awt/Focus/8013611/JDK8013611.java 8175366 windows-all,macosx-all
 java/awt/Focus/6378278/InputVerifierTest.java 8198616 macosx-all
@@ -182,7 +182,7 @@
 java/awt/event/KeyEvent/KeyMaskTest/KeyMaskTest.java 8129778 generic-all
 java/awt/event/MouseEvent/MouseButtonsAndKeyMasksTest/MouseButtonsAndKeyMasksTest.java 8129778 generic-all
 
-java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.html 8194947 generic-all
+java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.java 8194947 generic-all
 java/awt/Frame/SetMaximizedBounds/SetMaximizedBounds.java 8196006 windows-all
 java/awt/Frame/FramesGC/FramesGC.java 8079069 macosx-all
 java/awt/FullScreen/AltTabCrashTest/AltTabCrashTest.java 8047218 generic-all
@@ -246,11 +246,11 @@
 java/awt/TextArea/TextAreaScrolling/TextAreaScrolling.java 8196300 windows-all
 java/awt/print/PrinterJob/PSQuestionMark.java 7003378 generic-all
 java/awt/print/PrinterJob/GlyphPositions.java 7003378 generic-all
-java/awt/Choice/PopupPosTest/PopupPosTest.html  8197811 windows-all
+java/awt/Choice/PopupPosTest/PopupPosTest.java  8197811 windows-all
 java/awt/Choice/ChoiceMouseWheelTest/ChoiceMouseWheelTest.java 7100044 macosx-all,linux-all
 java/awt/Component/CreateImage/CreateImage.java 8198334  windows-all
 java/awt/Component/GetScreenLocTest/GetScreenLocTest.java 4753654 generic-all
-java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.html 8017454 macosx-all
+java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.java 8017454 macosx-all
 java/awt/Focus/NonFocusableWindowTest/NoEventsTest.java 8000171 windows-all
 java/awt/Frame/MiscUndecorated/RepaintTest.java 8079267 windows-all,linux-all
 java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java 8157173 generic-all
@@ -465,14 +465,14 @@
 java/awt/JAWT/JAWT.sh 8197798 windows-all,linux-all
 java/awt/Debug/DumpOnKey/DumpOnKey.java 8202667 windows-all
 java/awt/Robot/RobotWheelTest/RobotWheelTest.java 8129827 generic-all
-java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.html 8202926 linux-all
+java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.java 8202926 linux-all
 java/awt/datatransfer/ConstructFlavoredObjectTest/ConstructFlavoredObjectTest.java 8202860 linux-all
 java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java 8202790 macosx-all,linux-all
-java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.html 8202882 linux-all
+java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.java 8202882 linux-all
 java/awt/Frame/FramesGC/FramesGC.java 8079069 macosx-all
 java/awt/dnd/MissingDragExitEventTest/MissingDragExitEventTest.java 8030121 macosx-all,linux-all
 java/awt/Choice/ChoicePopupLocation/ChoicePopupLocation.java 8202931 macosx-all,linux-all
-java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.html 7124275 macosx-all
+java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.java 7124275 macosx-all
 java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java 6848810 macosx-all,linux-all
 java/awt/Component/NativeInLightShow/NativeInLightShow.java 8202932 linux-all
 java/awt/FileDialog/ModalFocus/FileDialogModalFocusTest.java 8194751 linux-all
@@ -481,7 +481,7 @@
 java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java 7107528 linux-all,macosx-all
 java/awt/Mouse/MouseDragEvent/MouseDraggedTest.java 8080676 linux-all
 java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersInKeyEvent.java 8157147 linux-all,solaris-all,windows-all
-java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.html 8148041 linux-all
+java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.java 8148041 linux-all
 java/awt/Toolkit/DesktopProperties/rfe4758438.java 8193547 linux-all
 java/awt/Toolkit/ToolkitPropertyTest/ToolkitPropertyTest_Enable.java 6847163
 java/awt/xembed/server/RunTestXEmbed.java 7034201 linux-all
--- a/test/jdk/java/awt/Choice/PopdownGeneratesMouseEvents/PopdownGeneratesMouseEvents.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-<!--
- Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-<html>
-<!--
-  @test
-  @key headful
-  @bug 6200670
-  @summary MouseMoved events are triggered by Choice when mouse is moved outside the component, XToolkit
-  @library ../../regtesthelpers/
-  @author andrei.dmitriev area=choice
-  @build Util
-  @run applet PopdownGeneratesMouseEvents.html
-  -->
-<head>
-<title>  </title>
-</head>
-<body>
-
-<h1>PopdownGeneratesMouseEvents<br>Bug ID: 6200670 </h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="PopdownGeneratesMouseEvents.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
-
--- a/test/jdk/java/awt/Choice/PopdownGeneratesMouseEvents/PopdownGeneratesMouseEvents.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Choice/PopdownGeneratesMouseEvents/PopdownGeneratesMouseEvents.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,27 +22,32 @@
  */
 
 /*
-  test
+  @test
+  @key headful
   @bug 6200670
   @summary MouseMoved events are triggered by Choice when mouse is moved outside the component, XToolkit
   @library ../../regtesthelpers/
-  @author andrei.dmitriev area=choice
   @build Util
-  @run applet PopdownGeneratesMouseEvents.html
+  @run main PopdownGeneratesMouseEvents
 */
 
 import test.java.awt.regtesthelpers.Util;
 
-import java.applet.Applet;
 import java.awt.*;
 import java.awt.event.*;
 
-public class PopdownGeneratesMouseEvents extends Applet {
+public class PopdownGeneratesMouseEvents extends Frame {
     private volatile Robot robot;
     private final Choice choice1 = new Choice();
 
     private volatile MouseMotionHandler mmh;
 
+    public static void main(final String[] args) {
+        PopdownGeneratesMouseEvents app = new PopdownGeneratesMouseEvents();
+        app.init();
+        app.start();
+    }
+
     public void init() {
         for (int i = 1; i < 10; i++) {
             choice1.add("item-0" + i);
@@ -61,6 +66,7 @@
 
     public void start() {
         setSize(300, 200);
+        setLocationRelativeTo(null);
         setVisible(true);
         validate();
         String toolkit = Toolkit.getDefaultToolkit().getClass().getName();
--- a/test/jdk/java/awt/Choice/PopupPosTest/PopupPosTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-<!--
- Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug 5044150
-  @summary Tests that pupup doesn't popdown if no space to display under 
-  @author ssi@sparc.spb.su
-  @library /test/lib
-  @build jdk.test.lib.Platform
-  @run applet PopupPosTest.html
-  -->
-<head>
-<title> PopupPosTest </title>
-</head>
-<body>
-
-<h1>PopupPosTest<br>Bug ID: 5044150</h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="PopupPosTest.class" WIDTH=350 HEIGHT=400></APPLET>
-</body>
-</html>
-
--- a/test/jdk/java/awt/Choice/PopupPosTest/PopupPosTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Choice/PopupPosTest/PopupPosTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -22,25 +22,23 @@
  */
 
 /*
-  test
+  @test
+  @key headful
   @bug 5044150
   @summary Tests that pupup doesn't popdown if no space to display under
-  @author andrei.dmitriev area=awt.choice
   @library /test/lib
   @build jdk.test.lib.Platform
-  @run applet PopupPosTest.html
+  @run main PopupPosTest
 */
 
-import java.applet.Applet;
 import java.awt.*;
 import java.awt.event.*;
 
 import jdk.test.lib.Platform;
 
-public class PopupPosTest extends Applet
-{
-    public void start ()
-    {
+public class PopupPosTest {
+
+    public static void main(final String[] args) {
         if (Platform.isOSX()) {
             // On OS X, popup isn't under the mouse
             return;
--- a/test/jdk/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-<!--
- Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-
-<html>
-<!--
-  @test
-  @key headful
-  @bug 6392086 8014725
-  @summary Tests basic DnD functionality in an applet
-  @author Alexey Utkin, Semyon Sadetsky area=dnd
-  @run applet HTMLTransferTest.html
--->
-<head>
-<title>  </title>
-</head>
-<body>
-
-<h1>HTMLTransferTest<br>Bug ID: 6392086</h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="HTMLTransferTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -22,26 +22,19 @@
  */
 
 /*
+  @test
+  @key headful
   @bug 6392086 8014725
-  @summary Tests basic DnD functionality in an applet
-  @author Alexey Utkin, Semyon Sadetsky
-  @run applet HTMLTransferTest.html
+  @summary tests that HTMLs of all supported native HTML formats are transfered
+           properly
+  @run main/othervm HTMLTransferTest
 */
 
-/**
- * HTMLTransferTest.java
- *
- * summary: tests that HTMLs of all supported native HTML formats
- *          are transfered properly
- */
-
-import java.applet.Applet;
 import java.awt.*;
 import java.awt.datatransfer.*;
 import java.io.*;
 
-
-public class HTMLTransferTest extends Applet {
+public class HTMLTransferTest {
     public static final int CODE_NOT_RETURNED = 100;
     public static final int CODE_CONSUMER_TEST_FAILED = 101;
     public static final int CODE_FAILURE = 102;
@@ -66,6 +59,12 @@
     private THTMLProducer imPr;
     private int returnCode = CODE_NOT_RETURNED;
 
+    public static void main(final String[] args) {
+        HTMLTransferTest app = new HTMLTransferTest();
+        app.init();
+        app.start();
+    }
+
     public void init() {
         initImpl();
 
--- a/test/jdk/java/awt/Component/F10TopToplevel/F10TopToplevel.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-<!--
- Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug 6533175
-  @summary Block F10 if closest toplevel to keystroke target is not a Frame.
-  @author yuri nesterenko : area= awt.toplevel
-  @run applet F10TopToplevel.html
-  -->
-<head>
-<title>  </title>
-</head>
-<body>
-
-<h1>F10TopToplevel<br>Bug ID: 6533175 Pressing F10 when a modal dialog is visible hangs the Xserver, XToolkit</h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="F10TopToplevel.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
-
--- a/test/jdk/java/awt/Component/F10TopToplevel/F10TopToplevel.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Component/F10TopToplevel/F10TopToplevel.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,51 +20,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 /*
-  test
+  @test
+  @key headful
   @bug 6533175
   @summary Block F10 if closest toplevel to keystroke target is not a Frame.
-  @author yuri nesterenko : area=awt.toplevel
-  @run applet F10TopToplevel.html
+  @run main F10TopToplevel
 */
 
-
-
-/**
- * F10TopToplevel.java
- *
- * summary: tests if F10 has no effect if focused toplevel if not Frame
- */
-
-import java.applet.Applet;
 import java.awt.*;
 import java.awt.event.*;
 
+public class F10TopToplevel {
 
-public class F10TopToplevel extends Applet
-{
-    //Declare things used in the test, like buttons and labels here
-    Frame frame;
-    Dialog dialog;
-    volatile boolean menuToggled = false;
+    static Frame frame;
+    static Dialog dialog;
+    static volatile boolean menuToggled = false;
 
-    public void init()
-    {
-        setLayout (new BorderLayout ());
-
-    }//End  init()
-
-    public void start ()
-    {
-        //Get things going.  Request focus, set size, et cetera
-        setSize (200,200);
-        setVisible(true);
-        validate();
-
-
-        //What would normally go into main() will probably go here.
-        //Use System.out.println for diagnostic messages that you want
-        //to read after the test is done.
+    public static void main(final String[] args) {
         MenuBar mb;
         Menu menu;
         MenuItem item;
@@ -115,6 +89,5 @@
             throw new RuntimeException("Oops! Menu should not open.");
         }
 
-    }// start()
-
+    }
 }// class F10TopToplevel
--- a/test/jdk/java/awt/ComponentOrientation/BorderTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/ComponentOrientation/BorderTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,9 +39,8 @@
 
 import java.awt.*;
 import java.awt.event.*;
-import java.applet.Applet;
 
-public class BorderTest extends Applet {
+public class BorderTest extends Panel {
     Panel       panel1;
     Panel       panel2;
 
@@ -108,8 +107,6 @@
         } );
 
         BorderTest BorderTest = new BorderTest();
-        BorderTest.init();
-        BorderTest.start();
 
         f.add("Center", BorderTest);
         f.setSize(450, 300);
--- a/test/jdk/java/awt/ComponentOrientation/FlowTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/ComponentOrientation/FlowTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,9 +39,8 @@
 
 import java.awt.*;
 import java.awt.event.*;
-import java.applet.Applet;
 
-public class FlowTest extends Applet {
+public class FlowTest extends Panel {
     Panel       panel;
 
     public FlowTest() {
@@ -141,8 +140,6 @@
         } );
 
         FlowTest flowTest = new FlowTest();
-        flowTest.init();
-        flowTest.start();
 
         f.add("Center", flowTest);
         f.setSize(300, 300);
--- a/test/jdk/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-<!--
- Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<HTML>
-  <!--  @test
-        @key headful
-        @bug 4023283
-        @summary Checks that an Error which propogate up to the EventDispatch
-        loop does not crash AWT.
-        @author Andrei Dmitriev: area=awt.event
-        @library ../../regtesthelpers
-        @modules java.desktop/sun.awt
-        @build Util
-        @run main LoopRobustness
-  -->
-  <HEAD>
-  <TITLE>LoopRobustness</TITLE>
-  </HEAD>
-  <BODY>
-  This is automatic test.
-  
-  <APPLET CODE="LoopRobustness.class"
-          CODEBASE = "."
-          WIDTH=350 HEIGHT=100>
-  </APPLET>
-  </BODY>                                                             
-  </HTML>
--- a/test/jdk/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.java	Wed Feb 27 18:46:55 2019 -0800
@@ -22,13 +22,14 @@
  */
 
 /**
- *
+ * @test
  * @bug 4023283
  * @key headful
  * @summary Checks that an Error which propogates up to the EventDispatch
  * loop does not crash AWT.
  * @author Andrei Dmitriev: area=awt.event
  * @library ../../regtesthelpers
+ * @modules java.desktop/sun.awt
  * @build Util
  * @run main LoopRobustness
  */
--- a/test/jdk/java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-<!--
- Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug 6448069
-  @summary namefilter is not called for file dialog on windows
-  @author oleg.sukhodolsky: area= awt.filedialog
-  @library ../../regtesthelpers
-  @build Util
-  @run applet FilenameFilterTest.html
-  -->
-<head>
-<title>  </title>
-</head>
-<body>
-
-<h1>FilenameFilterTest<br>Bug ID: 6448069 </h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="FilenameFilterTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
-
--- a/test/jdk/java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,20 +22,15 @@
  */
 
 /*
-  test
+  @test
+  @key headful
   @bug 6448069
   @summary namefilter is not called for file dialog on windows
-  @author oleg.sukhodolsky: area= awt.filedialog
-  @run applet FilenameFilterTest.html
+  @library ../../regtesthelpers
+  @build Util
+  @run main FilenameFilterTest
 */
 
-/**
- * FilenameFilterTest.java
- *
- * summary: namefilter is not called for file dialog on windows
- */
-
-import java.applet.Applet;
 import java.awt.*;
 
 import java.io.File;
@@ -43,28 +38,12 @@
 
 import test.java.awt.regtesthelpers.Util;
 
-public class FilenameFilterTest extends Applet
-{
-    //Declare things used in the test, like buttons and labels here
-    volatile boolean filter_was_called = false;
-    FileDialog fd;
+public class FilenameFilterTest {
 
-    public void init()
-    {
-        // Set up the environment -- set the layout manager, add
-        // buttons, etc.
+    static volatile boolean filter_was_called = false;
+    static FileDialog fd;
 
-        setLayout (new BorderLayout ());
-
-    }//End  init()
-
-    public void start ()
-    {
-        //Get things going.  Request focus, set size, et cetera
-        setSize (200,200);
-        setVisible(true);
-        validate();
-
+    public static void main(final String[] args) {
         EventQueue.invokeLater(new Runnable() {
                 public void run() {
                     fd = new FileDialog(new Frame(""), "hello world", FileDialog.LOAD);
@@ -93,6 +72,5 @@
         if (!filter_was_called) {
             throw new RuntimeException("Filter was not called");
         }
-    }// start()
-
+    }
 }// class FilenameFilterTest
--- a/test/jdk/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
   @key headful
   @bug       6314575
   @summary   Tests that previosly focused owned window doesn't steal focus when an owner's component requests focus.
-  @author    Anton.Tarasov: area=awt.focus
   @library   ../../regtesthelpers
   @build     Util
   @run       main ActualFocusedWindowBlockingTest
@@ -34,12 +33,9 @@
 
 import java.awt.*;
 import java.awt.event.*;
-import java.applet.Applet;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.lang.reflect.InvocationTargetException;
 import test.java.awt.regtesthelpers.Util;
 
-public class ActualFocusedWindowBlockingTest extends Applet {
+public class ActualFocusedWindowBlockingTest {
     Robot robot = Util.createRobot();
     Frame owner = new Frame("Owner Frame");
     Window win = new Window(owner);
--- a/test/jdk/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java	Wed Feb 27 18:46:55 2019 -0800
@@ -26,7 +26,6 @@
   @key headful
   @bug      4823903
   @summary  Tests actual focused window retaining.
-  @author   Anton.Tarasov: area=awt.focus
   @library  ../../regtesthelpers
   @build    Util
   @run      main ActualFocusedWindowRetaining
@@ -34,11 +33,9 @@
 
 import java.awt.*;
 import java.awt.event.*;
-import java.lang.reflect.*;
-import java.applet.*;
 import test.java.awt.regtesthelpers.Util;
 
-public class ActualFocusedWindowRetaining extends Applet {
+public class ActualFocusedWindowRetaining {
     public static Frame frame = new Frame("Other Frame");
     public static Frame owner = new Frame("Test Frame");
     public static Button otherButton1 = new Button("Other Button 1");
@@ -54,7 +51,6 @@
 
     public static void main(String[] args) {
         ActualFocusedWindowRetaining a = new ActualFocusedWindowRetaining();
-        a.init();
         a.start();
     }
 
@@ -76,10 +72,6 @@
                 }
             }, AWTEvent.WINDOW_EVENT_MASK | AWTEvent.WINDOW_FOCUS_EVENT_MASK | AWTEvent.FOCUS_EVENT_MASK);
 
-        setSize (500, 200);
-        setVisible(true);
-        validate();
-
         frame.setSize(new Dimension(400, 100));
         frame.setLocation(800, 400);
         frame.setVisible(true);
--- a/test/jdk/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-<!--
- Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--
-  @test
-  @key headful
-  @bug 4041703 4096228 4025223 4260929
-  @summary Ensures that appletviewer sets a reasonable default focus for an Applet on start
-  @author  das area=appletviewer
-  @library ../../regtesthelpers
-  @build   Util
-  @run applet AppletInitialFocusTest.html
-  -->
-<head>
-<title> AppletInitialFocusTest </title>
-</head>
-<body>
-
-<h1>AppletInitialFocusTest<br>Bug ID: 4041703</h1>
-
-<p> See the dialog box (usually in upper left corner) for instructions</p>
-
-<APPLET CODE="AppletInitialFocusTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
-
--- a/test/jdk/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,30 +22,42 @@
  */
 
 /*
-  test
-  @bug     4041703 4096228 4025223 4260929
+  @test
+  @key headful
+  @bug 4041703 4096228 4025223 4260929
   @summary Ensures that appletviewer sets a reasonable default focus for an Applet on start
-  @author  das area=appletviewer
-  @run     applet AppletInitialFocusTest.html
+  @library ../../regtesthelpers
+  @build   Util
+  @run main AppletInitialFocusTest
 */
 
-import java.applet.Applet;
 import java.awt.Button;
-import java.awt.Component;
+import java.awt.FlowLayout;
+import java.awt.Frame;
 import java.awt.Robot;
-import java.awt.Window;
 import test.java.awt.regtesthelpers.Util;
 
-public class AppletInitialFocusTest extends Applet {
+public class AppletInitialFocusTest extends Frame {
+
     Robot robot = Util.createRobot();
     Button button = new Button("Button");
 
-    public void init() {
-        add(button);
+    public static void main(final String[] args) throws Exception {
+        AppletInitialFocusTest app = new AppletInitialFocusTest();
+        app.init();
+        app.start();
     }
 
-    public void start() {
-        new Thread(new Runnable() {
+    public void init() {
+        setSize(200, 200);
+        setLocationRelativeTo(null);
+        setLayout(new FlowLayout());
+        add(button);
+        setVisible(true);
+    }
+
+    public void start() throws Exception {
+        Thread thread = new Thread(new Runnable() {
                 public void run() {
                     Util.waitTillShown(button);
                     robot.delay(1000); // delay the thread to let EDT to start dispatching focus events
@@ -54,6 +66,8 @@
                         throw new RuntimeException("Appletviewer doesn't set default focus correctly.");
                     }
                 }
-            }).start();
+            });
+        thread.start();
+        thread.join();
     }
 }
--- a/test/jdk/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-<!--
- Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--
-  @test
-  @key headful
-  @bug 4411534 4517274
-  @summary ensures that user's requestFocus() during applet initialization
-           is not ignored
-  @author  prs area=appletviewer
-  @library ../../regtesthelpers
-  @build   Util
-  @run applet AppletInitialFocusTest1.html
-  -->
-<head>
-<title> AppletInitialFocusTest1 </title>
-</head>
-<body>
-
-<h1>AppletInitialFocusTest1<br>Bug ID: 4517274</h1>
-
-<p> See the dialog box (usually in upper left corner) for instructions</p>
-
-<APPLET CODE="AppletInitialFocusTest1.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
-
--- a/test/jdk/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,18 +21,36 @@
  * questions.
  */
 
-import java.applet.Applet;
 import java.awt.*;
 import java.awt.event.*;
 
-public class AppletInitialFocusTest1 extends Applet implements FocusListener {
+/*
+  @test
+  @key headful
+  @bug 4411534 4517274
+  @summary ensures that user's requestFocus() during applet initialization
+           is not ignored
+  @library ../../regtesthelpers
+  @build   Util
+  @run main AppletInitialFocusTest1
+ */
+public class AppletInitialFocusTest1 extends Frame implements FocusListener {
 
     Button button1 = new Button("Button1");
     Button button2 = new Button("Button2");
 
     Object lock = new Object();
 
+    public static void main(final String[] args) throws Exception {
+        AppletInitialFocusTest1 app = new AppletInitialFocusTest1();
+        app.init();
+        Thread.sleep(10000);
+    }
+
     public void init() {
+        setSize(200, 200);
+        setLocationRelativeTo(null);
+        setLayout(new FlowLayout());
 
         Component parent = this;
         while (parent != null && !(parent instanceof Window)) {
@@ -52,34 +70,18 @@
         button2.addFocusListener(this);
         add(button1);
         add(button2);
+        setVisible(true);
         button2.requestFocus();
     }
 
     public void focusGained(FocusEvent e) {
         if (e.getSource() == button1) {
             synchronized (lock) {
-                System.err.println("failed: focus on the wrong button");
-                System.exit(2);
+                throw new RuntimeException("failed: focus on the wrong button");
             }
         }
     }
 
     public void focusLost(FocusEvent e) {
     }
-
-    public void start() {
-        Thread thread = new Thread(new Runnable() {
-            public void run() {
-                try {
-                    Thread.sleep(10000);
-                    synchronized (lock) {
-                        System.err.println("passed");
-                        System.exit(0);
-                    }
-                } catch(InterruptedException e) {
-                }
-            }
-        });
-        thread.start();
-    }
 }
--- a/test/jdk/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusSetVisibleTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusSetVisibleTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -26,20 +26,15 @@
   @key headful
   @bug       6187066
   @summary   Tests the Window.autoRequestFocus property for the Window.setVisible() method.
-  @author    anton.tarasov: area=awt.focus
   @library    ../../regtesthelpers
   @build      Util
   @run       main AutoRequestFocusSetVisibleTest
 */
 
 import java.awt.*;
-import java.awt.event.*;
-import java.applet.Applet;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.lang.reflect.InvocationTargetException;
 import test.java.awt.regtesthelpers.Util;
 
-public class AutoRequestFocusSetVisibleTest extends Applet {
+public class AutoRequestFocusSetVisibleTest {
     static Frame focusedFrame;
     static Button focusOwner;
     static Frame frame;
@@ -65,10 +60,6 @@
     }
 
     public void init() {
-        // Create instructions for the user here, as well as set up
-        // the environment -- set the layout manager, add buttons,
-        // etc.
-        this.setLayout (new BorderLayout ());
         toolkitClassName = Toolkit.getDefaultToolkit().getClass().getName();
     }
 
--- a/test/jdk/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusToFrontTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusToFrontTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -26,7 +26,6 @@
   @key headful
   @bug       6187066
   @summary   Tests the Window.autoRequestFocus property for the Window.toFront() method.
-  @author    anton.tarasov: area=awt.focus
   @library /java/awt/patchlib     ../../regtesthelpers
   @build java.desktop/java.awt.Helper
   @build      Util
@@ -34,13 +33,9 @@
 */
 
 import java.awt.*;
-import java.awt.event.*;
-import java.applet.Applet;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.lang.reflect.InvocationTargetException;
 import test.java.awt.regtesthelpers.Util;
 
-public class AutoRequestFocusToFrontTest extends Applet {
+public class AutoRequestFocusToFrontTest {
     static boolean haveDelays;
 
     static Frame auxFrame;
@@ -76,10 +71,6 @@
     }
 
     public void init() {
-        // Create instructions for the user here, as well as set up
-        // the environment -- set the layout manager, add buttons,
-        // etc.
-        this.setLayout (new BorderLayout ());
         toolkitClassName = Toolkit.getDefaultToolkit().getClass().getName();
     }
 
--- a/test/jdk/java/awt/Focus/ChildWindowFocusTest/ChildWindowFocusTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-<!--
- Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug        5090325
-  @summary    Tests that Window's child can be focused on XAWT.
-  @author     anton.tarasov@sun.com: area=awt.focus
-  @run        applet ChildWindowFocusTest.html
-  -->
-<head>
-<title>ChildWindowFocusTest</title>
-</head>
-<body>
-
-<h1>ChildWindowFocusTest<br>Bug ID: 5090325</h1>
-
-<p> See the dialog box (usually in upper left corner) for instructions</p>
-
-<APPLET CODE="ChildWindowFocusTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/Focus/ChildWindowFocusTest/ChildWindowFocusTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/ChildWindowFocusTest/ChildWindowFocusTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -22,19 +22,17 @@
  */
 
 /*
-  test
+  @test
+  @key headful
   @bug        5090325
   @summary    Tests that Window's child can be focused on XAWT.
-  @author     anton.tarasov@sun.com: area=awt.focus
-  @run        applet ChildWindowFocusTest.html
+  @run        main ChildWindowFocusTest
 */
 
 import java.awt.*;
 import java.awt.event.*;
-import java.applet.Applet;
-import java.lang.reflect.*;
 
-public class ChildWindowFocusTest extends Applet {
+public class ChildWindowFocusTest {
     Robot robot;
     Frame frame = new Frame("Owner");
     Button button0 = new Button("button-0");
@@ -46,16 +44,18 @@
     Button button1 = new Button("button-1");
     int shift;
 
+    public static void main(final String[] args) {
+        ChildWindowFocusTest app = new ChildWindowFocusTest();
+        app.init();
+        app.start();
+    }
+
     public void init() {
         try {
             robot = new Robot();
         } catch (AWTException e) {
             throw new RuntimeException("Error: unable to create robot", e);
         }
-        // Create instructions for the user here, as well as set up
-        // the environment -- set the layout manager, add buttons,
-        // etc.
-        this.setLayout (new BorderLayout ());
         shift = 100;
     }
 
--- a/test/jdk/java/awt/Focus/ClearLwQueueBreakTest/ClearLwQueueBreakTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/ClearLwQueueBreakTest/ClearLwQueueBreakTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -26,7 +26,6 @@
   @key headful
   @bug       6496958
   @summary   Tests that breaking the proccess of clearing LW requests doesn't break focus.
-  @author    anton.tarasov@...: area=awt-focus
   @library    ../../regtesthelpers
   @build      Util
   @run       main ClearLwQueueBreakTest
@@ -35,11 +34,10 @@
 import java.awt.*;
 import javax.swing.*;
 import java.awt.event.*;
-import java.applet.Applet;
 import test.java.awt.regtesthelpers.Util;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-public class ClearLwQueueBreakTest extends Applet {
+public class ClearLwQueueBreakTest {
     JFrame f1 = new JFrame("frame");
     JFrame f2 = new JFrame("frame");
     JButton b = new JButton("button");
@@ -60,11 +58,6 @@
 
     public void init() {
         robot = Util.createRobot();
-
-        // Create instructions for the user here, as well as set up
-        // the environment -- set the layout manager, add buttons,
-        // etc.
-        this.setLayout (new BorderLayout ());
     }
 
     public void start() {
@@ -118,6 +111,7 @@
         f1.add(tf3);
         f1.setLayout(new FlowLayout());
         f1.pack();
+        f1.setLocationRelativeTo(null);
         f1.setVisible(true);
         Util.waitForIdle(robot);
 
--- a/test/jdk/java/awt/Focus/CloseDialogActivateOwnerTest/CloseDialogActivateOwnerTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/CloseDialogActivateOwnerTest/CloseDialogActivateOwnerTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,20 +26,15 @@
   @key headful
   @bug       6785058
   @summary   Tests that an owner is activated on closing its owned dialog with the warning icon.
-  @author    Anton Tarasov: area=awt.focus
   @library   ../../regtesthelpers
   @build     Util
   @run       main/othervm/policy=java.policy -Djava.security.manager CloseDialogActivateOwnerTest
 */
 
 import java.awt.*;
-import java.awt.event.*;
-import java.applet.Applet;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.lang.reflect.InvocationTargetException;
 import test.java.awt.regtesthelpers.Util;
 
-public class CloseDialogActivateOwnerTest extends Applet {
+public class CloseDialogActivateOwnerTest {
     Robot robot;
 
     public static void main(String[] args) {
--- a/test/jdk/java/awt/Focus/ConsumeNextKeyTypedOnModalShowTest/ConsumeNextKeyTypedOnModalShowTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/ConsumeNextKeyTypedOnModalShowTest/ConsumeNextKeyTypedOnModalShowTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,10 @@
  */
 
 /*
-  @test      %W% %E%
+  @test
   @key headful
   @bug       6637607
   @summary   Showing a modal dlg on TAB KEY_PRESS shouldn't consume inappropriate KEY_TYPED.
-  @author    Anton Tarasov: area=awt-focus
   @library   ../../regtesthelpers
   @build     Util
   @run       main ConsumeNextKeyTypedOnModalShowTest
@@ -34,12 +33,9 @@
 
 import java.awt.*;
 import java.awt.event.*;
-import java.applet.Applet;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.lang.reflect.InvocationTargetException;
 import test.java.awt.regtesthelpers.Util;
 
-public class ConsumeNextKeyTypedOnModalShowTest extends Applet {
+public class ConsumeNextKeyTypedOnModalShowTest {
     Robot robot;
     Frame frame = new Frame("Frame");
     Dialog dialog = new Dialog(frame, "Dialog", true);
@@ -76,6 +72,7 @@
     }
 
     public void start() {
+        frame.setLocationRelativeTo(null);
         frame.setVisible(true);
         Util.waitTillShown(frame);
 
--- a/test/jdk/java/awt/Focus/ContainerFocusAutoTransferTest/ContainerFocusAutoTransferTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/ContainerFocusAutoTransferTest/ContainerFocusAutoTransferTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,13 +26,11 @@
   @key headful
   @bug       6607170
   @summary   Tests for focus-auto-transfer.
-  @author    Anton Tarasov: area=awt-focus
   @library   ../../regtesthelpers
   @build     Util
   @run       main ContainerFocusAutoTransferTest
 */
 
-import java.applet.Applet;
 import java.awt.AWTEvent;
 import java.awt.Component;
 import java.awt.ComponentOrientation;
@@ -50,7 +48,7 @@
 import javax.swing.JPanel;
 import test.java.awt.regtesthelpers.Util;
 
-public class ContainerFocusAutoTransferTest extends Applet {
+public class ContainerFocusAutoTransferTest {
     Robot robot;
     TestFrame frame;
     KeyboardFocusManager kfm;
--- a/test/jdk/java/awt/Focus/DeiconifiedFrameLoosesFocus/DeiconifiedFrameLoosesFocus.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-<!--
- Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--
-  @test
-  @key headful
-  @bug        6480534
-  @summary    A Frame changing its state from ICONIFIED to NORMAL should regain focus.
-  @author     anton.tarasov@...: area=awt.focus
-  @library    ../../regtesthelpers
-  @build      Util
-  @run        applet DeiconifiedFrameLoosesFocus.html
-  -->
-<head>
-<title>DeiconifiedFrameLoosesFocus</title>
-</head>
-<body>
- 
-<h1>DeiconifiedFrameLoosesFocus<br>Bug ID: 6480534</h1>
- 
-<p>See the dialog box (usually in upper left corner) for instructions</p>
- 
-<APPLET CODE=DeiconifiedFrameLoosesFocus.class WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/Focus/DeiconifiedFrameLoosesFocus/DeiconifiedFrameLoosesFocus.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/DeiconifiedFrameLoosesFocus/DeiconifiedFrameLoosesFocus.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,18 +22,19 @@
  */
 
 /*
-  test
-  @bug       6480534
-  @summary   A Frame changing its state from ICONIFIED to NORMAL should regain focus.
-  @author    anton.tarasov@...: area=awt.focus
-  @run       applet DeiconifiedFrameLoosesFocus.html
+  @test
+  @key headful
+  @bug        6480534
+  @summary    A Frame changing its state from ICONIFIED to NORMAL should regain focus.
+  @library    ../../regtesthelpers
+  @build      Util
+  @run        main DeiconifiedFrameLoosesFocus
 */
 
 import java.awt.*;
-import java.applet.Applet;
 import test.java.awt.regtesthelpers.Util;
 
-public class DeiconifiedFrameLoosesFocus extends Applet {
+public class DeiconifiedFrameLoosesFocus {
     Robot robot;
     static final Frame frame = new Frame("Frame");
 
@@ -45,11 +46,6 @@
 
     public void init() {
         robot = Util.createRobot();
-
-        // Create instructions for the user here, as well as set up
-        // the environment -- set the layout manager, add buttons,
-        // etc.
-        this.setLayout (new BorderLayout ());
     }
 
     public void start() {
--- a/test/jdk/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
  * @key       headful
  * @bug       6516675
  * @summary   Tests that EmbeddedFrame can be focused.
- * @author    anton.tarasov: area=awt-focus
  * @requires (os.family == "windows")
  * @modules   java.desktop/java.awt.peer
  *            java.desktop/sun.awt
@@ -39,13 +38,10 @@
 
 import java.awt.*;
 import java.awt.event.*;
-import java.applet.Applet;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.lang.reflect.InvocationTargetException;
 import test.java.awt.regtesthelpers.Util;
 import test.java.awt.regtesthelpers.UtilInternal;
 
-public class FocusEmbeddedFrameTest extends Applet {
+public class FocusEmbeddedFrameTest {
     static Frame embedder = new Frame("Embedder");
     static Frame ef = null;
     static volatile boolean passed;
--- a/test/jdk/java/awt/Focus/FocusOwnerFrameOnClick/FocusOwnerFrameOnClick.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/FocusOwnerFrameOnClick/FocusOwnerFrameOnClick.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,10 @@
  */
 
 /*
-  @test      FocusOwnerFrameOnClick.java %W% %E%
+  @test
   @key headful
   @bug       6886678
   @summary   Tests that clicking an owner frame switches focus from its owned window.
-  @author    Anton Tarasov: area=awt.focus
   @library   ../../regtesthelpers
   @build     Util
   @run       main FocusOwnerFrameOnClick
@@ -34,12 +33,10 @@
 
 import java.awt.*;
 import java.awt.event.*;
-import java.applet.Applet;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.lang.reflect.InvocationTargetException;
 import test.java.awt.regtesthelpers.Util;
 
-public class FocusOwnerFrameOnClick extends Applet {
+public class FocusOwnerFrameOnClick {
     Robot robot;
     Frame frame = new Frame("Frame");
     Window window = new Window(frame);
--- a/test/jdk/java/awt/Focus/FocusSubRequestTest/FocusSubRequestTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-<!--
- Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug        5082319
-  @summary    Tests that focus request for already focused component doesn't block key events.
-  @author     anton.tarasov@sun.com
-  @run applet FocusSubRequestTest.html
-  -->
-<head>
-<title>FocusSubRequestTest</title>
-</head>
-<body>
-
-<h1>FocusSubRequestTest<br>Bug ID: 5082319</h1>
-
-<p> See the dialog box (usually in upper left corner) for instructions</p>
-
-<APPLET CODE="FocusSubRequestTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/Focus/FocusSubRequestTest/FocusSubRequestTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/FocusSubRequestTest/FocusSubRequestTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,23 +22,28 @@
  */
 
 /*
-  test
+  @test
+  @key headful
   @bug        5082319
   @summary    Tests that focus request for already focused component doesn't block key events.
-  @author     anton.tarasov@sun.com
-  @run applet FocusSubRequestTest.html
+  @run main FocusSubRequestTest
 */
 
-import java.applet.Applet;
 import java.awt.*;
 import java.awt.event.*;
 
-public class FocusSubRequestTest extends Applet {
+public class FocusSubRequestTest {
     Frame frame = new Frame("Test Frame");
     Button button = new Button("button");
     boolean passed = false;
     Robot robot;
 
+    public static void main(final String[] args) {
+        FocusSubRequestTest app = new FocusSubRequestTest();
+        app.init();
+        app.start();
+    }
+
     public void init() {
         frame.add(button);
         button.addFocusListener(new FocusAdapter() {
@@ -64,7 +69,7 @@
 
     public void start() {
         frame.pack();
-        frame.setLocation(getLocation().x + getSize().width + 20, 0);
+        frame.setLocationRelativeTo(null);
         frame.setVisible(true);
 
         waitTillShown(button);
--- a/test/jdk/java/awt/Focus/FrameJumpingToMouse/FrameJumpingToMouse.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/FrameJumpingToMouse/FrameJumpingToMouse.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,26 +26,19 @@
  * @key headful
  * @bug        4752312
  * @summary    Tests that after moving non-focusable window it ungrabs mouse pointer
- * @author     Denis Mikhalkin: area=awt.focus
  * @library    ../../regtesthelpers
  * @build      Util
  * @run        main FrameJumpingToMouse
  */
 
-import java.applet.Applet;
-import java.awt.BorderLayout;
-import java.awt.Dialog;
-import java.awt.Frame;
 import java.awt.Point;
 import java.awt.Robot;
-import java.awt.TextArea;
-import java.awt.Toolkit;
 import java.awt.event.InputEvent;
 import javax.swing.JFrame;
 import test.java.awt.regtesthelpers.Util;
 
-public class FrameJumpingToMouse extends Applet
-{
+public class FrameJumpingToMouse {
+
     JFrame frame = new JFrame("Test jumping frame");
     Robot robot = Util.createRobot();
 
--- a/test/jdk/java/awt/Focus/IconifiedFrameFocusChangeTest/IconifiedFrameFocusChangeTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/IconifiedFrameFocusChangeTest/IconifiedFrameFocusChangeTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,18 +26,16 @@
   @key headful
   @bug       6522725
   @summary   Tests for proper request-focus-back on FOCUS_LOST.
-  @author    Anton Tarasov: area=awt-focus
   @library   ../../regtesthelpers
   @build     Util
   @run       main IconifiedFrameFocusChangeTest
 */
 
 import java.awt.*;
-import java.applet.Applet;
 import java.awt.event.*;
 import test.java.awt.regtesthelpers.Util;
 
-public class IconifiedFrameFocusChangeTest extends Applet {
+public class IconifiedFrameFocusChangeTest {
     Frame testFrame = new Frame("Test Frame");
     Frame otherFrame = new Frame("Other Frame");
     Button testButton = new Button("test button");
--- a/test/jdk/java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-<!--
- Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--
-  @test
-  @key headful
-  @bug        6426132
-  @summary    Modal blocked window shouldn't steal focus when shown, or brought to front.
-  @author     anton.tarasov@...: area=awt.focus
-  @library    ../../regtesthelpers        
-  @build      Util   
-  @run        applet ModalBlockedStealsFocusTest.html
-  -->
-<head>
-<title>ModalBlockedStealsFocusTest</title>
-</head>
-<body>
- 
-<h1>ModalBlockedStealsFocusTest<br>Bug ID: 6426132</h1>
- 
-<p>See the dialog box (usually in upper left corner) for instructions</p>
- 
-<APPLET CODE=ModalBlockedStealsFocusTest.class WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -22,38 +22,30 @@
  */
 
 /*
-  test
-  @bug       6426132
-  @summary   Modal blocked window shouldn't steal focus when shown, or brought to front.
-  @author    anton.tarasov@...: area=awt.focus
-  @run       applet ModalBlockedStealsFocusTest.html
+  @test
+  @key headful
+  @bug        6426132
+  @summary    Modal blocked window shouldn't steal focus when shown, or brought to front.
+  @library    ../../regtesthelpers
+  @build      Util
+  @run        main ModalBlockedStealsFocusTest
 */
 
 import java.awt.*;
 import java.awt.event.*;
-import java.applet.Applet;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.lang.reflect.InvocationTargetException;
 import test.java.awt.regtesthelpers.Util;
 
-public class ModalBlockedStealsFocusTest extends Applet {
+public class ModalBlockedStealsFocusTest {
     Frame frame = new Frame("Blocked Frame");
     Dialog dialog = new Dialog(frame, "Modal Dialog", Dialog.ModalityType.TOOLKIT_MODAL);
     AtomicBoolean lostFocus = new AtomicBoolean(false);
 
     public static void main(String[] args) {
         ModalBlockedStealsFocusTest app = new ModalBlockedStealsFocusTest();
-        app.init();
         app.start();
     }
 
-    public void init() {
-        // Create instructions for the user here, as well as set up
-        // the environment -- set the layout manager, add buttons,
-        // etc.
-        this.setLayout (new BorderLayout ());
-    }
-
     public void start() {
         if ("sun.awt.motif.MToolkit".equals(Toolkit.getDefaultToolkit().getClass().getName())) {
             System.out.println("The test is not for MToolkit.");
--- a/test/jdk/java/awt/Focus/ModalDialogInitialFocusTest/ModalDialogInitialFocusTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-<!--
- Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--
-  @test
-  @key headful
-  @bug        6382750
-  @summary
-  @author     anton.tarasov@sun.com: area=awt.focus
-  @run        applet ModalDialogInitialFocusTest.html
-  -->
-<head>
-<title>ModalDialogInitialFocusTest</title>
-</head>
-<body>
- 
-<h1>ModalDialogInitialFocusTest<br>Bug ID: 6382750</h1>
- 
-<p>See the dialog box (usually in upper left corner) for instructions</p>
- 
-<APPLET CODE=ModalDialogInitialFocusTest.class WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/Focus/ModalDialogInitialFocusTest/ModalDialogInitialFocusTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/ModalDialogInitialFocusTest/ModalDialogInitialFocusTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -22,20 +22,17 @@
  */
 
 /*
-  test
-  @bug       6382750
+  @test
+  @key headful
+  @bug        6382750
   @summary   Tests that modal dialog doesn't request extra initial focus on show.
-  @author    anton.tarasov@sun.com: area=awt.focus
-  @run       applet ModalDialogInitialFocusTest.html
+  @run        main ModalDialogInitialFocusTest
 */
 
 import java.awt.*;
 import java.awt.event.*;
-import java.applet.Applet;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.lang.reflect.InvocationTargetException;
 
-public class ModalDialogInitialFocusTest extends Applet {
+public class ModalDialogInitialFocusTest {
     Robot robot;
 
     Dialog dialog = new Dialog((Window)null, "Test Dialog", Dialog.ModalityType.TOOLKIT_MODAL);
@@ -55,10 +52,6 @@
         } catch (AWTException e) {
             throw new RuntimeException("Error: unable to create robot", e);
         }
-        // Create instructions for the user here, as well as set up
-        // the environment -- set the layout manager, add buttons,
-        // etc.
-        this.setLayout (new BorderLayout ());
     }
 
     public void start() {
--- a/test/jdk/java/awt/Focus/ModalExcludedWindowClickTest/ModalExcludedWindowClickTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-<!--
- Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug        6271849
-  @summary    Tests that component in modal excluded Window which parent is blocked responses to mouse clicks.
-  @author     anton.tarasov@sun.com: area=awt.focus
-  @modules java.desktop/sun.awt
-  @run        applet ModalExcludedWindowClickTest.html
-  -->
-<head>
-<title>ModalExcludedWindowClickTest</title>
-</head>
-<body>
-
-<h1>ModalExcludedWindowClickTest<br>Bug ID: 6272324</h1>
-
-<p> See the dialog box (usually in upper left corner) for instructions</p>
-
-<APPLET CODE="ModalExcludedWindowClickTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/Focus/ModalExcludedWindowClickTest/ModalExcludedWindowClickTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/ModalExcludedWindowClickTest/ModalExcludedWindowClickTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -22,19 +22,19 @@
  */
 
 /*
-  test
-  @bug       6271849
-  @summary   Tests that component in modal excluded Window which parent is blocked responses to mouse clicks.
-  @author    anton.tarasov@sun.com: area=awt.focus
-  @run       applet ModalExcludedWindowClickTest.html
+  @test
+  @key headful
+  @bug        6271849
+  @summary    Tests that component in modal excluded Window which parent is blocked responses to mouse clicks.
+  @modules java.desktop/sun.awt
+  @run        main ModalExcludedWindowClickTest
 */
 
-import java.applet.Applet;
 import java.awt.*;
 import java.awt.event.*;
 import java.lang.reflect.*;
 
-public class ModalExcludedWindowClickTest extends Applet {
+public class ModalExcludedWindowClickTest {
     Robot robot;
     Frame frame = new Frame("Frame");
     Window w = new Window(frame);
@@ -54,10 +54,6 @@
         } catch (AWTException e) {
             throw new RuntimeException("Error: unable to create robot", e);
         }
-        // Create instructions for the user here, as well as set up
-        // the environment -- set the layout manager, add buttons,
-        // etc.
-        this.setLayout (new BorderLayout ());
     }
 
     public void start() {
--- a/test/jdk/java/awt/Focus/NoAutotransferToDisabledCompTest/NoAutotransferToDisabledCompTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/NoAutotransferToDisabledCompTest/NoAutotransferToDisabledCompTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
   @key headful
   @bug       4685768
   @summary   Tests that auto-transfering focus doesn't stuck on a disabled component.
-  @author    Anton Tarasov: area=awt.focus
   @library   ../../regtesthelpers
   @build     Util
   @run       main NoAutotransferToDisabledCompTest
@@ -36,10 +35,9 @@
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
-import java.applet.Applet;
 import test.java.awt.regtesthelpers.Util;
 
-public class NoAutotransferToDisabledCompTest extends Applet {
+public class NoAutotransferToDisabledCompTest {
     Robot robot;
     JFrame frame = new JFrame("Frame");
     JButton b0 = new JButton("b0");
--- a/test/jdk/java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-<!--
- Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug        6272324
-  @summary    Modal excluded Window which decorated parent is blocked should be non-focusable.
-  @author     anton.tarasov@sun.com: area=awt.focus
-  @modules java.desktop/sun.awt
-  @run        applet NonFocusableBlockedOwnerTest.html
-  -->
-<head>
-<title>NonFocusableBlockedOwnerTest</title>
-</head>
-<body>
-
-<h1>NonFocusableBlockedOwnerTest<br>Bug ID: 6272324</h1>
-
-<p> See the dialog box (usually in upper left corner) for instructions</p>
-
-<APPLET CODE="NonFocusableBlockedOwnerTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -22,19 +22,19 @@
  */
 
 /*
-  test
-  @bug       6272324
-  @summary   Modal excluded Window which decorated parent is blocked should be non-focusable.
-  @author    anton.tarasov@sun.com: area=awt.focus
-  @run       applet NonFocusableBlockedOwnerTest.html
+  @test
+  @key headful
+  @bug        6272324
+  @summary    Modal excluded Window which decorated parent is blocked should be non-focusable.
+  @modules java.desktop/sun.awt
+  @run        main NonFocusableBlockedOwnerTest
 */
 
-import java.applet.Applet;
 import java.awt.*;
 import java.awt.event.*;
 import java.lang.reflect.*;
 
-public class NonFocusableBlockedOwnerTest extends Applet {
+public class NonFocusableBlockedOwnerTest {
     Robot robot;
     Frame frame = new Frame("Modal Blocked Frame");
     Dialog dialog = new Dialog(frame, "Modal Dialog", true);
@@ -53,10 +53,6 @@
         } catch (AWTException e) {
             throw new RuntimeException("Error: unable to create robot", e);
         }
-        // Create instructions for the user here, as well as set up
-        // the environment -- set the layout manager, add buttons,
-        // etc.
-        this.setLayout (new BorderLayout ());
     }
 
     public void start() {
--- a/test/jdk/java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
   @key headful
   @bug       6182359
   @summary   Tests that Window having non-focusable owner can't be a focus owner.
-  @author    Anton.Tarasov: area=awt.focus
   @library   ../../regtesthelpers
   @build     Util
   @run       main NonfocusableOwnerTest
@@ -34,12 +33,9 @@
 
 import java.awt.*;
 import java.awt.event.*;
-import java.applet.Applet;
-import java.lang.reflect.*;
-import java.io.*;
 import test.java.awt.regtesthelpers.Util;
 
-public class NonfocusableOwnerTest extends Applet {
+public class NonfocusableOwnerTest {
     Robot robot = Util.createRobot();
     Frame frame;
     Dialog dialog;
--- a/test/jdk/java/awt/Focus/RequestFocusToDisabledCompTest/RequestFocusToDisabledCompTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/RequestFocusToDisabledCompTest/RequestFocusToDisabledCompTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
   @key headful
   @bug       4685768
   @summary   Tests that it's possible to manually request focus on a disabled component.
-  @author    Anton Tarasov: area=awt.focus
   @library   ../../regtesthelpers
   @build     Util
   @run       main RequestFocusToDisabledCompTest
@@ -35,11 +34,9 @@
 import java.awt.Robot;
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
-import java.applet.Applet;
 import test.java.awt.regtesthelpers.Util;
 
-public class RequestFocusToDisabledCompTest extends Applet {
+public class RequestFocusToDisabledCompTest {
     Robot robot;
     JFrame frame = new JFrame("Frame");
     JButton b0 = new JButton("b0");
--- a/test/jdk/java/awt/Focus/ResetMostRecentFocusOwnerTest/ResetMostRecentFocusOwnerTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/ResetMostRecentFocusOwnerTest/ResetMostRecentFocusOwnerTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -26,15 +26,12 @@
   @key headful
   @bug      8013773
   @summary  Tests that disabled component is not retained as most recent focus owner.
-  @author   Anton.Tarasov: area=awt.focus
   @library  ../../regtesthelpers
   @build    Util
   @run      main ResetMostRecentFocusOwnerTest
 */
 
-import java.applet.Applet;
 import java.awt.AWTEvent;
-import java.awt.FlowLayout;
 import java.awt.Robot;
 import java.awt.Toolkit;
 import java.awt.event.AWTEventListener;
@@ -44,15 +41,13 @@
 import javax.swing.JFrame;
 import test.java.awt.regtesthelpers.Util;
 
-public class ResetMostRecentFocusOwnerTest extends Applet {
+public class ResetMostRecentFocusOwnerTest {
 
     public static void main(String[] args) {
         ResetMostRecentFocusOwnerTest app = new ResetMostRecentFocusOwnerTest();
-        app.init();
         app.start();
     }
 
-    @Override
     public void start() {
 
         Toolkit.getDefaultToolkit().addAWTEventListener(new AWTEventListener() {
@@ -68,7 +63,7 @@
         final JButton b1 = new JButton("button1");
         frame1.add(b1);
         frame1.pack();
-        frame1.setLocation(0, 300);
+        frame1.setLocation(100, 300);
 
         Util.showWindowWait(frame1);
 
--- a/test/jdk/java/awt/Focus/RestoreFocusOnDisabledComponentTest/RestoreFocusOnDisabledComponentTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/RestoreFocusOnDisabledComponentTest/RestoreFocusOnDisabledComponentTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -22,11 +22,10 @@
  */
 
 /*
-  @test      %W% %E%
+  @test
   @key headful
   @bug       6598089
   @summary   Tests restoring focus on a single disabled coponent
-  @author    Anton Tarasov: area=awt-focus
   @library   ../../regtesthelpers
   @build     Util
   @run       main RestoreFocusOnDisabledComponentTest
@@ -34,13 +33,12 @@
 
 import java.awt.*;
 import java.awt.event.*;
-import java.applet.Applet;
 import test.java.awt.regtesthelpers.Util;
 
 /*
  * The bug is not reproducible on Windows.
  */
-public class RestoreFocusOnDisabledComponentTest extends Applet {
+public class RestoreFocusOnDisabledComponentTest {
     Frame frame = new Frame("Frame") {public String toString() {return "FRAME";}};
     Button b0 = new Button("button0") {public String toString() {return "B-0";}};
     Button b1 = new Button("button1") {public String toString() {return "B-1";}};
@@ -62,7 +60,7 @@
         frame.add(b1);
         frame.setLayout(new FlowLayout());
         frame.pack();
-
+        frame.setLocationRelativeTo(null);
         frame.setVisible(true);
 
         Util.waitForIdle(robot);
--- a/test/jdk/java/awt/Focus/ShowFrameCheckForegroundTest/ShowFrameCheckForegroundTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/ShowFrameCheckForegroundTest/ShowFrameCheckForegroundTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -28,18 +28,14 @@
   @summary   Tests that showing a toplvel in a not foreground Java process activates it.
   @library   ../../regtesthelpers
   @build     Util
-  @author    Anton Tarasov: area=awt-focus
   @run       main ShowFrameCheckForegroundTest
  */
 
 import java.awt.*;
 import java.awt.event.*;
-import java.applet.Applet;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.lang.reflect.InvocationTargetException;
 import test.java.awt.regtesthelpers.Util;
 
-public class ShowFrameCheckForegroundTest extends Applet {
+public class ShowFrameCheckForegroundTest {
     Robot robot;
     Frame nofocusFrame = new Frame("Non-focusable");
     Frame frame = new Frame("Frame");
@@ -76,6 +72,7 @@
         nofocusFrame.add(showButton);
         nofocusFrame.pack();
         nofocusFrame.setFocusableWindowState(false);
+        nofocusFrame.setLocation(200, 200);
         nofocusFrame.setVisible(true);
         Util.waitForIdle(robot);
 
@@ -97,7 +94,7 @@
     private void test(Window toplevel, int stage) {
         toplevel.add(testButton);
         toplevel.pack();
-        toplevel.setLocation(200, 0);
+        toplevel.setLocation(400, 200);
 
         switch (stage) {
             case 1:
--- a/test/jdk/java/awt/Focus/ToFrontFocusTest/ToFrontFocus.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-<!--
- Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug 4092033 4529626
-  @summary Tests that toFront makes window focused unless it is non-focusable
-  @author  area=awt.focus
-  @library ../../regtesthelpers
-  @build Util
-  @run applet ToFrontFocus.html
-  -->
-<head>
-<title>  </title>
-</head>
-<body>
-
-<h1>ToFrontFocus<br>
-4092033 : (P4/S5) - window.toFront() method is now also setting focus
-4529626 : (P4/S2) - REGRESSION:In solaris and Linux ,toFront() is not making frame as the Focused.
-</h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="ToFrontFocus.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/Focus/ToFrontFocusTest/ToFrontFocus.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/ToFrontFocusTest/ToFrontFocus.java	Wed Feb 27 18:46:55 2019 -0800
@@ -22,39 +22,32 @@
  */
 
 /*
-  test
+  @test
+  @key headful
   @bug 4092033 4529626
   @summary Tests that toFront makes window focused unless it is non-focusable
-  @author  area=awt.focus
-  @run applet ToFrontFocus.html
+  @library ../../regtesthelpers
+  @build Util
+  @run main ToFrontFocus
 */
 
-/**
- * ToFrontFocus.java
- *
- * summary:
- */
-
-import java.applet.Applet;
 import java.awt.*;
 import java.awt.event.*;
 import test.java.awt.regtesthelpers.Util;
 
-public class ToFrontFocus extends Applet
- {
-   //Declare things used in the test, like buttons and labels here
-
+public class ToFrontFocus {
      Frame cover, focus_frame, nonfocus_frame;
      Button focus_button, nonfocus_button;
      volatile boolean focus_gained = false, nonfocus_gained = false;
-   public void init()
+
+    public static void main(final String[] args) {
+        ToFrontFocus app = new ToFrontFocus();
+        app.init();
+        app.start();
+    }
+
+    public void init()
     {
-      //Create instructions for the user here, as well as set up
-      // the environment -- set the layout manager, add buttons,
-      // etc.
-
-      this.setLayout (new BorderLayout ());
-
       cover = new Frame("Cover frame");
       cover.setBounds(100, 100, 200, 200);
       focus_frame = new Frame("Focusable frame");
@@ -78,9 +71,6 @@
 
    public void start ()
     {
-      //Get things going.  Request focus, set size, et cetera
-      setSize (200,200);
-      show();
       Util.waitForIdle(null);
 
       focus_frame.setFocusTraversalPolicy(new DefaultFocusTraversalPolicy() {
--- a/test/jdk/java/awt/Focus/WindowInitialFocusTest/WindowInitialFocusTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-<!--
- Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--
-  @test
-  @key headful
-  @bug        6426132
-  @summary    A Window should be focused upon start (XAWT bug).
-  @author     anton.tarasov@...: area=awt.focus
-  @library    ../../regtesthelpers        
-  @build      Util        
-  @run        applet WindowInitialFocusTest.html
-  -->
-<head>
-<title>WindowInitialFocusTest</title>
-</head>
-<body>
- 
-<h1>WindowInitialFocusTest<br>Bug ID: 6426132</h1>
- 
-<p>See the dialog box (usually in upper left corner) for instructions</p>
- 
-<APPLET CODE=WindowInitialFocusTest.class WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/Focus/WindowInitialFocusTest/WindowInitialFocusTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/WindowInitialFocusTest/WindowInitialFocusTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -22,20 +22,21 @@
  */
 
 /*
-  test
-  @bug       6426132
-  @summary   A Window should be initially focused on its showing (XAWT bug).
-  @author    anton.tarasov@...: area=awt.focus
-  @run       applet WindowInitialFocusTest.html
+  @test
+  @key headful
+  @bug        6426132
+  @summary    A Window should be focused upon start (XAWT bug).
+  @library    ../../regtesthelpers
+  @build      Util
+  @run        main WindowInitialFocusTest
 */
 
 import java.awt.*;
 import java.awt.event.*;
-import java.applet.Applet;
 import java.util.concurrent.atomic.AtomicBoolean;
 import test.java.awt.regtesthelpers.Util;
 
-public class WindowInitialFocusTest extends Applet {
+public class WindowInitialFocusTest {
     Frame frame = new Frame("Test Frame");
     Window window = new Window(frame);
     Button button = new Button("button");
@@ -44,17 +45,9 @@
 
     public static void main(String[] args) {
         WindowInitialFocusTest app = new WindowInitialFocusTest();
-        app.init();
         app.start();
     }
 
-    public void init() {
-        // Create instructions for the user here, as well as set up
-        // the environment -- set the layout manager, add buttons,
-        // etc.
-        this.setLayout (new BorderLayout ());
-    }
-
     public void start() {
         frame.setBounds(800, 0, 200, 100);
         window.setBounds(800, 200, 200, 100);
--- a/test/jdk/java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-<!--
- Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--
-  @test
-  @key headful
-  @bug        6253913
-  @summary    Tests that a Window shown before its owner is focusable.
-  @author     anton.tarasov@sun.com: area=awt-focus
-  @modules java.desktop/sun.awt
-  @run        applet WindowUpdateFocusabilityTest.html
-  -->
-<head>
-<title>WindowUpdateFocusabilityTest</title>
-</head>
-<body>
- 
-<h1>WindowUpdateFocusabilityTest<br>Bug ID: 6253913</h1>
- 
-<p>See the dialog box (usually in upper left corner) for instructions</p>
- 
-<APPLET CODE=WindowUpdateFocusabilityTest.class WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -22,19 +22,19 @@
  */
 
 /*
-  test
-  @bug       6253913
-  @summary   Tests that a Window shown before its owner is focusable.
-  @author    anton.tarasov@sun.com: area=awt-focus
-  @run       applet WindowUpdateFocusabilityTest.html
+  @test
+  @key headful
+  @bug        6253913
+  @summary    Tests that a Window shown before its owner is focusable.
+  @modules java.desktop/sun.awt
+  @run        main WindowUpdateFocusabilityTest
 */
 
 import java.awt.*;
 import java.awt.event.*;
-import java.applet.Applet;
 import java.lang.reflect.*;
 
-public class WindowUpdateFocusabilityTest extends Applet {
+public class WindowUpdateFocusabilityTest {
     Robot robot;
     boolean focusGained = false;
     final Object monitor = new Object();
@@ -60,10 +60,6 @@
         } catch (AWTException e) {
             throw new RuntimeException("Error: couldn't create robot");
         }
-        // Create instructions for the user here, as well as set up
-        // the environment -- set the layout manager, add buttons,
-        // etc.
-        this.setLayout (new BorderLayout ());
     }
 
     public void start() {
--- a/test/jdk/java/awt/Focus/WrongKeyTypedConsumedTest/WrongKeyTypedConsumedTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Focus/WrongKeyTypedConsumedTest/WrongKeyTypedConsumedTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,24 +26,15 @@
   @key headful
   @bug      4782886
   @summary  FocusManager consumes wrong KEY_TYPED events
-  @author   Oleg.Sukhodolsky: area=awt.focus
   @library  ../../regtesthelpers
   @build    Util
   @run      main WrongKeyTypedConsumedTest
 */
 
-import java.applet.Applet;
-import java.awt.AWTException;
 import java.awt.AWTKeyStroke;
 import java.awt.BorderLayout;
-import java.awt.Dialog;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Frame;
 import java.awt.KeyboardFocusManager;
-import java.awt.Point;
 import java.awt.Robot;
-import java.awt.TextArea;
 
 import java.awt.event.KeyEvent;
 
@@ -56,7 +47,7 @@
 
 import test.java.awt.regtesthelpers.Util;
 
-public class WrongKeyTypedConsumedTest extends Applet
+public class WrongKeyTypedConsumedTest
 {
     Robot robot = Util.createRobot();
 
@@ -67,10 +58,6 @@
 
     public void start ()
     {
-        setSize (200,200);
-        setVisible(true);
-        validate();
-
         JFrame frame = new JFrame("The Frame");
         Set ftk = new HashSet();
         ftk.add(AWTKeyStroke.getAWTKeyStroke(KeyEvent.VK_DOWN, 0));
@@ -85,6 +72,7 @@
         frame.getContentPane().add(textarea);
 
         frame.pack();
+        frame.setLocationRelativeTo(null);
         frame.setVisible(true);
         Util.waitForIdle(robot);
 
--- a/test/jdk/java/awt/FontClass/CreateFont/BigFont.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/FontClass/CreateFont/BigFont.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,12 +21,23 @@
  * questions.
  */
 
-import java.applet.*;
-import java.awt.*;
-import java.io.*;
-import java.net.*;
+import java.awt.Font;
+import java.awt.FontFormatException;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.nio.file.Paths;
 
-public class BigFont extends Applet {
+/**
+ * @test
+ * @key headful
+ * @bug 6522586
+ * @summary Enforce limits on font creation
+ * @run main BigFont 1 A.ttf
+ * @run main BigFont 2 A.ttf
+ */
+public class BigFont {
 
    static private class SizedInputStream extends InputStream {
 
@@ -51,12 +62,12 @@
        }
    }
 
-    String id;
-    String fileName;
+    static String id;
+    static String fileName;
 
-    public void init() {
-        id = getParameter("number");
-        fileName = getParameter("font");
+    public static void main(final String[] args) {
+        id = args[0];
+        fileName = args[1];
 
         System.out.println("Applet " + id + " "+
                            Thread.currentThread().getThreadGroup());
@@ -102,7 +113,10 @@
 
     int getFileSize(String fileName) {
         try {
-            URL url = new URL(getCodeBase(), fileName);
+            String path = Paths.get(System.getProperty("test.src", "."),
+                                    fileName).toAbsolutePath().normalize()
+                                             .toString();
+            URL url = new URL(path);
             InputStream inStream = url.openStream();
             BufferedInputStream fontStream = new BufferedInputStream(inStream);
             int size = 0;
@@ -123,7 +137,10 @@
         boolean gotException = false;
         for (int i=0; i<fontCnt; i++) {
             try {
-                URL url = new URL(getCodeBase(), fileName);
+                String path = Paths.get(System.getProperty("test.src", "."),
+                                        fileName).toAbsolutePath().normalize()
+                                                 .toString();
+                URL url = new URL(path);
                 InputStream inStream = url.openStream();
                 BufferedInputStream fontStream =
                     new BufferedInputStream(inStream);
--- a/test/jdk/java/awt/FontClass/CreateFont/bigfont.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-<!--
-
- Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
-
-  @test
-  @key headful
-  @bug 6522586
-  @run applet bigfont.html
-  @summary Enforce limits on font creation
-
--->
-
-<html>
-  <head>
-      <title>Test Font Creation Limits</title>
-  </head>
-  <body>
-<hr>
-<APPLET CODE = BigFont.class WIDTH = 100 HEIGHT = 100 >
-<param name="number" value="1">
-<param name="font" value="A.ttf">
-</APPLET>
-<APPLET CODE = BigFont.class WIDTH = 100 HEIGHT = 100>
-<param name="number" value="2">
-<param name="font" value="A.ttf">
-</APPLET>
-<hr>
-  </body>
-</html>
-
--- a/test/jdk/java/awt/Frame/DisposeStressTest/DisposeStressTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<html>
-<!--  
-  @test
-  @key headful
-  @bug 4051487 4145670
-  @summary Tests that disposing of an empty Frame or a Frame with a MenuBar
-           while it is being created does not crash the VM.
-  @author dpm area=Threads
-  @run applet/timeout=7200 DisposeStressTest.html
-  -->
-<head>
-<title>DisposeStressTest</title>
-</head>
-<body>
-
-<h1>DisposeStressTest<br>Bug ID: 4051487, 4145670</h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="DisposeStressTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/Frame/DisposeStressTest/DisposeStressTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Frame/DisposeStressTest/DisposeStressTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -21,67 +21,23 @@
  * questions.
  */
 
-
 /*
-  test
-  @bug 4051487 4145670 8062021
+  @test
+  @key headful
+  @bug 4051487 4145670
   @summary Tests that disposing of an empty Frame or a Frame with a MenuBar
            while it is being created does not crash the VM.
-  @author dpm area=Threads
-  @run applet/timeout=7200 DisposeStressTest.html
+  @run main/timeout=7200 DisposeStressTest
 */
 
-// Note there is no @ in front of test above.  This is so that the
-//  harness will not mistake this file as a test file.  It should
-//  only see the html file as a test file. (the harness runs all
-//  valid test files, so it would run this test twice if this file
-//  were valid as well as the html file.)
-// Also, note the area= after Your Name in the author tag.  Here, you
-//  should put which functional area the test falls in.  See the
-//  AWT-core home page -> test areas and/or -> AWT team  for a list of
-//  areas.
-// Note also the 'DisposeStressTest.html' in the run tag.  This should
-//  be changed to the name of the test.
+import java.awt.Frame;
+import java.awt.Menu;
+import java.awt.MenuBar;
+import java.awt.MenuItem;
 
+public class DisposeStressTest {
 
-/**
- * DisposeStressTest.java
- *
- * summary:
- */
-
-import java.applet.Applet;
-import java.awt.*;
-
-
-//Automated tests should run as applet tests if possible because they
-// get their environments cleaned up, including AWT threads, any
-// test created threads, and any system resources used by the test
-// such as file descriptors.  (This is normally not a problem as
-// main tests usually run in a separate VM, however on some platforms
-// such as the Mac, separate VMs are not possible and non-applet
-// tests will cause problems).  Also, you don't have to worry about
-// synchronisation stuff in Applet tests they way you do in main
-// tests...
-
-
-public class DisposeStressTest extends Applet
- {
-   //Declare things used in the test, like buttons and labels here
-
-   public void init()
-    {
-      //Create instructions for the user here, as well as set up
-      // the environment -- set the layout manager, add buttons,
-      // etc.
-
-      this.setLayout (new BorderLayout ());
-
-
-    }//End  init()
-
-   public void start ()
-    {
+    public static void main(final String[] args) {
         for (int i = 0; i < 1000; i++) {
             Frame f = new Frame();
             f.setBounds(10, 10, 10, 10);
@@ -98,6 +54,5 @@
             f2.show();
             f2.dispose();
         }
-    }// start()
-
- }// class DisposeStressTest
+    }
+}
--- a/test/jdk/java/awt/Frame/NonEDT_GUI_DeadlockTest/NonEDT_GUI_Deadlock.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-<html>
-<!--
- Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<!--  
-  @test
-  @key headful
-  @bug 4828019
-  @summary Frame/Window deadlock
-  @author yan@sparc.spb.su: area=
-  @run applet/timeout=9999 NonEDT_GUI_Deadlock.html
-  -->
-<head>
-<title>  </title>
-</head>
-<body>
-
-<h1>NonEDT_GUI_Deadlock<br>Bug ID: 4828019</h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="NonEDT_GUI_Deadlock.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
-
--- a/test/jdk/java/awt/Frame/NonEDT_GUI_DeadlockTest/NonEDT_GUI_Deadlock.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Frame/NonEDT_GUI_DeadlockTest/NonEDT_GUI_Deadlock.java	Wed Feb 27 18:46:55 2019 -0800
@@ -21,70 +21,22 @@
  * questions.
  */
 
-
 /*
-  test
+  @test
+  @key headful
   @bug 4828019
   @summary Frame/Window deadlock
-  @author yan@sparc.spb.su: area=
-  @run applet NonEDT_GUI_Deadlock.html
+  @run main/timeout=9999 NonEDT_GUI_Deadlock
 */
 
-// Note there is no @ in front of test above.  This is so that the
-//  harness will not mistake this file as a test file.  It should
-//  only see the html file as a test file. (the harness runs all
-//  valid test files, so it would run this test twice if this file
-//  were valid as well as the html file.)
-// Also, note the area= after Your Name in the author tag.  Here, you
-//  should put which functional area the test falls in.  See the
-//  AWT-core home page -> test areas and/or -> AWT team  for a list of
-//  areas.
-// Note also the 'AutomaticAppletTest.html' in the run tag.  This should
-//  be changed to the name of the test.
+import java.awt.*;
 
-
-/**
- * NonEDT_GUI_Deadlock.java
- *
- * summary:
- */
-
-import java.applet.Applet;
-import java.awt.*;
-import java.awt.event.*;
-import java.net.*;
-import java.io.*;
-
-
-//Automated tests should run as applet tests if possible because they
-// get their environments cleaned up, including AWT threads, any
-// test created threads, and any system resources used by the test
-// such as file descriptors.  (This is normally not a problem as
-// main tests usually run in a separate VM, however on some platforms
-// such as the Mac, separate VMs are not possible and non-applet
-// tests will cause problems).  Also, you don't have to worry about
-// synchronisation stuff in Applet tests they way you do in main
-// tests...
-
-
-public class NonEDT_GUI_Deadlock extends Applet
-{
-    //Declare things used in the test, like buttons and labels here
+public class NonEDT_GUI_Deadlock {
     boolean bOK = false;
     Thread badThread = null;
 
-    public void init()
-    {
-    }//End  init()
-
     public void start ()
     {
-        //Get things going.  Request focus, set size, et cetera
-
-        setSize (200,300);
-        setVisible(true);
-        validate();
-
         final Frame theFrame = new Frame("Window test");
         theFrame.setSize(240, 200);
 
@@ -164,7 +116,6 @@
 
     public static void main(String args[]) {
        NonEDT_GUI_Deadlock imt = new NonEDT_GUI_Deadlock();
-       imt.init();
        imt.start();
     }
 
--- a/test/jdk/java/awt/FullScreen/SetFSWindow/FSFrame.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/FullScreen/SetFSWindow/FSFrame.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,12 +30,10 @@
  * on older Gnome versions (see bug 6500686).
  * @run main FSFrame
  * @run main/othervm -Dsun.java2d.noddraw=true FSFrame
- * @author cheth
  */
 
 import java.awt.*;
 import java.awt.image.*;
-import java.applet.*;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
--- a/test/jdk/java/awt/GridBagLayout/GridBagLayoutIpadXYTest/GridBagLayoutIpadXYTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-<html>
-<!--  
-
- Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
-
-  @test
-  @key headful
-  @bug 5004032
-  @summary GridBagConstraints.ipad(x|y) defined in a new way
-  @author dav@sparc.spb.su area= 
-  @run applet GridBagLayoutIpadXYTest.html
-  -->
-<head>
-<title>  </title>
-</head>
-<body>
-
-<h1>GridBagLayoutIpadXYTest<br>Bug ID: 5004032 </h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="GridBagLayoutIpadXYTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
-
--- a/test/jdk/java/awt/GridBagLayout/GridBagLayoutIpadXYTest/GridBagLayoutIpadXYTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/GridBagLayout/GridBagLayoutIpadXYTest/GridBagLayoutIpadXYTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -22,32 +22,22 @@
  */
 
 /*
-  test
+  @test
+  @key headful
   @bug 5004032
   @summary GridBagConstraints.ipad(x|y) defined in a new way
-  @author dav@sparc.spb.su area=
-  @run applet GridBagLayoutIpadXYTest.html
+  @run main GridBagLayoutIpadXYTest
 */
 
-import java.applet.Applet;
 import java.awt.*;
 
-public class GridBagLayoutIpadXYTest extends Applet
-{
-    Frame frame = new Frame();
-    TextField jtf = null;
-    final int customIpadx = 300;
-    final int customIpady = 40;
+public class GridBagLayoutIpadXYTest {
+    static Frame frame = new Frame();
+    static TextField jtf = null;
+    static final int customIpadx = 300;
+    static final int customIpady = 40;
 
-    public void init()
-    {
-        this.setLayout (new BorderLayout ());
-
-    }//End  init()
-
-    public void start ()
-    {
-        validate();
+    public static void main(final String[] args) {
         frame.setLayout(new GridBagLayout());
         GridBagConstraints gc = new GridBagConstraints();
         Insets fieldInsets = new Insets(0,5,5,0);
@@ -64,6 +54,7 @@
         frame.add(jtf, gc);
 
         frame.pack();
+        frame.setLocationRelativeTo(null);
         frame.setVisible(true);
 
         Robot robot;
@@ -86,6 +77,5 @@
             throw new RuntimeException("Test Failed. TextField has incorrect width. ");
         }
         System.out.println("Test Passed.");
-
-    }// start()
+    }
 }
--- a/test/jdk/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeForModalDialogTest/ConsumeForModalDialogTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-<!--
- Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--
-  @test
-  @key headful
-  @bug        6391688
-  @summary    Tests that next mnemonic KeyTyped is consumed for a modal dialog.
-  @author     anton.tarasov@sun.com: area=awt.focus
-  @run        applet ConsumeForModalDialogTest.html
-  -->
-<head>
-<title>ConsumeForModalDialogTest</title>
-</head>
-<body>
- 
-<h1>ConsumeForModalDialogTest<br>Bug ID: 6391688</h1>
- 
-<p>See the dialog box (usually in upper left corner) for instructions</p>
- 
-<APPLET CODE=ConsumeForModalDialogTest.class WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeForModalDialogTest/ConsumeForModalDialogTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeForModalDialogTest/ConsumeForModalDialogTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -20,22 +20,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 /*
-  test
-  @bug       6391688
-  @summary   Tests that next mnemonic KeyTyped is consumed for a modal dialog.
-  @author    anton.tarasov@sun.com: area=awt.focus
-  @run       applet ConsumeForModalDialogTest.html
+  @test
+  @key headful
+  @bug        6391688
+  @summary    Tests that next mnemonic KeyTyped is consumed for a modal dialog.
+  @run        main ConsumeForModalDialogTest
 */
 
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
-import java.applet.Applet;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.lang.reflect.InvocationTargetException;
 
-public class ConsumeForModalDialogTest extends Applet {
+public class ConsumeForModalDialogTest {
     Robot robot;
     JFrame frame = new JFrame("Test Frame");
     JDialog dialog = new JDialog((Window)null, "Test Dialog", Dialog.ModalityType.DOCUMENT_MODAL);
@@ -55,10 +53,6 @@
         } catch (AWTException e) {
             throw new RuntimeException("Error: unable to create robot", e);
         }
-        // Create instructions for the user here, as well as set up
-        // the environment -- set the layout manager, add buttons,
-        // etc.
-        this.setLayout (new BorderLayout ());
     }
 
     public void start() {
@@ -93,6 +87,7 @@
 
         frame.setJMenuBar(menuBar);
         frame.setSize(100, 100);
+        frame.setLocationRelativeTo(null);
         frame.setVisible(true);
 
         robot.waitForIdle();
--- a/test/jdk/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeNextMnemonicKeyTypedTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-<!--
- Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--
-  @test
-  @key headful
-  @bug        6346690
-  @summary    Tests that key_typed is consumed after mnemonic key_pressed is handled for a menu item.
-  @author     anton.tarasov@sun.com: area=awt-focus
-  @library    /test/lib
-  @build      jdk.test.lib.Platform
-  @run        applet ConsumeNextMnemonicKeyTypedTest.html
-  -->
-<head>
-<title>ConsumeNextMnemonicKeyTypedTest</title>
-</head>
-<body>
- 
-<h1>ConsumeNextMnemonicKeyTypedTest<br>Bug ID: 6346690</h1>
- 
-<p>See the dialog box (usually in upper left corner) for instructions</p>
- 
-<APPLET CODE=ConsumeNextMnemonicKeyTypedTest.class WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeNextMnemonicKeyTypedTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeNextMnemonicKeyTypedTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -22,13 +22,13 @@
  */
 
 /*
-  test
-  @bug       6346690
-  @summary   Tests that key_typed is consumed after mnemonic key_pressed is handled for a menu item.
-  @author    anton.tarasov@sun.com: area=awt-focus
-  @library   /test/lib
-  @build     jdk.test.lib.Platform
-  @run       applet ConsumeNextMnemonicKeyTypedTest.html
+  @test
+  @key headful
+  @bug        6346690
+  @summary    Tests that key_typed is consumed after mnemonic key_pressed is handled for a menu item.
+  @library    /test/lib
+  @build      jdk.test.lib.Platform
+  @run        main ConsumeNextMnemonicKeyTypedTest
 */
 
 import jdk.test.lib.Platform;
@@ -36,10 +36,8 @@
 import java.awt.*;
 import javax.swing.*;
 import java.awt.event.*;
-import java.applet.Applet;
 
-
-public class ConsumeNextMnemonicKeyTypedTest extends Applet {
+public class ConsumeNextMnemonicKeyTypedTest {
     Robot robot;
     JFrame frame = new JFrame("Test Frame");
     JTextField text = new JTextField();
@@ -60,10 +58,6 @@
         } catch (AWTException e) {
             throw new RuntimeException("Error: unable to create robot", e);
         }
-        // Create instructions for the user here, as well as set up
-        // the environment -- set the layout manager, add buttons,
-        // etc.
-        this.setLayout (new BorderLayout ());
     }
 
     public void start() {
@@ -76,7 +70,7 @@
         frame.setJMenuBar(bar);
         frame.pack();
 
-        frame.setLocation(800, 0);
+        frame.setLocationRelativeTo(null);
         frame.setVisible(true);
 
         test();
--- a/test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-<!--
- Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--
-  @test
-  @key headful
-  @bug        6396785
-  @summary    Action key pressed on a button should be swallowed.
-  @author     anton.tarasov@...: area=awt.focus
-  @library    ../../../regtesthelpers
-  @build      Util
-  @run        applet ButtonActionKeyTest.html
-  -->
-<head>
-<title>ButtonActionKeyTest</title>
-</head>
-<body>
- 
-<h1>ButtonActionKeyTest<br>Bug ID: 6396785</h1>
- 
-<p>See the dialog box (usually in upper left corner) for instructions</p>
- 
-<APPLET CODE=ButtonActionKeyTest.class WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -22,22 +22,22 @@
  */
 
 /*
-  test
-  @bug       6396785
-  @summary   Action key pressed on a button should be swallowed.
-  @author    anton.tarasov@...: area=awt.focus
-  @run       applet ButtonActionKeyTest.html
+  @test
+  @key headful
+  @bug        6396785
+  @summary    Action key pressed on a button should be swallowed.
+  @library    ../../../regtesthelpers
+  @build      Util
+  @run        main ButtonActionKeyTest
 */
 
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import java.applet.Applet;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.lang.reflect.InvocationTargetException;
 import test.java.awt.regtesthelpers.Util;
 
-public class ButtonActionKeyTest extends Applet {
+public class ButtonActionKeyTest {
     Robot robot;
     JFrame frame = new JFrame("Frame");
     JButton button = new JButton("button");
@@ -52,11 +52,6 @@
 
     public void init() {
         robot = Util.createRobot();
-
-        // Create instructions for the user here, as well as set up
-        // the environment -- set the layout manager, add buttons,
-        // etc.
-        this.setLayout (new BorderLayout ());
     }
 
     public void start() {
@@ -84,7 +79,7 @@
                     }
                 }
             });
-
+        frame.setLocationRelativeTo(null);
         frame.setVisible(true);
         Util.waitForIdle(robot);
 
--- a/test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-<!--
- Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--
-  @test
-  @key headful
-  @bug        6396785
-  @summary    MenuItem activated with space should swallow this space.
-  @author     anton.tarasov@...: area=awt.focus
-  @library    ../../../regtesthelpers
-  @build      Util
-  @run        applet MenuItemActivatedTest.html
-  -->
-<head>
-<title>MenuItemActivatedTest</title>
-</head>
-<body>
- 
-<h1>MenuItemActivatedTest<br>Bug ID: 6396785</h1>
- 
-<p>See the dialog box (usually in upper left corner) for instructions</p>
- 
-<APPLET CODE=MenuItemActivatedTest.class WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -22,22 +22,22 @@
  */
 
 /*
-  test
-  @bug       6396785
-  @summary   MenuItem activated with space should swallow this space.
-  @author    anton.tarasov@...: area=awt.focus
-  @run       applet MenuItemActivatedTest.html
+  @test
+  @key headful
+  @bug        6396785
+  @summary    MenuItem activated with space should swallow this space.
+  @library    ../../../regtesthelpers
+  @build      Util
+  @run        main MenuItemActivatedTest
 */
 
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import java.applet.Applet;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.lang.reflect.InvocationTargetException;
 import test.java.awt.regtesthelpers.Util;
 
-public class MenuItemActivatedTest extends Applet {
+public class MenuItemActivatedTest {
     Robot robot;
     JFrame frame = new JFrame("Test Frame");
     JDialog dialog = new JDialog((Window)null, "Test Dialog", Dialog.ModalityType.DOCUMENT_MODAL);
@@ -55,11 +55,6 @@
 
     public void init() {
         robot = Util.createRobot();
-
-        // Create instructions for the user here, as well as set up
-        // the environment -- set the layout manager, add buttons,
-        // etc.
-        this.setLayout (new BorderLayout ());
     }
 
     public void start() {
@@ -68,6 +63,7 @@
         bar.add(menu);
         frame.setJMenuBar(bar);
         frame.pack();
+        frame.setLocationRelativeTo(null);
 
         item.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent ae) {
--- a/test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-<!--
- Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug 4799136
-  @summary Tests that type-ahead for dialog works and doesn't block program
-  @author  area=awt.focus
-  @library    ../../regtesthelpers
-  @modules java.desktop/sun.awt
-  @build      Util        
-  @run applet TestDialogTypeAhead.html
-  -->
-<head>
-<title>  </title>
-</head>
-<body>
-
-<h1>TestDialogTypeAhead<br>Bug ID: 4799136 Tests that type-ahead for dialog works and doesn't block program   </h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="TestDialogTypeAhead.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
-
--- a/test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.java	Wed Feb 27 18:46:55 2019 -0800
@@ -22,51 +22,21 @@
  */
 
 /*
-test
-@bug 4799136
-@summary Tests that type-ahead for dialog works and doesn't block program
-@author  area=awt.focus
-@run applet TestDialogTypeAhead.html
+  @test
+  @key headful
+  @bug 4799136
+  @summary Tests that type-ahead for dialog works and doesn't block program
+  @library    ../../regtesthelpers
+  @modules java.desktop/sun.awt
+  @build      Util
+  @run main TestDialogTypeAhead
 */
 
-// Note there is no @ in front of test above.  This is so that the
-//  harness will not mistake this file as a test file.  It should
-//  only see the html file as a test file. (the harness runs all
-//  valid test files, so it would run this test twice if this file
-//  were valid as well as the html file.)
-// Also, note the area= after Your Name in the author tag.  Here, you
-//  should put which functional area the test falls in.  See the
-//  AWT-core home page -> test areas and/or -> AWT team  for a list of
-//  areas.
-// Note also the 'TestDialogTypeAhead.html' in the run tag.  This should
-//  be changed to the name of the test.
-
-
-/**
- * TestDialogTypeAhead.java
- *
- * summary:
- */
-
-import java.applet.Applet;
 import java.awt.*;
 import java.awt.event.*;
 import java.lang.reflect.InvocationTargetException;
-import test.java.awt.regtesthelpers.Util;
 
-//Automated tests should run as applet tests if possible because they
-// get their environments cleaned up, including AWT threads, any
-// test created threads, and any system resources used by the test
-// such as file descriptors.  (This is normally not a problem as
-// main tests usually run in a separate VM, however on some platforms
-// such as the Mac, separate VMs are not possible and non-applet
-// tests will cause problems).  Also, you don't have to worry about
-// synchronisation stuff in Applet tests they way you do in main
-// tests...
-
-
-public class TestDialogTypeAhead extends Applet
-{
+public class TestDialogTypeAhead {
     //Declare things used in the test, like buttons and labels here
     static Frame f;
     static Button b;
@@ -76,12 +46,15 @@
     static Semaphore robotSema = new Semaphore();
     static volatile boolean gotFocus = false;
     static Robot robot;
+
+    public static void main(final String[] args) {
+        TestDialogTypeAhead app = new TestDialogTypeAhead();
+        app.init();
+        app.start();
+    }
+
     public void init()
     {
-        //Create instructions for the user here, as well as set up
-        // the environment -- set the layout manager, add buttons,
-        // etc.
-
         Toolkit.getDefaultToolkit().addAWTEventListener(new AWTEventListener() {
                 public void eventDispatched(AWTEvent e) {
                     System.err.println(e.toString());
@@ -90,8 +63,6 @@
 
         KeyboardFocusManager.setCurrentKeyboardFocusManager(new TestKFM());
 
-        this.setLayout (new BorderLayout ());
-
         f = new Frame("frame");
         b = new Button("press");
         d = new Dialog(f, "dialog", true);
@@ -139,16 +110,12 @@
 
     public void start ()
     {
-        //Get things going.  Request focus, set size, et cetera
-        setSize (200,200);
-        setVisible(true);
-        validate();
         try {
             robot = new Robot();
         } catch (Exception e) {
             throw new RuntimeException("Can't create robot:" + e);
         }
-
+        f.setLocationRelativeTo(null);
         f.setVisible(true);
         waitTillShown(b);
         System.err.println("b is shown");
--- a/test/jdk/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-<html>
-<!--
-  Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- 
-  This code is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License version 2 only, as
-  published by the Free Software Foundation.
- 
-  This code is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-  version 2 for more details (a copy is included in the LICENSE file that
-  accompanied this code).
- 
-  You should have received a copy of the GNU General Public License version
-  2 along with this work; if not, write to the Free Software Foundation,
-  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- 
-  Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-  or visit www.oracle.com if you need additional information or have any
-  questions.
- -->
-<!--  
-  @test
-  @key headful
-  @bug 6299858
-  @summary PIT. Focused border not shown on List if selected item is removed, XToolkit
-  @author Dmitry.Cherepanov@SUN.COM area=awt.list
-  @library /test/lib
-  @build jdk.test.lib.Platform
-  @run applet FirstItemRemoveTest.html
-  -->
-<head>
-<title>  </title>
-</head>
-<body>
-
-<h1>FirstItemRemoveTest<br>Bug ID: 6299858 </h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="FirstItemRemoveTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
-
--- a/test/jdk/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -22,24 +22,31 @@
  */
 
 /*
-  test
-  @bug 6299858 7124338
+  @test
+  @key headful
+  @bug 6299858
   @summary PIT. Focused border not shown on List if selected item is removed, XToolkit
-  @author Dmitry.Cherepanov@SUN.COM area=awt.list
-  @run applet FirstItemRemoveTest.html
+  @library /test/lib
+  @build jdk.test.lib.Platform
+  @run main FirstItemRemoveTest
 */
 
 import jdk.test.lib.Platform;
 
-import java.applet.Applet;
 import java.awt.*;
 import java.awt.event.*;
 
-public class FirstItemRemoveTest extends Applet
+public class FirstItemRemoveTest extends Frame
 {
     List list = new List(4, false);
     Panel panel = new Panel();
 
+    public static void main(final String[] args) {
+        FirstItemRemoveTest app = new FirstItemRemoveTest();
+        app.init();
+        app.start();
+    }
+
     public void init()
     {
         list.add("000");
@@ -59,6 +66,8 @@
     public void start ()
     {
         setSize (200,200);
+        setUndecorated(true);
+        setLocationRelativeTo(null);
         setVisible(true);
         validate();
 
--- a/test/jdk/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-<!--
- Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- 
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
- 
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
- 
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- 
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-<html>
-<!--  
-  @test
-  @key headful
-  @bug 6387275
-  @summary List: the focus is at the top of the first item, XAWT
-  @author Dmitry.Cherepanov@SUN.COM area=awt.list
-  @requires (os.family == "linux" | os.family == "solaris")
-  @modules java.desktop/sun.awt
-           java.desktop/java.awt.peer
-           java.desktop/sun.awt.X11:open
-  @run applet FocusEmptyListTest.html
-  -->
-<head>
-<title> FocusEmptyListTest </title>
-</head>
-<body>
-
-<h1>FocusEmptyListTest<br>Bug ID: 6387275 </h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="FocusEmptyListTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
-
--- a/test/jdk/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,25 +22,29 @@
  */
 
 /*
-  test
+  @test
+  @key headful
   @bug 6387275
   @summary List: the focus is at the top of the first item, XAWT
-  @author Dmitry.Cherepanov@SUN.COM area=awt.list
-  @run applet FocusEmptyListTest.html
+  @requires (os.family == "linux" | os.family == "solaris")
+  @modules java.desktop/sun.awt
+           java.desktop/java.awt.peer
+           java.desktop/sun.awt.X11:open
+  @run main FocusEmptyListTest
 */
 
-import java.applet.Applet;
 import java.awt.*;
 import java.lang.reflect.*;
 import java.awt.peer.ListPeer;
 
 import sun.awt.AWTAccessor;
 
-public class FocusEmptyListTest extends Applet {
+public class FocusEmptyListTest extends Frame {
 
-    public void init() {
-        setLayout(new BorderLayout());
-    }//End  init()
+    public static void main(final String[] args) {
+        FocusEmptyListTest app = new FocusEmptyListTest();
+        app.start();
+    }
 
     public void start() {
         boolean isXToolkit = Toolkit.getDefaultToolkit()
@@ -61,6 +65,8 @@
         list.add("item1");
 
         setSize(200, 200);
+        setUndecorated(true);
+        setLocationRelativeTo(null);
         setVisible(true);
         validate();
 
--- a/test/jdk/java/awt/List/KeyEventsTest/KeyEventsTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-<!--
- Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug 6190768 6190778
-  @summary Tests that triggering events on AWT list by pressing CTRL + HOME, CTRL + END, PG-UP, PG-DOWN similar Motif behavior
-  @author Dmitry.Cherepanov@SUN.COM area=awt.list
-  @library /test/lib
-  @build jdk.test.lib.Platform
-  @run applet KeyEventsTest.html
-  -->
-<head>
-<title>  </title>
-</head>
-<body>
-
-<h1>KeyEventsTest<br>Bug ID: 6190768 6190778 </h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="KeyEventsTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
-
--- a/test/jdk/java/awt/List/KeyEventsTest/KeyEventsTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/List/KeyEventsTest/KeyEventsTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -22,30 +22,23 @@
  */
 
 /*
-  test
+  @test
+  @key headful
   @bug 6190768 6190778
-  @summary Tests that triggering events on AWT list by pressing CTRL + HOME, CTRL + END, PG-UP, PG-DOWN similar Motif behavior
-  @author Dmitry.Cherepanov@SUN.COM area=awt.list
+  @summary Tests that triggering events on AWT list by pressing CTRL + HOME,
+           CTRL + END, PG-UP, PG-DOWN similar Motif behavior
   @library /test/lib
   @build jdk.test.lib.Platform
-  @run applet KeyEventsTest.html
+  @run main KeyEventsTest
 */
 
-/**
- * KeyEventsTest.html
- *
- * summary:
- */
-
-import java.applet.Applet;
 import java.awt.*;
 import java.awt.event.*;
-import java.util.Set;
 import java.lang.reflect.*;
 
 import jdk.test.lib.Platform;
 
-public class KeyEventsTest extends Applet implements ItemListener, FocusListener, KeyListener
+public class KeyEventsTest extends Frame implements ItemListener, FocusListener, KeyListener
 {
     TestState currentState;
     final Object LOCK = new Object();
@@ -57,6 +50,12 @@
     Panel p1 = new Panel ();
     Panel p2 = new Panel ();
 
+    public static void main(final String[] args) {
+        KeyEventsTest app = new KeyEventsTest();
+        app.init();
+        app.start();
+    }
+
     public void init()
     {
         setLayout (new BorderLayout ());
@@ -100,11 +99,13 @@
 
         try{
             setSize (200,200);
+            validate();
+            setUndecorated(true);
+            setLocationRelativeTo(null);
             setVisible(true);
-            validate();
 
-            main(null);
-
+            doTest();
+            System.out.println("Test passed.");
         } catch (Exception e) {
             e.printStackTrace();
             throw new RuntimeException("The test failed.");
@@ -112,14 +113,6 @@
 
     }// start()
 
-    private void main(String[] args)
-      throws InterruptedException, InvocationTargetException {
-
-        doTest();
-
-        System.out.println("Test passed.");
-    }
-
     public void itemStateChanged (ItemEvent ie) {
         System.out.println("itemStateChanged-"+ie);
         this.currentState.setAction(true);
--- a/test/jdk/java/awt/Mouse/ExtraMouseClick/ExtraMouseClick.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-<!--
- Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug 5039416 6404008
-  @summary REGRESSION: Extra mouse click dispatched after press-drag- release sequence.
-  @library ../../regtesthelpers
-  @build Util
-  @author andrei.dmitriev area=awt.event
-  @run applet ExtraMouseClick.html
-  -->
-<head>
-<title>ExtraMouseClick </title>
-</head>
-<body>
-
-<h1>ExtraMouseClick<br>Bug ID: 5039416 </h1>
-
-<p> See the dialog box (usually in upper left corner) for instructions</p>
-
-<APPLET CODE="ExtraMouseClick.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/Mouse/ExtraMouseClick/ExtraMouseClick.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Mouse/ExtraMouseClick/ExtraMouseClick.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,18 +22,16 @@
  */
 
  /*
-  test
-  @bug 5039416 6404008 7087869
+  @test
+  @key headful
+  @bug 5039416 6404008
   @summary REGRESSION: Extra mouse click dispatched after press-drag- release sequence.
   @library ../../regtesthelpers
   @build Util
-  @author  andrei.dmitriev area=awt.event
-  @run applet ExtraMouseClick.html
+  @run main ExtraMouseClick
  */
 
-import java.applet.Applet;
 import java.awt.AWTException;
-import java.awt.BorderLayout;
 import java.awt.Frame;
 import java.awt.Point;
 import java.awt.Robot;
@@ -50,9 +48,7 @@
 // Note that this test may not fail easily. But it must always pass on
 // patched workspace.
 //**
-
-public class ExtraMouseClick extends Applet
-{
+public class ExtraMouseClick {
     Frame frame = new Frame("Extra Click After MouseDrag");
     final int TRIALS = 10;
     final int SMUDGE_WIDTH = 4;
@@ -64,10 +60,14 @@
     boolean pressed = false;
     boolean released = false;
 
+    public static void main(final String[] args) {
+        ExtraMouseClick app = new ExtraMouseClick();
+        app.init();
+        app.start();
+    }
+
     public void init()
     {
-        this.setLayout (new BorderLayout ());
-
         frame.addMouseListener(new MouseAdapter() {
                 public void mousePressed(MouseEvent e) {
                     System.out.println("MousePressed");
@@ -99,6 +99,7 @@
     public void start ()
     {
         frame.setSize(480, 300);
+        frame.setLocationRelativeTo(null);
         frame.setVisible(true);
         try{
             robot = new Robot();
--- a/test/jdk/java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-<!--
- Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug 4664415
-  @summary Test that double clicking the titlebar does not send RELEASE/CLICKED
-  @library    ../../regtesthelpers
-  @build      Util        
-  @author bchristi: area=Mouse 
-  @run applet TitleBarDoubleClick.html
-  -->
-<head>
-<title>  </title>
-</head>
-<body>
-
-<h1>TitleBarDoubleClick<br>Bug ID: 9999999 XXX_CHANGE_THIS </h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="TitleBarDoubleClick.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
-
--- a/test/jdk/java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,18 +22,20 @@
  */
 
 /*
-  test
+  @test
+  @key headful
   @bug 4664415
-  @summary REGRESSION: double click jframe titlebar generating mouse events in panel
-  @author Andrei Dmitriev: area=awt.mouse
-  @run applet TitleBarDoubleClick.html
+  @summary Test that double clicking the titlebar does not send RELEASE/CLICKED
+  @library    ../../regtesthelpers
+  @build      Util
+  @run main TitleBarDoubleClick
 */
-import java.applet.Applet;
+
 import java.awt.*;
 import java.awt.event.*;
 import test.java.awt.regtesthelpers.Util;
 
-public class TitleBarDoubleClick extends Applet implements MouseListener,
+public class TitleBarDoubleClick implements MouseListener,
  WindowListener
 {
     //Declare things used in the test, like buttons and labels here
@@ -43,24 +45,13 @@
     Frame frame;
     Robot robot;
 
-    public void init()
-    {
-        this.setLayout (new BorderLayout ());
-
-    }//End  init()
+    public static void main(final String[] args) {
+        TitleBarDoubleClick app = new TitleBarDoubleClick();
+        app.start();
+    }
 
     public void start ()
     {
-        //Get things going.  Request focus, set size, et cetera
-        setSize (200,200);
-        setVisible(true);
-        validate();
-
-        //What would normally go into main() will probably go here.
-        //Use System.out.println for diagnostic messages that you want
-        //to read after the test is done.
-        //Use Sysout.println for messages you want the tester to read.
-
             robot = Util.createRobot();
             robot.setAutoDelay(100);
             robot.mouseMove(BOUNDS.x + (BOUNDS.width / 2),
--- a/test/jdk/java/awt/Multiscreen/WindowGCChangeTest/WindowGCChangeTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-<!--
- Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug 4868278
-  @summary Tests that GraphicsConfig for invisible (peerless) windows is
-updated after showing the window
-  @author artem.ananiev, area=awt.multiscreen
-  @library ../../regtesthelpers
-  @build Util
-  @run applet WindowGCChangeTest.html
-  -->
-<head>
-<title> WindowGCChangeTest </title>
-</head>
-<body>
-
-<h1>WindowGCChangeTest<br>Bug ID: 4868278 Problem with Action button tooltips with some multiple monitor configurations </h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="WindowGCChangeTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
-
--- a/test/jdk/java/awt/Multiscreen/WindowGCChangeTest/WindowGCChangeTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Multiscreen/WindowGCChangeTest/WindowGCChangeTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,31 +22,24 @@
  */
 
 /*
-  test
+  @test
+  @key headful
   @bug 4868278
-  @summary Tests that GraphicsConfig for invisible (peerless) window is
-   updated after showing the window
-  @author artem.ananiev, area=awt.multiscreen
+  @summary Tests that GraphicsConfig for invisible (peerless) windows is
+           updated after showing the window
   @library ../../regtesthelpers
   @build Util
-  @run applet WindowGCChangeTest.html
+  @run main WindowGCChangeTest
 */
 
-import java.applet.Applet;
-
 import java.awt.*;
 import java.awt.event.*;
 
 import test.java.awt.regtesthelpers.Util;
 
-public class WindowGCChangeTest extends Applet
-{
-    public void init()
-    {
-    }
+public class WindowGCChangeTest {
 
-    public void start()
-    {
+    public static void main(final String[] args) {
         Robot robot = null;
         try
         {
@@ -57,10 +50,6 @@
             z.printStackTrace(System.err);
             throw new RuntimeException("Test FAILED: couldn't create Robot instance", z);
         }
-
-        setSize(200, 200);
-        setVisible(true);
-        validate();
         Util.waitForIdle(robot);
 
         GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
--- a/test/jdk/java/awt/Window/HandleWindowDestroyTest/HandleWindowDestroyTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<html>
-<!--  
-  @test
-  @key headful
-  @bug 6260648
-  @summary Tests that WINDOW_DESTROY event can be handled by overriding handleEvent(). Also,
-tests that handleEvent() is not called by AWT if any listener is added to the component
-(i. e. when post-1.1 events schema is used)
-  @author artem.ananiev: area=awt.event
-  @run applet HandleWindowDestroyTest.html
-  -->
-<head>
-<title>  </title>
-</head>
-<body>
-
-<h1>HandleWindowDestroyTest<br>Bug ID: 6260648</h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="HandleWindowDestroyTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
-
--- a/test/jdk/java/awt/Window/HandleWindowDestroyTest/HandleWindowDestroyTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/Window/HandleWindowDestroyTest/HandleWindowDestroyTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,30 +24,23 @@
  */
 
 /*
-  test
+  @test
+  @key headful
   @bug 6260648
   @summary Tests that WINDOW_DESTROY event can be handled by overriding handleEvent(). Also,
 tests that handleEvent() is not called by AWT if any listener is added to the component
 (i. e. when post-1.1 events schema is used)
-  @author artem.ananiev: area=awt.event
-  @run applet HandleWindowDestroyTest.html
+  @run main HandleWindowDestroyTest
 */
 
-import java.applet.*;
-
 import java.awt.*;
 import java.awt.event.*;
 
-public class HandleWindowDestroyTest extends Applet
-{
-    private volatile boolean handleEventCalled;
+public class HandleWindowDestroyTest {
 
-    public void start ()
-    {
-        setSize (200,200);
-        setVisible(true);
-        validate();
+    private static volatile boolean handleEventCalled;
 
+    public static void main(final String[] args) {
         Robot robot;
         try {
             robot = new Robot();
--- a/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-<!--
- Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug 5098433
-  @summary REG: DnD of File-List between JVM is broken for non ASCII file names - Win32
-  @author Denis Fokin: area=dnd
-  @library ../../regtesthelpers
-  @library ../../regtesthelpers/process
-  @build Util
-  @build ProcessResults ProcessCommunicator 
-  @run applet/othervm DragUnicodeBetweenJVMTest.html
-
--->
-<head>
-<title> REG: DnD of File-List between JVM is broken for non ASCII file names - Win32</title>
-</head>
-<body>
-
-<h1> DragUnicodeBetweenJVMTest <br>Bug ID: 5098433 </h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="DragUnicodeBetweenJVMTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,43 +22,26 @@
  */
 
 /*
-  test
+  @test
+  @key headful
   @bug 5098433
   @summary REG: DnD of File-List between JVM is broken for non ASCII file names - Win32
-  @author Denis Fokin: area=dnd
-  @library    ../../regtesthelpers
+  @library ../../regtesthelpers
   @library ../../regtesthelpers/process
   @build Util
   @build ProcessResults ProcessCommunicator
-
-
-  @run applet/othervm DragUnicodeBetweenJVMTest.html
+  @run main/othervm DragUnicodeBetweenJVMTest main
 */
 
-/**
- * DragUnicodeBetweenJVMTest.java
- *
- * summary: The test drags a list of files (DataFlavor.javaFileListFlavor) from one jvm to another.
- *          The files have Unicode names. The list on target side must be equal to
- *          the list on the source side.
- */
-
-
 import java.awt.*;
 import java.awt.event.*;
-import java.applet.Applet;
 
 import test.java.awt.regtesthelpers.process.ProcessCommunicator;
 import test.java.awt.regtesthelpers.process.ProcessResults;
 import test.java.awt.regtesthelpers.Util;
 import static java.lang.Thread.sleep;
 
-public class DragUnicodeBetweenJVMTest extends Applet
-{
-
-    public void init() {
-        setLayout(new BorderLayout());
-    }//End  init()
+public class DragUnicodeBetweenJVMTest {
 
     public void start() {
 
@@ -176,7 +159,11 @@
         }
     }
 
-    public static void main (String [] args) {
+    public static void main(final String [] args) {
+        if (args.length > 0 && args[0].equals("main")) {
+            new DragUnicodeBetweenJVMTest().start();
+            return;
+        }
         Point dragSourcePoint = new Point(InterprocessArguments.DRAG_SOURCE_POINT_X_ARGUMENT.extract(args),
                 InterprocessArguments.DRAG_SOURCE_POINT_Y_ARGUMENT.extract(args));
         Point targetFrameLocation = new Point(InterprocessArguments.TARGET_FRAME_X_POSITION_ARGUMENT.extract(args),
@@ -188,6 +175,4 @@
             e.printStackTrace();
         }
     }
-
-
 }
--- a/test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-<!--
- Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug 8005932 8017456
-  @summary Java 7 on mac os x only provides text clipboard formats
-  @author mikhail.cherkasov@oracle.com
-  @library ../../regtesthelpers
-  @library ../../regtesthelpers/process
-  @library /test/lib
-  @build Util
-  @build ProcessResults ProcessCommunicator
-  @build jdk.test.lib.Platform
-  @run applet/othervm MissedHtmlAndRtfBug.html
--->
-
-<head>
-    <title>Java 7 on mac os x only provides text clipboard formats</title>
-</head>
-<body>
-
-<h1> MissedHtmlAndRtfBug <br>Bug ID: 8005932 </h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="MissedHtmlAndRtfBug.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java	Wed Feb 27 18:46:55 2019 -0800
@@ -24,7 +24,6 @@
 import java.awt.*;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.event.*;
-import java.applet.Applet;
 import java.io.File;
 import java.util.ArrayList;
 
@@ -35,11 +34,20 @@
 
 import static java.lang.Thread.sleep;
 
-public class MissedHtmlAndRtfBug extends Applet {
-
-    public void init() {
-        setLayout(new BorderLayout());
-    }//End  init()
+/*
+    @test
+    @key headful
+    @bug 8005932 8017456
+    @summary Java 7 on mac os x only provides text clipboard formats
+    @library ../../regtesthelpers
+    @library ../../regtesthelpers/process
+    @library /test/lib
+    @build Util
+    @build ProcessResults ProcessCommunicator
+    @build jdk.test.lib.Platform
+    @run main/othervm MissedHtmlAndRtfBug main
+ */
+public class MissedHtmlAndRtfBug {
 
     public void start() {
         if (!Platform.isOSX() && !Platform.isWindows()) {
@@ -178,6 +186,11 @@
     }
 
     public static void main(String[] args) throws InterruptedException {
+        if (args.length > 0 && args[0].equals("main")) {
+            new MissedHtmlAndRtfBug().start();
+            return;
+        }
+
         Point dragSourcePoint = new Point(InterprocessArguments.DRAG_SOURCE_POINT_X_ARGUMENT.extractInt(args),
                 InterprocessArguments.DRAG_SOURCE_POINT_Y_ARGUMENT.extractInt(args));
         Point targetFrameLocation = new Point(InterprocessArguments.TARGET_FRAME_X_POSITION_ARGUMENT.extractInt(args),
--- a/test/jdk/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-<!--
- Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug 6887703
-  @summary Unsigned applet can retrieve the dragged information before drop action occurs
-  @author : area=dnd
-  @library ../../regtesthelpers
-  @library ../../regtesthelpers/process
-  @build Util
-  @build ProcessResults ProcessCommunicator 
-  @run applet/othervm DragInterceptorAppletTest.html
-
--->
-<head>
-<title> Unsigned applet can retrieve the dragged information before drop action occurs </title>
-</head>
-<body>
-
-<h1>DragInterceptorAppletTest<br>Bug ID: 6887703</h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="DragInterceptorAppletTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,33 +22,28 @@
  */
 
 /*
-  test
+  @test
+  @key headful
   @bug 6887703
   @summary Unsigned applet can retrieve the dragged information before drop action occurs
-  @author : area=dnd
-  @run applet DragInterceptorAppletTest.html
+  @library ../../regtesthelpers
+  @library ../../regtesthelpers/process
+  @build Util
+  @build ProcessResults ProcessCommunicator
+  @run main/othervm DragInterceptorAppletTest main
 */
 
-/**
- * DragInterceptorAppletTest.java
- *
- * summary: Unsigned applet can retrieve the dragged information before drop action occurs
- */
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.InputEvent;
+
+import test.java.awt.regtesthelpers.Util;
+import test.java.awt.regtesthelpers.process.ProcessCommunicator;
+import test.java.awt.regtesthelpers.process.ProcessResults;
 
 import static java.lang.Thread.sleep;
 
-import test.java.awt.regtesthelpers.process.ProcessCommunicator;
-import test.java.awt.regtesthelpers.process.ProcessResults;
-import test.java.awt.regtesthelpers.Util;
-import java.applet.Applet;
-import java.awt.*;
-import java.awt.event.InputEvent;
-
-public class DragInterceptorAppletTest extends Applet {
-
-    public void init() {
-        setLayout(new BorderLayout());
-    }//End  init()
+public class DragInterceptorAppletTest {
 
     public void start() {
 
@@ -138,7 +133,11 @@
         }
     }
 
-    public static void main (String [] args) {
+    public static void main(final String[] args) {
+        if (args.length > 0 && args[0].equals("main")) {
+            new DragInterceptorAppletTest().start();
+            return;
+        }
         Point dragSourcePoint = new Point(InterprocessArguments.DRAG_SOURCE_POINT_X_ARGUMENT.extract(args),
                 InterprocessArguments.DRAG_SOURCE_POINT_Y_ARGUMENT.extract(args));
         Point targetFrameLocation = new Point(InterprocessArguments.TARGET_FRAME_X_POSITION_ARGUMENT.extract(args),
--- a/test/jdk/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-<!--
- Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug 5079469
-  @summary DnD of File-List across JVM adds two empty items to the list
-  @author : area=dnd
-  @library ../../regtesthelpers
-  @library ../../regtesthelpers/process
-  @build Util
-  @build ProcessResults ProcessCommunicator 
-  @run applet/othervm FileListBetweenJVMsTest.html
-
--->
-<head>
-<title> DnD of File-List across JVM </title>
-</head>
-<body>
-
-<h1>FileListBetweenJVMsTest<br>Bug ID: 5079469</h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="FileListBetweenJVMsTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,39 +22,30 @@
  */
 
 /*
-  test
+  @test
+  @key headful
   @bug 5079469
   @summary DnD of File-List across JVM adds two empty items to the list
-  @author : area=dnd
-  @run applet FileListBetweenJVMsTest.html
+  @library ../../regtesthelpers
+  @library ../../regtesthelpers/process
+  @build Util
+  @build ProcessResults ProcessCommunicator
+  @run main/othervm FileListBetweenJVMsTest main
 */
 
-/**
- * FileListBetweenJVMsTest.java
- *
- * summary: DnD of File-List across JVM adds two empty items to the list
- */
-
 import static java.lang.Thread.sleep;
 
 import test.java.awt.regtesthelpers.process.ProcessCommunicator;
 import test.java.awt.regtesthelpers.process.ProcessResults;
 import test.java.awt.regtesthelpers.Util;
-import java.applet.Applet;
 import java.awt.*;
 import java.awt.event.InputEvent;
-import java.io.*;
 
-public class FileListBetweenJVMsTest extends Applet {
+public class FileListBetweenJVMsTest {
 
     // information related to the test in common
     static int VISIBLE_RAWS_IN_LIST=15;
 
-    public void init() {
-        setLayout(new BorderLayout());
-
-    }//End  init()
-
     public void start() {
 
         SourceFileListFrame sourceFrame = new SourceFileListFrame();
@@ -130,7 +121,11 @@
         }
     }
 
-    public static void main (String [] args) {
+    public static void main(final String [] args) {
+        if (args.length > 0 && args[0].equals("main")) {
+            new FileListBetweenJVMsTest().start();
+            return;
+        }
         Point dragSourcePoint = new Point(InterprocessArguments.DRAG_SOURCE_POINT_X_ARGUMENT.extract(args),
                 InterprocessArguments.DRAG_SOURCE_POINT_Y_ARGUMENT.extract(args));
         Point targetFrameLocation = new Point(InterprocessArguments.TARGET_FRAME_X_POSITION_ARGUMENT.extract(args),
--- a/test/jdk/java/awt/dnd/ImageDecoratedDnDInOut/ImageDecoratedDnDInOut.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-<!--
- Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--
-  @test %W% %E%
-  @key headful
-  @bug 4874070
-  @summary Tests basic DnD functionality
-  @author Your Name: Alexey Utkin area=dnd
-  @run applet ImageDecoratedDnDInOut.html
-  -->
-<head>
-    <title> ImageDecoratedDnDInOut </title>
-</head>
-<body>
-
-<h1>ImageDecoratedDnDInOut<br>Bug ID: 4874070</h1>
-
-<p> See the dialog box (usually in upper left corner) for instructions</p>
-
-<APPLET CODE="ImageDecoratedDnDInOut.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/dnd/ImageDecoratedDnDInOut/ImageDecoratedDnDInOut.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/dnd/ImageDecoratedDnDInOut/ImageDecoratedDnDInOut.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,56 +22,44 @@
  */
 
 /*
-  test %W% %E%
+  @test
+  @key headful
   @bug 4874070
   @summary Tests basic DnD functionality
-  @author Your Name: Alexey Utkin area=dnd
-  @run applet ImageDecoratedDnDInOut.html
+  @run main ImageDecoratedDnDInOut
 */
 
-import java.applet.Applet;
 import java.awt.*;
 import java.awt.Robot;
 import java.awt.event.InputEvent;
 import java.awt.dnd.DragSource;
 
+/*
+    "Automatic test.",
+    "A Frame, which contains a yellow button labeled \"Drag ME!\" and ",
+    "a red panel, will appear below. ",
+    "1. The button would be clicked and dragged to the red panel. ",
+    "2. When the mouse enters the red panel during the drag, the panel ",
+    "should turn yellow. On the systems that supports pictured drag, ",
+    "the image under the drag-cursor should appear (ancor is shifted ",
+    "from top-left corner of the picture inside the picture to 10pt in both dimensions ). ",
+    "In WIN32 systems the image under cursor would be visible ONLY over ",
+    "the drop targets with activated extended OLE D\'n\'D support (that are ",
+    "the desktop and IE ).",
+    "3. The mouse would be released.",
+    "The panel should turn red again and a yellow button labeled ",
+    "\"Drag ME!\" should appear inside the panel. "
+ */
+public class ImageDecoratedDnDInOut {
 
-public class ImageDecoratedDnDInOut extends Applet {
-    //Declare things used in the test, like buttons and labels here
-
-    public void init() {
-        //Create instructions for the user here, as well as set up
-        // the environment -- set the layout manager, add buttons,
-        // etc.
-        this.setLayout(new BorderLayout());
-
-        String[] instructions =
-                {
-                        "Automatic test.",
-                        "A Frame, which contains a yellow button labeled \"Drag ME!\" and ",
-                        "a red panel, will appear below. ",
-                        "1. The button would be clicked and dragged to the red panel. ",
-                        "2. When the mouse enters the red panel during the drag, the panel ",
-                        "should turn yellow. On the systems that supports pictured drag, ",
-                        "the image under the drag-cursor should appear (ancor is shifted ",
-                        "from top-left corner of the picture inside the picture to 10pt in both dimensions ). ",
-                        "In WIN32 systems the image under cursor would be visible ONLY over ",
-                        "the drop targets with activated extended OLE D\'n\'D support (that are ",
-                        "the desktop and IE ).",
-                        "3. The mouse would be released.",
-                        "The panel should turn red again and a yellow button labeled ",
-                        "\"Drag ME!\" should appear inside the panel. "
-                };
-        Sysout.createDialogWithInstructions(instructions);
-
-    }//End  init()
-
-    public void start() {
+    public static void main(final String[] args) {
         Frame f = new Frame("Use keyboard for DnD change");
         Panel mainPanel;
         Component dragSource, dropTarget;
 
-        f.setBounds(0, 400, 200, 200);
+        f.setSize(200, 200);
+        f.setUndecorated(true);
+        f.setLocationRelativeTo(null);
         f.setLayout(new BorderLayout());
 
         mainPanel = new Panel();
@@ -93,6 +81,7 @@
             sourcePoint.translate(d.width / 2, d.height / 2);
 
             Robot robot = new Robot();
+            robot.waitForIdle();
             robot.mouseMove(sourcePoint.x, sourcePoint.y);
             robot.mousePress(InputEvent.BUTTON1_MASK);
             Thread.sleep(2000);
@@ -121,112 +110,5 @@
             throw new RuntimeException("test failed: drop was not successful with exception " + e);
         }
 
-    }// start()
+    }
 }// class DnDAcceptanceTest
-
-
-/**
- * *************************************************
- * Standard Test Machinery
- * DO NOT modify anything below -- it's a standard
- * chunk of code whose purpose is to make user
- * interaction uniform, and thereby make it simpler
- * to read and understand someone else's test.
- * **************************************************
- */
-class Sysout {
-    private static TestDialog dialog;
-
-    public static void createDialogWithInstructions(String[] instructions) {
-        dialog = new TestDialog(new Frame(), "Instructions");
-        dialog.printInstructions(instructions);
-        dialog.show();
-        println("Any messages for the tester will display here.");
-    }
-
-    public static void createDialog() {
-        dialog = new TestDialog(new Frame(), "Instructions");
-        String[] defInstr = {"Instructions will appear here. ", ""};
-        dialog.printInstructions(defInstr);
-        dialog.show();
-        println("Any messages for the tester will display here.");
-    }
-
-
-    public static void printInstructions(String[] instructions) {
-        dialog.printInstructions(instructions);
-    }
-
-
-    public static void println(String messageIn) {
-        dialog.displayMessage(messageIn);
-    }
-
-}// Sysout  class
-
-
-class TestDialog extends Dialog {
-
-    TextArea instructionsText;
-    TextArea messageText;
-    int maxStringLength = 80;
-
-    //DO NOT call this directly, go through Sysout
-    public TestDialog(Frame frame, String name) {
-        super(frame, name);
-        int scrollBoth = TextArea.SCROLLBARS_BOTH;
-        instructionsText = new TextArea("", 15, maxStringLength, scrollBoth);
-        add("North", instructionsText);
-
-        messageText = new TextArea("", 5, maxStringLength, scrollBoth);
-        add("South", messageText);
-
-        pack();
-
-        show();
-    }// TestDialog()
-
-    //DO NOT call this directly, go through Sysout
-    public void printInstructions(String[] instructions) {
-        //Clear out any current instructions
-        instructionsText.setText("");
-
-        //Go down array of instruction strings
-
-        String printStr, remainingStr;
-        for (int i = 0; i < instructions.length; i++) {
-            //chop up each into pieces maxSringLength long
-            remainingStr = instructions[i];
-            while (remainingStr.length() > 0) {
-                //if longer than max then chop off first max chars to print
-                if (remainingStr.length() >= maxStringLength) {
-                    //Try to chop on a word boundary
-                    int posOfSpace = remainingStr.
-                            lastIndexOf(' ', maxStringLength - 1);
-
-                    if (posOfSpace <= 0) posOfSpace = maxStringLength - 1;
-
-                    printStr = remainingStr.substring(0, posOfSpace + 1);
-                    remainingStr = remainingStr.substring(posOfSpace + 1);
-                }
-                //else just print
-                else {
-                    printStr = remainingStr;
-                    remainingStr = "";
-                }
-
-                instructionsText.append(printStr + "\n");
-
-            }// while
-
-        }// for
-
-    }//printInstructions()
-
-    //DO NOT call this directly, go through Sysout
-    public void displayMessage(String messageIn) {
-        messageText.append(messageIn + "\n");
-    }
-
-}// TestDialog  class
-
--- a/test/jdk/java/awt/dnd/ImageDecoratedDnDNegative/ImageDecoratedDnDNegative.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-<!--
- Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--
-  @test %W% %E%
-  @key headful
-  @bug 4874070
-  @summary Tests basic DnD functionality
-  @author Your Name: Alexey Utkin area=dnd
-  @run applet ImageDecoratedDnDNegative.html
-  -->
-<head>
-    <title> ImageDecoratedDnDNegative </title>
-</head>
-<body>
-
-<h1>ImageDecoratedDnDInOut<br>Bug ID: 4874070</h1>
-
-<p> See the dialog box (usually in upper left corner) for the test description</p>
-
-<APPLET CODE="ImageDecoratedDnDNegative.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/dnd/ImageDecoratedDnDNegative/ImageDecoratedDnDNegative.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/dnd/ImageDecoratedDnDNegative/ImageDecoratedDnDNegative.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,14 +22,13 @@
  */
 
 /*
-  test %W% %E%
-  @bug 4874070 7146550
+  @test
+  @key headful
+  @bug 4874070
   @summary Tests basic DnD functionality
-  @author Your Name: Alexey Utkin area=dnd
-  @run applet ImageDecoratedDnDNegative.html
+  @run main ImageDecoratedDnDNegative
 */
 
-import java.applet.Applet;
 import java.awt.*;
 import java.awt.Robot;
 import java.awt.event.InputEvent;
@@ -39,39 +38,26 @@
 
 import java.awt.dnd.DragSource;
 
+/*
+    "Automatic test.",
+    "A Frame, which contains a yellow button labeled \"Drag ME!\" and ",
+    "a red panel, will appear below. ",
+    "1. The button would be clicked and dragged to the red panel. ",
+    "2. When the mouse enters the red panel during the drag, the panel ",
+    "should turn yellow. On the systems that supports pictured drag, ",
+    "the image under the drag-cursor should appear (ancor is shifted ",
+    "from top-left corner of the picture inside the picture to 10pt in both dimensions ). ",
+    "In WIN32 systems the image under cursor would be visible ONLY over ",
+    "the drop targets with activated extended OLE D\'n\'D support (that are ",
+    "the desktop and IE ).",
+    "3. The mouse would be released.",
+    "The panel should turn red again and a yellow button labeled ",
+    "\"Drag ME!\" should appear inside the panel. You should be able ",
+    "to repeat this operation multiple times."
+ */
+public class ImageDecoratedDnDNegative {
 
-public class ImageDecoratedDnDNegative extends Applet {
-    //Declare things used in the test, like buttons and labels here
-
-    public void init() {
-        //Create instructions for the user here, as well as set up
-        // the environment -- set the layout manager, add buttons,
-        // etc.
-        this.setLayout(new BorderLayout());
-
-        String[] instructions =
-                {
-                        "Automatic test.",
-                        "A Frame, which contains a yellow button labeled \"Drag ME!\" and ",
-                        "a red panel, will appear below. ",
-                        "1. The button would be clicked and dragged to the red panel. ",
-                        "2. When the mouse enters the red panel during the drag, the panel ",
-                        "should turn yellow. On the systems that supports pictured drag, ",
-                        "the image under the drag-cursor should appear (ancor is shifted ",
-                        "from top-left corner of the picture inside the picture to 10pt in both dimensions ). ",
-                        "In WIN32 systems the image under cursor would be visible ONLY over ",
-                        "the drop targets with activated extended OLE D\'n\'D support (that are ",
-                        "the desktop and IE ).",
-                        "3. The mouse would be released.",
-                        "The panel should turn red again and a yellow button labeled ",
-                        "\"Drag ME!\" should appear inside the panel. You should be able ",
-                        "to repeat this operation multiple times."
-                };
-        Sysout.createDialogWithInstructions(instructions);
-
-    }//End  init()
-
-    public void moveTo(
+    public static void moveTo(
         Robot r,
         Point b,
         Point e)
@@ -95,7 +81,7 @@
         r.delay(5);
     }
 
-    public void start() {
+    public static void main(final String[] args) {
         Frame f = new Frame("Use keyboard for DnD change");
         Panel mainPanel;
         Component dragSource, dropTarget;
@@ -114,7 +100,8 @@
         mainPanel.add(dragSource, "North");
         mainPanel.add(dropTarget, "Center");
         f.add(mainPanel, BorderLayout.CENTER);
-
+        f.setUndecorated(true);
+        f.setLocationRelativeTo(null);
         f.setVisible(true);
 
         Point sourcePoint = dragSource.getLocationOnScreen();
@@ -123,6 +110,7 @@
 
         try {
             Robot robot = new Robot();
+            robot.waitForIdle();
             robot.mouseMove(sourcePoint.x, sourcePoint.y);
             Point start = new Point(
                     sourcePoint.x,
@@ -155,112 +143,5 @@
             e.printStackTrace();
             throw new RuntimeException("test failed: drop was not successful with exception " + e);
         }
-    }// start()
+    }
 }// class DnDAcceptanceTest
-
-
-/**
- * *************************************************
- * Standard Test Machinery
- * DO NOT modify anything below -- it's a standard
- * chunk of code whose purpose is to make user
- * interaction uniform, and thereby make it simpler
- * to read and understand someone else's test.
- * **************************************************
- */
-class Sysout {
-    private static TestDialog dialog;
-
-    public static void createDialogWithInstructions(String[] instructions) {
-        dialog = new TestDialog(new Frame(), "Instructions");
-        dialog.printInstructions(instructions);
-        dialog.show();
-        println("Any messages for the tester will display here.");
-    }
-
-    public static void createDialog() {
-        dialog = new TestDialog(new Frame(), "Instructions");
-        String[] defInstr = {"Instructions will appear here. ", ""};
-        dialog.printInstructions(defInstr);
-        dialog.show();
-        println("Any messages for the tester will display here.");
-    }
-
-
-    public static void printInstructions(String[] instructions) {
-        dialog.printInstructions(instructions);
-    }
-
-
-    public static void println(String messageIn) {
-        dialog.displayMessage(messageIn);
-    }
-
-}// Sysout  class
-
-
-class TestDialog extends Dialog {
-
-    TextArea instructionsText;
-    TextArea messageText;
-    int maxStringLength = 80;
-
-    //DO NOT call this directly, go through Sysout
-    public TestDialog(Frame frame, String name) {
-        super(frame, name);
-        int scrollBoth = TextArea.SCROLLBARS_BOTH;
-        instructionsText = new TextArea("", 15, maxStringLength, scrollBoth);
-        add("North", instructionsText);
-
-        messageText = new TextArea("", 5, maxStringLength, scrollBoth);
-        add("South", messageText);
-
-        pack();
-
-        show();
-    }// TestDialog()
-
-    //DO NOT call this directly, go through Sysout
-    public void printInstructions(String[] instructions) {
-        //Clear out any current instructions
-        instructionsText.setText("");
-
-        //Go down array of instruction strings
-
-        String printStr, remainingStr;
-        for (int i = 0; i < instructions.length; i++) {
-            //chop up each into pieces maxSringLength long
-            remainingStr = instructions[i];
-            while (remainingStr.length() > 0) {
-                //if longer than max then chop off first max chars to print
-                if (remainingStr.length() >= maxStringLength) {
-                    //Try to chop on a word boundary
-                    int posOfSpace = remainingStr.
-                            lastIndexOf(' ', maxStringLength - 1);
-
-                    if (posOfSpace <= 0) posOfSpace = maxStringLength - 1;
-
-                    printStr = remainingStr.substring(0, posOfSpace + 1);
-                    remainingStr = remainingStr.substring(posOfSpace + 1);
-                }
-                //else just print
-                else {
-                    printStr = remainingStr;
-                    remainingStr = "";
-                }
-
-                instructionsText.append(printStr + "\n");
-
-            }// while
-
-        }// for
-
-    }//printInstructions()
-
-    //DO NOT call this directly, go through Sysout
-    public void displayMessage(String messageIn) {
-        messageText.append(messageIn + "\n");
-    }
-
-}// TestDialog  class
-
--- a/test/jdk/java/awt/dnd/InterJVMGetDropSuccessTest/InterJVMGetDropSuccessTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-<!--
- Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug 4658741
-  @summary verifies that getDropSuccess() returns correct value for inter-JVM DnD
-  @author das@sparc.spb.su area=dnd
-  @run applet InterJVMGetDropSuccessTest.html
-  -->
-<head>
-<title>  </title>
-</head>
-<body>
-
-<h1>InterJVMGetDropSuccessTest<br>Bug ID: 4658741</h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="InterJVMGetDropSuccessTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/dnd/InterJVMGetDropSuccessTest/InterJVMGetDropSuccessTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/dnd/InterJVMGetDropSuccessTest/InterJVMGetDropSuccessTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -22,53 +22,20 @@
  */
 
 /*
-  test
+  @test
+  @key headful
   @bug 4658741
   @summary verifies that getDropSuccess() returns correct value for inter-JVM DnD
-  @author das@sparc.spb.su area=dnd
-  @run applet InterJVMGetDropSuccessTest.html
+  @run main InterJVMGetDropSuccessTest
 */
 
-// Note there is no @ in front of test above.  This is so that the
-//  harness will not mistake this file as a test file.  It should
-//  only see the html file as a test file. (the harness runs all
-//  valid test files, so it would run this test twice if this file
-//  were valid as well as the html file.)
-// Also, note the area= after Your Name in the author tag.  Here, you
-//  should put which functional area the test falls in.  See the
-//  AWT-core home page -> test areas and/or -> AWT team  for a list of
-//  areas.
-// Note also the 'InterJVMGetDropSuccessTest.html' in the run tag.  This should
-//  be changed to the name of the test.
-
-
-/**
- * InterJVMGetDropSuccessTest.java
- *
- * summary: verifies that getDropSuccess() returns correct value for inter-JVM DnD
- */
-
-import java.applet.Applet;
 import java.awt.*;
 import java.awt.datatransfer.*;
 import java.awt.dnd.*;
 import java.awt.event.*;
 import java.io.*;
-import javax.swing.*;
 
-
-//Automated tests should run as applet tests if possible because they
-// get their environments cleaned up, including AWT threads, any
-// test created threads, and any system resources used by the test
-// such as file descriptors.  (This is normally not a problem as
-// main tests usually run in a separate VM, however on some platforms
-// such as the Mac, separate VMs are not possible and non-applet
-// tests will cause problems).  Also, you don't have to worry about
-// synchronisation stuff in Applet tests they way you do in main
-// tests...
-
-
-public class InterJVMGetDropSuccessTest extends Applet {
+public class InterJVMGetDropSuccessTest {
 
     private int returnCode = Util.CODE_NOT_RETURNED;
     private boolean successCodes[] = { true, false };
@@ -85,6 +52,12 @@
         };
     final DropTarget dropTarget = new DropTarget(frame, dropTargetListener);
 
+    public static void main(final String[] args) {
+        InterJVMGetDropSuccessTest app = new InterJVMGetDropSuccessTest();
+        app.init();
+        app.start();
+    }
+
     public void init() {
         frame.setTitle("Test frame");
         frame.setBounds(100, 100, 150, 150);
--- a/test/jdk/java/awt/dnd/NoFormatsCrashTest/NoFormatsCrashTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-<!--
- Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug 4870762
-  @summary tests that a drop target JVM doesn't crash if the source doesn't export 
-           data in native formats.
-  @author das@sparc.spb.su area=dnd
-  @run applet NoFormatsCrashTest.html
-  -->
-<head>
-<title>  </title>
-</head>
-<body>
-
-<h1>NoFormatsCrashTest<br>Bug ID: 4870762</h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="NoFormatsCrashTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
-
--- a/test/jdk/java/awt/dnd/NoFormatsCrashTest/NoFormatsCrashTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/dnd/NoFormatsCrashTest/NoFormatsCrashTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -22,55 +22,21 @@
  */
 
 /*
-  test
+  @test
+  @key headful
   @bug 4870762
   @summary tests that a drop target JVM doesn't crash if the source doesn't export
            data in native formats.
-  @author das@sparc.spb.su area=dnd
-  @compile NoFormatsCrashTest.java
-  @run applet NoFormatsCrashTest.html
+  @run main NoFormatsCrashTest main
 */
 
-// Note there is no @ in front of test above.  This is so that the
-//  harness will not mistake this file as a test file.  It should
-//  only see the html file as a test file. (the harness runs all
-//  valid test files, so it would run this test twice if this file
-//  were valid as well as the html file.)
-// Also, note the area= after Your Name in the author tag.  Here, you
-//  should put which functional area the test falls in.  See the
-//  AWT-core home page -> test areas and/or -> AWT team  for a list of
-//  areas.
-// Note also the 'NoFormatsCrashTest.html' in the run tag.  This should
-//  be changed to the name of the test.
-
-
-/**
- * NoFormatsCrashTest.java
- *
- * summary: tests that a drop target JVM doesn't crash if the source doesn't export
- *          data in native formats.
- */
-
-import java.applet.Applet;
 import java.awt.*;
 import java.awt.datatransfer.*;
 import java.awt.dnd.*;
 import java.awt.event.*;
 import java.io.*;
 
-
-//Automated tests should run as applet tests if possible because they
-// get their environments cleaned up, including AWT threads, any
-// test created threads, and any system resources used by the test
-// such as file descriptors.  (This is normally not a problem as
-// main tests usually run in a separate VM, however on some platforms
-// such as the Mac, separate VMs are not possible and non-applet
-// tests will cause problems).  Also, you don't have to worry about
-// synchronisation stuff in Applet tests they way you do in main
-// tests...
-
-
-public class NoFormatsCrashTest extends Applet {
+public class NoFormatsCrashTest {
 
     final Frame frame = new Frame();
     private volatile Process process;
@@ -78,6 +44,13 @@
     static final int FRAME_ACTIVATION_TIMEOUT = 2000;
 
     public static void main(String[] args) {
+        if (args.length > 0 && args[0].equals("main")) {
+            NoFormatsCrashTest test = new NoFormatsCrashTest();
+            test.init();
+            test.start();
+            return;
+        }
+
         NoFormatsCrashTest test = new NoFormatsCrashTest();
         test.run(args);
     }
--- a/test/jdk/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-<!--
- Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug 4899516
-  @summary Transferable has no DataFlavors when dragging from Gnome window to Swing
-  @author : area=dnd
-  @library ../../regtesthelpers
-  @library ../../regtesthelpers/process
-  @build Util
-  @build ProcessResults ProcessCommunicator 
-  @run applet/othervm URIListBetweenJVMsTest.html
-
--->
-<head>
-<title> DnD of URI-List across JVM </title>
-</head>
-<body>
-
-<h1>URIListBetweenJVMsTest<br>Bug ID: 4899516</h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="URIListBetweenJVMsTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,39 +22,30 @@
  */
 
 /*
-  test
+  @test
+  @key headful
   @bug 4899516
   @summary Transferable has no DataFlavors when dragging from Gnome window to Swing
-  @author : area=dnd
-  @run applet URIListBetweenJVMsTest.html
+  @library ../../regtesthelpers
+  @library ../../regtesthelpers/process
+  @build Util
+  @build ProcessResults ProcessCommunicator
+  @run main/othervm URIListBetweenJVMsTest main
 */
 
-/**
- * URIListBetweenJVMsTest.java
- *
- * summary: Transferable has no DataFlavors when dragging from Gnome window to Swing
- */
-
 import static java.lang.Thread.sleep;
 
 import test.java.awt.regtesthelpers.process.ProcessCommunicator;
 import test.java.awt.regtesthelpers.process.ProcessResults;
 import test.java.awt.regtesthelpers.Util;
-import java.applet.Applet;
 import java.awt.*;
 import java.awt.event.InputEvent;
-import java.io.*;
 
-public class URIListBetweenJVMsTest extends Applet {
+public class URIListBetweenJVMsTest {
 
     // information related to the test in common
     static int VISIBLE_RAWS_IN_LIST=15;
 
-    public void init() {
-        setLayout(new BorderLayout());
-
-    }//End  init()
-
     public void start() {
 
     String toolkit = Toolkit.getDefaultToolkit().getClass().getName();
@@ -140,6 +131,10 @@
     }
 
     public static void main (String [] args) {
+        if (args.length > 0 && args[0].equals("main")) {
+            new URIListBetweenJVMsTest().start();
+            return;
+        }
         Point dragSourcePoint = new Point(InterprocessArguments.DRAG_SOURCE_POINT_X_ARGUMENT.extract(args),
                 InterprocessArguments.DRAG_SOURCE_POINT_Y_ARGUMENT.extract(args));
         Point targetFrameLocation = new Point(InterprocessArguments.TARGET_FRAME_X_POSITION_ARGUMENT.extract(args),
--- a/test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-<!--
- Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug 8029565
-  @summary Conversion of a URI list to File list fails
-  @author Petr Pchelko <petr.pchelko@oracle.com>
-  @library ../../regtesthelpers
-  @library ../../regtesthelpers/process
-  @build Util
-  @build ProcessResults ProcessCommunicator
-  @run applet/othervm URIListToFileListBetweenJVMsTest.html
-
--->
-<head>
-<title> DnD of File-List across JVM </title>
-</head>
-<body>
-
-<h1>URIListToFileListBetweenJVMsTest<br>Bug ID: 5079469</h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="URIListToFileListBetweenJVMsTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,42 +22,31 @@
  */
 
 /*
-  test
+  @test
+  @key headful
   @bug 8029565
   @summary Conversion of a URI list to File list fails
-  @author Petr Pchelko <petr.pchelko@oracle.com>
   @library ../../regtesthelpers
   @library ../../regtesthelpers/process
   @build Util
   @build ProcessResults ProcessCommunicator
-  @run applet/othervm URIListToFileListBetweenJVMsTest.html
- */
-
-/**
- * URIListToFileListBetweenJVMsTest.java
- *
- * summary: DnD of File-List across JVM adds two empty items to the list
+  @run main/othervm URIListToFileListBetweenJVMsTest main
  */
 
 import test.java.awt.regtesthelpers.Util;
 import test.java.awt.regtesthelpers.process.ProcessCommunicator;
 import test.java.awt.regtesthelpers.process.ProcessResults;
 
-import java.applet.Applet;
 import java.awt.*;
 import java.awt.event.InputEvent;
 
 import static java.lang.Thread.sleep;
 
-public class URIListToFileListBetweenJVMsTest extends Applet {
+public class URIListToFileListBetweenJVMsTest {
 
     // information related to the test in common
     static int VISIBLE_RAWS_IN_LIST=15;
 
-    public void init() {
-        setLayout(new BorderLayout());
-    }
-
     public void start() {
 
         SourceFileListFrame sourceFrame = new SourceFileListFrame();
@@ -127,7 +116,11 @@
         }
     }
 
-    public static void main (String [] args) throws Exception {
+    public static void main(final String [] args) throws Exception {
+        if (args.length > 0 && args[0].equals("main")) {
+            new URIListToFileListBetweenJVMsTest().start();
+            return;
+        }
         Point dragSourcePoint = new Point(InterprocessArguments.DRAG_SOURCE_POINT_X_ARGUMENT.extract(args),
                 InterprocessArguments.DRAG_SOURCE_POINT_Y_ARGUMENT.extract(args));
         Point targetFrameLocation = new Point(InterprocessArguments.TARGET_FRAME_X_POSITION_ARGUMENT.extract(args),
--- a/test/jdk/java/awt/event/ComponentEvent/MovedResizedTardyEventTest/MovedResizedTardyEventTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-<!--
- Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug          4985250
-  @summary      COMPONENT_MOVED/RESIZED tardy events shouldn't be generated.
-  @author       tav@sparc.spb.su
-  @modules java.desktop/sun.awt
-  @run applet MovedResizedTardyEventTest.html
-  -->
-<head>
-<title>MovedResizedTardyEventTest</title>
-</head>
-<body>
-
-<h1>MovedResizedTardyEventTest<br>Bug ID: 4985250</h1>
-
-<p> See the dialog box (usually in upper left corner) for instructions</p>
-
-<APPLET CODE="MovedResizedTardyEventTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/event/ComponentEvent/MovedResizedTardyEventTest/MovedResizedTardyEventTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/event/ComponentEvent/MovedResizedTardyEventTest/MovedResizedTardyEventTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -22,26 +22,26 @@
  */
 
 /*
-  test
-  @bug      4985250
-  @summary  COMPONENT_MOVED/RESIZED tardy events shouldn't be generated.
-  @author   tav@sparc.spb.su
-  @run applet MovedResizedTardyEventTest.html
+  @test
+  @key headful
+  @bug          4985250
+  @summary      COMPONENT_MOVED/RESIZED tardy events shouldn't be generated.
+  @modules java.desktop/sun.awt
+  @run main MovedResizedTardyEventTest
 */
 
 import java.awt.*;
 import java.awt.event.*;
-import java.applet.Applet;
 import java.lang.reflect.InvocationTargetException;
 
-public class MovedResizedTardyEventTest extends Applet {
+public class MovedResizedTardyEventTest {
     Frame f1 = new Frame("F-1");
     Frame f2 = new Frame("F-2");
 
     boolean eventFlag = false;
 
     public static void main(String[] args) {
-        Applet a = new MovedResizedTardyEventTest();
+        MovedResizedTardyEventTest a = new MovedResizedTardyEventTest();
         a.start();
     }
 
--- a/test/jdk/java/awt/event/KeyEvent/KeyTyped/CtrlASCII.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-<!--
- Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug  6497426
-  @summary ests that pressing of Ctrl+ascii mostly fires KEY_TYPED with a Unicode control symbols
-  @author yuri.nesterenko@... area=awt.keyboard
-  @run applet CtrlASCII.html
-  -->
-<head>
-<title> CtrlASCII </title>
-</head>
-<body>
-
-<h1>CtrlASCII<br>Bug ID: 6497426</h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="CtrlASCII.class" WIDTH=400 HEIGHT=300></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/event/KeyEvent/KeyTyped/CtrlASCII.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/event/KeyEvent/KeyTyped/CtrlASCII.java	Wed Feb 27 18:46:55 2019 -0800
@@ -22,38 +22,17 @@
  */
 
 /*
- * test
- * @bug 6497426
- * @summary Tests that pressing of Ctrl+ascii mostly fires KEY_TYPED with a Unicode control symbols
- * @author Yuri.Nesterenko@... area=awt.keyboard
- * @run applet CtrlASCII.html
+  @test
+  @key headful
+  @bug  6497426
+  @summary ests that pressing of Ctrl+ascii mostly fires KEY_TYPED with a Unicode control symbols
+  @run main CtrlASCII
  */
 
-// Note there is no @ in front of test above.  This is so that the
-//  harness will not mistake this file as a test file.  It should
-//  only see the html file as a test file. (the harness runs all
-//  valid test files, so it would run this test twice if this file
-//  were valid as well as the html file.)
-// Also, note the area= after Your Name in the author tag.  Here, you
-//  should put which functional area the test falls in.  See the
-//  AWT-core home page -> test areas and/or -> AWT team  for a list of
-//  areas.
-// Note also the 'RobotLWTest.html' in the run tag.  This should
-//  be changed to the name of the test.
-
-
-/**
- * CtrlASCII.java
- *
- * @summary Tests that pressing of Ctrl+ascii mostly fires KEY_TYPED with a Unicode control symbols
- */
-
-import java.applet.Applet;
 import java.awt.*;
 import java.awt.event.*;
 import java.util.*;
 
-
 //
 // In this test, a key listener for KEY_TYPED checks if a character typed has
 // a correspondent keycode in an initially filled hashtable.
@@ -63,8 +42,7 @@
 // produce a unicode character, so there will be no KEY_TYPED and no problem.
 // Test doesn't try to verify Ctrl+deadkey behavior.
 //
-
-public class CtrlASCII extends Applet implements KeyListener
+public class CtrlASCII extends Frame implements KeyListener
 {
     // Declare things used in the test, like buttons and labels here
     static Hashtable<Character, Integer> keycharHash = new Hashtable<Character, Integer>();
@@ -194,6 +172,7 @@
     public void start ()
     {
         setSize(400,300);
+        setLocationRelativeTo(null);
         setVisible(true);
 
         String original = "0123456789";
--- a/test/jdk/java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-<!--
- Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug 4992908
-  @summary Need way to get location of MouseEvent in screen  coordinates (Unit-test)
-  @author Andrei.Dmitriev area=event
-  @library ../../../regtesthelpers
-  @build Util
-  @run applet FrameMouseEventAbsoluteCoordsTest.html
-  -->
-<head>
-<title>  </title>
-</head>
-<body>
-
-<h1>FrameMouseEventAbsoluteCoordsTest<br>Bug ID: 4992908 </h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="FrameMouseEventAbsoluteCoordsTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
-
--- a/test/jdk/java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,14 +22,15 @@
  */
 
 /*
-  test
+  @test
+  @key headful
   @bug 4992908
   @summary Need way to get location of MouseEvent in screen  coordinates (Unit-test)
-  @author Andrei.Dmitriev area=event
-  @run applet FrameMouseEventAbsoluteCoordsTest.html
+  @library ../../../regtesthelpers
+  @build Util
+  @run main FrameMouseEventAbsoluteCoordsTest
 */
 
-import java.applet.Applet;
 import java.awt.*;
 import java.awt.event.*;
 import test.java.awt.regtesthelpers.Util;
@@ -39,7 +40,7 @@
 // Click on this frame.
 // verify that our MouseEvent contain correct xAbs, yAbs values
 
-public class FrameMouseEventAbsoluteCoordsTest extends Applet implements MouseListener
+public class FrameMouseEventAbsoluteCoordsTest implements MouseListener
 {
     Robot robot;
     Frame frame = new Frame("MouseEvent Test Frame II");
@@ -47,20 +48,23 @@
     Point mousePositionAbsolute;
     Point mousePosition;
 
+    public static void main(final String[] args) {
+        FrameMouseEventAbsoluteCoordsTest app = new FrameMouseEventAbsoluteCoordsTest();
+        app.init();
+        app.start();
+    }
+
     public void init()
     {
-
-        this.setLayout (new BorderLayout ());
         button.addMouseListener(this);
         frame.add(button);
         frame.pack();
+        frame.setLocationRelativeTo(null);
     }//End  init()
 
     public void start ()
     {
-        setSize (200,200);
         frame.setVisible(true);
-        validate();
         Util.waitForIdle(robot);
 
         try {
--- a/test/jdk/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-<!--
- Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug 4992908
-  @summary Need way to get location of MouseEvent in screen coordinates
-  @author Andrei.Dmitriev area=event
-  @library ../../../regtesthelpers
-  @build Util
-  @run applet MenuDragMouseEventAbsoluteCoordsTest.html
-  -->
-<head>
-<title>  </title>
-</head>
-<body>
-
-<h1>MenuDragMouseEventAbsoluteCoordsTest<br>Bug ID: 4992908 </h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="MenuDragMouseEventAbsoluteCoordsTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
-
--- a/test/jdk/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -22,19 +22,18 @@
  */
 
 /*
-  test
+  @test
+  @key headful
   @bug 4992908
   @summary Need way to get location of MouseEvent in screen coordinates
-  @author Andrei.Dmitriev area=event
-  @run applet MenuDragMouseEventAbsoluteCoordsTest.html
+  @library ../../../regtesthelpers
+  @build Util
+  @run main MenuDragMouseEventAbsoluteCoordsTest
 */
 
-import java.applet.Applet;
 import java.awt.*;
 import javax.swing.event.*;
 import java.awt.event.*;
-import javax.swing.MenuSelectionManager;
-import javax.swing.MenuElement;
 import test.java.awt.regtesthelpers.Util;
 
 // The test consits of several parts:
@@ -44,12 +43,19 @@
 // getLocationOnScreen(),  get(X|Y), getPoint() .
 
 
-public class MenuDragMouseEventAbsoluteCoordsTest extends Applet implements MouseListener
+public class MenuDragMouseEventAbsoluteCoordsTest implements MouseListener
 {
     Frame frame = new Frame("MenuDragMouseEvent Test Frame");
 
     Point mousePositionOnScreen = new Point(200, 200);
     Point mousePosition = new Point(100, 100);
+
+    public static void main(String[] args) {
+        MenuDragMouseEventAbsoluteCoordsTest app = new MenuDragMouseEventAbsoluteCoordsTest();
+        app.init();
+        app.start();
+    }
+
     public void init()
     {
         frame.addMouseListener(this);
@@ -60,7 +66,6 @@
         //Get things going.  Request focus, set size, et cetera
         frame.setSize (200,200);
         frame.setVisible(true);
-        validate();
 
         try {
             Util.waitForIdle(new Robot());
--- a/test/jdk/java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-<!--
- Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug 6267983
-  @summary PIT: MouseClicked is triggered when the mouse is released outside the tray icon, Win32
-  @author dmitry.cherepanov@... area=awt.event
-  @library    ../../../regtesthelpers
-  @build      Util
-  @run applet MouseClickTest.html
-  -->
-<head>
-<title>  </title>
-</head>
-<body>
-
-<h1>MouseClickTest<br>Bug ID: 6267983</h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="MouseClickTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
-
--- a/test/jdk/java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -22,42 +22,33 @@
  */
 
 /*
-  test
+  @test
+  @key headful
   @bug 6267983
   @summary PIT: MouseClicked is triggered when the mouse is released outside the tray icon, Win32
-  @author dmitry.cherepanov@... area=awt.event
-  @run applet MouseClickTest.html
+  @library    ../../../regtesthelpers
+  @build      Util
+  @run main MouseClickTest
 */
 
-import java.applet.Applet;
 import java.awt.*;
 import java.awt.event.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import test.java.awt.regtesthelpers.Util;
 
-public class MouseClickTest extends Applet
+public class MouseClickTest
 {
     private static final int TIMEOUT = 3000;
 
-    public void init()
-    {
-        setLayout (new BorderLayout ());
-    }
-
     public void start ()
     {
-        setSize (200,200);
-        setVisible(true);
-        validate();
-
         runTests();
     }
 
     public static final void main(String args[])
     {
         MouseClickTest test = new MouseClickTest();
-        test.init();
         test.start();
     }
 
--- a/test/jdk/java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-<!--
- Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug 4992908
-  @summary Need way to get location of MouseEvent in screen coordinates
-  @author Andrei.Dmitriev area=event 
-  @library ../../../regtesthelpers
-  @build Util
-  @run applet MouseWheelEventAbsoluteCoordsTest.html
-  -->
-<head>
-<title>  </title>
-</head>
-<body>
-
-<h1>MouseWheelEventAbsoluteCoordsTest<br>Bug ID: 4992908  </h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="MouseWheelEventAbsoluteCoordsTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
-
--- a/test/jdk/java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,14 +22,15 @@
  */
 
 /*
-  test
+  @test
+  @key headful
   @bug 4992908
   @summary Need way to get location of MouseEvent in screen coordinates
-  @author Andrei.Dmitriev area=event
-  @run applet MouseWheelEventAbsoluteCoordsTest.html
+  @library ../../../regtesthelpers
+  @build Util
+  @run main MouseWheelEventAbsoluteCoordsTest
 */
 
-import java.applet.Applet;
 import java.awt.*;
 import java.awt.event.*;
 import test.java.awt.regtesthelpers.Util;
@@ -41,17 +42,21 @@
 // getLocationOnScreen(),  get(X|Y), getPoint() .
 
 
-public class MouseWheelEventAbsoluteCoordsTest extends Applet implements MouseWheelListener
+public class MouseWheelEventAbsoluteCoordsTest implements MouseWheelListener
 {
     Frame frame = new Frame("MouseWheelEvent Test Frame");
 
     Point mousePositionOnScreen = new Point(200, 200);
     Point mousePosition = new Point(100, 100);
+
+    public static void main(final String[] args) {
+        MouseWheelEventAbsoluteCoordsTest app = new MouseWheelEventAbsoluteCoordsTest();
+        app.init();
+        app.start();
+    }
+
     public void init()
     {
-
-        this.setLayout (new BorderLayout ());
-
         frame.addMouseWheelListener(this);
     }//End  init()
 
@@ -62,7 +67,6 @@
         frame.setLocation(47, 47);
 
         frame.setVisible(true);
-        validate();
         try {
             Util.waitForIdle(new Robot());
         }catch (Exception e){
--- a/test/jdk/java/awt/event/MouseEvent/RobotLWTest/RobotLWTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-<!--
- Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--
-  @test
-  @key headful
-  @bug 4350402
-  @summary Tests that mouse behavior on LW component
-  @compile ../../../regtesthelpers/Util.java
-  @run applet RobotLWTest.html
-  -->
-<head>
-<title> RobotLWTest </title>
-</head>
-<body>
-
-<h1>RobotLWTest<br>Bug ID: 4058400</h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="RobotLWTest.class" WIDTH=350 HEIGHT=100></APPLET>
-</body>
-</html>
--- a/test/jdk/java/awt/event/MouseEvent/RobotLWTest/RobotLWTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/event/MouseEvent/RobotLWTest/RobotLWTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -22,29 +22,24 @@
  */
 
 /*
-  test
+  @test
+  @key headful
   @bug 4350402
   @summary Tests that mouse behavior on LW component
+  @compile ../../../regtesthelpers/Util.java
+  @run main RobotLWTest
 */
 
-/**
- * RobotLWTest.java
- *
- * summary:
- */
-
-import java.applet.Applet;
 import java.awt.*;
 import java.awt.event.*;
 import test.java.awt.regtesthelpers.Util;
 
-public class RobotLWTest extends Applet
-{
-    //Declare things used in the test, like buttons and labels here
+public class RobotLWTest {
 
-    public void init()
-    {
-    }//End  init()
+    public static void main(String[] args) {
+        RobotLWTest app = new RobotLWTest();
+        app.start();
+    }
 
     public void start ()
     {
@@ -54,6 +49,7 @@
         c.add(b);
         frame.add(c);
         frame.setSize(400,400);
+        frame.setLocationRelativeTo(null);
         frame.setVisible(true);
 
         try {
--- a/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-<!--
- Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug 6480024
-  @library ../../../regtesthelpers
-  @build Util Sysout AbstractTest
-  @summary stack overflow on mouse wheel rotation within JApplet
-  @author Andrei Dmitriev: area=awt.event
-  @run applet InfiniteRecursion_2.html
-  -->
-<head>
-<title>  </title>
-</head>
-<body>
-
-<h1>InfiniteRecursion_2<br>Bug ID: 6480024 </h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="InfiniteRecursion_2.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
-
--- a/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,13 @@
  */
 
 /*
-  test
+  @test
+  @key headful
   @bug 6480024
   @library ../../../regtesthelpers
   @build Util Sysout AbstractTest
-  @summary stack overflow on mouse wheel rotation within Applet
-  @author Andrei Dmitriev: area=awt.event
-  @run applet InfiniteRecursion_2.html
+  @summary stack overflow on mouse wheel rotation within JApplet
+  @run main InfiniteRecursion_2
 */
 
 /**
@@ -49,11 +49,8 @@
 import javax.swing.*;
 import test.java.awt.regtesthelpers.Util;
 import test.java.awt.regtesthelpers.AbstractTest;
-import test.java.awt.regtesthelpers.Sysout;
 
-import java.applet.Applet;
-
-public class InfiniteRecursion_2 extends Applet {
+public class InfiniteRecursion_2 extends Frame {
     final static Robot robot = Util.createRobot();
     final static int MOVE_COUNT = 5;
     //*2 for both rotation directions,
@@ -61,6 +58,12 @@
     final static int EXPECTED_COUNT = MOVE_COUNT * 2 * 2;
     static int actualEvents = 0;
 
+    public static void main(final String[] args) {
+        InfiniteRecursion_2 app = new InfiniteRecursion_2();
+        app.init();
+        app.start();
+    }
+
     public void init()
     {
         setLayout (new BorderLayout ());
@@ -72,6 +75,7 @@
         JButton jButton = new JButton();
 
         this.setSize(200, 200);
+        this.setLocationRelativeTo(null);
         this.addMouseWheelListener(new MouseWheelListener() {
                 public void mouseWheelMoved(MouseWheelEvent e)
                 {
--- a/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-<!--
- Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug 6480024
-  @library ../../../regtesthelpers
-  @build Util Sysout AbstractTest
-  @summary stack overflow on mouse wheel rotation within JApplet
-  @author Andrei Dmitriev: area=awt.event
-  @run applet InfiniteRecursion_3.html
-  -->
-<head>
-<title>  </title>
-</head>
-<body>
-
-<h1>InfiniteRecursion_3<br>Bug ID: 6480024 </h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="InfiniteRecursion_3.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
-
--- a/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,13 @@
  */
 
 /*
-  test
+  @test
+  @key headful
   @bug 6480024
   @library ../../../regtesthelpers
   @build Util Sysout AbstractTest
-  @summary stack overflow on mouse wheel rotation within Applet
-  @author Andrei Dmitriev: area=awt.event
-  @run applet InfiniteRecursion_3.html
+  @summary stack overflow on mouse wheel rotation within JApplet
+  @run main InfiniteRecursion_3
 */
 
 /**
@@ -44,10 +44,8 @@
 import javax.swing.*;
 import test.java.awt.regtesthelpers.Util;
 import test.java.awt.regtesthelpers.AbstractTest;
-import test.java.awt.regtesthelpers.Sysout;
-import java.applet.Applet;
 
-public class InfiniteRecursion_3 extends Applet {
+public class InfiniteRecursion_3 extends Frame {
     final static Robot robot = Util.createRobot();
     final static int MOVE_COUNT = 5;
     //*2 for both rotation directions,
@@ -55,6 +53,12 @@
     final static int EXPECTED_COUNT = MOVE_COUNT * 2 * 2;
     static int actualEvents = 0;
 
+    public static void main(final String[] args) {
+        InfiniteRecursion_3 app = new InfiniteRecursion_3();
+        app.init();
+        app.start();
+    }
+
     public void init()
     {
         setLayout (new BorderLayout ());
@@ -74,7 +78,7 @@
             });
 
         this.add(jButton);
-
+        this.setLocationRelativeTo(null);
         this.setVisible(true);
         this.validate();
 
--- a/test/jdk/javax/imageio/AppletResourceTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-<!--
-  ~ Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
-  ~ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  ~
-  ~ This code is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License version 2 only, as
-  ~ published by the Free Software Foundation.
-  ~
-  ~ This code is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-  ~ version 2 for more details (a copy is included in the LICENSE file that
-  ~ accompanied this code).
-  ~
-  ~ You should have received a copy of the GNU General Public License version
-  ~ 2 along with this work; if not, write to the Free Software Foundation,
-  ~ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-  ~
-  ~ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-  ~ or visit www.oracle.com if you need additional information or have any
-  ~ questions.
-  -->
-
-<html>
-<!--
- test
- @bug 4481957
- @run main AppletResourceTest
- @run applet RestrictedBundleTest.html
- @summary Tests that applet-supplied ImageReader, ImageWriter, and
- IIOMetadataFormat implementations do not throw unexpected exceptions
- when indirectly attempting to access ResourceBundles.
-  -->
-<head>
-<title> AppletResourceTest </title>
-</head>
-<body>
-<applet code=AppletResourceTest.class width=400 height=400></applet>
-</body>
-</html>
--- a/test/jdk/javax/imageio/AppletResourceTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/javax/imageio/AppletResourceTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,15 +24,12 @@
 /*
  * @test
  * @bug 4481957
- * @key headful
  * @summary Tests that applet-supplied ImageReader, ImageWriter, and
  *          IIOMetadataFormat implementations do not throw unexpected exceptions
  *          when indirectly attempting to access ResourceBundles
  * @run main AppletResourceTest
- * @run applet AppletResourceTest.html
  */
 
-import java.applet.Applet;
 import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
@@ -53,7 +50,7 @@
 
 import org.w3c.dom.Node;
 
-public class AppletResourceTest extends Applet {
+public class AppletResourceTest {
 
     public static void main(String[] argv) {
         new AppletResourceTest().init();
--- a/test/jdk/javax/swing/JFrame/4962534/bug4962534.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-<html>
-<!--
-  Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
-  This code is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License version 2 only, as
-  published by the Free Software Foundation.
-
-  This code is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-  version 2 for more details (a copy is included in the LICENSE file that
-  accompanied this code).
-
-  You should have received a copy of the GNU General Public License version
-  2 along with this work; if not, write to the Free Software Foundation,
-  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
-  Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-  or visit www.oracle.com if you need additional information or have any
-  questions.
- -->
-
-<!--
-  @test
-  @key headful
-  @bug 4962534
-  @summary JFrame dances very badly
-  @author dav@sparc.spb.su area=
-  @run applet bug4962534.html
-  -->
-<head>
-<title>  </title>
-</head>
-<body>
-
-<h1>bug4962534<br>Bug ID: 4962534 </h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="bug4962534.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/javax/swing/JFrame/4962534/bug4962534.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/javax/swing/JFrame/4962534/bug4962534.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,19 +22,19 @@
  */
 
 /*
- test
- @bug 4962534 7104594
- @summary JFrame dances very badly
- @author dav@sparc.spb.su area=
- @run applet bug4962534.html
+  @test
+  @key headful
+  @bug 4962534
+  @summary JFrame dances very badly
+  @run main bug4962534
  */
-import java.applet.Applet;
+
 import java.awt.*;
 import java.awt.event.*;
 import java.util.Random;
 import javax.swing.*;
 
-public class bug4962534 extends Applet {
+public class bug4962534 {
 
     Robot robot;
     volatile Point framePosition;
@@ -46,7 +46,12 @@
     volatile boolean titleFound = false;
     public static Object LOCK = new Object();
 
-    @Override
+    public static void main(final String[] args) {
+        bug4962534 app = new bug4962534();
+        app.init();
+        app.start();
+    }
+
     public void init() {
         try {
             SwingUtilities.invokeAndWait(new Runnable() {
@@ -60,10 +65,7 @@
         }
     }//End  init()
 
-    @Override
     public void start() {
-        validate();
-
         try {
             setJLayeredPaneEDT();
             setTitleComponentEDT();
@@ -149,6 +151,7 @@
         frame = new JFrame("JFrame Dance Test");
         frame.pack();
         frame.setSize(450, 260);
+        frame.setLocationRelativeTo(null);
         frame.setVisible(true);
     }
 
--- a/test/jdk/javax/swing/JPopupMenu/4634626/bug4634626.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<Html>
-<Body>
-<APPLET  code="bug4634626.class" WIDTH = 50 HEIGHT = 50>
-</APPLET>
-
-</Body>
-</Html>
-
--- a/test/jdk/javax/swing/JPopupMenu/4634626/bug4634626.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/javax/swing/JPopupMenu/4634626/bug4634626.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,17 +26,16 @@
  * @key headful
  * @bug 4634626
  * @summary Implement context popup menus for components
- * @author Alexander Zuev
  * @library /lib/client
  * @build ExtendedRobot
- * @run applet bug4634626.html
+ * @run main bug4634626
  */
 
 import javax.swing.*;
 import java.awt.event.*;
 import java.awt.*;
 
-public class bug4634626 extends JApplet {
+public class bug4634626 {
 
     public boolean passed = true;
     public boolean done = false;
@@ -84,6 +83,12 @@
 
     public static MouseWatcher mouser = new MouseWatcher();
 
+    public static void main(final String[] args) {
+        bug4634626 app = new bug4634626();
+        app.init();
+        app.destroy();
+    }
+
     public void init() {
 
         try {
@@ -118,6 +123,7 @@
         mainFrame.setLocation(50, 50);
 
         mainFrame.addWindowListener(new TestStateListener());
+        mainFrame.setLocationRelativeTo(null);
         mainFrame.setVisible(true);
 
         while(!done) Thread.yield();
--- a/test/jdk/javax/swing/MultiUIDefaults/4300666/bug4300666.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-<!--
- Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
- 
-<html>
-<body>
-<applet  code="bug4300666.class" width=200 height=200></applet>
-</body>
-</html>
--- a/test/jdk/javax/swing/MultiUIDefaults/4300666/bug4300666.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/javax/swing/MultiUIDefaults/4300666/bug4300666.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,19 +23,15 @@
 
 /*
  * @test
- * @key headful
  * @bug 4300666
  * @summary Printing UIDefaults throws NoSuchElementExcept
- * @author Andrey Pikalev
- * @run applet bug4300666.html
  */
 
 import javax.swing.*;
 
+public class bug4300666 {
 
-public class bug4300666 extends JApplet {
-
-    public void init() {
+    public static void main(final String[] args) {
         UIDefaults d = UIManager.getDefaults();
         d.toString();
     }
--- a/test/jdk/javax/swing/text/StyledEditorKit/4506788/bug4506788.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-<!--
- Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<Html>
-<Body>
-<APPLET  code="bug4506788.class" WIDTH = 600 HEIGHT = 400></APPLET>
-</Body>
-</Html>
--- a/test/jdk/javax/swing/text/StyledEditorKit/4506788/bug4506788.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/javax/swing/text/StyledEditorKit/4506788/bug4506788.java	Wed Feb 27 18:46:55 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,7 @@
  * @key headful
  * @bug 4506788 7147408
  * @summary  Tests if cursor gets stuck after insertion a character
- * @author Denis Sharypov
- * @run applet bug4506788.html
+ * @run main bug4506788
  */
 
 import java.awt.*;
@@ -37,12 +36,17 @@
 import javax.swing.event.*;
 import javax.swing.text.*;
 
-public class bug4506788 extends JApplet {
+public class bug4506788 {
 
     private volatile boolean passed = false;
     private JEditorPane jep;
 
-    @Override
+    public static void main(final String[] args) {
+        bug4506788 app = new bug4506788();
+        app.init();
+        app.start();
+    }
+
     public void init() {
         try {
             SwingUtilities.invokeAndWait(new Runnable() {
@@ -57,7 +61,6 @@
         }
     }
 
-    @Override
     public void start() {
         Robot robot;
         try {
@@ -129,6 +132,7 @@
 
         f.getContentPane().add(jep);
         f.setSize(100, 100);
+        f.setLocationRelativeTo(null);
         f.setVisible(true);
     }
 }
--- a/test/jdk/sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.html	Wed Feb 27 14:30:08 2019 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-<!--
- Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @key headful
-  @bug 4185854
-  @summary Checks that constructors do not accept nulls and throw NPE
-  @author tdv@eng.sun.com: area= 
-  @run applet ConstructorsNullTest.html
-  -->
-<head>
-<title>  </title>
-</head>
-<body>
-
-<h1>ConstructorsNullTest<br>Bug ID: 4185854</h1>
-
-<p> This is an AUTOMATIC test, simply wait for completion </p>
-
-<APPLET CODE="ConstructorsNullTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
--- a/test/jdk/sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.java	Wed Feb 27 14:30:08 2019 -0800
+++ b/test/jdk/sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.java	Wed Feb 27 18:46:55 2019 -0800
@@ -20,69 +20,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 /*
-  test
+  @test
   @bug 4185854
   @summary Checks that constructors do not accept nulls and throw NPE
-  @run applet ConstructorsNullTest.html
+  @run main ConstructorsNullTest
 */
 
-// Note there is no @ in front of test above.  This is so that the
-//  harness will not mistake this file as a test file.  It should
-//  only see the html file as a test file. (the harness runs all
-//  valid test files, so it would run this test twice if this file
-//  were valid as well as the html file.)
-// Also, note the area= after Your Name in the author tag.  Here, you
-//  should put which functional area the test falls in.  See the
-//  AWT-core home page -> test areas and/or -> AWT team  for a list of
-//  areas.
-// Note also the 'ConstructorsNullTest.html' in the run tag.  This should
-//  be changed to the name of the test.
+import java.awt.RenderingHints;
+import java.awt.color.ColorSpace;
+import java.awt.color.ICC_Profile;
+import java.awt.image.ColorConvertOp;
 
+public class ConstructorsNullTest {
 
-/**
- * ConstructorsNullTest.java
- *
- * summary:
- */
-
-import java.applet.Applet;
-import java.awt.*;
-import java.awt.image.*;
-import java.awt.color.*;
-
-
-//Automated tests should run as applet tests if possible because they
-// get their environments cleaned up, including AWT threads, any
-// test created threads, and any system resources used by the test
-// such as file descriptors.  (This is normally not a problem as
-// main tests usually run in a separate VM, however on some platforms
-// such as the Mac, separate VMs are not possible and non-applet
-// tests will cause problems).  Also, you don't have to worry about
-// synchronisation stuff in Applet tests they way you do in main
-// tests...
-
-
-public class ConstructorsNullTest extends Applet
- {
-   //Declare things used in the test, like buttons and labels here
-
-   public void init()
-    {
-      //Create instructions for the user here, as well as set up
-      // the environment -- set the layout manager, add buttons,
-      // etc.
-
-      this.setLayout (new BorderLayout ());
-
-    }//End  init()
-
-   public void start ()
-    {
-      //Get things going.  Request focus, set size, et cetera
-      setSize (200,200);
-      show();
-
+    public static void main(final String[] args) {
       ColorConvertOp gp;
       boolean passed = false;
       try {
@@ -104,12 +57,5 @@
           throw new RuntimeException("Test FAILED: one of constructors didn't throw NullPointerException.");
       }
       System.out.println("Test PASSED: all constructors threw NullPointerException.");
-
-      //What would normally go into main() will probably go here.
-      //Use System.out.println for diagnostic messages that you want
-      //to read after the test is done.
-      //Use System.out.println for messages you want the tester to read.
-
-    }// start()
-
- }// class ConstructorsNullTest
+    }
+}// class ConstructorsNullTest