diff --git a/make/CompileDemos.gmk b/make/CompileDemos.gmk
index 5addedcb599..f694600ea0a 100644
--- a/make/CompileDemos.gmk
+++ b/make/CompileDemos.gmk
@@ -233,9 +233,6 @@ ifneq ($(OPENJDK_TARGET_OS), solaris)
EXTRA_COPY_TO_IMAGE := *.java, \
))
- $(eval $(call SetupBuildDemo, SwingApplet, \
- DEMO_SUBDIR := jfc, \
- ))
endif
$(eval $(call SetupBuildDemo, FileChooserDemo, \
@@ -298,7 +295,6 @@ $(SUPPORT_OUTPUTDIR)/demos/image/nbproject/%: $(DEMO_SHARE_SRC)/nbproject/%
ifeq ($(OPENJDK_TARGET_OS), solaris)
TARGETS += $(patsubst $(DEMO_SHARE_SRC)/nbproject/%, \
$(SUPPORT_OUTPUTDIR)/demos/image/nbproject/%, \
- $(filter-out $(DEMO_SHARE_SRC)/nbproject/jfc/SwingApplet%, \
$(call CacheFind, $(DEMO_SHARE_SRC)/nbproject)))
else
TARGETS += $(patsubst $(DEMO_SHARE_SRC)/nbproject/%, \
diff --git a/src/demo/share/jfc/SwingApplet/README.txt b/src/demo/share/jfc/SwingApplet/README.txt
deleted file mode 100644
index 70ce62966aa..00000000000
--- a/src/demo/share/jfc/SwingApplet/README.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-SwingApplet illustrates how it's possible to run a Swing-based
-applet, as long as the Swing classes are in the browser's class
-path. In the Java 2 platform, Standard Edition, the Swing classes
-are core, and thus are always in the class path. For example,
-you can run SwingApplet with this command:
-
- appletviewer SwingApplet.html
-
-These instructions assume that this installation's version of appletviewer
-command is in your path. If it isn't, then you should either
-specify the complete path to the appletviewer command or update
-your PATH environment variable as described in the installation
-instructions for the Java(TM) SE Development Kit.
-
diff --git a/src/demo/share/jfc/SwingApplet/SwingApplet.html b/src/demo/share/jfc/SwingApplet/SwingApplet.html
deleted file mode 100644
index 4f10dc9c11e..00000000000
--- a/src/demo/share/jfc/SwingApplet/SwingApplet.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-Swing Applet
-
-
-
diff --git a/src/demo/share/jfc/SwingApplet/SwingApplet.java b/src/demo/share/jfc/SwingApplet/SwingApplet.java
deleted file mode 100644
index b239893ffd7..00000000000
--- a/src/demo/share/jfc/SwingApplet/SwingApplet.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * - Neither the name of Oracle nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * This source code is provided to illustrate the usage of a given feature
- * or technique and has been deliberately simplified. Additional steps
- * required for a production-quality application, such as security checks,
- * input validation and proper error handling, might not be present in
- * this sample code.
- */
-
-
-
-import java.awt.FlowLayout;
-import java.lang.reflect.InvocationTargetException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.swing.JApplet;
-import javax.swing.JButton;
-import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
-
-
-/**
- * A very simple applet.
- */
-@SuppressWarnings("serial")
-public class SwingApplet extends JApplet {
-
- JButton button;
-
- private void initUI() {
- // Trying to set Nimbus look and feel
- try {
- UIManager.setLookAndFeel("javax.swing.plaf.nimbus.NimbusLookAndFeel");
- } catch (Exception ex) {
- Logger.getLogger(SwingApplet.class.getName()).
- log(Level.SEVERE, "Failed to apply Nimbus look and feel", ex);
- }
- getContentPane().setLayout(new FlowLayout());
- button = new JButton("Hello, I'm a Swing Button!");
- getContentPane().add(button);
- getContentPane().doLayout();
- }
-
- @Override
- public void init() {
- try {
- SwingUtilities.invokeAndWait(new Runnable() {
-
- @Override
- public void run() {
- initUI();
- }
- });
- } catch (InterruptedException ex) {
- Logger.getLogger(SwingApplet.class.getName()).
- log(Level.SEVERE, null, ex);
- } catch (InvocationTargetException ex) {
- Logger.getLogger(SwingApplet.class.getName()).
- log(Level.SEVERE, null, ex);
- }
- }
-
- @Override
- public void stop() {
- if (button != null) {
- getContentPane().remove(button);
- button = null;
- }
- }
-}