--- old/java/awt/TrayIcon/ShowAfterDisposeTest/ShowAfterDisposeTest.html	2013-09-25 15:06:08.597939097 +0400
+++ new/java/awt/TrayIcon/ShowAfterDisposeTest/ShowAfterDisposeTest.html	2013-09-25 15:06:08.155253584 +0400
@@ -1,7 +1,30 @@
 <html>
 <!--
+ Copyright (c) 2013, 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
-  @bug 6384984
+  @bug 6384984 8004032
   @summary TrayIcon try to dispay a tooltip when is not visible
   @author Dmitry.Cherepanov@sun.com area=awt.tray
   @run applet/manual=yesno ShowAfterDisposeTest.html
--- old/java/awt/TrayIcon/ShowAfterDisposeTest/ShowAfterDisposeTest.java	2013-09-25 15:06:09.304374268 +0400
+++ new/java/awt/TrayIcon/ShowAfterDisposeTest/ShowAfterDisposeTest.java	2013-09-25 15:06:09.163826035 +0400
@@ -1,6 +1,29 @@
 /*
+ * Copyright (c) 2013, 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
-  @bug 6384984
+  @bug 6384984 8004032
   @summary TrayIcon try to dispay a tooltip when is not visible
   @author Dmitry.Cherepanov@sun.com area=awt.tray
   @run applet/manual=yesno ShowAfterDisposeTest.html
@@ -27,7 +50,12 @@
             String[] s =
             {
                 "1) When the test starts an icon is added to the SystemTray area.",
-                "2) Double click on this icon (it's important to click before the tooltip is shown).",
+                "2a) If you use Apple OS X,",
+                "    right click on this icon (it's important to click before the tooltip is shown).",
+                "    The icon should disappear.",
+                "2b) If you use other os (Windows, Linux, Solaris),",
+                "    double click on this icon (it's important to click before the tooltip is shown).",
+                "    The icon should disappear.",
                 "3) If the bug is reproducible then the test will fail without assistance.",
                 "4) Just press the 'pass' button."
             };
