From 57e0ace0820b897ee3ba9e9d978b0b4bbe7d7078 Mon Sep 17 00:00:00 2001 From: Sergey Bylokhov Date: Fri, 22 Jan 2016 15:46:24 +0300 Subject: [PATCH] 8074165: Deprecate support for AppletViewer Reviewed-by: almatvee, ssadetsky --- .../share/classes/sun/applet/Main.java | 3 +- .../sun/applet/resources/MsgAppletViewer.java | 3 +- .../DeprecatedAppletViewer.java | 56 +++++++++++++++++++ 3 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 jdk/test/sun/applet/DeprecatedAppletViewer/DeprecatedAppletViewer.java diff --git a/jdk/src/java.desktop/share/classes/sun/applet/Main.java b/jdk/src/java.desktop/share/classes/sun/applet/Main.java index 8544795b291..681fb81c6db 100644 --- a/jdk/src/java.desktop/share/classes/sun/applet/Main.java +++ b/jdk/src/java.desktop/share/classes/sun/applet/Main.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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 @@ -107,6 +107,7 @@ public class Main { private int run(String [] args) { // DECODE ARGS try { + System.out.println(lookup("deprecated")); if (args.length == 0) { usage(); return 0; diff --git a/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer.java b/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer.java index af1f3d5a609..f05729b972e 100644 --- a/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer.java +++ b/jdk/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 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 @@ -73,6 +73,7 @@ public class MsgAppletViewer extends ListResourceBundle { {"appletviewer.parse.warning.embed.requiresheight", "Warning: tag requires height attribute."}, {"appletviewer.parse.warning.embed.requireswidth", "Warning: tag requires width attribute."}, {"appletviewer.parse.warning.appnotLongersupported", "Warning: tag no longer supported, use instead:"}, + {"appletviewer.deprecated", "AppletViewer is deprecated."}, {"appletviewer.usage", "Usage: appletviewer url(s)\n\nwhere include:\n -debug Start the applet viewer in the Java debugger\n -encoding Specify character encoding used by HTML files\n -J Pass argument to the java interpreter\n\nThe -J option is non-standard and subject to change without notice."}, {"appletviewer.main.err.unsupportedopt", "Unsupported option: {0}"}, {"appletviewer.main.err.unrecognizedarg", "Unrecognized argument: {0}"}, diff --git a/jdk/test/sun/applet/DeprecatedAppletViewer/DeprecatedAppletViewer.java b/jdk/test/sun/applet/DeprecatedAppletViewer/DeprecatedAppletViewer.java new file mode 100644 index 00000000000..f3b43f83eee --- /dev/null +++ b/jdk/test/sun/applet/DeprecatedAppletViewer/DeprecatedAppletViewer.java @@ -0,0 +1,56 @@ +/* + * Copyright (c) 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. + */ + +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; + +/** + * @test + * @bug 8074165 + * @modules java.desktop/sun.applet + * @run main/othervm -Duser.language=en DeprecatedAppletViewer + */ +public final class DeprecatedAppletViewer { + + private static final String TEXT = "AppletViewer is deprecated."; + + public static void main(final String[] args) { + final PrintStream old = System.out; + final ByteArrayOutputStream baos = new ByteArrayOutputStream(1000); + final PrintStream ps = new PrintStream(baos); + try { + System.setOut(ps); + sun.applet.Main.main(new String[]{}); + } finally { + System.setOut(old); + } + + final String text = new String(baos.toByteArray()); + if (!text.contains(TEXT)) { + System.err.println("The text should contain: \"" + TEXT + "\""); + System.err.println("But the current text is: "); + System.err.println(text); + throw new RuntimeException("Error"); + } + } +}