diff --git a/jdk/.hgignore b/jdk/.hgignore
index 1ed4344d03f..9710bc5d891 100644
--- a/jdk/.hgignore
+++ b/jdk/.hgignore
@@ -7,3 +7,5 @@
^make/netbeans/.*/dist/
^.hgtip
.DS_Store
+.*/JTreport/.*
+.*/JTwork/.*
diff --git a/jdk/make/netbeans/client_sanity/README b/jdk/make/netbeans/client_sanity/README
new file mode 100644
index 00000000000..76d57db49c3
--- /dev/null
+++ b/jdk/make/netbeans/client_sanity/README
@@ -0,0 +1,15 @@
+This NetBeans project corresponds to client sanity test suite in jdk/test/sanity/client.
+
+It simplifies working on the suite in NetBeans.
+
+It also includes the following custom tasks:
+
+prepare-bundle creates dist/sanity.zip containing standalone bundle of the suite
+
+run-jemmy-browser runs Jemmy browser for the ButtonDemo (hardcoded in build.xml file)
+ The tool allows to explore the UI hierarchy.
+
+There is no task to run tests using JTReg. Please refer to corresponding README file
+in the client sanity test suite folder on how to run the tests.
+
+Contact alexander.kouznetsov@oracle.com in case of issues.
\ No newline at end of file
diff --git a/jdk/make/netbeans/client_sanity/build.xml b/jdk/make/netbeans/client_sanity/build.xml
new file mode 100644
index 00000000000..734fe10b036
--- /dev/null
+++ b/jdk/make/netbeans/client_sanity/build.xml
@@ -0,0 +1,94 @@
+
+
+
+
+
+
+
+
+
+
+ Builds, tests, and runs the project SanityTests.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/jdk/make/netbeans/client_sanity/manifest.mf b/jdk/make/netbeans/client_sanity/manifest.mf
new file mode 100644
index 00000000000..1574df4a2de
--- /dev/null
+++ b/jdk/make/netbeans/client_sanity/manifest.mf
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+X-COMMENT: Main-Class will be added automatically by build
+
diff --git a/jdk/make/netbeans/client_sanity/nbproject/build-impl.xml b/jdk/make/netbeans/client_sanity/nbproject/build-impl.xml
new file mode 100644
index 00000000000..00073338957
--- /dev/null
+++ b/jdk/make/netbeans/client_sanity/nbproject/build-impl.xml
@@ -0,0 +1,1429 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must set src.src3.dir
+ Must set src.src4.dir
+ Must set src.src2.dir
+ Must set src.src.dir
+ Must set build.dir
+ Must set dist.dir
+ Must set build.classes.dir
+ Must set dist.javadoc.dir
+ Must set build.test.classes.dir
+ Must set build.test.results.dir
+ Must set build.classes.excludes
+ Must set dist.jar
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must set javac.includes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ No tests executed.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must set JVM to use for profiling in profiler.info.jvm
+ Must set profiler agent JVM arguments in profiler.info.jvmargs.agent
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select some files in the IDE or set javac.includes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ To run this application from the command line without Ant, try:
+
+ java -jar "${dist.jar.resolved}"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set run.class
+
+
+
+ Must select one file in the IDE or set run.class
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set debug.class
+
+
+
+
+ Must select one file in the IDE or set debug.class
+
+
+
+
+ Must set fix.includes
+
+
+
+
+
+
+
+
+
+ This target only works when run from inside the NetBeans IDE.
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set profile.class
+ This target only works when run from inside the NetBeans IDE.
+
+
+
+
+
+
+
+
+ This target only works when run from inside the NetBeans IDE.
+
+
+
+
+
+
+
+
+
+
+
+
+ This target only works when run from inside the NetBeans IDE.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set run.class
+
+
+
+
+
+ Must select some files in the IDE or set test.includes
+
+
+
+
+ Must select one file in the IDE or set run.class
+
+
+
+
+ Must select one file in the IDE or set applet.url
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select some files in the IDE or set javac.includes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Some tests failed; see details above.
+
+
+
+
+
+
+
+
+ Must select some files in the IDE or set test.includes
+
+
+
+ Some tests failed; see details above.
+
+
+
+ Must select some files in the IDE or set test.class
+ Must select some method in the IDE or set test.method
+
+
+
+ Some tests failed; see details above.
+
+
+
+
+ Must select one file in the IDE or set test.class
+
+
+
+ Must select one file in the IDE or set test.class
+ Must select some method in the IDE or set test.method
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set applet.url
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set applet.url
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/jdk/make/netbeans/client_sanity/nbproject/genfiles.properties b/jdk/make/netbeans/client_sanity/nbproject/genfiles.properties
new file mode 100644
index 00000000000..fc956fd5f2e
--- /dev/null
+++ b/jdk/make/netbeans/client_sanity/nbproject/genfiles.properties
@@ -0,0 +1,8 @@
+build.xml.data.CRC32=0f9d9977
+build.xml.script.CRC32=f902e8b8
+build.xml.stylesheet.CRC32=8064a381@1.75.2.48
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=55414227
+nbproject/build-impl.xml.script.CRC32=c12f9d04
+nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
diff --git a/jdk/make/netbeans/client_sanity/nbproject/project.properties b/jdk/make/netbeans/client_sanity/nbproject/project.properties
new file mode 100644
index 00000000000..a43ee024fd8
--- /dev/null
+++ b/jdk/make/netbeans/client_sanity/nbproject/project.properties
@@ -0,0 +1,79 @@
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.title=SanityTests
+application.vendor=akouznet
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+ ${run.classpath}
+debug.test.classpath=\
+ ${run.test.classpath}
+# Files in build.classes.dir which should be excluded from distribution jar
+dist.archive.excludes=
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/SanityTests.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+excludes=*.cfg
+includes=**
+jar.compress=false
+javac.classpath=\
+ ${libs.testng.classpath}
+# Space-separated list of extra javac options
+javac.compilerargs=-Xmaxwarns 9999 -Xlint:all -Xlint:-serial
+javac.deprecation=false
+javac.external.vm=false
+javac.processorpath=\
+ ${javac.classpath}
+javac.source=1.8
+javac.target=1.8
+javac.test.classpath=\
+ ${javac.classpath}:\
+ ${build.classes.dir}
+javac.test.processorpath=\
+ ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+main.class=
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
+platform.active=default_platform
+run.classpath=\
+ ${javac.classpath}:\
+ ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project.
+# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
+# To set system properties for unit tests define test-sys-prop.name=value:
+run.jvmargs=-ea
+run.test.classpath=\
+ ${javac.test.classpath}:\
+ ${build.test.classes.dir}
+source.encoding=UTF-8
+src.src.dir=..\\..\\..\\test\\sanity\\client\\SwingSet\\src
+src.src2.dir=..\\..\\..\\test\\sanity\\client\\lib\\SwingSet3\\src
+src.src3.dir=..\\..\\..\\test\\sanity\\client\\lib\\jemmy\\src
+src.src4.dir=..\\..\\..\\test\\sanity\\client\\lib\\Jemmy2Ext\\src
diff --git a/jdk/make/netbeans/client_sanity/nbproject/project.xml b/jdk/make/netbeans/client_sanity/nbproject/project.xml
new file mode 100644
index 00000000000..fccac4ecf31
--- /dev/null
+++ b/jdk/make/netbeans/client_sanity/nbproject/project.xml
@@ -0,0 +1,17 @@
+
+
+ org.netbeans.modules.java.j2seproject
+
+
+ SanityTests
+
+
+
+
+
+
+
+
+
+
+
diff --git a/jdk/test/TEST.groups b/jdk/test/TEST.groups
index 898ace52108..53deee5c732 100644
--- a/jdk/test/TEST.groups
+++ b/jdk/test/TEST.groups
@@ -60,7 +60,8 @@ tier3 = \
:jdk_rmi \
:jdk_beans \
:jdk_imageio \
- :jdk_sound
+ :jdk_sound \
+ :jdk_client_sanity
###############################################################################
#
@@ -351,6 +352,10 @@ jdk_desktop = \
:jdk_sound \
:jdk_imageio
+# SwingSet3 tests.
+jdk_client_sanity = \
+ sanity/client/SwingSet
+
###############################################################################
#
# Serviceability sanity groups
diff --git a/jdk/test/sanity/client/README b/jdk/test/sanity/client/README
new file mode 100644
index 00000000000..09f8e16326a
--- /dev/null
+++ b/jdk/test/sanity/client/README
@@ -0,0 +1,45 @@
+This suite contains automated client sanity tests which can be run using JTReg.
+
+Contact alexander.kouznetsov@oracle.com in case of issues.
+
+-------------------------------------------------------------------------------
+How to run:
+
+1) Download/Install the JDK to be tested in the system.
+ (For example C:/java/jdk1.9.0 in windows or
+ /export/jdk/jdk1.9.0 in linux/mac/solaris)
+2) Download/Install JTReg harness, minimum required version is 4.1 b13.
+3) Open terminal(cmd in windows, *not* cygwin) and go to the this directory.
+4) To run
+ - see the notes below on how to prepare for the test run
+ - set JT_HOME to , for example
+ set JT_HOME=C:\Java\client\jtreg (Windows)
+ - run the command
+ 'sh -ea -k:\!screenshots -jdk: SwingSet'
+
+ For example: 'sh C:/jtreg/bin/jtreg -ea -k:\!screenshots -jdk:C:/java/jdk1.9.0 SwingSet' (Windows)
+ 'sh /export/jtreg/bin/jtreg -ea -k:\!screenshots -jdk:/export/jdk/jdk1.9.0 SwingSet' (Linux/Solaris)
+ 'sh /export/jtreg/bin/jtreg -ea -k:\!screenshots -jdk:/export/jdk/jdk1.9.0/Contents/Home SwingSet' (Mac)
+
+Try to minimize all the other windows for no interference and test stability.
+Do not touch keyboard or mouse, open any window, nor lock the screen while the tests are running.
+The tests will be executed, and the results will be displayed in the terminal.
+
+A report will be generated under
+ a) JTReg: "JTReport/index.html".
+The failure logs could be found under:
+ a) JTReg: "JTWork//.jtr"
+
+The following additional options might be useful:
+-retain:all to keep work files for passed tests
+-k:\!screenshots removal of this option will run tests that require full environment with Robot and screenshots
+-g to run JavaTest GUI
+
+-------------------------------------------------------------------------------
+
+The tests in the suite are based on SwingSet3 demo application. They use Jemmy to
+operate on controls of the demo and verify that it is behaving as expected. Both
+Jemmy and SwingSet3 sources are available as copies in lib folder.
+
+Original Jemmy repository is https://jemmy.java.net
+Original SwingSet3 repository is https://java.net/projects/swingset3
\ No newline at end of file
diff --git a/jdk/test/sanity/client/SwingSet/src/ButtonDemoScreenshotTest.java b/jdk/test/sanity/client/SwingSet/src/ButtonDemoScreenshotTest.java
new file mode 100644
index 00000000000..b6959ac150a
--- /dev/null
+++ b/jdk/test/sanity/client/SwingSet/src/ButtonDemoScreenshotTest.java
@@ -0,0 +1,94 @@
+/*
+ * 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.
+ */
+
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.InputEvent;
+import java.awt.image.BufferedImage;
+import org.netbeans.jemmy.ClassReference;
+import org.netbeans.jemmy.image.StrictImageComparator;
+import org.netbeans.jemmy.operators.JButtonOperator;
+import org.netbeans.jemmy.operators.JFrameOperator;
+import static org.jemmy2ext.JemmyExt.*;
+import org.testng.annotations.Test;
+import static com.sun.swingset3.demos.button.ButtonDemo.*;
+
+/*
+ * @test
+ * @key headful screenshots
+ * @summary Verifies buttons on SwingSet3 ButtonDemo page by clicking each
+ * button, taking its screenshots and checking that pressed button
+ * image is different from initial button image.
+ *
+ * @library /sanity/client/lib/jemmy/src
+ * @library /sanity/client/lib/Jemmy2Ext/src
+ * @library /sanity/client/lib/SwingSet3/src
+ * @build org.jemmy2ext.JemmyExt
+ * @build com.sun.swingset3.demos.button.ButtonDemo
+ * @run testng ButtonDemoScreenshotTest
+ */
+public class ButtonDemoScreenshotTest {
+
+ private static final int BUTTON_COUNT = 6; // TODO: Decide about "open browser" buttons (value was 8 originally)
+
+ @Test
+ public void test() throws Exception {
+ captureDebugInfoOnFail(() -> {
+ Robot rob = new Robot();
+
+ new ClassReference(com.sun.swingset3.demos.button.ButtonDemo.class.getCanonicalName()).startApplication();
+
+ JFrameOperator mainFrame = new JFrameOperator(DEMO_TITLE);
+ waitImageIsStill(rob, mainFrame);
+
+ // Check all the buttons
+ for (int i = 0; i < BUTTON_COUNT; i++) {
+ checkButton(mainFrame, i, rob);
+ }
+ });
+ }
+
+ public void checkButton(JFrameOperator jfo, int i, Robot rob) {
+ JButtonOperator button = new JButtonOperator(jfo, i);
+
+ Point loc = button.getLocationOnScreen();
+ rob.mouseMove(loc.x, loc.y);
+
+ BufferedImage initialButtonImage = capture(rob, button);
+ assertNotBlack(initialButtonImage);
+ save(initialButtonImage, "button" + i + "_0initial.png");
+ rob.mousePress(InputEvent.BUTTON1_MASK);
+ try {
+ waitPressed(button);
+ BufferedImage pressedButtonImage = capture(rob, button);
+ assertNotBlack(pressedButtonImage);
+ save(pressedButtonImage, "button" + i + "_1pressed.png");
+
+ StrictImageComparator sComparator = new StrictImageComparator();
+ assertNotEquals("Button " + i + " Test", sComparator, initialButtonImage, pressedButtonImage);
+ } finally {
+ rob.mouseRelease(InputEvent.BUTTON1_MASK);
+ }
+ }
+
+}
diff --git a/jdk/test/sanity/client/SwingSet/src/ButtonDemoTest.java b/jdk/test/sanity/client/SwingSet/src/ButtonDemoTest.java
new file mode 100644
index 00000000000..3d0d8f1afea
--- /dev/null
+++ b/jdk/test/sanity/client/SwingSet/src/ButtonDemoTest.java
@@ -0,0 +1,177 @@
+/*
+ * 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.
+ */
+
+import com.sun.swingset3.demos.JHyperlink;
+import com.sun.swingset3.demos.button.ButtonDemo;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import javax.swing.ButtonModel;
+import javax.swing.JButton;
+import javax.swing.event.ChangeEvent;
+import static org.testng.AssertJUnit.*;
+import org.testng.annotations.Test;
+import org.jemmy2ext.JemmyExt.ByToolTipChooser;
+import static org.jemmy2ext.JemmyExt.EXACT_STRING_COMPARATOR;
+import org.netbeans.jemmy.ClassReference;
+import org.netbeans.jemmy.operators.JButtonOperator;
+import org.netbeans.jemmy.operators.JFrameOperator;
+import static com.sun.swingset3.demos.button.ButtonDemo.*;
+import org.jemmy2ext.JemmyExt;
+import org.jemmy2ext.JemmyExt.MultiThreadedTryCatch;
+import static org.jemmy2ext.JemmyExt.captureDebugInfoOnFail;
+
+/*
+ * @test
+ * @key headful
+ * @summary Verifies buttons on SwingSet3 ButtonDemo page by clicking each button
+ * and checking model change events. It also verifies tooltips and text
+ * on buttons before and after click.
+ *
+ * @library /sanity/client/lib/jemmy/src
+ * @library /sanity/client/lib/Jemmy2Ext/src
+ * @library /sanity/client/lib/SwingSet3/src
+ * @build org.jemmy2ext.JemmyExt
+ * @build com.sun.swingset3.demos.button.ButtonDemo
+ * @run testng ButtonDemoTest
+ */
+public class ButtonDemoTest {
+
+ private static final String[] BUTTON_TEXT_AFTER = {
+ DO_IT_AGAIN,};
+
+ private static final String[] BUTTON_TEXT_BEFORE = {
+ DO_IT,
+ "",
+ FIND,
+ GO,
+ CONNECT,
+ "",
+ GET_MORE_INFO,
+ null
+ };
+
+ private static final String[] BUTTON_TOOLTIP = {
+ SIMPLE_BUTTON,
+ IMAGE_BUTTON,
+ BUTTON_WITH_TEXT_AND_IMAGE,
+ BUTTON_WITH_BACKGROUND_COLOR,
+ BUTTON_WITH_NO_BORDER,
+ BUTTON_WITH_ROLLOVER_IMAGE,
+ JAVA_SE_URL,
+ JAVA_BLOGS_URL
+ };
+
+ private static final String[] GOLDEN = {
+ "isArmed = false, isEnabled = true, isPressed = false, isSelected = false",
+ "isArmed = true, isEnabled = true, isPressed = false, isSelected = false",
+ "isArmed = true, isEnabled = true, isPressed = true, isSelected = false",
+ "isArmed = true, isEnabled = true, isPressed = false, isSelected = false",
+ "isArmed = false, isEnabled = true, isPressed = false, isSelected = false"
+ };
+
+ @Test
+ public void test() throws Exception {
+
+ captureDebugInfoOnFail(() -> {
+
+ new ClassReference(ButtonDemo.class.getCanonicalName()).startApplication();
+
+ JFrameOperator mainFrame = new JFrameOperator(DEMO_TITLE);
+ mainFrame.setComparator(EXACT_STRING_COMPARATOR);
+
+ // Check all the buttons
+ for (int i = 0; i < BUTTON_TOOLTIP.length; i++) {
+ String tooltip = BUTTON_TOOLTIP[i];
+
+ JButtonOperator button = new JButtonOperator(mainFrame, new ByToolTipChooser(tooltip));
+
+ assertEquals(BUTTON_TEXT_BEFORE[i], button.getText());
+
+ // Two buttons are hyperlinks, we don't want to click them
+ if (!button.getSource().getClass().equals(JHyperlink.class)) {
+ checkButton(button);
+ }
+
+ if (BUTTON_TEXT_AFTER.length > i) {
+ assertEquals(BUTTON_TEXT_AFTER[i], button.getText());
+ } else {
+ assertEquals(BUTTON_TEXT_BEFORE[i], button.getText());
+ }
+ }
+
+ });
+ }
+
+ private void checkButton(JButtonOperator button) throws Exception {
+ MultiThreadedTryCatch tryCatch = new JemmyExt.MultiThreadedTryCatch();
+ try {
+ BlockingQueue modelStateChanges = new ArrayBlockingQueue<>(GOLDEN.length);
+ button.getQueueTool().invokeAndWait(() -> {
+ try {
+ JButton jButton = (JButton) button.getSource();
+ ButtonModel model = jButton.getModel();
+ String line = toString(model);
+ System.out.println("Inital: " + line);
+ modelStateChanges.add(line);
+ model.addChangeListener((ChangeEvent e) -> {
+ try {
+ String line2 = toString(model);
+ System.out.println("ChangeEvent: " + line2);
+
+ // We are only interested in the first GOLDEN.length events
+ if (modelStateChanges.remainingCapacity() > 0) {
+ modelStateChanges.add(line2);
+ }
+ } catch (RuntimeException | Error t) {
+ tryCatch.register(t);
+ }
+ });
+ } catch (Error error) {
+ // All exceptions are already handled by Jemmy but Errors are not
+ tryCatch.register(error);
+ throw error;
+ }
+ });
+
+ assertEquals("Initial state check", GOLDEN[0], modelStateChanges.take());
+
+ button.clickMouse();
+
+ for (int state = 1; state < GOLDEN.length; state++) {
+ assertEquals(GOLDEN[state], modelStateChanges.take());
+ }
+ } catch (RuntimeException | Error | InterruptedException t) {
+ tryCatch.registerRoot(t);
+ } finally {
+ tryCatch.throwRegistered();
+ }
+ }
+
+ private static String toString(ButtonModel model) {
+ return "isArmed = " + model.isArmed()
+ + ", isEnabled = " + model.isEnabled()
+ + ", isPressed = " + model.isPressed()
+ + ", isSelected = " + model.isSelected();
+ }
+
+}
diff --git a/jdk/test/sanity/client/SwingSet/src/ComboBoxDemoTest.java b/jdk/test/sanity/client/SwingSet/src/ComboBoxDemoTest.java
new file mode 100644
index 00000000000..303bbd681f1
--- /dev/null
+++ b/jdk/test/sanity/client/SwingSet/src/ComboBoxDemoTest.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2010, 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 com.sun.swingset3.demos.combobox.ComboBoxDemo;
+import static org.testng.AssertJUnit.*;
+import org.testng.annotations.Test;
+import org.netbeans.jemmy.ClassReference;
+import org.netbeans.jemmy.operators.JComboBoxOperator;
+import org.netbeans.jemmy.operators.JFrameOperator;
+import static com.sun.swingset3.demos.combobox.ComboBoxDemo.*;
+import static org.jemmy2ext.JemmyExt.captureDebugInfoOnFail;
+
+/*
+ * @test
+ * @key headful
+ * @summary Verifies ComboBoxes on SwingSet2 ComboBoxDemo page by selecting
+ * each value of each ComboBox.
+ *
+ * @library /sanity/client/lib/jemmy/src
+ * @library /sanity/client/lib/Jemmy2Ext/src
+ * @library /sanity/client/lib/SwingSet3/src
+ * @build org.jemmy2ext.JemmyExt
+ * @build com.sun.swingset3.demos.combobox.ComboBoxDemo
+ * @run testng ComboBoxDemoTest
+ */
+public class ComboBoxDemoTest {
+
+ private static enum ComboBoxInfo {
+ PRESETS("Presets:"),
+ HAIR("Hair:"),
+ EYES_N_NOSE("Eyes & Nose:"),
+ MOUTH("Mouth:");
+
+ private final String comboBoxName;
+
+ private ComboBoxInfo(String comboBoxName) {
+ this.comboBoxName = comboBoxName;
+ }
+
+ }
+
+ @Test
+ public void test() throws Exception {
+ captureDebugInfoOnFail(() -> {
+ new ClassReference(ComboBoxDemo.class.getCanonicalName()).startApplication();
+
+ JFrameOperator frame = new JFrameOperator(DEMO_TITLE);
+ for (ComboBoxInfo comboBoxInfo : ComboBoxInfo.values()) {
+ comboBoxChecker(frame, comboBoxInfo);
+ }
+ });
+ }
+
+ private void comboBoxChecker(JFrameOperator jfo, ComboBoxInfo comboBoxInfo) {
+ JComboBoxOperator jcbo = new JComboBoxOperator(jfo, comboBoxInfo.ordinal());
+ for (int i = 0; i < jcbo.getItemCount(); i++) {
+ jcbo.selectItem(i);
+ assertEquals(comboBoxInfo.comboBoxName + " ComboBox SelectedIndex is correct", i, jcbo.getSelectedIndex());
+ }
+ }
+
+}
diff --git a/jdk/test/sanity/client/SwingSet/src/ListDemoTest.java b/jdk/test/sanity/client/SwingSet/src/ListDemoTest.java
new file mode 100644
index 00000000000..c24399e526b
--- /dev/null
+++ b/jdk/test/sanity/client/SwingSet/src/ListDemoTest.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2010, 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 com.sun.swingset3.demos.list.ListDemo;
+import static com.sun.swingset3.demos.list.ListDemo.DEMO_TITLE;
+import static org.testng.AssertJUnit.*;
+import org.testng.annotations.Test;
+import static org.jemmy2ext.JemmyExt.getLabeledContainerOperator;
+import org.netbeans.jemmy.ClassReference;
+import org.netbeans.jemmy.operators.JCheckBoxOperator;
+import org.netbeans.jemmy.operators.JFrameOperator;
+import org.netbeans.jemmy.operators.JListOperator;
+import static org.jemmy2ext.JemmyExt.captureDebugInfoOnFail;
+
+/*
+ * @test
+ * @key headful
+ * @summary Verifies SwingSet3 ListDemo page by checking and unchecking all
+ * the checkboxes on the page and verifying the number of items in the
+ * list.
+ *
+ * @library /sanity/client/lib/jemmy/src
+ * @library /sanity/client/lib/Jemmy2Ext/src
+ * @library /sanity/client/lib/SwingSet3/src
+ * @build org.jemmy2ext.JemmyExt
+ * @build com.sun.swingset3.demos.list.ListDemo
+ * @run testng ListDemoTest
+ */
+public class ListDemoTest {
+
+ private static final int CHECKBOX_COUNT = 50;
+
+ @Test
+ public void test() throws Exception {
+ captureDebugInfoOnFail(() -> {
+ new ClassReference(ListDemo.class.getCanonicalName()).startApplication();
+
+ JFrameOperator frame = new JFrameOperator(DEMO_TITLE);
+ JListOperator listOp = new JListOperator(frame);
+
+ // Check *NO* Prefix and Suffixes Marked
+ for (int i = 0; i < CHECKBOX_COUNT; i++) {
+ JCheckBoxOperator checkBox = getJCheckBoxOperator(frame, i);
+ checkBox.changeSelection(false);
+ }
+ System.out.println("######## Number of Items = " + listOp.getModel().getSize());
+ assertEquals("Select None number of items is correct", 0, listOp.getModel().getSize());
+
+ // Check *ALL* Prefix and Suffixes Marked
+ for (int i = 0; i < CHECKBOX_COUNT; i++) {
+ JCheckBoxOperator checkBox = getJCheckBoxOperator(frame, i);
+ checkBox.changeSelection(true);
+ }
+ System.out.println("######## Number of Items = " + listOp.getModel().getSize());
+ assertEquals("Select All number of items is correct", CHECKBOX_COUNT / 2 * CHECKBOX_COUNT / 2, listOp.getModel().getSize());
+
+ // Check *ALL* Prefix and *NO* Suffixes Marked
+ for (int i = 0; i < CHECKBOX_COUNT; i++) {
+ JCheckBoxOperator checkBox = getJCheckBoxOperator(frame, i);
+ if (i < CHECKBOX_COUNT / 2) {
+ checkBox.changeSelection(true);
+ } else {
+ checkBox.changeSelection(false);
+ }
+ }
+ System.out.println("######## Number of Items = " + listOp.getModel().getSize());
+ assertEquals("Select All Prefixes and NO Suffixes number of items is correct", 0, listOp.getModel().getSize());
+
+ // Check *NO* Prefix and *ALL* Suffixes Marked
+ for (int i = 0; i < CHECKBOX_COUNT; i++) {
+ JCheckBoxOperator checkBox = getJCheckBoxOperator(frame, i);
+ if (i < CHECKBOX_COUNT / 2) {
+ checkBox.changeSelection(false);
+ } else {
+ checkBox.changeSelection(true);
+ }
+ }
+ System.out.println("######## Number of Items = " + listOp.getModel().getSize());
+ assertEquals("Select NO Prefixes and All Suffixes number of items is correct", 0, listOp.getModel().getSize());
+ });
+ }
+
+ private JCheckBoxOperator getJCheckBoxOperator(JFrameOperator frame, int index) {
+
+ // We map first half of indexes to the Prefixes panel and the second half
+ // to the Suffixes panel
+ String labelText;
+ int subindex;
+ if (index < CHECKBOX_COUNT / 2) {
+ labelText = "Prefixes";
+ subindex = index;
+ } else {
+ labelText = "Suffixes";
+ subindex = index - CHECKBOX_COUNT / 2;
+ }
+
+ return new JCheckBoxOperator(getLabeledContainerOperator(frame, labelText), subindex);
+ }
+
+}
diff --git a/jdk/test/sanity/client/SwingSet/src/OptionPaneDemoTest.java b/jdk/test/sanity/client/SwingSet/src/OptionPaneDemoTest.java
new file mode 100644
index 00000000000..2cecfe72637
--- /dev/null
+++ b/jdk/test/sanity/client/SwingSet/src/OptionPaneDemoTest.java
@@ -0,0 +1,339 @@
+/*
+ * Copyright (c) 2010, 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 com.sun.swingset3.demos.optionpane.OptionPaneDemo;
+import static com.sun.swingset3.demos.optionpane.OptionPaneDemo.*;
+import javax.swing.UIManager;
+import static org.jemmy2ext.JemmyExt.*;
+import static org.testng.AssertJUnit.*;
+import org.testng.annotations.Test;
+import org.netbeans.jemmy.ClassReference;
+import org.netbeans.jemmy.operators.JButtonOperator;
+import org.netbeans.jemmy.operators.JComboBoxOperator;
+import org.netbeans.jemmy.operators.JDialogOperator;
+import org.netbeans.jemmy.operators.JFrameOperator;
+import org.netbeans.jemmy.operators.JLabelOperator;
+import org.netbeans.jemmy.operators.JTextFieldOperator;
+
+
+/*
+ * @test
+ * @key headful
+ * @summary Verifies SwingSet3 OptionPaneDemo page by opening all the dialogs
+ * and choosing different options in them.
+ *
+ * @library /sanity/client/lib/jemmy/src
+ * @library /sanity/client/lib/Jemmy2Ext/src
+ * @library /sanity/client/lib/SwingSet3/src
+ * @build org.jemmy2ext.JemmyExt
+ * @build com.sun.swingset3.demos.optionpane.OptionPaneDemo
+ * @run testng OptionPaneDemoTest
+ */
+public class OptionPaneDemoTest {
+
+ public static final String SOME_TEXT_TO_TYPE = "I am some text";
+ public static final String MESSAGE = UIManager.getString("OptionPane.messageDialogTitle");
+ public static final String OK = "OK";
+ public static final String CANCEL = "Cancel";
+ public static final String INPUT = UIManager.getString("OptionPane.inputDialogTitle");
+ public static final String TEXT_TO_TYPE = "Hooray! I'm a textField";
+ public static final String NO = "No";
+ public static final String YES = "Yes";
+ public static final String SELECT_AN__OPTION = UIManager.getString("OptionPane.titleText");
+
+ @Test
+ public void test() throws Exception {
+ captureDebugInfoOnFail(() -> {
+ new ClassReference(OptionPaneDemo.class.getCanonicalName()).startApplication();
+
+ JFrameOperator frame = new JFrameOperator(DEMO_TITLE);
+
+ showInputDialog(frame);
+ showWarningDialog(frame);
+ showMessageDialog(frame);
+ showComponentDialog(frame);
+ showConfirmationDialog(frame);
+ });
+ }
+
+ public void showInputDialog(JFrameOperator jfo) throws Exception {
+ // Cancel with text case
+ {
+ new JButtonOperator(jfo, INPUT_BUTTON).pushNoBlock();
+
+ JDialogOperator jdo = new JDialogOperator(INPUT);
+ JTextFieldOperator jto = new JTextFieldOperator(jdo);
+ jto.setText(SOME_TEXT_TO_TYPE);
+
+ assertTrue("Show Input Dialog cancel w/ Text", jdo.isShowing());
+
+ new JButtonOperator(jdo, CANCEL).push();
+
+ assertFalse("Show Input Dialog cancel w/ Text", jdo.isShowing());
+ }
+
+ // Cancel with *NO* text case
+ {
+ new JButtonOperator(jfo, INPUT_BUTTON).pushNoBlock();
+
+ JDialogOperator jdo = new JDialogOperator(INPUT);
+
+ assertTrue("Show Input Dialog cancel w/o Text", jdo.isShowing());
+
+ new JButtonOperator(jdo, CANCEL).push();
+
+ assertFalse("Show Input Dialog cancel w/o Text", jdo.isShowing());
+ }
+
+ // Text field has *NO* input
+ {
+ new JButtonOperator(jfo, INPUT_BUTTON).pushNoBlock();
+
+ JDialogOperator jdo = new JDialogOperator(INPUT);
+
+ assertTrue("Show Input Dialog w/o Input", jdo.isShowing());
+
+ new JButtonOperator(jdo, OK).push();
+
+ assertFalse("Show Input Dialog w/o Input", jdo.isShowing());
+ }
+
+ // Text field has input
+ {
+ final String enteredText = "Rambo";
+
+ new JButtonOperator(jfo, INPUT_BUTTON).pushNoBlock();
+
+ JDialogOperator jdo = new JDialogOperator(INPUT);
+ JTextFieldOperator jto = new JTextFieldOperator(jdo);
+ jto.setText(enteredText);
+ new JButtonOperator(jdo, OK).pushNoBlock();
+
+ JDialogOperator jdo1 = new JDialogOperator(MESSAGE);
+
+ assertTrue("Show Input Dialog w/ Input", jdo1.isShowing());
+
+ final String labelText = enteredText + INPUT_RESPONSE;
+ JLabelOperator jLabelOperator = new JLabelOperator(jdo1, labelText);
+ assertEquals("Text from the field made it into the dialog", labelText, jLabelOperator.getText());
+
+ new JButtonOperator(jdo1, OK).push();
+
+ assertFalse("Show Input Dialog w/ Input", jdo1.isShowing());
+ }
+ }
+
+ public void showWarningDialog(JFrameOperator jfo) throws Exception {
+ new JButtonOperator(jfo, WARNING_BUTTON).pushNoBlock();
+
+ JDialogOperator jdo = new JDialogOperator(WARNING_TITLE);
+
+ assertTrue("Show Warning Dialog", jdo.isShowing());
+
+ new JButtonOperator(jdo, OK).push();
+
+ assertFalse("Show Warning Dialog", jdo.isShowing());
+ }
+
+ public void showMessageDialog(JFrameOperator jfo) throws Exception {
+ new JButtonOperator(jfo, MESSAGE_BUTTON).pushNoBlock();
+
+ JDialogOperator jdo = new JDialogOperator(MESSAGE);
+
+ assertTrue("Show Message Dialog", jdo.isShowing());
+
+ new JButtonOperator(jdo, OK).push();
+
+ assertFalse("Show Message Dialog", jdo.isShowing());
+ }
+
+ public void showComponentDialog(JFrameOperator jfo) throws Exception {
+ // Case: Cancel
+ {
+ new JButtonOperator(jfo, COMPONENT_BUTTON).pushNoBlock();
+
+ JDialogOperator jdo = new JDialogOperator(COMPONENT_TITLE);
+
+ assertTrue("Show Component Dialog Cancel Option", jdo.isShowing());
+
+ new JButtonOperator(jdo, COMPONENT_OP5).push();
+
+ assertFalse("Show Component Dialog Cancel Option", jdo.isShowing());
+ }
+
+ // Case: Yes option selected
+ {
+ new JButtonOperator(jfo, COMPONENT_BUTTON).pushNoBlock();
+
+ JDialogOperator jdo = new JDialogOperator(COMPONENT_TITLE);
+ new JButtonOperator(jdo, COMPONENT_OP1).pushNoBlock();
+
+ JDialogOperator jdo1 = new JDialogOperator(MESSAGE);
+
+ assertTrue("Component Dialog Example Yes Option", jdo1.isShowing());
+
+ final String labelText = COMPONENT_R1;
+ JLabelOperator jLabelOperator = new JLabelOperator(jdo1, labelText);
+ assertEquals("Dialog contains appropriate text", labelText, jLabelOperator.getText());
+
+ new JButtonOperator(jdo1, OK).push();
+
+ assertFalse("Component Dialog Example Yes Option", jdo1.isShowing());
+ }
+
+ // Case: No option selected
+ {
+ new JButtonOperator(jfo, COMPONENT_BUTTON).pushNoBlock();
+
+ JDialogOperator jdo = new JDialogOperator(COMPONENT_TITLE);
+ new JButtonOperator(jdo, COMPONENT_OP2).pushNoBlock();
+
+ JDialogOperator jdo1 = new JDialogOperator(MESSAGE);
+
+ assertTrue("Component Dialog Example No Option", jdo1.isShowing());
+
+ final String labelText = COMPONENT_R2;
+ JLabelOperator jLabelOperator = new JLabelOperator(jdo1, labelText);
+ assertEquals("Dialog contains appropriate text", labelText, jLabelOperator.getText());
+
+ new JButtonOperator(jdo1, OK).push();
+
+ assertFalse("Component Dialog Example No Option", jdo1.isShowing());
+ }
+
+ // Case: Maybe option selected
+ {
+ new JButtonOperator(jfo, COMPONENT_BUTTON).pushNoBlock();
+
+ JDialogOperator jdo = new JDialogOperator(COMPONENT_TITLE);
+ new JButtonOperator(jdo, COMPONENT_OP3).pushNoBlock();
+
+ JDialogOperator jdo1 = new JDialogOperator(MESSAGE);
+
+ assertTrue("Component Dialog Maybe Yes Option", jdo1.isShowing());
+
+ final String labelText = COMPONENT_R3;
+ JLabelOperator jLabelOperator = new JLabelOperator(jdo1, labelText);
+ assertEquals("Dialog contains appropriate text", labelText, jLabelOperator.getText());
+
+ new JButtonOperator(jdo1, OK).push();
+
+ assertFalse("Component Dialog Maybe Yes Option", jdo1.isShowing());
+ }
+
+ // Case: Probably option selected
+ {
+ new JButtonOperator(jfo, COMPONENT_BUTTON).pushNoBlock();
+
+ JDialogOperator jdo = new JDialogOperator(COMPONENT_TITLE);
+ new JButtonOperator(jdo, COMPONENT_OP4).pushNoBlock();
+
+ JDialogOperator jdo1 = new JDialogOperator(MESSAGE);
+
+ assertTrue("Component Dialog Example Probably Option", jdo1.isShowing());
+
+ final String labelText = COMPONENT_R4;
+ JLabelOperator jLabelOperator = new JLabelOperator(jdo1, labelText);
+ assertEquals("Dialog contains appropriate text", labelText, jLabelOperator.getText());
+
+ new JButtonOperator(jdo1, OK).push();
+
+ assertFalse("Component Dialog Example Probably Option", jdo1.isShowing());
+ }
+
+ // Case TextField and ComboBox functional
+ {
+ new JButtonOperator(jfo, COMPONENT_BUTTON).push();
+
+ JDialogOperator jdo = new JDialogOperator(COMPONENT_TITLE);
+
+ JTextFieldOperator jto = new JTextFieldOperator(jdo);
+ jto.clearText();
+ jto.typeText(TEXT_TO_TYPE);
+
+ JComboBoxOperator jcbo = new JComboBoxOperator(jdo);
+ jcbo.selectItem(2);
+
+ assertEquals("Show Component Dialog TextField", TEXT_TO_TYPE, jto.getText());
+ assertEquals("Show Component Dialog ComboBox", 2, jcbo.getSelectedIndex());
+
+ new JButtonOperator(jdo, "cancel").push();
+ }
+ }
+
+ public void showConfirmationDialog(JFrameOperator jfo) throws Exception {
+ // Case: Yes option selected
+ {
+ new JButtonOperator(jfo, CONFIRM_BUTTON).pushNoBlock();
+
+ JDialogOperator jdo = new JDialogOperator(SELECT_AN__OPTION);
+ new JButtonOperator(jdo, YES).pushNoBlock();
+
+ JDialogOperator jdo1 = new JDialogOperator(MESSAGE);
+
+ assertTrue("Show Confirmation Dialog Yes Option", jdo1.isShowing());
+
+ final String labelText = CONFIRM_YES;
+ JLabelOperator jLabelOperator = new JLabelOperator(jdo1, labelText);
+ assertEquals("Dialog contains appropriate text", labelText, jLabelOperator.getText());
+
+ new JButtonOperator(jdo1, OK).push();
+
+ assertFalse("Show Confirmation Dialog Yes Option", jdo1.isShowing());
+ }
+
+ // Case: No option selected
+ {
+ new JButtonOperator(jfo, CONFIRM_BUTTON).pushNoBlock();
+
+ JDialogOperator jdo = new JDialogOperator(SELECT_AN__OPTION);
+ new JButtonOperator(jdo, NO).pushNoBlock();
+
+ JDialogOperator jdo1 = new JDialogOperator(MESSAGE);
+
+ assertTrue("Show Confirmation Dialog No Option", jdo1.isShowing());
+
+ final String labelText = CONFIRM_NO;
+ JLabelOperator jLabelOperator = new JLabelOperator(jdo1, labelText);
+ assertEquals("Dialog contains appropriate text", labelText, jLabelOperator.getText());
+
+ new JButtonOperator(jdo1, OK).push();
+
+ assertFalse("Show Confirmation Dialog No Option", jdo1.isShowing());
+ }
+
+ // Case: Cancel option selected
+ {
+ new JButtonOperator(jfo, CONFIRM_BUTTON).pushNoBlock();
+
+ JDialogOperator jdo = new JDialogOperator(SELECT_AN__OPTION);
+
+ assertTrue("Show Confirmation Dialog Cancel Option", jdo.isShowing());
+
+ new JButtonOperator(jdo, CANCEL).push();
+
+ assertFalse("Show Confirmation Dialog Cancel Option", jdo.isShowing());
+ }
+ }
+
+}
diff --git a/jdk/test/sanity/client/SwingSet/src/ProgressBarDemoTest.java b/jdk/test/sanity/client/SwingSet/src/ProgressBarDemoTest.java
new file mode 100644
index 00000000000..411d05cd1b7
--- /dev/null
+++ b/jdk/test/sanity/client/SwingSet/src/ProgressBarDemoTest.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2010, 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 com.sun.swingset3.demos.progressbar.ProgressBarDemo;
+import static com.sun.swingset3.demos.progressbar.ProgressBarDemo.*;
+import java.awt.Component;
+import static org.testng.AssertJUnit.*;
+import org.testng.annotations.Test;
+import org.netbeans.jemmy.ClassReference;
+import org.netbeans.jemmy.ComponentChooser;
+import org.netbeans.jemmy.operators.JButtonOperator;
+import org.netbeans.jemmy.operators.JFrameOperator;
+import org.netbeans.jemmy.operators.JProgressBarOperator;
+import static org.jemmy2ext.JemmyExt.captureDebugInfoOnFail;
+
+/*
+ * @test
+ * @key headful
+ * @summary Verifies SwingSet3 ProgressBarDemo page by pressing start and stop
+ * buttons and checking the progress bar and the buttons state.
+ *
+ * @library /sanity/client/lib/jemmy/src
+ * @library /sanity/client/lib/Jemmy2Ext/src
+ * @library /sanity/client/lib/SwingSet3/src
+ * @build org.jemmy2ext.JemmyExt
+ * @build com.sun.swingset3.demos.progressbar.ProgressBarDemo
+ * @run testng ProgressBarDemoTest
+ */
+public class ProgressBarDemoTest {
+
+ @Test
+ public void test() throws Exception {
+ captureDebugInfoOnFail(() -> {
+ new ClassReference(ProgressBarDemo.class.getCanonicalName()).startApplication();
+
+ JFrameOperator frame = new JFrameOperator(DEMO_TITLE);
+
+ JButtonOperator startButton = new JButtonOperator(frame, START_BUTTON);
+ JButtonOperator stopButton = new JButtonOperator(frame, STOP_BUTTON);
+ JProgressBarOperator jpbo = new JProgressBarOperator(frame);
+
+ // Check that progress completes and corect enable/disable of start/stop buttons
+ checkCompleteProgress(frame, startButton, stopButton, jpbo);
+
+ // Check progess bar progression and start/stop button disabled/enabled states
+ checkStartStop(frame, startButton, stopButton, jpbo);
+ });
+ }
+
+ // Check that progress completes and corect enable/disable of start/stop buttons
+ public void checkStartStop(JFrameOperator frame, JButtonOperator startButton, JButtonOperator stopButton, JProgressBarOperator progressBar) throws Exception {
+ int initialProgress = progressBar.getValue();
+ System.out.println("initialProgress = " + initialProgress);
+ int maximum = progressBar.getMaximum();
+
+ startButton.pushNoBlock();
+
+ progressBar.waitState(new ComponentChooser() {
+
+ @Override
+ public boolean checkComponent(Component comp) {
+ int value = progressBar.getValue();
+ System.out.println("checkComponent1 value = " + value);
+ return value < maximum;
+ }
+
+ @Override
+ public String getDescription() {
+ return "Progress < maximum (" + maximum + ")";
+ }
+ });
+
+ stopButton.waitComponentEnabled();
+
+ progressBar.waitState(new ComponentChooser() {
+
+ @Override
+ public boolean checkComponent(Component comp) {
+ int value = progressBar.getValue();
+ System.out.println("checkComponent2 value = " + value);
+ return value > 0;
+ }
+
+ @Override
+ public String getDescription() {
+ return "Progress > 0";
+ }
+ });
+
+ int progress = progressBar.getValue();
+ System.out.println("progress = " + progress);
+
+ //Check that progress par has progressed and Start Button Disabled
+ assertTrue("Progress Bar Progressing (progress > 0, actual value: " + progress + ")", progress > 0);
+ assertFalse("Start Button Disabled", startButton.isEnabled());
+ assertTrue("Stop Button Enabled", stopButton.isEnabled());
+
+ //Wait a liitle bit longer then Press stop get progress
+ progressBar.waitState(new ComponentChooser() {
+
+ @Override
+ public boolean checkComponent(Component comp) {
+ return progressBar.getValue() > progress;
+ }
+
+ @Override
+ public String getDescription() {
+ return "Progress > " + progress;
+ }
+ });
+
+ stopButton.pushNoBlock();
+
+ startButton.waitComponentEnabled();
+
+ int interimProgress = progressBar.getValue();
+
+ // Check that progress par has Stopped and Start Button Disabled
+ assertTrue("Progress Bar Stopped "
+ + "(interimProgress, actual value: " + interimProgress + " "
+ + "> progress, actual value: " + progress + ")",
+ interimProgress > progress);
+ assertTrue("Start Button Enabled", startButton.isEnabled());
+ assertFalse("Stop Button Disabled", stopButton.isEnabled());
+ }
+
+ // Check progess bar progression and start/stop button disabled/enabled states
+ public void checkCompleteProgress(JFrameOperator frame, JButtonOperator startButton, JButtonOperator stopButton, JProgressBarOperator progressBar) throws Exception {
+ startButton.pushNoBlock();
+
+ progressBar.waitValue(progressBar.getMaximum());
+
+ startButton.waitComponentEnabled();
+
+ assertEquals("Complete Progress", progressBar.getMaximum(), progressBar.getValue());
+ assertTrue("Start Button Enabled", startButton.isEnabled());
+ assertFalse("Stop Button Disabled", stopButton.isEnabled());
+ }
+
+}
diff --git a/jdk/test/sanity/client/SwingSet/src/ScrollPaneDemoTest.java b/jdk/test/sanity/client/SwingSet/src/ScrollPaneDemoTest.java
new file mode 100644
index 00000000000..bd88904f875
--- /dev/null
+++ b/jdk/test/sanity/client/SwingSet/src/ScrollPaneDemoTest.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2010, 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 com.sun.swingset3.demos.scrollpane.ScrollPaneDemo;
+import static com.sun.swingset3.demos.scrollpane.ScrollPaneDemo.DEMO_TITLE;
+import static org.testng.AssertJUnit.*;
+import org.testng.annotations.Test;
+import org.netbeans.jemmy.ClassReference;
+import org.netbeans.jemmy.operators.JFrameOperator;
+import org.netbeans.jemmy.operators.JScrollPaneOperator;
+import static org.jemmy2ext.JemmyExt.captureDebugInfoOnFail;
+
+/*
+ * @test
+ * @key headful
+ * @summary Verifies SwingSet3 ScrollPaneDemo by scrolling to bottom, to top,
+ * to left and to right and checking scroll bar values.
+ *
+ * @library /sanity/client/lib/jemmy/src
+ * @library /sanity/client/lib/Jemmy2Ext/src
+ * @library /sanity/client/lib/SwingSet3/src
+ * @build org.jemmy2ext.JemmyExt
+ * @build com.sun.swingset3.demos.scrollpane.ScrollPaneDemo
+ * @run testng ScrollPaneDemoTest
+ */
+public class ScrollPaneDemoTest {
+
+ @Test
+ public void test() throws Exception {
+ captureDebugInfoOnFail(() -> {
+ new ClassReference(ScrollPaneDemo.class.getName()).startApplication();
+
+ JFrameOperator frame = new JFrameOperator(DEMO_TITLE);
+ JScrollPaneOperator jspo = new JScrollPaneOperator(frame);
+
+ // Set initial scrollbar positions
+ int initialVerticalValue = jspo.getVerticalScrollBar().getValue();
+ int initialHorizontalValue = jspo.getHorizontalScrollBar().getValue();
+
+ System.out.println("Initial Vertical Value = " + jspo.getVerticalScrollBar().getValue());
+ System.out.println("Initial HoriZontal Value = " + jspo.getHorizontalScrollBar().getValue());
+
+ // Check scroll to Bottom
+ {
+ jspo.scrollToBottom();
+ int currentValue = jspo.getVerticalScrollBar().getValue();
+ System.out.println("Final Value = " + currentValue);
+ assertTrue("Scroll to Bottom of Pane "
+ + "(initialVerticalValue, actual value: " + initialVerticalValue + " "
+ + "< currentValue, actual value = " + currentValue + ")",
+ initialVerticalValue < currentValue);
+ }
+
+ // Check scroll to Top
+ {
+ jspo.scrollToTop();
+ int currentValue = jspo.getVerticalScrollBar().getValue();
+ System.out.println("Top Scroll Final Value = " + currentValue);
+ assertTrue("Scroll to Top of Pane "
+ + "(initialVerticalValue, actual value: " + initialVerticalValue + " "
+ + "> currentValue, actual value = " + currentValue + ")",
+ initialVerticalValue > currentValue);
+ }
+
+ // Check scroll to Left
+ {
+ jspo.scrollToLeft();
+ int currentValue = jspo.getHorizontalScrollBar().getValue();
+ System.out.println("Scroll to Left Final Value = " + currentValue);
+ assertTrue("Scroll to Left of Pane "
+ + "(initialHorizontalValue, actual value: " + initialHorizontalValue + " "
+ + "> currentValue, actual value = " + currentValue + ")",
+ initialHorizontalValue > currentValue);
+ }
+
+ // Check scroll to Right
+ {
+ jspo.scrollToRight();
+ int currentValue = jspo.getHorizontalScrollBar().getValue();
+ System.out.println("Scroll to Right Final Value = " + currentValue);
+ assertTrue("Scroll to Right of Pane "
+ + "(initialHorizontalValue, actual value: " + initialHorizontalValue + " "
+ + "< currentValue, actual value = " + currentValue + ")",
+ initialHorizontalValue < currentValue);
+ }
+ });
+ }
+
+}
diff --git a/jdk/test/sanity/client/SwingSet/src/SpinnerDemoTest.java b/jdk/test/sanity/client/SwingSet/src/SpinnerDemoTest.java
new file mode 100644
index 00000000000..89585adb6ad
--- /dev/null
+++ b/jdk/test/sanity/client/SwingSet/src/SpinnerDemoTest.java
@@ -0,0 +1,94 @@
+/*
+ * 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.
+ */
+
+import com.sun.swingset3.demos.spinner.SpinnerDemo;
+import static com.sun.swingset3.demos.spinner.SpinnerDemo.DEMO_TITLE;
+import java.text.DecimalFormat;
+import static org.testng.AssertJUnit.*;
+import org.testng.annotations.Test;
+import org.netbeans.jemmy.ClassReference;
+import org.netbeans.jemmy.operators.JFrameOperator;
+import org.netbeans.jemmy.operators.JSpinnerOperator;
+import org.netbeans.jemmy.operators.JTextFieldOperator;
+import static org.jemmy2ext.JemmyExt.captureDebugInfoOnFail;
+
+/*
+ * @test
+ * @key headful
+ * @summary Verifies SwingSet3 SpinnerDemo by adjusting each spinner value via
+ * the spinner button and checking text field value.
+ *
+ * @library /sanity/client/lib/jemmy/src
+ * @library /sanity/client/lib/Jemmy2Ext/src
+ * @library /sanity/client/lib/SwingSet3/src
+ * @build org.jemmy2ext.JemmyExt
+ * @build com.sun.swingset3.demos.spinner.SpinnerDemo
+ * @run testng SpinnerDemoTest
+ */
+public class SpinnerDemoTest {
+
+ private static final int SPINNERS_COUNT = 9;
+ private static final DecimalFormat decimalFormat = new DecimalFormat();
+
+ @Test
+ public void test() throws Exception {
+ captureDebugInfoOnFail(() -> {
+ new ClassReference(SpinnerDemo.class.getCanonicalName()).startApplication();
+
+ JFrameOperator frame = new JFrameOperator(DEMO_TITLE);
+
+ // Check changing different spinners
+ for (int i = 0; i < SPINNERS_COUNT; i++) {
+ changeValues(frame, i);
+ }
+ });
+ }
+
+ private void changeValues(JFrameOperator jfo, int spinnerIndex) throws Exception {
+ JSpinnerOperator spinner = new JSpinnerOperator(jfo, spinnerIndex);
+ JTextFieldOperator jtfo = new JTextFieldOperator(spinner);
+ float originalFieldValue = decimalFormat.parse(jtfo.getText()).floatValue();
+ float finalFieldValue;
+
+ // increment by one the value via spinner
+ spinner.getIncreaseOperator().push();
+ finalFieldValue = decimalFormat.parse(jtfo.getText()).floatValue();
+
+ // check that the value was increased
+ assertTrue("Increment Spinner " + spinner
+ + " (originalFieldValue, actual value: " + originalFieldValue + " "
+ + "< finalFieldValue, actual value = " + finalFieldValue + ")",
+ originalFieldValue < finalFieldValue);
+
+ // decrease value via spinner
+ spinner.getDecreaseOperator().push();
+ finalFieldValue = decimalFormat.parse(jtfo.getText()).floatValue();
+
+ // check that the value was decrimented
+ assertTrue("Decrement Spinner " + spinner
+ + " (originalFieldValue, actual value: " + originalFieldValue + " "
+ + ">= finalFieldValue, actual value = " + finalFieldValue + ")",
+ originalFieldValue >= finalFieldValue);
+ }
+
+}
diff --git a/jdk/test/sanity/client/SwingSet/src/SplitPaneDemoTest.java b/jdk/test/sanity/client/SwingSet/src/SplitPaneDemoTest.java
new file mode 100644
index 00000000000..2a242cc3f16
--- /dev/null
+++ b/jdk/test/sanity/client/SwingSet/src/SplitPaneDemoTest.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright (c) 2010, 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 com.sun.swingset3.demos.splitpane.SplitPaneDemo;
+import static com.sun.swingset3.demos.splitpane.SplitPaneDemo.*;
+import java.awt.event.KeyEvent;
+import javax.swing.JSplitPane;
+import static org.testng.AssertJUnit.*;
+import org.testng.annotations.Test;
+import org.netbeans.jemmy.ClassReference;
+import org.netbeans.jemmy.operators.JButtonOperator;
+import org.netbeans.jemmy.operators.JCheckBoxOperator;
+import org.netbeans.jemmy.operators.JFrameOperator;
+import org.netbeans.jemmy.operators.JRadioButtonOperator;
+import org.netbeans.jemmy.operators.JSplitPaneOperator;
+import org.netbeans.jemmy.operators.JTextFieldOperator;
+import static org.jemmy2ext.JemmyExt.*;
+
+/*
+ * @test
+ * @key headful
+ * @summary Verifies SwingSet3 SplitPaneDemo by performing OneClick expansion,
+ * changing size of the divier, moving the divider to different positions
+ * and changing the divider orientation.
+ *
+ * @library /sanity/client/lib/jemmy/src
+ * @library /sanity/client/lib/Jemmy2Ext/src
+ * @library /sanity/client/lib/SwingSet3/src
+ * @build org.jemmy2ext.JemmyExt
+ * @build com.sun.swingset3.demos.splitpane.SplitPaneDemo
+ * @run testng SplitPaneDemoTest
+ */
+public class SplitPaneDemoTest {
+
+ @Test
+ public void test() throws Exception {
+ captureDebugInfoOnFail(() -> {
+ new ClassReference(SplitPaneDemo.class.getCanonicalName()).startApplication();
+
+ JFrameOperator frame = new JFrameOperator(DEMO_TITLE);
+
+ JSplitPaneOperator splitPane = new JSplitPaneOperator(frame);
+
+ // Toggle OneTouch Expandable
+ checkOneTouch(frame, splitPane, true);
+ checkOneTouch(frame, splitPane, false);
+
+ // Check changing divider size to minimum and maximum values
+ changeDividerSize(frame, splitPane, 50);
+ changeDividerSize(frame, splitPane, 6);
+
+ // Check moving the divider
+ checkDividerMoves(frame, splitPane, false);
+ checkDividerMoves(frame, splitPane, true);
+
+ // Check different minumum Day/Night sizes
+ changeMinimumSizes(frame, splitPane, 100);
+ changeMinimumSizes(frame, splitPane, 0);
+ });
+ }
+
+ // Check for different day and night minimum size
+ public void changeMinimumSizes(JFrameOperator frame, JSplitPaneOperator splitPane, int amount) throws Exception {
+ for (String label : new String[]{FIRST_COMPONENT_MIN_SIZE, SECOND_COMPONENT_MIN_SIZE}) {
+ JTextFieldOperator size = new JTextFieldOperator(getLabeledContainerOperator(frame, label));
+ size.enterText(Integer.toString(amount));
+ size.pressKey(KeyEvent.VK_ENTER);
+ }
+ checkDividerMoves(frame, splitPane, false);
+ checkDividerMoves(frame, splitPane, true);
+ }
+
+ // Check moving of divider
+ public void checkDividerMoves(JFrameOperator frame, JSplitPaneOperator splitPane, boolean isVertical) throws Exception {
+ if (isVertical) {
+ new JRadioButtonOperator(frame, VERTICAL_SPLIT).doClick();
+ } else {
+ new JRadioButtonOperator(frame, HORIZONTAL_SPLIT).doClick();
+ }
+
+ splitPane.moveDivider(0.0);
+ assertEquals("Move Minimum, dividerLocation is at minimumDividerLocation",
+ splitPane.getMinimumDividerLocation(), splitPane.getDividerLocation());
+
+ // use getMaximumDividerLocation() to move divider to here because using proportion 1.0 does not work
+ splitPane.moveDivider(1.0);
+
+ assertEquals("Move Maximum, dividerLocation is at maximumDividerLocation",
+ splitPane.getMaximumDividerLocation(), splitPane.getDividerLocation());
+
+ splitPane.moveDivider(0.5);
+ assertEquals("Move Middle, dividerLocation is at the artithmetic average of minimum and maximum DividerLocations",
+ (splitPane.getMaximumDividerLocation() + splitPane.getMinimumDividerLocation()) / 2, splitPane.getDividerLocation());
+ }
+
+ // Check changing the size of the divider
+ public void changeDividerSize(JFrameOperator frame, JSplitPaneOperator splitPane, int amount) throws Exception {
+ JTextFieldOperator size = new JTextFieldOperator(getLabeledContainerOperator(frame, DIVIDER_SIZE));
+ size.clearText();
+ size.typeText(Integer.toString(amount));
+ size.pressKey(KeyEvent.VK_ENTER);
+
+ assertEquals("Change Divider Size", amount, splitPane.getDividerSize());
+ }
+
+ public void checkOneTouch(JFrameOperator frame, JSplitPaneOperator splitPane, boolean oneTouch) throws Exception {
+ JCheckBoxOperator checkBox = new JCheckBoxOperator(frame, ONE_TOUCH_EXPANDABLE);
+ JButtonOperator buttonLeft = new JButtonOperator(splitPane.getDivider(), 0);
+ JButtonOperator buttonRight = new JButtonOperator(splitPane.getDivider(), 1);
+ int initDividerLocation = splitPane.getDividerLocation();
+
+ if (oneTouch) {
+ if (!checkBox.isSelected()) {
+ // uncheck
+ checkBox.doClick();
+ }
+
+ int left = getUIValue(splitPane, (JSplitPane sp) -> sp.getInsets().left);
+ System.out.println("left = " + left);
+ int right = getUIValue(splitPane, (JSplitPane sp) -> sp.getInsets().right);
+ System.out.println("right = " + right);
+
+ // expand full left
+ buttonLeft.push();
+ assertEquals("Expandable Left", left, splitPane.getDividerLocation());
+
+ // expand back from full left
+ buttonRight.push();
+ assertEquals("Expandable Back to Original from Left",
+ initDividerLocation, splitPane.getDividerLocation());
+
+ // expand all the way right
+ buttonRight.push();
+ assertEquals("Expandable Right",
+ splitPane.getWidth() - splitPane.getDividerSize() - right,
+ splitPane.getDividerLocation());
+
+ // Click to move back from right expansion
+ buttonLeft.push();
+ assertEquals("Expandable Back to Original from Right",
+ initDividerLocation, splitPane.getDividerLocation());
+ }
+
+ // Test for case where one touch expandable is disabled
+ if (!oneTouch) {
+ if (checkBox.isSelected()) {
+ // uncheck
+ checkBox.doClick();
+ }
+ assertFalse("One Touch Expandable Off", splitPane.isOneTouchExpandable());
+ }
+ }
+
+}
diff --git a/jdk/test/sanity/client/SwingSet/src/TabbedPaneDemoTest.java b/jdk/test/sanity/client/SwingSet/src/TabbedPaneDemoTest.java
new file mode 100644
index 00000000000..d3d8d28245f
--- /dev/null
+++ b/jdk/test/sanity/client/SwingSet/src/TabbedPaneDemoTest.java
@@ -0,0 +1,78 @@
+/*
+ * 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.
+ */
+
+import com.sun.swingset3.demos.tabbedpane.TabbedPaneDemo;
+import static com.sun.swingset3.demos.tabbedpane.TabbedPaneDemo.*;
+import static org.jemmy2ext.JemmyExt.getLabeledContainerOperator;
+import static org.testng.AssertJUnit.*;
+import org.testng.annotations.Test;
+import org.netbeans.jemmy.ClassReference;
+import org.netbeans.jemmy.operators.ContainerOperator;
+import org.netbeans.jemmy.operators.JFrameOperator;
+import org.netbeans.jemmy.operators.JRadioButtonOperator;
+import org.netbeans.jemmy.operators.JTabbedPaneOperator;
+import static org.jemmy2ext.JemmyExt.captureDebugInfoOnFail;
+
+/*
+ * @test
+ * @key headful
+ * @summary Verifies SwingSet3 TabbedPaneDemo by iterating through tab placement
+ * positions, opening each tab and verifying the the tab gets selected.
+ *
+ * @library /sanity/client/lib/jemmy/src
+ * @library /sanity/client/lib/Jemmy2Ext/src
+ * @library /sanity/client/lib/SwingSet3/src
+ * @build org.jemmy2ext.JemmyExt
+ * @build com.sun.swingset3.demos.tabbedpane.TabbedPaneDemo
+ * @run testng TabbedPaneDemoTest
+ */
+public class TabbedPaneDemoTest {
+
+ @Test
+ public void test() throws Exception {
+ captureDebugInfoOnFail(() -> {
+ new ClassReference(TabbedPaneDemo.class.getCanonicalName()).startApplication();
+
+ JFrameOperator mainFrame = new JFrameOperator(DEMO_TITLE);
+
+ for (String tp : new String[]{TOP, LEFT, BOTTOM, RIGHT}) {
+ testTabs(mainFrame, tp);
+ }
+ });
+ }
+
+ public void testTabs(JFrameOperator mainFrame, String tabPlacement) throws Exception {
+ ContainerOperator rbCont = getLabeledContainerOperator(mainFrame, TAB_PLACEMENT);
+ new JRadioButtonOperator(rbCont, tabPlacement).doClick();
+
+ final String[] tabTitles = new String[]{CAMILLE, MIRANDA, EWAN, BOUNCE};
+ for (int i = 0; i < tabTitles.length; i++) {
+ String pageTitle = tabTitles[i];
+ JTabbedPaneOperator tabOperator = new JTabbedPaneOperator(mainFrame);
+ tabOperator.selectPage(pageTitle);
+
+ assertEquals("Selected tab is selected", i, tabOperator.getSelectedIndex());
+ }
+ }
+
+}
diff --git a/jdk/test/sanity/client/SwingSet/src/TextFieldDemoTest.java b/jdk/test/sanity/client/SwingSet/src/TextFieldDemoTest.java
new file mode 100644
index 00000000000..4d38ce38a38
--- /dev/null
+++ b/jdk/test/sanity/client/SwingSet/src/TextFieldDemoTest.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2010, 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 com.sun.swingset3.demos.textfield.JHistoryTextField;
+import com.sun.swingset3.demos.textfield.TextFieldDemo;
+import static com.sun.swingset3.demos.textfield.TextFieldDemo.*;
+import java.awt.Color;
+import java.awt.event.KeyEvent;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+import javax.swing.JFormattedTextField;
+import static org.jemmy2ext.JemmyExt.*;
+import static org.testng.AssertJUnit.*;
+import org.testng.annotations.Test;
+import org.netbeans.jemmy.ClassReference;
+import org.netbeans.jemmy.QueueTool;
+import org.netbeans.jemmy.operators.ContainerOperator;
+import org.netbeans.jemmy.operators.JButtonOperator;
+import org.netbeans.jemmy.operators.JFrameOperator;
+import org.netbeans.jemmy.operators.JLabelOperator;
+import org.netbeans.jemmy.operators.JPasswordFieldOperator;
+import org.netbeans.jemmy.operators.JTextFieldOperator;
+
+/*
+ * @test
+ * @key headful
+ * @summary Verifies SwingSet3 TextFieldDemo by entering text in each field and
+ * checking that app reacts accordingly.
+ *
+ * @library /sanity/client/lib/jemmy/src
+ * @library /sanity/client/lib/Jemmy2Ext/src
+ * @library /sanity/client/lib/SwingSet3/src
+ * @build org.jemmy2ext.JemmyExt
+ * @build com.sun.swingset3.demos.textfield.TextFieldDemo
+ * @run testng TextFieldDemoTest
+ */
+public class TextFieldDemoTest {
+
+ @Test
+ public void test() throws Exception {
+ captureDebugInfoOnFail(() -> {
+ new ClassReference(TextFieldDemo.class.getCanonicalName()).startApplication();
+
+ JFrameOperator frame = new JFrameOperator(DEMO_TITLE);
+
+ historyTextField(frame);
+ dateTextField(frame);
+ passwordField(frame);
+ });
+ }
+
+ private void historyTextField(JFrameOperator jfo) throws Exception {
+ JTextFieldOperator jtfo = new JTextFieldOperator(jfo, new ByClassChooser(JHistoryTextField.class));
+ jtfo.typeText("cat");
+
+ jtfo.pressKey(KeyEvent.VK_DOWN);
+ jtfo.pressKey(KeyEvent.VK_DOWN);
+ jtfo.pressKey(KeyEvent.VK_ENTER);
+
+ final String expectedValue = "category";
+ jtfo.waitText(expectedValue);
+ assertEquals("Select History Item", expectedValue, jtfo.getText());
+ }
+
+ public void dateTextField(JFrameOperator jfo) throws Exception {
+ JTextFieldOperator jtfo = new JTextFieldOperator(jfo,
+ new ByClassChooser(JFormattedTextField.class));
+ ContainerOperator containerOperator = new ContainerOperator<>(jtfo.getParent());
+ JButtonOperator jbo = new JButtonOperator(containerOperator, GO);
+ JLabelOperator dowLabel = new JLabelOperator(containerOperator);
+ Calendar calendar = Calendar.getInstance(Locale.ENGLISH);
+
+ // Check default date Day of the Week
+ jbo.push();
+ assertEquals("Default DOW",
+ calendar.getDisplayName(Calendar.DAY_OF_WEEK, Calendar.LONG, Locale.ENGLISH),
+ dowLabel.getText());
+
+ // Check Custom Day of the Week
+ calendar.set(2012, 9, 11); // Represents "Oct 11, 2012"
+ Date date = calendar.getTime();
+ String dateString = jtfo.getQueueTool().invokeAndWait(
+ new QueueTool.QueueAction("Formatting the value using JFormattedTextField formatter") {
+
+ @Override
+ public String launch() throws Exception {
+ return ((JFormattedTextField) jtfo.getSource()).getFormatter().valueToString(date);
+ }
+ });
+ System.out.println("dateString = " + dateString);
+ jtfo.enterText(dateString);
+
+ jbo.push();
+ assertEquals("Custom DOW", "Thursday", dowLabel.getText());
+ }
+
+ public void passwordField(JFrameOperator jfo) throws Exception {
+ JPasswordFieldOperator password1 = new JPasswordFieldOperator(jfo, 0);
+ JPasswordFieldOperator password2 = new JPasswordFieldOperator(jfo, 1);
+
+ password1.typeText("password");
+ password2.typeText("password");
+
+ // Check Matching Passwords
+ assertEquals("Matching Passwords", Color.green, password1.getBackground());
+ assertEquals("Matching Passwords", Color.green, password2.getBackground());
+
+ // Check non-matching passwords
+ password2.typeText("passwereertegrs");
+ assertEquals("Non-Matching Passwords", Color.white, password1.getBackground());
+ assertEquals("Non-Matching Passwords", Color.white, password2.getBackground());
+ }
+
+}
diff --git a/jdk/test/sanity/client/SwingSet/src/ToggleButtonDemoTest.java b/jdk/test/sanity/client/SwingSet/src/ToggleButtonDemoTest.java
new file mode 100644
index 00000000000..c240540739e
--- /dev/null
+++ b/jdk/test/sanity/client/SwingSet/src/ToggleButtonDemoTest.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 2010, 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 com.sun.swingset3.DemoProperties;
+import com.sun.swingset3.demos.togglebutton.DirectionPanel;
+import com.sun.swingset3.demos.togglebutton.LayoutControlPanel;
+import com.sun.swingset3.demos.togglebutton.ToggleButtonDemo;
+import static com.sun.swingset3.demos.togglebutton.ToggleButtonDemo.*;
+import java.util.function.BiFunction;
+import org.jemmy2ext.JemmyExt.ByClassChooser;
+import static org.jemmy2ext.JemmyExt.EXACT_STRING_COMPARATOR;
+import static org.jemmy2ext.JemmyExt.getBorderTitledJPanelOperator;
+import static org.jemmy2ext.JemmyExt.getLabeledContainerOperator;
+import static org.testng.AssertJUnit.*;
+import org.testng.annotations.Test;
+import org.netbeans.jemmy.ClassReference;
+import org.netbeans.jemmy.ComponentChooser;
+import org.netbeans.jemmy.operators.ContainerOperator;
+import org.netbeans.jemmy.operators.JCheckBoxOperator;
+import org.netbeans.jemmy.operators.JFrameOperator;
+import org.netbeans.jemmy.operators.JRadioButtonOperator;
+import org.netbeans.jemmy.operators.JTabbedPaneOperator;
+import static org.jemmy2ext.JemmyExt.captureDebugInfoOnFail;
+
+/*
+ * @test
+ * @key headful
+ * @summary Verifies SwingSet3 ToggleButtonDemo by toggling each radio button,
+ * each checkbox and each location of the direction dial toggle.
+ * It verifies initial selected values for all the elements and checks
+ * that those change upon clicking. When toggling radio buttons it
+ * verifies that other radio buttons in the same group are not longer
+ * selected.
+ *
+ * @library /sanity/client/lib/jemmy/src
+ * @library /sanity/client/lib/Jemmy2Ext/src
+ * @library /sanity/client/lib/SwingSet3/src
+ * @build org.jemmy2ext.JemmyExt
+ * @build com.sun.swingset3.demos.togglebutton.ToggleButtonDemo
+ * @run testng ToggleButtonDemoTest
+ */
+public class ToggleButtonDemoTest {
+
+ @Test
+ public void test() throws Exception {
+ captureDebugInfoOnFail(() -> {
+ new ClassReference(ToggleButtonDemo.class.getCanonicalName()).startApplication();
+
+ JFrameOperator mainFrame = new JFrameOperator(ToggleButtonDemo.class.getAnnotation(DemoProperties.class).value());
+ JTabbedPaneOperator tabPane = new JTabbedPaneOperator(mainFrame);
+
+ // Radio Button Toggles
+ testRadioButtons(getBorderTitledJPanelOperator(mainFrame, TEXT_RADIO_BUTTONS), 3, null);
+ testRadioButtons(getBorderTitledJPanelOperator(mainFrame, IMAGE_RADIO_BUTTONS), 3, null);
+ testRadioButtons(getLabeledContainerOperator(mainFrame, PAD_AMOUNT), 3, (t, i) -> DEFAULT.equals(t));
+
+ // switch to the Check Boxes Tab
+ tabPane.selectPage(CHECK_BOXES);
+
+ // Check Box Toggles
+ ContainerOperator textCheckBoxesJPanel = getBorderTitledJPanelOperator(mainFrame, TEXT_CHECKBOXES);
+ testCheckBox(textCheckBoxesJPanel, CHECK1, false);
+ testCheckBox(textCheckBoxesJPanel, CHECK2, false);
+ testCheckBox(textCheckBoxesJPanel, CHECK3, false);
+
+ ContainerOperator imageCheckBoxesJPanel = getBorderTitledJPanelOperator(mainFrame, IMAGE_CHECKBOXES);
+ testCheckBox(imageCheckBoxesJPanel, CHECK1, false);
+ testCheckBox(imageCheckBoxesJPanel, CHECK2, false);
+ testCheckBox(imageCheckBoxesJPanel, CHECK3, false);
+
+ ContainerOperator displayOptionsContainer = getLabeledContainerOperator(mainFrame, DISPLAY_OPTIONS);
+ testCheckBox(displayOptionsContainer, PAINT_BORDER, false);
+ testCheckBox(displayOptionsContainer, PAINT_FOCUS, true);
+ testCheckBox(displayOptionsContainer, ENABLED, true);
+ testCheckBox(displayOptionsContainer, CONTENT_FILLED, true);
+
+ // Direction Button Toggles
+ testToggleButtons(mainFrame);
+ });
+ }
+
+ /**
+ * The interface is invoked for each radio button providing its name and
+ * index and it should return whether the radio button has to be selected.
+ */
+ private static interface SelectedRadioButton extends BiFunction {
+ }
+
+ /**
+ * Tests a group of radio buttons
+ *
+ * @param parent container containing the buttons
+ * @param radioButtonCount number of radio buttons
+ * @param selectedRadioButton initial selected radio button
+ */
+ private void testRadioButtons(ContainerOperator parent, int radioButtonCount, SelectedRadioButton selectedRadioButton) {
+ JRadioButtonOperator[] jrbo = new JRadioButtonOperator[radioButtonCount];
+ for (int i = 0; i < radioButtonCount; i++) {
+ jrbo[i] = new JRadioButtonOperator(parent, i);
+ if (selectedRadioButton != null && selectedRadioButton.apply(jrbo[i].getText(), i)) {
+ assertTrue("Radio Button " + i + " is initially selected", jrbo[i].isSelected());
+ } else {
+ assertFalse("Radio Button " + i + " is initially not selected", jrbo[i].isSelected());
+ }
+ }
+
+ for (int i = 0; i < radioButtonCount; i++) {
+ jrbo[i].doClick();
+ assertTrue("Radio Button " + i + " is selected", jrbo[i].isSelected());
+
+ for (int j = 0; j < radioButtonCount; j++) {
+ if (i != j) {
+ assertFalse("Radio Button " + j + " is not selected", jrbo[j].isSelected());
+ }
+ }
+ }
+ }
+
+ /**
+ * Will change the state of the CheckBox then change back to initial state.
+ *
+ * @param parent
+ * @param text
+ * @param expectedValue
+ * @throws Exception
+ */
+ private void testCheckBox(ContainerOperator parent, String text, boolean expectedValue) {
+
+ parent.setComparator(EXACT_STRING_COMPARATOR);
+ JCheckBoxOperator jcbo = new JCheckBoxOperator(parent, text);
+ assertEquals("Initial selection state of the checkbox '" + text + "'", expectedValue, jcbo.isSelected());
+
+ // click check box (toggle the state)
+ jcbo.doClick();
+ assertEquals("Selection state of the checkbox '" + text + "' after click", !expectedValue, jcbo.isSelected());
+ if (jcbo.isSelected()) {
+ // toggle back to not-selected state
+ jcbo.doClick();
+ assertFalse("Check Box '" + text + "' is not selected", jcbo.isSelected());
+ } else {
+ // toggle back to selected state
+ jcbo.doClick();
+
+ assertTrue("Check Box '" + text + "' is selected", jcbo.isSelected());
+ }
+ }
+
+
+ /*
+ * testDirectionRadioButtons(JFrameOperator) will toggle each position of
+ * the direction radio button panels
+ */
+ private void testToggleButtons(JFrameOperator jfo) {
+ ComponentChooser directionPanelChooser = new ByClassChooser(DirectionPanel.class);
+
+ String text_Position = LayoutControlPanel.TEXT_POSITION;
+ ContainerOperator textPositionContainer = getLabeledContainerOperator(jfo, text_Position);
+ ContainerOperator directionPanelOperator = new ContainerOperator<>(textPositionContainer, directionPanelChooser);
+ testRadioButtons(directionPanelOperator, 9, (t, i) -> i == 5);
+
+ // Unfortunately, both directionPanels are in the same parent container
+ // so we have to use indexes here.
+ // There is no guarantee that if the UI changes, the code would be still
+ // valid in terms of which directionPanel is checked first. However, it
+ // does guarantee that two different directionPanels are checked.
+ String content_Alignment = LayoutControlPanel.CONTENT_ALIGNMENT;
+ ContainerOperator contentAlignmentContainer = getLabeledContainerOperator(jfo, content_Alignment);
+ ContainerOperator directionPanelOperator2 = new ContainerOperator<>(contentAlignmentContainer, directionPanelChooser,
+ contentAlignmentContainer.getSource() == textPositionContainer.getSource() ? 1 : 0);
+ testRadioButtons(directionPanelOperator2, 9, (t, i) -> i == 4);
+
+ }
+
+}
diff --git a/jdk/test/sanity/client/SwingSet/src/TreeDemoTest.java b/jdk/test/sanity/client/SwingSet/src/TreeDemoTest.java
new file mode 100644
index 00000000000..b558d6fb96c
--- /dev/null
+++ b/jdk/test/sanity/client/SwingSet/src/TreeDemoTest.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2010, 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 com.sun.swingset3.demos.tree.TreeDemo;
+import static com.sun.swingset3.demos.tree.TreeDemo.DEMO_TITLE;
+import javax.swing.tree.TreePath;
+import static org.testng.AssertJUnit.*;
+import org.testng.annotations.Test;
+import org.netbeans.jemmy.ClassReference;
+import org.netbeans.jemmy.operators.JFrameOperator;
+import org.netbeans.jemmy.operators.JTreeOperator;
+import static org.jemmy2ext.JemmyExt.captureDebugInfoOnFail;
+
+/*
+ * @test
+ * @key headful
+ * @summary Verifies SwingSet3 TreeDemo by expanding all collapsed nodes in the
+ * tree and then collapsing all the expanded nodes in the tree. It
+ * verifies the number of nodes expanded, number of nodes collapsed and
+ * number of rows in the tree in the begininng, after expanding and
+ * after collapsing the nodes. It also checks that the tree grows
+ * vertically (as ScrollPane allows it).
+ *
+ * @library /sanity/client/lib/jemmy/src
+ * @library /sanity/client/lib/Jemmy2Ext/src
+ * @library /sanity/client/lib/SwingSet3/src
+ * @build org.jemmy2ext.JemmyExt
+ * @build com.sun.swingset3.demos.tree.TreeDemo
+ * @run testng TreeDemoTest
+ */
+public class TreeDemoTest {
+
+ @Test
+ public void test() throws Exception {
+ captureDebugInfoOnFail(() -> {
+ new ClassReference(TreeDemo.class.getCanonicalName()).startApplication();
+
+ JFrameOperator frame = new JFrameOperator(DEMO_TITLE);
+
+ JTreeOperator tree = new JTreeOperator(frame);
+
+ assertEquals("Initial number of rows in the tree", 4, tree.getRowCount());
+
+ int initialTreeHeight = tree.getHeight();
+
+ // expand all nodes
+ int expandsCount = 0;
+ for (int i = 0; i < tree.getRowCount(); i++) {
+ TreePath tp = tree.getPathForRow(i);
+ if (tree.getChildCount(tp) > 0 && !tree.isExpanded(tp)) {
+ tree.expandRow(i);
+ expandsCount++;
+ }
+ }
+
+ assertEquals("Number of rows expanded", 75, expandsCount);
+ assertEquals("Number of rows in the tree after expanding all of them",
+ 616, tree.getRowCount());
+
+ int expandedTreeHeight = tree.getHeight();
+ assertTrue("Expanded tree height has increased, current "
+ + expandedTreeHeight + " > initial " + initialTreeHeight,
+ expandedTreeHeight > initialTreeHeight);
+
+ // collapse all nodes
+ int collapsesCount = 0;
+ for (int i = tree.getRowCount() - 1; i >= 0; i--) {
+ TreePath tp = tree.getPathForRow(i);
+ if (tree.getChildCount(tp) > 0 && tree.isExpanded(tp)) {
+ tree.collapseRow(i);
+ collapsesCount++;
+ }
+ }
+
+ assertEquals("Number of rows collapsed", 76, collapsesCount);
+ assertEquals("Number of rows in the tree after collapsing all of them",
+ 1, tree.getRowCount());
+
+ int collapsedTreeHeight = tree.getHeight();
+ assertTrue("Collpased tree height is not longer than initial, "
+ + "current " + collapsedTreeHeight + " <= initial "
+ + initialTreeHeight,
+ collapsedTreeHeight <= initialTreeHeight);
+
+ });
+ }
+
+}
diff --git a/jdk/test/sanity/client/SwingSet/src/WindowDemoTest.java b/jdk/test/sanity/client/SwingSet/src/WindowDemoTest.java
new file mode 100644
index 00000000000..ef0fb850360
--- /dev/null
+++ b/jdk/test/sanity/client/SwingSet/src/WindowDemoTest.java
@@ -0,0 +1,76 @@
+/*
+ * 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.
+ */
+
+import com.sun.swingset3.demos.window.WindowDemo;
+import static com.sun.swingset3.demos.window.WindowDemo.*;
+import static org.jemmy2ext.JemmyExt.*;
+import static org.testng.AssertJUnit.*;
+import org.testng.annotations.Test;
+import org.netbeans.jemmy.ClassReference;
+import org.netbeans.jemmy.operators.JButtonOperator;
+import org.netbeans.jemmy.operators.JFrameOperator;
+import org.netbeans.jemmy.operators.JLabelOperator;
+import org.netbeans.jemmy.operators.WindowOperator;
+
+/*
+ * @test
+ * @key headful
+ * @summary Verifies SwingSet3 WindowDemo by checking that separate JWindow is
+ * shown, it contains predefined label and no new windows are opened
+ * when the "Show JWindow..." button is clicked.
+ *
+ * @library /sanity/client/lib/jemmy/src
+ * @library /sanity/client/lib/Jemmy2Ext/src
+ * @library /sanity/client/lib/SwingSet3/src
+ * @build org.jemmy2ext.JemmyExt
+ * @build com.sun.swingset3.demos.window.WindowDemo
+ * @run testng WindowDemoTest
+ */
+public class WindowDemoTest {
+
+ @Test
+ public void test() throws Exception {
+ captureDebugInfoOnFail(() -> {
+ new ClassReference(WindowDemo.class.getCanonicalName()).startApplication();
+
+ JFrameOperator frame = new JFrameOperator();
+
+ assertEquals("Only one JWindow is shown", 1, getJWindowCount());
+
+ WindowOperator window = new WindowOperator(getJWindow());
+
+ assertTrue("JFrame is showing", frame.isShowing());
+ assertFalse("JFrame is not iconified", isIconified(frame));
+ assertTrue("JWindow is showing", window.isShowing());
+
+ final String labelText = I_HAVE_NO_SYSTEM_BORDER;
+ JLabelOperator jLabelOperator = new JLabelOperator(window, labelText);
+ assertEquals("JWindow contains the label with corresponding text", labelText, jLabelOperator.getText());
+
+ new JButtonOperator(frame, SHOW_J_WINDOW).push();
+
+ assertEquals("Only one JWindow is shown", 1, getJWindowCount());
+ });
+ }
+
+}
diff --git a/jdk/test/sanity/client/TEST.ROOT.template b/jdk/test/sanity/client/TEST.ROOT.template
new file mode 100644
index 00000000000..6881809d9f8
--- /dev/null
+++ b/jdk/test/sanity/client/TEST.ROOT.template
@@ -0,0 +1,24 @@
+# This file identifies the root of the test-suite hierarchy.
+# It also contains test-suite configuration information.
+
+# The list of keywords supported in the entire test suite. The
+# "intermittent" keyword marks tests known to fail intermittently.
+# The "randomness" keyword marks tests using randomness with test
+# cases differing from run to run. (A test using a fixed random seed
+# would not count as "randomness" by this definition.) Extra care
+# should be taken to handle test failures of intermittent or
+# randomness tests.
+#
+# A "headful" test requires a graphical environment to meaningfully
+# run. Tests that are not headful are "headless."
+
+keys=screenshots
+
+# Tests that must run in othervm mode
+othervm.dirs=sanity/client/SwingSet
+
+# Tests that cannot run concurrently
+exclusiveAccess.dirs=sanity/client/SwingSet
+
+# Tests using jtreg 4.1 b13 features
+requiredVersion=4.1 b13
diff --git a/jdk/test/sanity/client/TEST.properties b/jdk/test/sanity/client/TEST.properties
new file mode 100644
index 00000000000..343e80e76f2
--- /dev/null
+++ b/jdk/test/sanity/client/TEST.properties
@@ -0,0 +1,14 @@
+# This file contains test-suite configuration information related to this portion
+# of the test suite.
+#
+# A "screenshots" test requires a 100% headful graphical environment
+# as they rely on Robot to take screenshots and move mouse.
+
+# The list of keywords supported in this part of the test suite
+keys=screenshots
+
+# Tests that cannot run concurrently
+exclusiveAccess.dirs=SwingSet
+
+# Tests require jtreg 4.1 b13 features
+#requiredVersion=4.1 b13
diff --git a/jdk/test/sanity/client/lib/Jemmy2Ext/src/org/jemmy2ext/JemmyExt.java b/jdk/test/sanity/client/lib/Jemmy2Ext/src/org/jemmy2ext/JemmyExt.java
new file mode 100644
index 00000000000..fe0431b684e
--- /dev/null
+++ b/jdk/test/sanity/client/lib/Jemmy2Ext/src/org/jemmy2ext/JemmyExt.java
@@ -0,0 +1,614 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+package org.jemmy2ext;
+
+import java.awt.Component;
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.awt.Window;
+import java.awt.image.BufferedImage;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Function;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.stream.IntStream;
+import javax.imageio.ImageIO;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.JWindow;
+import javax.swing.border.Border;
+import javax.swing.border.CompoundBorder;
+import javax.swing.border.TitledBorder;
+import org.netbeans.jemmy.ComponentChooser;
+import org.netbeans.jemmy.DefaultCharBindingMap;
+import org.netbeans.jemmy.QueueTool;
+import org.netbeans.jemmy.TimeoutExpiredException;
+import org.netbeans.jemmy.Waitable;
+import org.netbeans.jemmy.Waiter;
+import org.netbeans.jemmy.drivers.scrolling.JSpinnerDriver;
+import org.netbeans.jemmy.image.StrictImageComparator;
+import org.netbeans.jemmy.operators.ComponentOperator;
+import org.netbeans.jemmy.operators.ContainerOperator;
+import org.netbeans.jemmy.operators.FrameOperator;
+import org.netbeans.jemmy.operators.JButtonOperator;
+import org.netbeans.jemmy.operators.JFrameOperator;
+import org.netbeans.jemmy.operators.JLabelOperator;
+import org.netbeans.jemmy.operators.Operator;
+import org.netbeans.jemmy.util.Dumper;
+import org.netbeans.jemmy.util.PNGEncoder;
+import static org.testng.AssertJUnit.*;
+
+/**
+ * This class solves two tasks: 1. It adds functionality that is missing in
+ * Jemmy 2. It references all the Jemmy API that is needed by tests so that they
+ * can just @build JemmyExt class and do not worry about Jemmy
+ *
+ * @author akouznet
+ */
+public class JemmyExt {
+
+ /**
+ * Statically referencing all the classes that are needed by tests so that
+ * they're compiled by jtreg
+ */
+ static final Class[] DEPENDENCIES = {
+ JSpinnerDriver.class,
+ DefaultCharBindingMap.class
+ };
+
+ public static void assertNotBlack(BufferedImage image) {
+ int w = image.getWidth();
+ int h = image.getHeight();
+ try {
+ assertFalse("All pixels are not black", IntStream.range(0, w).parallel().allMatch(x
+ -> IntStream.range(0, h).allMatch(y -> (image.getRGB(x, y) & 0xffffff) == 0)
+ ));
+ } catch (Throwable t) {
+ save(image, "allPixelsAreBlack.png");
+ throw t;
+ }
+ }
+
+ public static void waitArmed(JButtonOperator button) {
+ button.waitState(new ComponentChooser() {
+
+ @Override
+ public boolean checkComponent(Component comp) {
+ return isArmed(button);
+ }
+
+ @Override
+ public String getDescription() {
+ return "Button is armed";
+ }
+ });
+ }
+
+ public static boolean isArmed(JButtonOperator button) {
+ return button.getQueueTool().invokeSmoothly(new QueueTool.QueueAction("getModel().isArmed()") {
+
+ @Override
+ public Boolean launch() throws Exception {
+ return ((JButton) button.getSource()).getModel().isArmed();
+ }
+ });
+ }
+
+ public static void waitPressed(JButtonOperator button) {
+ button.waitState(new ComponentChooser() {
+
+ @Override
+ public boolean checkComponent(Component comp) {
+ return isPressed(button);
+ }
+
+ @Override
+ public String getDescription() {
+ return "Button is pressed";
+ }
+ });
+ }
+
+ public static boolean isPressed(JButtonOperator button) {
+ return button.getQueueTool().invokeSmoothly(new QueueTool.QueueAction("getModel().isPressed()") {
+
+ @Override
+ public Boolean launch() throws Exception {
+ return ((JButton) button.getSource()).getModel().isPressed();
+ }
+ });
+ }
+
+ public static void assertEquals(String string, StrictImageComparator comparator, BufferedImage expected, BufferedImage actual) {
+ try {
+ assertTrue(string, comparator.compare(expected, actual));
+ } catch (Error err) {
+ save(expected, "expected.png");
+ save(actual, "actual.png");
+ throw err;
+ }
+ }
+
+ public static void assertNotEquals(String string, StrictImageComparator comparator, BufferedImage notExpected, BufferedImage actual) {
+ try {
+ assertFalse(string, comparator.compare(notExpected, actual));
+ } catch (Error err) {
+ save(notExpected, "notExpected.png");
+ save(actual, "actual.png");
+ throw err;
+ }
+ }
+
+ public static void save(BufferedImage image, String filename) {
+ String filepath = filename;
+ try {
+ filepath = new File(filename).getCanonicalPath();
+ System.out.println("Saving screenshot to " + filepath);
+ BufferedOutputStream file = new BufferedOutputStream(new FileOutputStream(filepath));
+ new PNGEncoder(file, PNGEncoder.COLOR_MODE).encode(image);
+ } catch (IOException ioe) {
+ throw new RuntimeException("Failed to save image to " + filepath, ioe);
+ }
+ }
+
+ public static void waitImageIsStill(Robot rob, ComponentOperator operator) {
+ operator.waitState(new ComponentChooser() {
+
+ private BufferedImage previousImage = null;
+ private int index = 0;
+ private final StrictImageComparator sComparator = new StrictImageComparator();
+
+ @Override
+ public boolean checkComponent(Component comp) {
+ BufferedImage currentImage = capture(rob, operator);
+ save(currentImage, "waitImageIsStill" + index + ".png");
+ index++;
+ boolean compareResult = previousImage == null ? false : sComparator.compare(currentImage, previousImage);
+ previousImage = currentImage;
+ return compareResult;
+ }
+
+ @Override
+ public String getDescription() {
+ return "Image of " + operator + " is still";
+ }
+ });
+ }
+
+ private static class ThrowableHolder {
+
+ volatile Throwable t;
+ }
+
+ public static void waitFor(String description, RunnableWithException r) throws Exception {
+ Waiter waiter = new Waiter<>(new Waitable() {
+
+ @Override
+ public Boolean actionProduced(ThrowableHolder obj) {
+ try {
+ r.run();
+ return true;
+ } catch (Throwable t) {
+ obj.t = t;
+ return null;
+ }
+ }
+
+ @Override
+ public String getDescription() {
+ return description;
+ }
+ });
+ ThrowableHolder th = new ThrowableHolder();
+ try {
+ waiter.waitAction(th);
+ } catch (TimeoutExpiredException tee) {
+ Throwable t = th.t;
+ if (t != null) {
+ t.addSuppressed(tee);
+ if (t instanceof Exception) {
+ throw (Exception) t;
+ } else if (t instanceof Error) {
+ throw (Error) t;
+ } else if (t instanceof RuntimeException) {
+ throw (RuntimeException) t;
+ } else {
+ throw new IllegalStateException("Unexpected exception type", t);
+ }
+ }
+ }
+ }
+
+ public static BufferedImage capture(Robot rob, ComponentOperator operator) {
+ Rectangle boundary = new Rectangle(operator.getLocationOnScreen(),
+ operator.getSize());
+ return rob.createScreenCapture(boundary);
+ }
+
+ /**
+ * Wraps the test code so that in case of any failure as much information as
+ * possible is captured
+ *
+ * @param r test code Runnable
+ * @throws Exception whatever exception the test may throw
+ */
+ public static void captureDebugInfoOnFail(RunnableWithException r) throws Exception {
+ // TODO: Remove this once https://bugs.openjdk.java.net/browse/JDK-8151671 is fixed
+ try {
+ r.run();
+ System.out.println("TEST PASSED");
+ } catch (Throwable t) {
+ captureAll();
+ throw t;
+ }
+ }
+
+ /**
+ * This is a helper class which allows to catch throwables thrown in other
+ * threads and throw them in the main test thread
+ */
+ public static class MultiThreadedTryCatch {
+
+ private final List throwables
+ = Collections.synchronizedList(new ArrayList<>());
+
+ /**
+ * Throws registered throwables. If the list of the registered
+ * throwables is not empty, it re-throws the first throwable in the list
+ * adding all others into its suppressed list. Can be used in any
+ * thread.
+ *
+ * @throws Exception
+ */
+ public void throwRegistered() throws Exception {
+ Throwable root = null;
+ synchronized (throwables) {
+ if (!throwables.isEmpty()) {
+ root = throwables.remove(0);
+ while (!throwables.isEmpty()) {
+ root.addSuppressed(throwables.remove(0));
+ }
+ }
+ }
+ if (root != null) {
+ if (root instanceof Error) {
+ throw (Error) root;
+ } else if (root instanceof Exception) {
+ throw (Exception) root;
+ } else {
+ throw new AssertionError("Unexpected exception type: " + root.getClass() + " (" + root + ")");
+ }
+ }
+ }
+
+ /**
+ * Registers a throwable and adds it to the list of throwables. Can be
+ * used in any thread.
+ *
+ * @param t
+ */
+ public void register(Throwable t) {
+ t.printStackTrace();
+ throwables.add(t);
+ }
+
+ /**
+ * Registers a throwable and adds it as the first item of the list of
+ * catched throwables.
+ *
+ * @param t
+ */
+ public void registerRoot(Throwable t) {
+ t.printStackTrace();
+ throwables.add(0, t);
+ }
+ }
+
+ /**
+ * Trying to capture as much information as possible. Currently it includes
+ * full dump and a screenshot of the whole screen.
+ */
+ public static void captureAll() {
+ PNGEncoder.captureScreen("failure.png", PNGEncoder.COLOR_MODE);
+ try {
+ Dumper.dumpAll("dumpAll.xml");
+ } catch (FileNotFoundException ex) {
+ Logger.getLogger(JemmyExt.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ captureWindows();
+ }
+
+ /**
+ * Captures each showing window image using Window.paint() method.
+ */
+ private static void captureWindows() {
+ try {
+ EventQueue.invokeAndWait(() -> {
+ Window[] windows = Window.getWindows();
+ int index = 0;
+ for (Window w : windows) {
+ if (!w.isShowing()) {
+ continue;
+ }
+ BufferedImage img = new BufferedImage(w.getWidth(), w.getHeight(), BufferedImage.TYPE_INT_ARGB);
+ Graphics g = img.getGraphics();
+ w.paint(g);
+ g.dispose();
+
+ try {
+ ImageIO.write(img, "png", new File("window" + index++ + ".png"));
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ });
+ } catch (InterruptedException | InvocationTargetException ex) {
+ Logger.getLogger(JemmyExt.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ }
+
+ public static interface RunnableWithException {
+
+ public void run() throws Exception;
+ }
+
+ public static void waitIsFocused(JFrameOperator jfo) {
+ jfo.waitState(new ComponentChooser() {
+
+ @Override
+ public boolean checkComponent(Component comp) {
+ return jfo.isFocused();
+ }
+
+ @Override
+ public String getDescription() {
+ return "JFrame is focused";
+ }
+ });
+ }
+
+ public static int getJWindowCount() {
+ return new QueueTool().invokeAndWait(new QueueTool.QueueAction(null) {
+
+ @Override
+ public Integer launch() throws Exception {
+ Window[] windows = Window.getWindows();
+ int windowCount = 0;
+ for (Window w : windows) {
+ if (w.getClass().equals(JWindow.class)) {
+ windowCount++;
+ }
+ }
+ return windowCount;
+ }
+ });
+ }
+
+ public static JWindow getJWindow() {
+ return getJWindow(0);
+ }
+
+ public static JWindow getJWindow(int index) {
+ return new QueueTool().invokeAndWait(new QueueTool.QueueAction(null) {
+
+ @Override
+ public JWindow launch() throws Exception {
+ Window[] windows = Window.getWindows();
+ int windowIndex = 0;
+ for (Window w : windows) {
+ if (w.getClass().equals(JWindow.class)) {
+ if (windowIndex == index) {
+ return (JWindow) w;
+ }
+ windowIndex++;
+ }
+ }
+ return null;
+ }
+ });
+ }
+
+ public static boolean isIconified(FrameOperator frameOperator) {
+ return frameOperator.getQueueTool().invokeAndWait(new QueueTool.QueueAction("Frame is iconified") {
+
+ @Override
+ public Boolean launch() throws Exception {
+ return (((Frame) frameOperator.getSource()).getState() & Frame.ICONIFIED) != 0;
+ }
+ });
+ }
+
+ public static final Operator.DefaultStringComparator EXACT_STRING_COMPARATOR
+ = new Operator.DefaultStringComparator(true, true);
+
+ /**
+ * Finds a label with the exact labelText and returns the operator for its
+ * parent container.
+ *
+ * @param container
+ * @param labelText
+ * @return
+ */
+ public static ContainerOperator getLabeledContainerOperator(ContainerOperator container, String labelText) {
+
+ container.setComparator(EXACT_STRING_COMPARATOR);
+
+ JLabelOperator jLabelOperator = new JLabelOperator(container, labelText);
+
+ assert labelText.equals(jLabelOperator.getText());
+
+ return new ContainerOperator<>(jLabelOperator.getParent());
+ }
+
+ /**
+ * Finds a JPanel with exact title text.
+ *
+ * @param container
+ * @param titleText
+ * @return
+ */
+ public static ContainerOperator getBorderTitledJPanelOperator(ContainerOperator container, String titleText) {
+ return new ContainerOperator<>(container, new JPanelByBorderTitleFinder(titleText, EXACT_STRING_COMPARATOR));
+ }
+
+ public static final QueueTool QUEUE_TOOL = new QueueTool();
+
+ /**
+ * Allows to find JPanel by the title text in its border.
+ */
+ public static class JPanelByBorderTitleFinder implements ComponentChooser {
+
+ String titleText;
+ Operator.StringComparator comparator;
+
+ /**
+ * @param titleText title text pattern
+ * @param comparator specifies string comparison algorithm.
+ */
+ public JPanelByBorderTitleFinder(String titleText, Operator.StringComparator comparator) {
+ this.titleText = titleText;
+ this.comparator = comparator;
+ }
+
+ /**
+ * @param titleText title text pattern
+ */
+ public JPanelByBorderTitleFinder(String titleText) {
+ this(titleText, Operator.getDefaultStringComparator());
+ }
+
+ @Override
+ public boolean checkComponent(Component comp) {
+ assert EventQueue.isDispatchThread();
+ if (comp instanceof JPanel) {
+ return checkBorder(((JPanel) comp).getBorder());
+ }
+ return false;
+ }
+
+ public boolean checkBorder(Border border) {
+ if (border instanceof TitledBorder) {
+ String title = ((TitledBorder) border).getTitle();
+ return comparator.equals(title, titleText);
+ } else if (border instanceof CompoundBorder) {
+ CompoundBorder compoundBorder = (CompoundBorder) border;
+ return checkBorder(compoundBorder.getInsideBorder()) || checkBorder(compoundBorder.getOutsideBorder());
+ } else {
+ return false;
+ }
+ }
+
+ @Override
+ public String getDescription() {
+ return ("JPanel with border title text \"" + titleText + "\" with comparator " + comparator);
+ }
+ }
+
+ public static class ByClassSimpleNameChooser implements ComponentChooser {
+
+ private final String className;
+
+ public ByClassSimpleNameChooser(String className) {
+ this.className = className;
+ }
+
+ @Override
+ public boolean checkComponent(Component comp) {
+ return comp.getClass().getSimpleName().equals(className);
+ }
+
+ @Override
+ public String getDescription() {
+ return "Component with the simple class name of " + className;
+ }
+
+ }
+
+ public static class ByClassChooser implements ComponentChooser {
+
+ private final Class clazz;
+
+ public ByClassChooser(Class clazz) {
+ this.clazz = clazz;
+ }
+
+ @Override
+ public boolean checkComponent(Component comp) {
+ return comp.getClass().equals(clazz);
+ }
+
+ @Override
+ public String getDescription() {
+ return "Component with the class of " + clazz;
+ }
+
+ }
+
+ public static class ByToolTipChooser implements ComponentChooser {
+
+ private final String tooltip;
+
+ public ByToolTipChooser(String tooltip) {
+ if (tooltip == null) {
+ throw new NullPointerException("Tooltip cannot be null");
+ }
+ this.tooltip = tooltip;
+ }
+
+ @Override
+ public boolean checkComponent(Component comp) {
+ return (comp instanceof JComponent)
+ ? tooltip.equals(((JComponent) comp).getToolTipText())
+ : false;
+ }
+
+ @Override
+ public String getDescription() {
+ return "JComponent with the tooltip '" + tooltip + "'";
+ }
+
+ }
+
+ @SuppressWarnings(value = "unchecked")
+ public static R getUIValue(O operator, Function getter) {
+ return operator.getQueueTool().invokeSmoothly(new QueueTool.QueueAction("getting UI value through the queue using " + getter) {
+
+ @Override
+ public R launch() throws Exception {
+ return getter.apply((S) operator.getSource());
+ }
+ });
+ }
+}
diff --git a/jdk/test/sanity/client/lib/SwingSet3/README b/jdk/test/sanity/client/lib/SwingSet3/README
new file mode 100644
index 00000000000..1952a70cd26
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/README
@@ -0,0 +1,4 @@
+This content of this src folder was originally taken from SwingSet3 demo project: https://java.net/projects/swingset3/.
+Then it was modified to increase testability and remove extra content and extra dependencies.
+
+Do NOT modify files in it.
\ No newline at end of file
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/DemoProperties.java b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/DemoProperties.java
new file mode 100644
index 00000000000..19781096f74
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/DemoProperties.java
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+package com.sun.swingset3;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Annotation type for specifying meta-data about Demo
+ *
+ * @author aim
+ */
+@Retention(RetentionPolicy.RUNTIME)
+public @interface DemoProperties {
+
+ String value(); // Name
+
+ String category();
+
+ String description();
+
+ String iconFile() default "";
+
+ String[] sourceFiles() default "";
+}
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/DemoUtilities.java b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/DemoUtilities.java
new file mode 100644
index 00000000000..8049ec9ba3b
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/DemoUtilities.java
@@ -0,0 +1,115 @@
+/*
+ * 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.
+ */
+package com.sun.swingset3.demos;
+
+import java.awt.*;
+import java.net.URI;
+import java.io.IOException;
+import javax.swing.*;
+
+/**
+ * @author Pavel Porvatov
+ */
+public class DemoUtilities {
+
+ private DemoUtilities() {
+ // Hide constructor
+ }
+
+ public static void setToplevelLocation(Window toplevel, Component component,
+ int relativePosition) {
+
+ Rectangle compBounds = component.getBounds();
+
+ // Convert component location to screen coordinates
+ Point p = new Point();
+ SwingUtilities.convertPointToScreen(p, component);
+
+ int x;
+ int y;
+
+ // Set frame location to be centered on panel
+ switch (relativePosition) {
+ case SwingConstants.NORTH: {
+ x = (p.x + (compBounds.width / 2)) - (toplevel.getWidth() / 2);
+ y = p.y - toplevel.getHeight();
+ break;
+ }
+ case SwingConstants.EAST: {
+ x = p.x + compBounds.width;
+ y = (p.y + (compBounds.height / 2)) - (toplevel.getHeight() / 2);
+ break;
+ }
+ case SwingConstants.SOUTH: {
+ x = (p.x + (compBounds.width / 2)) - (toplevel.getWidth() / 2);
+ y = p.y + compBounds.height;
+ break;
+ }
+ case SwingConstants.WEST: {
+ x = p.x - toplevel.getWidth();
+ y = (p.y + (compBounds.height / 2)) - (toplevel.getHeight() / 2);
+ break;
+ }
+ case SwingConstants.NORTH_EAST: {
+ x = p.x + compBounds.width;
+ y = p.y - toplevel.getHeight();
+ break;
+ }
+ case SwingConstants.NORTH_WEST: {
+ x = p.x - toplevel.getWidth();
+ y = p.y - toplevel.getHeight();
+ break;
+ }
+ case SwingConstants.SOUTH_EAST: {
+ x = p.x + compBounds.width;
+ y = p.y + compBounds.height;
+ break;
+ }
+ case SwingConstants.SOUTH_WEST: {
+ x = p.x - toplevel.getWidth();
+ y = p.y + compBounds.height;
+ break;
+ }
+ default:
+ case SwingConstants.CENTER: {
+ x = (p.x + (compBounds.width / 2)) - (toplevel.getWidth() / 2);
+ y = (p.y + (compBounds.height / 2)) - (toplevel.getHeight() / 2);
+ }
+ }
+ toplevel.setLocation(x, y);
+ }
+
+ public static boolean browse(URI uri) throws IOException {
+ // Try using the Desktop api first
+ try {
+ Desktop desktop = Desktop.getDesktop();
+ desktop.browse(uri);
+
+ return true;
+ } catch (SecurityException e) {
+ e.printStackTrace();
+ }
+
+ return false;
+ }
+}
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/JGridPanel.java b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/JGridPanel.java
new file mode 100644
index 00000000000..a0f5bf577b7
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/JGridPanel.java
@@ -0,0 +1,231 @@
+/*
+ * 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.
+ */
+package com.sun.swingset3.demos;
+
+import java.awt.*;
+import javax.swing.*;
+
+/**
+ * JGridPanel
+ *
+ * @author Pavel Porvatov
+ */
+public class JGridPanel extends JPanel {
+
+ public static final int DEFAULT_GAP = 5;
+
+ public enum Layout {
+ FIRST,
+ CENTER,
+ LAST,
+ FILL
+ }
+
+ private enum ComponentType {
+ NO_RESIZABLE,
+ HORIZONTAL_FILL,
+ FULL
+ }
+
+ private final int cols;
+
+ private int bigCol = -1;
+
+ private int bigRow = -1;
+
+ private int vGap = -1;
+
+ private int hGap = -1;
+
+ public JGridPanel(int cols) {
+ this(cols, -1, -1);
+ }
+
+ public JGridPanel(int cols, int bigCol) {
+ this(cols, bigCol, -1);
+ }
+
+ public JGridPanel(int cols, int bigCol, int bigRow) {
+ super(new GridBagLayout());
+
+ assert cols > 0;
+ assert bigCol >= -1 && bigCol < cols;
+ assert bigRow >= -1;
+
+ this.cols = cols;
+ this.bigCol = bigCol;
+ this.bigRow = bigRow;
+ }
+
+ public void setVGap(int vGap) {
+ this.vGap = vGap;
+ }
+
+ public void setHGap(int hGap) {
+ this.hGap = hGap;
+ }
+
+ public JGridPanel cell() {
+ return cell(null, getHLayout(null), getVLayout(null), null);
+ }
+
+ public JGridPanel cell(Component component) {
+ return cell(component, getHLayout(component), getVLayout(component), null);
+ }
+
+ public JGridPanel cell(Component component, Layout hLayout) {
+ return cell(component, hLayout, getVLayout(component), null);
+ }
+
+ public JGridPanel cell(Component component, Layout hLayout, Layout vLayout) {
+ return cell(component, hLayout, vLayout, null);
+ }
+
+ public JGridPanel cell(Component component, Insets insets) {
+ assert insets != null;
+
+ return cell(component, getHLayout(component), getVLayout(component), insets);
+ }
+
+ private JGridPanel cell(Component component, Layout hLayout, Layout vLayout, Insets insets) {
+ int componentCount = getComponentCount();
+ int x = componentCount % cols;
+ int y = componentCount / cols;
+
+ int weightx = x == bigCol || (bigCol < 0 && hLayout == Layout.FILL) ? 1 : 0;
+ int weighty = y == bigRow || (bigRow < 0 && vLayout == Layout.FILL) ? 1 : 0;
+
+ if (insets == null) {
+ int topGap = y == 0 ? 0 : vGap;
+ int leftGap = x == 0 ? 0 : hGap;
+
+ insets = new Insets(topGap < 0 ? DEFAULT_GAP : topGap,
+ leftGap < 0 ? DEFAULT_GAP : leftGap, 0, 0);
+ }
+
+ add(component == null ? createSeparator() : component,
+ new GridBagConstraints(x, y,
+ 1, 1,
+ weightx, weighty,
+ getAnchor(hLayout, vLayout), getFill(hLayout, vLayout),
+ insets, 0, 0));
+
+ return this;
+ }
+
+ public void setComponent(Component component, int col, int row) {
+ assert col >= 0 && col < cols;
+ assert row >= 0;
+
+ GridBagLayout layout = (GridBagLayout) getLayout();
+
+ for (int i = 0; i < getComponentCount(); i++) {
+ Component oldComponent = getComponent(i);
+
+ GridBagConstraints constraints = layout.getConstraints(oldComponent);
+
+ if (constraints.gridx == col && constraints.gridy == row) {
+ remove(i);
+
+ add(component == null ? createSeparator() : component, constraints);
+
+ validate();
+ repaint();
+
+ return;
+ }
+ }
+
+ // Cell not found
+ assert false;
+ }
+
+ private static JComponent createSeparator() {
+ return new JLabel();
+ }
+
+ private static int getFill(Layout hLayout, Layout vLayout) {
+ if (hLayout == Layout.FILL) {
+ return vLayout == Layout.FILL ? GridBagConstraints.BOTH : GridBagConstraints.HORIZONTAL;
+ }
+
+ return vLayout == Layout.FILL ? GridBagConstraints.VERTICAL : GridBagConstraints.NONE;
+ }
+
+ private static ComponentType getComponentType(Component component) {
+ if (component == null
+ || component instanceof JLabel
+ || component instanceof JRadioButton
+ || component instanceof JCheckBox
+ || component instanceof JButton) {
+ return ComponentType.NO_RESIZABLE;
+ }
+
+ if (component instanceof JComboBox
+ || component instanceof JTextField) {
+ return ComponentType.HORIZONTAL_FILL;
+ }
+
+ return ComponentType.FULL;
+ }
+
+ private static Layout getHLayout(Component component) {
+ if (getComponentType(component) == ComponentType.NO_RESIZABLE) {
+ return Layout.FIRST;
+ } else {
+ return Layout.FILL;
+ }
+ }
+
+ private static Layout getVLayout(Component component) {
+ if (getComponentType(component) == ComponentType.FULL) {
+ return Layout.FILL;
+ } else {
+ return Layout.CENTER;
+ }
+ }
+
+ private static final int[][] ANCHORS = new int[][]{
+ {GridBagConstraints.NORTHWEST, GridBagConstraints.NORTH, GridBagConstraints.NORTHEAST},
+ {GridBagConstraints.WEST, GridBagConstraints.CENTER, GridBagConstraints.EAST},
+ {GridBagConstraints.SOUTHWEST, GridBagConstraints.SOUTH, GridBagConstraints.SOUTHEAST}
+ };
+
+ private static int getAnchorIndex(Layout layout) {
+ if (layout == Layout.CENTER) {
+ return 1;
+ } else if (layout == Layout.LAST) {
+ return 2;
+ } else {
+ return 0;
+ }
+ }
+
+ private static int getAnchor(Layout hLayout, Layout vLayout) {
+ return ANCHORS[getAnchorIndex(vLayout)][getAnchorIndex(hLayout)];
+ }
+
+ public void setBorderEqual(int border) {
+ setBorder(BorderFactory.createEmptyBorder(border, border, border, border));
+ }
+}
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/JHyperlink.java b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/JHyperlink.java
new file mode 100644
index 00000000000..1deb250c5fe
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/JHyperlink.java
@@ -0,0 +1,237 @@
+/*
+ * 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.
+ */
+package com.sun.swingset3.demos;
+
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.Graphics;
+import java.awt.Insets;
+import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.net.URI;
+import java.net.URISyntaxException;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.ButtonModel;
+import javax.swing.Icon;
+import javax.swing.JButton;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+
+/**
+ *
+ * @author aim
+ */
+//Create HTML hyperlink
+//Create HTML image hyperlink
+public class JHyperlink extends JButton {
+
+ private static final BrowseAction defaultBrowseAction = new BrowseAction();
+
+ private URI targetURI;
+ private boolean visited;
+
+ private final transient Rectangle viewRect = new Rectangle();
+ private final transient Rectangle iconRect = new Rectangle();
+ private final transient Rectangle textRect = new Rectangle();
+
+ //remind(aim): lookup colors instead of hardcoding them
+ private Color normalForeground;
+ private Color activeForeground;
+ private Color visitedForeground;
+ private boolean drawUnderline = true;
+
+ static {
+ UIManager.put("Hyperlink.foreground", Color.blue);
+ UIManager.put("Hyperlink.activeForeground", Color.red);
+ UIManager.put("Hyperlink.visitedForeground", new Color(85, 145, 90));
+ }
+
+ /**
+ * Creates a new instance of JHyperlink
+ */
+ public JHyperlink() {
+ super();
+ normalForeground = UIManager.getColor("Hyperlink.foreground");
+ activeForeground = UIManager.getColor("Hyperlink.activeForeground");
+ visitedForeground = UIManager.getColor("Hyperlink.visitedForeground");
+ setBorderPainted(false);
+ setContentAreaFilled(false);
+ setForeground(normalForeground);
+ setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+ setMargin(new Insets(0, 0, 0, 0));
+ setAction(defaultBrowseAction);
+ }
+
+ /**
+ * Creates a new instance of JHyperlink
+ */
+ public JHyperlink(String text) {
+ this();
+ setText(text); // override the inheritence of the action's name
+ }
+
+ public JHyperlink(String text, String targetURI) throws URISyntaxException {
+ this(text, new URI(targetURI));
+ }
+
+ public JHyperlink(String text, URI target) {
+ this(text);
+ setTarget(target);
+ }
+
+ public JHyperlink(String text, Action action) {
+ this(text);
+ setAction(action); // replaces default browse action
+ setText(text); // override the inheritence of the action's name
+ }
+
+ public JHyperlink(String text, Icon icon) {
+ this(text);
+ setIcon(icon);
+ }
+
+ public JHyperlink(Icon icon, String targetURI) throws URISyntaxException {
+ this(null, icon, targetURI);
+ }
+
+ public JHyperlink(String text, Icon icon, String targetURI) throws URISyntaxException {
+ this(text, new URI(targetURI));
+ setIcon(icon);
+ }
+
+ public JHyperlink(String text, Icon icon, URI target) {
+ this(text);
+ setIcon(icon);
+ setTarget(target);
+ }
+
+ public void setTarget(URI target) {
+ this.targetURI = target;
+ setToolTipText(target.toASCIIString());
+ }
+
+ public URI getTarget() {
+ return targetURI;
+ }
+
+ public void setVisited(boolean visited) {
+ this.visited = visited;
+ }
+
+ public boolean isVisited() {
+ return visited;
+ }
+
+ @Override
+ public void setForeground(Color foreground) {
+ normalForeground = foreground;
+ super.setForeground(foreground);
+ }
+
+ public void setVisitedForeground(Color visited) {
+ visitedForeground = visited;
+ }
+
+ public void setDrawUnderline(boolean drawUnderline) {
+ this.drawUnderline = drawUnderline;
+ }
+
+ public boolean getDrawUnderline() {
+ return drawUnderline;
+ }
+
+ @Override
+ protected void paintComponent(Graphics g) {
+ // Set the foreground on the fly to ensure the text is painted
+ // with the proper color in super.paintComponent
+ ButtonModel model = getModel();
+ if (model.isArmed()) {
+ super.setForeground(activeForeground);
+ } else if (visited) {
+ super.setForeground(visitedForeground);
+ } else {
+ super.setForeground(normalForeground);
+ }
+ super.paintComponent(g);
+
+ if (drawUnderline) {
+ Insets insets = getInsets();
+ viewRect.x = insets.left;
+ viewRect.y = insets.top;
+ viewRect.width = getWidth() - insets.left - insets.right;
+ viewRect.height = getHeight() - insets.top - insets.bottom;
+ int baseline = getBaseline(viewRect.width, viewRect.height);
+
+ iconRect.x = iconRect.y = iconRect.width = iconRect.height = 0;
+ textRect.x = textRect.y = textRect.width = textRect.height = 0;
+ SwingUtilities.layoutCompoundLabel(g.getFontMetrics(), getText(),
+ getIcon(), getVerticalAlignment(), getHorizontalAlignment(),
+ getVerticalTextPosition(), getHorizontalTextPosition(),
+ viewRect, iconRect, textRect, getIconTextGap());
+
+ // getBaseline not returning correct results, so workaround for now
+ if (UIManager.getLookAndFeel().getName().equals("Nimbus")) {
+ baseline += 7;
+ } else {
+ baseline += 3;
+ }
+
+ g.setColor(getForeground());
+ g.drawLine(textRect.x,
+ baseline,
+ textRect.x + textRect.width,
+ baseline);
+ }
+
+ }
+
+ // This action is stateless and hence can be shared across hyperlinks
+ private static class BrowseAction extends AbstractAction {
+
+ public BrowseAction() {
+ super();
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ JHyperlink hyperlink = (JHyperlink) e.getSource();
+
+ URI targetURI = hyperlink.getTarget();
+ if (targetURI != null) {
+ try {
+ DemoUtilities.browse(targetURI);
+ hyperlink.setVisited(true);
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ System.err.println(ex);
+ }
+
+ }
+ }
+
+ }
+//
+//
+
+}
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/ResourceManager.java b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/ResourceManager.java
new file mode 100644
index 00000000000..af44f84a6ad
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/ResourceManager.java
@@ -0,0 +1,77 @@
+/*
+ * 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.
+ */
+package com.sun.swingset3.demos;
+
+import java.net.URL;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.swing.*;
+
+/**
+ * @author Pavel Porvatov
+ */
+public class ResourceManager {
+
+ private static final Logger logger = Logger.getLogger(ResourceManager.class.getName());
+
+ private final Class demoClass;
+
+ // Resource bundle for internationalized and accessible text
+ private ResourceBundle bundle = null;
+
+ public ResourceManager(Class demoClass) {
+ this.demoClass = demoClass;
+
+ String bundleName = demoClass.getPackage().getName() + ".resources." + demoClass.getSimpleName();
+
+ try {
+ bundle = ResourceBundle.getBundle(bundleName);
+ } catch (MissingResourceException e) {
+ logger.log(Level.SEVERE, "Couldn't load bundle: " + bundleName);
+ }
+ }
+
+ public String getString(String key) {
+ return bundle != null ? bundle.getString(key) : key;
+ }
+
+ public char getMnemonic(String key) {
+ return (getString(key)).charAt(0);
+ }
+
+ public ImageIcon createImageIcon(String filename, String description) {
+ String path = "resources/images/" + filename;
+
+ URL imageURL = demoClass.getResource(path);
+
+ if (imageURL == null) {
+ logger.log(Level.SEVERE, "unable to access image file: " + path);
+
+ return null;
+ } else {
+ return new ImageIcon(imageURL, description);
+ }
+ }
+}
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/ButtonDemo.java b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/ButtonDemo.java
new file mode 100644
index 00000000000..728e0543b68
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/ButtonDemo.java
@@ -0,0 +1,224 @@
+/*
+ * 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.
+ */
+package com.sun.swingset3.demos.button;
+
+import java.awt.Color;
+import java.awt.FlowLayout;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.net.URISyntaxException;
+import javax.swing.BorderFactory;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+
+import com.sun.swingset3.DemoProperties;
+import com.sun.swingset3.demos.JHyperlink;
+
+/**
+ *
+ * @author aim
+ */
+@DemoProperties(
+ value = "JButton Demo",
+ category = "Controls",
+ description = "Demonstrates the many uses of JButton, Swing's push button component.",
+ sourceFiles = {
+ "com/sun/swingset3/demos/button/ButtonDemo.java",
+ "com/sun/swingset3/demos/JHyperlink.java",
+ "com/sun/swingset3/demos/button/resources/ButtonDemo.html",
+ "com/sun/swingset3/demos/button/resources/images/blogs.png",
+ "com/sun/swingset3/demos/button/resources/images/ButtonDemo.gif",
+ "com/sun/swingset3/demos/button/resources/images/document-print.png",
+ "com/sun/swingset3/demos/button/resources/images/earth_day.gif",
+ "com/sun/swingset3/demos/button/resources/images/earth_night.gif",
+ "com/sun/swingset3/demos/button/resources/images/edit-find.png",
+ "com/sun/swingset3/demos/button/resources/images/redbutton.png",
+ "com/sun/swingset3/demos/button/resources/images/redbutton_dark.png",
+ "com/sun/swingset3/demos/button/resources/images/redbutton_glow.png"
+ }
+)
+public final class ButtonDemo extends JPanel {
+
+ public static final String DEMO_TITLE = ButtonDemo.class.getAnnotation(DemoProperties.class).value();
+ public static final String DO_IT_AGAIN = "Do it again";
+ public static final String DO_IT = "Do it";
+ public static final String BUTTON_WITH_TEXT_AND_IMAGE = "button with text and image";
+ public static final String BUTTON_WITH_BACKGROUND_COLOR = "button with background color";
+ public static final String GO = "Go";
+ public static final String FIND = "Find";
+ public static final String IMAGE_BUTTON = "image button";
+ public static final String SIMPLE_BUTTON = "simple button";
+ public static final String GET_MORE_INFO = "Get More Info";
+ public static final String JAVA_BLOGS_URL = "https://blogs.oracle.com/java/";
+ public static final String JAVA_SE_URL = "http://www.oracle.com/technetwork/java/javase/overview/index.html";
+ public static final String BUTTON_WITH_ROLLOVER_IMAGE = "button with rollover image";
+ public static final String BUTTON_WITH_NO_BORDER = "button with no border";
+ public static final String CONNECT = "Connect";
+
+ public ButtonDemo() {
+ setToolTipText("Demonstrates JButton, Swing's push button component.");
+ initComponents();
+ setOpaque(false);
+ }
+
+ protected void initComponents() {
+ setLayout(new GridLayout(0, 1));
+
+ add(createSimpleButtonPanel());
+ add(createCreativeButtonPanel());
+ }
+
+ protected JPanel createSimpleButtonPanel() {
+ JPanel panel = new JPanel();
+ panel.setLayout(new FlowLayout(FlowLayout.CENTER, 20, 8));
+ panel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEmptyBorder(),
+ "Simple Buttons"));
+
+ //Create simple button
+ final JButton simpleButton = new JButton(DO_IT);
+ simpleButton.setToolTipText(SIMPLE_BUTTON);
+ //
+ //Add action listener using anonymous inner class
+ // This style is useful when the action code is tied to a
+ // single button instance and it's useful for simplicity
+ // sake to keep the action code located near the button.
+ // More global application actions should be implemented
+ // using Action classes instead.
+ simpleButton.addActionListener((ActionEvent event) -> {
+ simpleButton.setText(DO_IT_AGAIN);
+ // Need to force toplevel to relayout to accommodate new button size
+ SwingUtilities.getWindowAncestor(simpleButton).validate();
+ });
+ //
+ simpleButton.putClientProperty("snippetKey", "Create simple button");
+ panel.add(simpleButton);
+
+ //Create image button
+ // Image is from the Java Look and Feel Graphics Repository
+ JButton button = new JButton(new ImageIcon(getClass().
+ getResource("resources/images/document-print.png")));
+ button.setToolTipText(IMAGE_BUTTON);
+ //
+ button.putClientProperty("snippetKey", "Create image button");
+ panel.add(button);
+
+ //Create button with text and image
+ // Image is from the Java Look and Feel Graphics Repository
+ button = new JButton(FIND,
+ new ImageIcon(getClass().
+ getResource("resources/images/edit-find.png")));
+ button.setToolTipText(BUTTON_WITH_TEXT_AND_IMAGE);
+ button.setHorizontalTextPosition(JButton.LEADING);
+ button.setIconTextGap(6);
+ //
+ button.putClientProperty("snippetKey", "Create button with text and image");
+ panel.add(button);
+
+ //Create button with background color
+ button = new JButton(GO);
+ button.setBackground(Color.green);
+ button.setContentAreaFilled(true);
+ button.setOpaque(false);
+ button.setToolTipText(BUTTON_WITH_BACKGROUND_COLOR);
+ //
+ button.putClientProperty("snippetKey", "Create button with background color");
+ panel.add(button);
+
+ return panel;
+ }
+
+ protected JPanel createCreativeButtonPanel() {
+ JPanel panel = new JPanel();
+ panel.setLayout(new FlowLayout(FlowLayout.CENTER, 16, 8));
+ panel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEmptyBorder(),
+ "More Interesting Buttons"));
+
+ //Create button with no border
+ JButton button = new JButton();
+ button.setText(CONNECT);
+ button.setIcon(new ImageIcon(getClass().getResource("resources/images/earth_day.gif")));
+ button.setPressedIcon(new ImageIcon(getClass().getResource("resources/images/earth_night.gif")));
+ button.setBorderPainted(false);
+ button.setContentAreaFilled(false);
+ button.setVerticalTextPosition(JButton.BOTTOM);
+ button.setHorizontalTextPosition(JButton.CENTER);
+ button.setIconTextGap(0);
+ button.setToolTipText(BUTTON_WITH_NO_BORDER);
+ //
+ button.putClientProperty("snippetKey", "Create button with no border");
+ panel.add(button);
+
+ //Create image button with rollover image
+ button = new JButton();
+ button.setBorderPainted(false);
+ button.setContentAreaFilled(false);
+ button.setIcon(new ImageIcon(getClass().getResource("resources/images/redbutton.png")));
+ button.setRolloverEnabled(true);
+ button.setRolloverIcon(new ImageIcon(getClass().getResource("resources/images/redbutton_glow.png")));
+ button.setPressedIcon(new ImageIcon(getClass().getResource("resources/images/redbutton_dark.png")));
+ button.setToolTipText(BUTTON_WITH_ROLLOVER_IMAGE);
+ //
+ button.putClientProperty("snippetKey", "Create image button with rollover image");
+ panel.add(button);
+
+ //Create HTML hyperlink
+ JHyperlink hyperlink;
+ try {
+ hyperlink = new JHyperlink(GET_MORE_INFO, JAVA_SE_URL);
+ } catch (URISyntaxException use) {
+ use.printStackTrace();
+ hyperlink = new JHyperlink(GET_MORE_INFO);
+ }
+ //
+ hyperlink.putClientProperty("snippetKey", "Create HTML hyperlink");
+ panel.add(hyperlink);
+
+ //Create HTML image hyperlink
+ try {
+ hyperlink = new JHyperlink(
+ new ImageIcon(getClass().getResource("resources/images/blogs.png")), JAVA_BLOGS_URL);
+ } catch (URISyntaxException use) {
+ use.printStackTrace();
+ }
+ //
+ button.putClientProperty("snippetKey", "Create HTML image hyperlink");
+ panel.add(hyperlink);
+
+ return panel;
+ }
+
+ public static void main(String args[]) {
+ final ButtonDemo buttonDemo = new ButtonDemo();
+
+ javax.swing.SwingUtilities.invokeLater(() -> {
+ JFrame frame = new JFrame(DEMO_TITLE);
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ frame.add(buttonDemo);
+ frame.pack();
+ frame.setVisible(true);
+ });
+ }
+}
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/ButtonDemo.html b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/ButtonDemo.html
new file mode 100644
index 00000000000..866856b9e6a
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/ButtonDemo.html
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
Today's modern GUIs often use buttons which don't look like the traditional "push" button. Swing's button component, javax.swing.JButton,
+ can be used to create both ordinary and more creative button visuals. In the end, they all perform an action when clicked.
+
+
+ To highlight the source code used to create a particular button, popup the context menu over that button.
+
+
+
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/ButtonDemo.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/ButtonDemo.gif
new file mode 100644
index 00000000000..9f400fe4ac0
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/ButtonDemo.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/blogs.png b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/blogs.png
new file mode 100644
index 00000000000..cde6b947c2c
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/blogs.png differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/document-print.png b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/document-print.png
new file mode 100644
index 00000000000..99abfb51b08
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/document-print.png differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/earth_day.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/earth_day.gif
new file mode 100644
index 00000000000..01d61f74eb7
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/earth_day.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/earth_night.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/earth_night.gif
new file mode 100644
index 00000000000..649a3892f70
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/earth_night.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/edit-find.png b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/edit-find.png
new file mode 100644
index 00000000000..44376a6775a
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/edit-find.png differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/redbutton.png b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/redbutton.png
new file mode 100644
index 00000000000..b07c818766d
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/redbutton.png differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/redbutton_dark.png b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/redbutton_dark.png
new file mode 100644
index 00000000000..64539c9e461
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/redbutton_dark.png differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/redbutton_glow.png b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/redbutton_glow.png
new file mode 100644
index 00000000000..b2e99220d1c
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/images/redbutton_glow.png differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/ComboBoxDemo.java b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/ComboBoxDemo.java
new file mode 100644
index 00000000000..5fc080f95bb
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/ComboBoxDemo.java
@@ -0,0 +1,445 @@
+/*
+ * 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.
+ */
+package com.sun.swingset3.demos.combobox;
+
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.HashMap;
+import java.util.Map;
+import javax.accessibility.AccessibleRelation;
+import javax.swing.*;
+import javax.swing.border.BevelBorder;
+
+import com.sun.swingset3.demos.ResourceManager;
+import com.sun.swingset3.DemoProperties;
+
+/**
+ * JComboBox Demo
+ *
+ * @author Jeff Dinkins
+ * @version 1.13 11/17/05
+ */
+@DemoProperties(
+ value = "JComboBox Demo",
+ category = "Controls",
+ description = "Demonstrates JComboBox, a control which allows the user to make a selection from a popup list",
+ sourceFiles = {
+ "com/sun/swingset3/demos/combobox/ComboBoxDemo.java",
+ "com/sun/swingset3/demos/ResourceManager.java",
+ "com/sun/swingset3/demos/combobox/resources/ComboBoxDemo.properties",
+ "com/sun/swingset3/demos/combobox/resources/images/brenteyes.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/brenthair.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/brentmouth.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/ComboBoxDemo.gif",
+ "com/sun/swingset3/demos/combobox/resources/images/georgeseyes.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/georgeshair.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/georgesmouth.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/hanseyes.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/hanshair.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/hansmouth.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/howardeyes.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/howardhair.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/howardmouth.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/jameseyes.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/jameshair.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/jamesmouth.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/jeffeyes.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/jeffhair.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/jeffmouth.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/joneyes.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/jonhair.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/jonmouth.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/laraeyes.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/larahair.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/laramouth.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/larryeyes.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/larryhair.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/larrymouth.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/lisaeyes.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/lisahair.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/lisamouth.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/michaeleyes.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/michaelhair.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/michaelmouth.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/philipeyes.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/philiphair.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/philipmouth.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/scotteyes.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/scotthair.jpg",
+ "com/sun/swingset3/demos/combobox/resources/images/scottmouth.jpg"
+ }
+)
+public class ComboBoxDemo extends JPanel implements ActionListener {
+
+ private static final Dimension VGAP15 = new Dimension(1, 15);
+ private static final Dimension HGAP20 = new Dimension(20, 1);
+ private static final Dimension VGAP20 = new Dimension(1, 20);
+ private static final Dimension HGAP30 = new Dimension(30, 1);
+ private static final Dimension VGAP30 = new Dimension(1, 30);
+
+ private final ResourceManager resourceManager = new ResourceManager(this.getClass());
+ public static final String DEMO_TITLE = ComboBoxDemo.class.getAnnotation(DemoProperties.class).value();
+
+ private Face face;
+ private JLabel faceLabel;
+
+ private JComboBox hairCB;
+ private JComboBox eyesCB;
+ private JComboBox mouthCB;
+
+ private JComboBox presetCB;
+
+ private final Map parts = new HashMap<>();
+
+ /**
+ * main method allows us to run as a standalone demo.
+ *
+ * @param args
+ */
+ public static void main(String[] args) {
+ JFrame frame = new JFrame(DEMO_TITLE);
+
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ frame.getContentPane().add(new ComboBoxDemo());
+ frame.setPreferredSize(new Dimension(800, 600));
+ frame.pack();
+ frame.setLocationRelativeTo(null);
+ frame.setVisible(true);
+ }
+
+ /**
+ * ComboBoxDemo Constructor
+ */
+ public ComboBoxDemo() {
+ createComboBoxDemo();
+ }
+
+ private void createComboBoxDemo() {
+ setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
+
+ JPanel innerPanel = new JPanel();
+ innerPanel.setLayout(new BoxLayout(innerPanel, BoxLayout.X_AXIS));
+
+ add(Box.createRigidArea(VGAP20));
+ add(innerPanel);
+ add(Box.createRigidArea(VGAP20));
+
+ innerPanel.add(Box.createRigidArea(HGAP20));
+
+ // Create a panel to hold buttons
+ JPanel comboBoxPanel = new JPanel() {
+ @Override
+ public Dimension getMaximumSize() {
+ return new Dimension(getPreferredSize().width, super.getMaximumSize().height);
+ }
+ };
+ comboBoxPanel.setLayout(new BoxLayout(comboBoxPanel, BoxLayout.Y_AXIS));
+
+ comboBoxPanel.add(Box.createRigidArea(VGAP15));
+
+ JLabel l = (JLabel) comboBoxPanel.add(new JLabel(resourceManager.getString("ComboBoxDemo.presets")));
+ l.setAlignmentX(JLabel.LEFT_ALIGNMENT);
+ comboBoxPanel.add(presetCB = createPresetComboBox());
+ presetCB.setAlignmentX(JComboBox.LEFT_ALIGNMENT);
+ l.setLabelFor(presetCB);
+ comboBoxPanel.add(Box.createRigidArea(VGAP30));
+
+ l = (JLabel) comboBoxPanel.add(new JLabel(resourceManager.getString("ComboBoxDemo.hair_description")));
+ l.setAlignmentX(JLabel.LEFT_ALIGNMENT);
+ comboBoxPanel.add(hairCB = createHairComboBox());
+ hairCB.setAlignmentX(JComboBox.LEFT_ALIGNMENT);
+ l.setLabelFor(hairCB);
+ comboBoxPanel.add(Box.createRigidArea(VGAP15));
+
+ l = (JLabel) comboBoxPanel.add(new JLabel(resourceManager.getString("ComboBoxDemo.eyes_description")));
+ l.setAlignmentX(JLabel.LEFT_ALIGNMENT);
+ comboBoxPanel.add(eyesCB = createEyesComboBox());
+ eyesCB.setAlignmentX(JComboBox.LEFT_ALIGNMENT);
+ l.setLabelFor(eyesCB);
+ comboBoxPanel.add(Box.createRigidArea(VGAP15));
+
+ l = (JLabel) comboBoxPanel.add(new JLabel(resourceManager.getString("ComboBoxDemo.mouth_description")));
+ l.setAlignmentX(JLabel.LEFT_ALIGNMENT);
+ comboBoxPanel.add(mouthCB = createMouthComboBox());
+
+ mouthCB.setAlignmentX(JComboBox.LEFT_ALIGNMENT);
+ l.setLabelFor(mouthCB);
+ comboBoxPanel.add(Box.createRigidArea(VGAP15));
+
+ // Fill up the remaining space
+ comboBoxPanel.add(new JPanel(new BorderLayout()));
+
+ // Create and place the Face.
+ face = new Face();
+ JPanel facePanel = new JPanel();
+ facePanel.setLayout(new BorderLayout());
+ facePanel.setBorder(new BevelBorder(BevelBorder.LOWERED));
+
+ faceLabel = new JLabel(face);
+ facePanel.add(faceLabel, BorderLayout.CENTER);
+ // Indicate that the face panel is controlled by the hair, eyes and
+ // mouth combo boxes.
+ Object[] controlledByObjects = new Object[3];
+ controlledByObjects[0] = hairCB;
+ controlledByObjects[1] = eyesCB;
+ controlledByObjects[2] = mouthCB;
+ AccessibleRelation controlledByRelation
+ = new AccessibleRelation(AccessibleRelation.CONTROLLED_BY_PROPERTY,
+ controlledByObjects);
+ facePanel.getAccessibleContext().getAccessibleRelationSet().add(controlledByRelation);
+
+ // Indicate that the hair, eyes and mouth combo boxes are controllers
+ // for the face panel.
+ AccessibleRelation controllerForRelation
+ = new AccessibleRelation(AccessibleRelation.CONTROLLER_FOR_PROPERTY,
+ facePanel);
+ hairCB.getAccessibleContext().getAccessibleRelationSet().add(controllerForRelation);
+ eyesCB.getAccessibleContext().getAccessibleRelationSet().add(controllerForRelation);
+ mouthCB.getAccessibleContext().getAccessibleRelationSet().add(controllerForRelation);
+
+ // add buttons and image panels to inner panel
+ innerPanel.add(comboBoxPanel);
+ innerPanel.add(Box.createRigidArea(HGAP30));
+ innerPanel.add(facePanel);
+ innerPanel.add(Box.createRigidArea(HGAP20));
+
+ // load up the face parts
+ addFace("brent", resourceManager.getString("ComboBoxDemo.brent"));
+ addFace("georges", resourceManager.getString("ComboBoxDemo.georges"));
+ addFace("hans", resourceManager.getString("ComboBoxDemo.hans"));
+ addFace("howard", resourceManager.getString("ComboBoxDemo.howard"));
+ addFace("james", resourceManager.getString("ComboBoxDemo.james"));
+ addFace("jeff", resourceManager.getString("ComboBoxDemo.jeff"));
+ addFace("jon", resourceManager.getString("ComboBoxDemo.jon"));
+ addFace("lara", resourceManager.getString("ComboBoxDemo.lara"));
+ addFace("larry", resourceManager.getString("ComboBoxDemo.larry"));
+ addFace("lisa", resourceManager.getString("ComboBoxDemo.lisa"));
+ addFace("michael", resourceManager.getString("ComboBoxDemo.michael"));
+ addFace("philip", resourceManager.getString("ComboBoxDemo.philip"));
+ addFace("scott", resourceManager.getString("ComboBoxDemo.scott"));
+
+ // set the default face
+ presetCB.setSelectedIndex(0);
+ }
+
+ private void addFace(String name, String i18n_name) {
+ ImageIcon i;
+ String i18n_hair = resourceManager.getString("ComboBoxDemo.hair");
+ String i18n_eyes = resourceManager.getString("ComboBoxDemo.eyes");
+ String i18n_mouth = resourceManager.getString("ComboBoxDemo.mouth");
+
+ parts.put(i18n_name, name); // i18n name lookup
+ parts.put(name, i18n_name); // reverse name lookup
+
+ i = resourceManager.createImageIcon(name + "hair.jpg", i18n_name + i18n_hair);
+ parts.put(name + "hair", i);
+
+ i = resourceManager.createImageIcon(name + "eyes.jpg", i18n_name + i18n_eyes);
+ parts.put(name + "eyes", i);
+
+ i = resourceManager.createImageIcon(name + "mouth.jpg", i18n_name + i18n_mouth);
+ parts.put(name + "mouth", i);
+ }
+
+ private JComboBox createHairComboBox() {
+ JComboBox cb = new JComboBox<>();
+ fillComboBox(cb);
+ cb.addActionListener(this);
+ return cb;
+ }
+
+ private JComboBox createEyesComboBox() {
+ JComboBox cb = new JComboBox<>();
+ fillComboBox(cb);
+ cb.addActionListener(this);
+ return cb;
+ }
+
+ private JComboBox createMouthComboBox() {
+ JComboBox cb = new JComboBox<>();
+ fillComboBox(cb);
+ cb.addActionListener(this);
+ return cb;
+ }
+
+ private JComboBox createPresetComboBox() {
+ JComboBox cb = new JComboBox<>();
+ cb.addItem(resourceManager.getString("ComboBoxDemo.preset1"));
+ cb.addItem(resourceManager.getString("ComboBoxDemo.preset2"));
+ cb.addItem(resourceManager.getString("ComboBoxDemo.preset3"));
+ cb.addItem(resourceManager.getString("ComboBoxDemo.preset4"));
+ cb.addItem(resourceManager.getString("ComboBoxDemo.preset5"));
+ cb.addItem(resourceManager.getString("ComboBoxDemo.preset6"));
+ cb.addItem(resourceManager.getString("ComboBoxDemo.preset7"));
+ cb.addItem(resourceManager.getString("ComboBoxDemo.preset8"));
+ cb.addItem(resourceManager.getString("ComboBoxDemo.preset9"));
+ cb.addItem(resourceManager.getString("ComboBoxDemo.preset10"));
+ cb.addActionListener(this);
+ return cb;
+ }
+
+ private void fillComboBox(JComboBox cb) {
+ cb.addItem(resourceManager.getString("ComboBoxDemo.brent"));
+ cb.addItem(resourceManager.getString("ComboBoxDemo.georges"));
+ cb.addItem(resourceManager.getString("ComboBoxDemo.hans"));
+ cb.addItem(resourceManager.getString("ComboBoxDemo.howard"));
+ cb.addItem(resourceManager.getString("ComboBoxDemo.james"));
+ cb.addItem(resourceManager.getString("ComboBoxDemo.jeff"));
+ cb.addItem(resourceManager.getString("ComboBoxDemo.jon"));
+ cb.addItem(resourceManager.getString("ComboBoxDemo.lara"));
+ cb.addItem(resourceManager.getString("ComboBoxDemo.larry"));
+ cb.addItem(resourceManager.getString("ComboBoxDemo.lisa"));
+ cb.addItem(resourceManager.getString("ComboBoxDemo.michael"));
+ cb.addItem(resourceManager.getString("ComboBoxDemo.philip"));
+ cb.addItem(resourceManager.getString("ComboBoxDemo.scott"));
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ if (e.getSource() == hairCB) {
+ String name = (String) parts.get(hairCB.getSelectedItem());
+ face.setHair((ImageIcon) parts.get(name + "hair"));
+ faceLabel.repaint();
+ } else if (e.getSource() == eyesCB) {
+ String name = (String) parts.get(eyesCB.getSelectedItem());
+ face.setEyes((ImageIcon) parts.get(name + "eyes"));
+ faceLabel.repaint();
+ } else if (e.getSource() == mouthCB) {
+ String name = (String) parts.get(mouthCB.getSelectedItem());
+ face.setMouth((ImageIcon) parts.get(name + "mouth"));
+ faceLabel.repaint();
+ } else if (e.getSource() == presetCB) {
+ String hair = null;
+ String eyes = null;
+ String mouth = null;
+ switch (presetCB.getSelectedIndex()) {
+ case 0:
+ hair = (String) parts.get("philip");
+ eyes = (String) parts.get("howard");
+ mouth = (String) parts.get("jeff");
+ break;
+ case 1:
+ hair = (String) parts.get("jeff");
+ eyes = (String) parts.get("larry");
+ mouth = (String) parts.get("philip");
+ break;
+ case 2:
+ hair = (String) parts.get("howard");
+ eyes = (String) parts.get("scott");
+ mouth = (String) parts.get("hans");
+ break;
+ case 3:
+ hair = (String) parts.get("philip");
+ eyes = (String) parts.get("jeff");
+ mouth = (String) parts.get("hans");
+ break;
+ case 4:
+ hair = (String) parts.get("brent");
+ eyes = (String) parts.get("jon");
+ mouth = (String) parts.get("scott");
+ break;
+ case 5:
+ hair = (String) parts.get("lara");
+ eyes = (String) parts.get("larry");
+ mouth = (String) parts.get("lisa");
+ break;
+ case 6:
+ hair = (String) parts.get("james");
+ eyes = (String) parts.get("philip");
+ mouth = (String) parts.get("michael");
+ break;
+ case 7:
+ hair = (String) parts.get("philip");
+ eyes = (String) parts.get("lisa");
+ mouth = (String) parts.get("brent");
+ break;
+ case 8:
+ hair = (String) parts.get("james");
+ eyes = (String) parts.get("philip");
+ mouth = (String) parts.get("jon");
+ break;
+ case 9:
+ hair = (String) parts.get("lara");
+ eyes = (String) parts.get("jon");
+ mouth = (String) parts.get("scott");
+ break;
+ }
+ if (hair != null) {
+ hairCB.setSelectedItem(hair);
+ eyesCB.setSelectedItem(eyes);
+ mouthCB.setSelectedItem(mouth);
+ faceLabel.repaint();
+ }
+ }
+ }
+
+ private static class Face implements Icon {
+
+ private ImageIcon hair;
+ private ImageIcon eyes;
+ private ImageIcon mouth;
+
+ void setHair(ImageIcon i) {
+ hair = i;
+ }
+
+ void setEyes(ImageIcon i) {
+ eyes = i;
+ }
+
+ void setMouth(ImageIcon i) {
+ mouth = i;
+ }
+
+ @Override
+ public void paintIcon(Component c, Graphics g, int x, int y) {
+ int height = y;
+ x = c.getWidth() / 2 - getIconWidth() / 2;
+
+ if (hair != null) {
+ hair.paintIcon(c, g, x, height);
+ height += hair.getIconHeight();
+ }
+
+ if (eyes != null) {
+ eyes.paintIcon(c, g, x, height);
+ height += eyes.getIconHeight();
+ }
+
+ if (mouth != null) {
+ mouth.paintIcon(c, g, x, height);
+ }
+ }
+
+ @Override
+ public int getIconWidth() {
+ return 344;
+ }
+
+ @Override
+ public int getIconHeight() {
+ return 455;
+ }
+ }
+}
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/ComboBoxDemo.properties b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/ComboBoxDemo.properties
new file mode 100644
index 00000000000..51ee144e0c8
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/ComboBoxDemo.properties
@@ -0,0 +1,42 @@
+### ComboBox Demo ###
+
+ComboBoxDemo.accessible_description=This demo shows an example of using the JComboBox component.
+ComboBoxDemo.tooltip=JComboBox demo
+ComboBoxDemo.name=ComboBox Demo
+
+ComboBoxDemo.hair=hair
+ComboBoxDemo.eyes=eyes
+ComboBoxDemo.mouth=mouth
+ComboBoxDemo.presets=Presets:
+
+ComboBoxDemo.preset1=Philip, Howard, Jeff
+ComboBoxDemo.preset2=Jeff, Larry, Philip
+ComboBoxDemo.preset3=Howard, Scott, Hans
+ComboBoxDemo.preset4=Philip, Jeff, Hans
+ComboBoxDemo.preset5=Brent, Jon, Scott
+ComboBoxDemo.preset6=Lara, Larry, Lisa
+ComboBoxDemo.preset7=James, Philip, Michael
+ComboBoxDemo.preset8=Philip, Lisa, Brent
+ComboBoxDemo.preset9=James, Philip, Jon
+ComboBoxDemo.preset10=Lara, Jon, Scott
+
+
+ComboBoxDemo.hair_description=Hair:
+ComboBoxDemo.eyes_description=Eyes & Nose:
+ComboBoxDemo.mouth_description=Mouth:
+
+ComboBoxDemo.amy=Amy
+ComboBoxDemo.brent=Brent
+ComboBoxDemo.georges=Georges
+ComboBoxDemo.hans=Hans
+ComboBoxDemo.howard=Howard
+ComboBoxDemo.james=James
+ComboBoxDemo.jeff=Jeff
+ComboBoxDemo.jon=Jon
+ComboBoxDemo.lara=Lara
+ComboBoxDemo.larry=Larry
+ComboBoxDemo.lisa=Lisa
+ComboBoxDemo.michael=Michael
+ComboBoxDemo.philip=Philip
+ComboBoxDemo.scott=Scott
+
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/ComboBoxDemo.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/ComboBoxDemo.gif
new file mode 100644
index 00000000000..f8e971f19ce
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/ComboBoxDemo.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/brenteyes.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/brenteyes.jpg
new file mode 100644
index 00000000000..6f7d0f4fee2
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/brenteyes.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/brenthair.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/brenthair.jpg
new file mode 100644
index 00000000000..cfde575e7ce
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/brenthair.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/brentmouth.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/brentmouth.jpg
new file mode 100644
index 00000000000..6b3c5259b37
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/brentmouth.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/georgeseyes.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/georgeseyes.jpg
new file mode 100644
index 00000000000..224cef61da1
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/georgeseyes.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/georgeshair.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/georgeshair.jpg
new file mode 100644
index 00000000000..7071dde0adb
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/georgeshair.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/georgesmouth.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/georgesmouth.jpg
new file mode 100644
index 00000000000..b917e515d48
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/georgesmouth.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/hanseyes.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/hanseyes.jpg
new file mode 100644
index 00000000000..e7001add02b
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/hanseyes.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/hanshair.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/hanshair.jpg
new file mode 100644
index 00000000000..bf46bb63ed0
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/hanshair.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/hansmouth.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/hansmouth.jpg
new file mode 100644
index 00000000000..09eb9e014d4
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/hansmouth.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/howardeyes.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/howardeyes.jpg
new file mode 100644
index 00000000000..b5f1ba50bb1
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/howardeyes.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/howardhair.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/howardhair.jpg
new file mode 100644
index 00000000000..b0cdb19a8d9
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/howardhair.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/howardmouth.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/howardmouth.jpg
new file mode 100644
index 00000000000..ebc85f021d2
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/howardmouth.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jameseyes.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jameseyes.jpg
new file mode 100644
index 00000000000..a53f9224760
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jameseyes.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jameshair.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jameshair.jpg
new file mode 100644
index 00000000000..52d2ca53ba9
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jameshair.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jamesmouth.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jamesmouth.jpg
new file mode 100644
index 00000000000..7b0e35c1872
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jamesmouth.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jeffeyes.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jeffeyes.jpg
new file mode 100644
index 00000000000..0608e070772
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jeffeyes.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jeffhair.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jeffhair.jpg
new file mode 100644
index 00000000000..b67834a5c01
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jeffhair.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jeffmouth.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jeffmouth.jpg
new file mode 100644
index 00000000000..8a313496d45
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jeffmouth.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/joneyes.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/joneyes.jpg
new file mode 100644
index 00000000000..f7440841e6f
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/joneyes.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jonhair.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jonhair.jpg
new file mode 100644
index 00000000000..59a182451e2
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jonhair.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jonmouth.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jonmouth.jpg
new file mode 100644
index 00000000000..9f39f0b1e4d
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/jonmouth.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/laraeyes.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/laraeyes.jpg
new file mode 100644
index 00000000000..24c8778e5f9
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/laraeyes.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larahair.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larahair.jpg
new file mode 100644
index 00000000000..8c23d01953d
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larahair.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/laramouth.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/laramouth.jpg
new file mode 100644
index 00000000000..b00407c9213
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/laramouth.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larryeyes.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larryeyes.jpg
new file mode 100644
index 00000000000..a2b771ec709
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larryeyes.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larryhair.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larryhair.jpg
new file mode 100644
index 00000000000..5366c15d599
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larryhair.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larrymouth.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larrymouth.jpg
new file mode 100644
index 00000000000..d0642d274ba
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/larrymouth.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/lisaeyes.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/lisaeyes.jpg
new file mode 100644
index 00000000000..4a9cc86a1b8
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/lisaeyes.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/lisahair.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/lisahair.jpg
new file mode 100644
index 00000000000..3eb7d4f3084
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/lisahair.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/lisamouth.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/lisamouth.jpg
new file mode 100644
index 00000000000..ac565029910
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/lisamouth.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/michaeleyes.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/michaeleyes.jpg
new file mode 100644
index 00000000000..ae8487facdf
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/michaeleyes.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/michaelhair.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/michaelhair.jpg
new file mode 100644
index 00000000000..271d20c2c56
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/michaelhair.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/michaelmouth.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/michaelmouth.jpg
new file mode 100644
index 00000000000..02119ed0202
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/michaelmouth.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/philipeyes.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/philipeyes.jpg
new file mode 100644
index 00000000000..1d308070cd2
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/philipeyes.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/philiphair.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/philiphair.jpg
new file mode 100644
index 00000000000..18988dfc5cc
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/philiphair.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/philipmouth.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/philipmouth.jpg
new file mode 100644
index 00000000000..dcf4b96bc74
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/philipmouth.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/scotteyes.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/scotteyes.jpg
new file mode 100644
index 00000000000..fa7ead76cb2
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/scotteyes.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/scotthair.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/scotthair.jpg
new file mode 100644
index 00000000000..ef237cb248b
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/scotthair.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/scottmouth.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/scottmouth.jpg
new file mode 100644
index 00000000000..9eea453afaf
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/combobox/resources/images/scottmouth.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/ListDemo.java b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/ListDemo.java
new file mode 100644
index 00000000000..b8dce72ba9e
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/ListDemo.java
@@ -0,0 +1,404 @@
+/*
+ * 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.
+ */
+package com.sun.swingset3.demos.list;
+
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.util.Vector;
+import javax.swing.*;
+
+import com.sun.swingset3.DemoProperties;
+import com.sun.swingset3.demos.ResourceManager;
+
+/**
+ * List Demo. This demo shows that it is not always necessary to have an array
+ * of objects as big as the size of the list stored.
+ *
+ * Indeed, in this example, there is no array kept for the list data, rather it
+ * is generated on the fly as only those elements are needed.
+ *
+ * @version 1.17 11/17/05
+ * @author Jeff Dinkins
+ */
+@DemoProperties(
+ value = "JList Demo",
+ category = "Data",
+ description = "Demonstrates JList, a component which supports display/editing of a data list",
+ sourceFiles = {
+ "com/sun/swingset3/demos/list/ListDemo.java",
+ "com/sun/swingset3/demos/list/Permuter.java",
+ "com/sun/swingset3/demos/ResourceManager.java",
+ "com/sun/swingset3/demos/list/resources/ListDemo.properties",
+ "com/sun/swingset3/demos/list/resources/images/blue.gif",
+ "com/sun/swingset3/demos/list/resources/images/cyan.gif",
+ "com/sun/swingset3/demos/list/resources/images/gray.gif",
+ "com/sun/swingset3/demos/list/resources/images/green.gif",
+ "com/sun/swingset3/demos/list/resources/images/ListDemo.gif",
+ "com/sun/swingset3/demos/list/resources/images/magenta.gif",
+ "com/sun/swingset3/demos/list/resources/images/red.gif",
+ "com/sun/swingset3/demos/list/resources/images/yellow.gif"
+ }
+)
+public final class ListDemo extends JPanel {
+
+ private static final Dimension HGAP10 = new Dimension(10, 1);
+ private static final Dimension VGAP10 = new Dimension(1, 10);
+ private static final Dimension HGAP15 = new Dimension(15, 1);
+ private static final Dimension HGAP30 = new Dimension(30, 1);
+
+ private final ResourceManager resourceManager = new ResourceManager(this.getClass());
+ public static final String DEMO_TITLE = ListDemo.class.getAnnotation(DemoProperties.class).value();
+
+ private final JList list;
+
+ private JPanel prefixList;
+ private JPanel suffixList;
+
+ private Action prefixAction;
+ private Action suffixAction;
+
+ private final GeneratedListModel listModel;
+
+ /**
+ * main method allows us to run as a standalone demo.
+ *
+ * @param args
+ */
+ public static void main(String[] args) {
+ JFrame frame = new JFrame(DEMO_TITLE);
+
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ frame.getContentPane().add(new ListDemo());
+ frame.setPreferredSize(new Dimension(800, 600));
+ frame.pack();
+ frame.setLocationRelativeTo(null);
+ frame.setVisible(true);
+ }
+
+ /**
+ * ListDemo Constructor
+ */
+ public ListDemo() {
+ setLayout(new BorderLayout());
+
+ loadImages();
+
+ JLabel description = new JLabel(resourceManager.getString("ListDemo.description"));
+ add(description, BorderLayout.NORTH);
+
+ JPanel centerPanel = new JPanel();
+ centerPanel.setLayout(new BoxLayout(centerPanel, BoxLayout.X_AXIS));
+ centerPanel.add(Box.createRigidArea(HGAP10));
+ add(centerPanel, BorderLayout.CENTER);
+
+ JPanel listPanel = new JPanel();
+ listPanel.setLayout(new BoxLayout(listPanel, BoxLayout.Y_AXIS));
+ listPanel.add(Box.createRigidArea(VGAP10));
+
+ centerPanel.add(listPanel);
+ centerPanel.add(Box.createRigidArea(HGAP30));
+
+ // Create the list
+ list = new JList<>();
+ list.setCellRenderer(new CompanyLogoListCellRenderer());
+ listModel = new GeneratedListModel();
+ list.setModel(listModel);
+
+ // Set the preferred row count. This affects the preferredSize
+ // of the JList when it's in a scrollpane.
+ list.setVisibleRowCount(22);
+
+ // Add list to a scrollpane
+ JScrollPane scrollPane = new JScrollPane(list);
+ listPanel.add(scrollPane);
+ listPanel.add(Box.createRigidArea(VGAP10));
+
+ // Add the control panel (holds the prefix/suffix list and prefix/suffix checkboxes)
+ centerPanel.add(createControlPanel());
+
+ // create prefixes and suffixes
+ addPrefix("Tera", true);
+ addPrefix("Micro", false);
+ addPrefix("Southern", false);
+ addPrefix("Net", true);
+ addPrefix("YoYo", true);
+ addPrefix("Northern", false);
+ addPrefix("Tele", false);
+ addPrefix("Eastern", false);
+ addPrefix("Neo", false);
+ addPrefix("Digi", false);
+ addPrefix("National", false);
+ addPrefix("Compu", true);
+ addPrefix("Meta", true);
+ addPrefix("Info", false);
+ addPrefix("Western", false);
+ addPrefix("Data", false);
+ addPrefix("Atlantic", false);
+ addPrefix("Advanced", false);
+ addPrefix("Euro", false);
+ addPrefix("Pacific", false);
+ addPrefix("Mobile", false);
+ addPrefix("In", false);
+ addPrefix("Computa", false);
+ addPrefix("Digital", false);
+ addPrefix("Analog", false);
+
+ addSuffix("Tech", true);
+ addSuffix("Soft", true);
+ addSuffix("Telecom", true);
+ addSuffix("Solutions", false);
+ addSuffix("Works", true);
+ addSuffix("Dyne", false);
+ addSuffix("Services", false);
+ addSuffix("Vers", false);
+ addSuffix("Devices", false);
+ addSuffix("Software", false);
+ addSuffix("Serv", false);
+ addSuffix("Systems", true);
+ addSuffix("Dynamics", true);
+ addSuffix("Net", false);
+ addSuffix("Sys", false);
+ addSuffix("Computing", false);
+ addSuffix("Scape", false);
+ addSuffix("Com", false);
+ addSuffix("Ware", false);
+ addSuffix("Widgets", false);
+ addSuffix("Media", false);
+ addSuffix("Computer", false);
+ addSuffix("Hardware", false);
+ addSuffix("Gizmos", false);
+ addSuffix("Concepts", false);
+ }
+
+ private JPanel createControlPanel() {
+ JPanel controlPanel = new JPanel() {
+ private final Insets insets = new Insets(0, 4, 10, 10);
+
+ @Override
+ public Insets getInsets() {
+ return insets;
+ }
+ };
+ controlPanel.setLayout(new BoxLayout(controlPanel, BoxLayout.X_AXIS));
+
+ JPanel prefixPanel = new JPanel();
+ prefixPanel.setLayout(new BoxLayout(prefixPanel, BoxLayout.Y_AXIS));
+ prefixPanel.add(new JLabel(resourceManager.getString("ListDemo.prefixes")));
+
+ JPanel suffixPanel = new JPanel();
+ suffixPanel.setLayout(new BoxLayout(suffixPanel, BoxLayout.Y_AXIS));
+ suffixPanel.add(new JLabel(resourceManager.getString("ListDemo.suffixes")));
+
+ prefixList = new JPanel() {
+ private final Insets insets = new Insets(0, 4, 0, 0);
+
+ @Override
+ public Insets getInsets() {
+ return insets;
+ }
+ };
+ prefixList.setLayout(new BoxLayout(prefixList, BoxLayout.Y_AXIS));
+ JScrollPane scrollPane = new JScrollPane(prefixList);
+ scrollPane.getVerticalScrollBar().setUnitIncrement(10);
+ prefixPanel.add(scrollPane);
+ prefixPanel.add(Box.createRigidArea(HGAP10));
+
+ suffixList = new JPanel() {
+ private final Insets insets = new Insets(0, 4, 0, 0);
+
+ @Override
+ public Insets getInsets() {
+ return insets;
+ }
+ };
+ suffixList.setLayout(new BoxLayout(suffixList, BoxLayout.Y_AXIS));
+ scrollPane = new JScrollPane(suffixList);
+ scrollPane.getVerticalScrollBar().setUnitIncrement(10);
+ suffixPanel.add(scrollPane);
+ suffixPanel.add(Box.createRigidArea(HGAP10));
+
+ controlPanel.add(prefixPanel);
+ controlPanel.add(Box.createRigidArea(HGAP15));
+ controlPanel.add(suffixPanel);
+ return controlPanel;
+ }
+
+ private final FocusListener listFocusListener = new FocusAdapter() {
+ @Override
+ public void focusGained(FocusEvent e) {
+ JComponent c = (JComponent) e.getComponent();
+ c.scrollRectToVisible(new Rectangle(0, 0, c.getWidth(), c.getHeight()));
+ }
+ };
+
+ private void addPrefix(String prefix, boolean selected) {
+ if (prefixAction == null) {
+ prefixAction = new UpdatePrefixListAction(listModel);
+ }
+ final JCheckBox cb = (JCheckBox) prefixList.add(new JCheckBox(prefix));
+ cb.setSelected(selected);
+ cb.addActionListener(prefixAction);
+ if (selected) {
+ listModel.addPrefix(prefix);
+ }
+ cb.addFocusListener(listFocusListener);
+ }
+
+ private void addSuffix(String suffix, boolean selected) {
+ if (suffixAction == null) {
+ suffixAction = new UpdateSuffixListAction(listModel);
+ }
+ final JCheckBox cb = (JCheckBox) suffixList.add(new JCheckBox(suffix));
+ cb.setSelected(selected);
+ cb.addActionListener(suffixAction);
+ if (selected) {
+ listModel.addSuffix(suffix);
+ }
+ cb.addFocusListener(listFocusListener);
+ }
+
+ private static class UpdatePrefixListAction extends AbstractAction {
+
+ private final GeneratedListModel listModel;
+
+ protected UpdatePrefixListAction(GeneratedListModel listModel) {
+ this.listModel = listModel;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ JCheckBox cb = (JCheckBox) e.getSource();
+ if (cb.isSelected()) {
+ listModel.addPrefix(cb.getText());
+ } else {
+ listModel.removePrefix(cb.getText());
+ }
+ }
+ }
+
+ private static class UpdateSuffixListAction extends AbstractAction {
+
+ private final GeneratedListModel listModel;
+
+ protected UpdateSuffixListAction(GeneratedListModel listModel) {
+ this.listModel = listModel;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ JCheckBox cb = (JCheckBox) e.getSource();
+ if (cb.isSelected()) {
+ listModel.addSuffix(cb.getText());
+ } else {
+ listModel.removeSuffix(cb.getText());
+ }
+ }
+ }
+
+ private static class GeneratedListModel extends AbstractListModel {
+
+ private Permuter permuter;
+
+ private final Vector prefix = new Vector<>();
+ private final Vector suffix = new Vector<>();
+
+ private void update() {
+ permuter = new Permuter(getSize());
+ fireContentsChanged(this, 0, getSize());
+ }
+
+ public void addPrefix(String s) {
+ if (!prefix.contains(s)) {
+ prefix.addElement(s);
+ update();
+ }
+ }
+
+ public void removePrefix(String s) {
+ prefix.removeElement(s);
+ update();
+ }
+
+ public void addSuffix(String s) {
+ if (!suffix.contains(s)) {
+ suffix.addElement(s);
+ update();
+ }
+ }
+
+ public void removeSuffix(String s) {
+ suffix.removeElement(s);
+ update();
+ }
+
+ @Override
+ public int getSize() {
+ return prefix.size() * suffix.size();
+ }
+
+ @Override
+ public String getElementAt(int index) {
+ if (permuter == null) {
+ update();
+ }
+ // morph the index to another int -- this has the benefit of
+ // causing the list to look random.
+ int j = permuter.map(index);
+ int ps = prefix.size();
+ int ss = suffix.size();
+ return prefix.elementAt(j % ps) + suffix.elementAt((j / ps) % ss);
+ }
+ }
+
+ private final ImageIcon[] images = new ImageIcon[7];
+
+ void loadImages() {
+ images[0] = resourceManager.createImageIcon("red.gif", resourceManager.getString("ListDemo.red"));
+ images[1] = resourceManager.createImageIcon("blue.gif", resourceManager.getString("ListDemo.blue"));
+ images[2] = resourceManager.createImageIcon("yellow.gif", resourceManager.getString("ListDemo.yellow"));
+ images[3] = resourceManager.createImageIcon("green.gif", resourceManager.getString("ListDemo.green"));
+ images[4] = resourceManager.createImageIcon("gray.gif", resourceManager.getString("ListDemo.gray"));
+ images[5] = resourceManager.createImageIcon("cyan.gif", resourceManager.getString("ListDemo.cyan"));
+ images[6] = resourceManager.createImageIcon("magenta.gif", resourceManager.getString("ListDemo.magenta"));
+ }
+
+ private class CompanyLogoListCellRenderer extends DefaultListCellRenderer {
+
+ @Override
+ public Component getListCellRendererComponent(
+ JList list,
+ Object value,
+ int index,
+ boolean isSelected,
+ boolean cellHasFocus) {
+ Component retValue = super.getListCellRendererComponent(
+ list, value, index, isSelected, cellHasFocus
+ );
+ setIcon(images[index % 7]);
+ return retValue;
+ }
+ }
+}
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/Permuter.java b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/Permuter.java
new file mode 100644
index 00000000000..7b3dc726723
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/Permuter.java
@@ -0,0 +1,100 @@
+/*
+ * 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.
+ */
+package com.sun.swingset3.demos.list;
+
+/**
+ * An object that implements a cheesy pseudorandom permutation of the integers
+ * from zero to some user-specified value. (The permutation is a linear
+ * function.)
+ *
+ * @version 1.9 11/17/05
+ * @author Josh Bloch
+ */
+class Permuter {
+
+ /**
+ * The size of the permutation.
+ */
+ private int modulus;
+
+ /**
+ * Nonnegative integer less than n that is relatively prime to m.
+ */
+ private int multiplier;
+
+ /**
+ * Pseudorandom nonnegative integer less than n.
+ */
+ private static final int ADDEND = 22;
+
+ public Permuter(int n) {
+ if (n < 0) {
+ throw new IllegalArgumentException();
+ }
+ modulus = n;
+ if (n == 1) {
+ return;
+ }
+
+ // Initialize the multiplier and offset
+ multiplier = (int) Math.sqrt(n);
+ while (gcd(multiplier, n) != 1) {
+ if (++multiplier == n) {
+ multiplier = 1;
+ }
+ }
+ }
+
+ /**
+ * Returns the integer to which this permuter maps the specified integer.
+ * The specified integer must be between 0 and n-1, and the returned integer
+ * will be as well.
+ */
+ public int map(int i) {
+ return (multiplier * i + ADDEND) % modulus;
+ }
+
+ /**
+ * Calculate GCD of a and b, which are assumed to be non-negative.
+ */
+ private static int gcd(int a, int b) {
+ while (b != 0) {
+ int tmp = a % b;
+ a = b;
+ b = tmp;
+ }
+ return a;
+ }
+
+ /**
+ * Simple test. Takes modulus on command line and prints out permutation.
+ */
+ public static void main(String[] args) {
+ int modulus = Integer.parseInt(args[0]);
+ Permuter p = new Permuter(modulus);
+ for (int i = 0; i < modulus; i++) {
+ System.out.print(p.map(i) + " ");
+ }
+ System.out.println();
+ }
+}
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/ListDemo.properties b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/ListDemo.properties
new file mode 100644
index 00000000000..197cb7f69e9
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/ListDemo.properties
@@ -0,0 +1,18 @@
+### List Demo ###
+
+ListDemo.accessible_description=JList Demo
+ListDemo.name=List Demo
+ListDemo.tooltip=JList demo
+ListDemo.prefixes=Prefixes
+ListDemo.suffixes=Suffixes
+ListDemo.count_label=Number of generated list entries:
+ListDemo.all=All
+ListDemo.none=None
+ListDemo.red=Red Company Logo Image
+ListDemo.yellow=Red Company Logo Image
+ListDemo.blue=Blue Company Logo Image
+ListDemo.gray=Gray Company Logo Image
+ListDemo.green=Green Company Logo Image
+ListDemo.magenta=Magenta Company Logo Image
+ListDemo.cyan=Cyan Company Logo Image
+ListDemo.description=
This demo shows how to present lists of data in two different ways. On the left is a JList component whose list items consist of the permutations of the checked prefixes and suffixes. The prefix and suffix checkbox columns on the right are created by using a JPanel with a Y Axis BoxLayout inside a JScrollPane.
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/ListDemo.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/ListDemo.gif
new file mode 100644
index 00000000000..d50e74f75ee
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/ListDemo.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/blue.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/blue.gif
new file mode 100644
index 00000000000..0cbfc10f3c5
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/blue.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/cyan.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/cyan.gif
new file mode 100644
index 00000000000..1a15194edaa
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/cyan.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/gray.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/gray.gif
new file mode 100644
index 00000000000..7e168315415
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/gray.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/green.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/green.gif
new file mode 100644
index 00000000000..5613d8dbe1c
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/green.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/magenta.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/magenta.gif
new file mode 100644
index 00000000000..e3741ab69ee
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/magenta.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/red.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/red.gif
new file mode 100644
index 00000000000..c197ffce1bc
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/red.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/yellow.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/yellow.gif
new file mode 100644
index 00000000000..9baeebfe585
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/list/resources/images/yellow.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/optionpane/OptionPaneDemo.java b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/optionpane/OptionPaneDemo.java
new file mode 100644
index 00000000000..0e8c1e46a13
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/optionpane/OptionPaneDemo.java
@@ -0,0 +1,270 @@
+/*
+ * 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.
+ */
+package com.sun.swingset3.demos.optionpane;
+
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.net.URL;
+import javax.swing.*;
+
+import com.sun.swingset3.demos.ResourceManager;
+import com.sun.swingset3.DemoProperties;
+
+/**
+ * JOptionPaneDemo
+ *
+ * @author Jeff Dinkins
+ * @version 1.11 11/17/05
+ */
+@DemoProperties(
+ value = "JOptionPane Demo",
+ category = "Choosers",
+ description = "Demonstrates JOptionPane, a component which displays standard message dialogs (question, warning, error, etc).",
+ sourceFiles = {
+ "com/sun/swingset3/demos/optionpane/OptionPaneDemo.java",
+ "com/sun/swingset3/demos/ResourceManager.java",
+ "com/sun/swingset3/demos/optionpane/resources/OptionPaneDemo.properties",
+ "com/sun/swingset3/demos/optionpane/resources/images/bottle.gif",
+ "com/sun/swingset3/demos/optionpane/resources/images/OptionPaneDemo.gif"
+ }
+)
+public class OptionPaneDemo extends JPanel {
+
+ private static final Dimension VGAP15 = new Dimension(1, 15);
+ private static final Dimension VGAP30 = new Dimension(1, 30);
+
+ private static final ResourceManager resourceManager = new ResourceManager(OptionPaneDemo.class);
+ public static final String WARNING_TITLE = resourceManager.getString("OptionPaneDemo.warningtitle");
+ public static final String WARNING_TEXT = resourceManager.getString("OptionPaneDemo.warningtext");
+ public static final String WARNING_BUTTON = resourceManager.getString("OptionPaneDemo.warningbutton");
+ public static final String CONFIRM_NO = resourceManager.getString("OptionPaneDemo.confirmno");
+ public static final String CONFIRM_YES = resourceManager.getString("OptionPaneDemo.confirmyes");
+ public static final String CONFIRM_QUESTION = resourceManager.getString("OptionPaneDemo.confirmquestion");
+ public static final String CONFIRM_BUTTON = resourceManager.getString("OptionPaneDemo.confirmbutton");
+ public static final String MESSAGE_TEXT = resourceManager.getString("OptionPaneDemo.messagetext");
+ public static final String MESSAGE_BUTTON = resourceManager.getString("OptionPaneDemo.messagebutton");
+ public static final String INPUT_QUESTION = resourceManager.getString("OptionPaneDemo.inputquestion");
+ public static final String INPUT_RESPONSE = ": " + resourceManager.getString("OptionPaneDemo.inputresponse");
+ public static final String INPUT_BUTTON = resourceManager.getString("OptionPaneDemo.inputbutton");
+ public static final String COMPONENT_R4 = resourceManager.getString("OptionPaneDemo.component_r4");
+ public static final String COMPONENT_R3 = resourceManager.getString("OptionPaneDemo.component_r3");
+ public static final String COMPONENT_R2 = resourceManager.getString("OptionPaneDemo.component_r2");
+ public static final String COMPONENT_R1 = resourceManager.getString("OptionPaneDemo.component_r1");
+ public static final String COMPONENT_TITLE = resourceManager.getString("OptionPaneDemo.componenttitle");
+ public static final String COMPONENT_OP5 = resourceManager.getString("OptionPaneDemo.component_op5");
+ public static final String COMPONENT_OP4 = resourceManager.getString("OptionPaneDemo.component_op4");
+ public static final String COMPONENT_OP3 = resourceManager.getString("OptionPaneDemo.component_op3");
+ public static final String COMPONENT_OP2 = resourceManager.getString("OptionPaneDemo.component_op2");
+ public static final String COMPONENT_OP1 = resourceManager.getString("OptionPaneDemo.component_op1");
+ public static final String COMPONENT_MESSAGE_2 = resourceManager.getString("OptionPaneDemo.componentmessage2");
+ public static final String COMPONENT_CB3 = resourceManager.getString("OptionPaneDemo.component_cb3");
+ public static final String COMPONENT_CB2 = resourceManager.getString("OptionPaneDemo.component_cb2");
+ public static final String COMPONENT_CB1 = resourceManager.getString("OptionPaneDemo.component_cb1");
+ public static final String COMPONENT_BUTTON = resourceManager.getString("OptionPaneDemo.componentbutton");
+ public static final String COMPONENT_TEXT_FIELD = resourceManager.getString("OptionPaneDemo.componenttextfield");
+ public static final String COMPONENT_MESSAGE = resourceManager.getString("OptionPaneDemo.componentmessage");
+ public static final String DEMO_TITLE = OptionPaneDemo.class.getAnnotation(DemoProperties.class).value();
+
+ /**
+ * main method allows us to run as a standalone demo.
+ *
+ * @param args
+ */
+ public static void main(String[] args) {
+ JFrame frame = new JFrame(DEMO_TITLE);
+
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ frame.getContentPane().add(new OptionPaneDemo());
+ frame.setPreferredSize(new Dimension(800, 600));
+ frame.pack();
+ frame.setLocationRelativeTo(null);
+ frame.setVisible(true);
+ }
+
+ /**
+ * OptionPaneDemo Constructor
+ */
+ public OptionPaneDemo() {
+ setLayout(new BoxLayout(this, BoxLayout.X_AXIS));
+
+ JPanel bp = new JPanel() {
+ @Override
+ public Dimension getMaximumSize() {
+ return new Dimension(getPreferredSize().width, super.getMaximumSize().height);
+ }
+ };
+ bp.setLayout(new BoxLayout(bp, BoxLayout.Y_AXIS));
+
+ bp.add(Box.createRigidArea(VGAP30));
+ bp.add(Box.createRigidArea(VGAP30));
+
+ bp.add(createInputDialogButton());
+ bp.add(Box.createRigidArea(VGAP15));
+ bp.add(createWarningDialogButton());
+ bp.add(Box.createRigidArea(VGAP15));
+ bp.add(createMessageDialogButton());
+ bp.add(Box.createRigidArea(VGAP15));
+ bp.add(createComponentDialogButton());
+ bp.add(Box.createRigidArea(VGAP15));
+ bp.add(createConfirmDialogButton());
+ bp.add(Box.createVerticalGlue());
+
+ add(Box.createHorizontalGlue());
+ add(bp);
+ add(Box.createHorizontalGlue());
+ }
+
+ private JButton createWarningDialogButton() {
+ Action a = new AbstractAction(WARNING_BUTTON) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ JOptionPane.showMessageDialog(OptionPaneDemo.this,
+ WARNING_TEXT,
+ WARNING_TITLE,
+ JOptionPane.WARNING_MESSAGE
+ );
+ }
+ };
+ return createButton(a);
+ }
+
+ private JButton createMessageDialogButton() {
+ Action a = new AbstractAction(MESSAGE_BUTTON) {
+ final URL img = getClass().getResource("resources/images/bottle.gif");
+ final String imagesrc = "";
+ final String message = MESSAGE_TEXT;
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ JOptionPane.showMessageDialog(
+ OptionPaneDemo.this,
+ "" + imagesrc + "
" + message + "
"
+ );
+ }
+ };
+ return createButton(a);
+ }
+
+ private JButton createConfirmDialogButton() {
+ Action a = new AbstractAction(CONFIRM_BUTTON) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ int result = JOptionPane.showConfirmDialog(OptionPaneDemo.this, CONFIRM_QUESTION);
+ if (result == JOptionPane.YES_OPTION) {
+ JOptionPane.showMessageDialog(OptionPaneDemo.this, CONFIRM_YES);
+ } else if (result == JOptionPane.NO_OPTION) {
+ JOptionPane.showMessageDialog(OptionPaneDemo.this, CONFIRM_NO);
+ }
+ }
+ };
+ return createButton(a);
+ }
+
+ private JButton createInputDialogButton() {
+ Action a = new AbstractAction(INPUT_BUTTON) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ String result = JOptionPane.showInputDialog(OptionPaneDemo.this, INPUT_QUESTION);
+ if ((result != null) && (result.length() > 0)) {
+ JOptionPane.showMessageDialog(OptionPaneDemo.this,
+ result + INPUT_RESPONSE);
+ }
+ }
+ };
+ return createButton(a);
+ }
+
+ private JButton createComponentDialogButton() {
+ Action a = new AbstractAction(COMPONENT_BUTTON) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ // In a ComponentDialog, you can show as many message components and
+ // as many options as you want:
+
+ // Messages
+ Object[] message = new Object[4];
+ message[0] = COMPONENT_MESSAGE;
+ message[1] = new JTextField(COMPONENT_TEXT_FIELD);
+
+ JComboBox cb = new JComboBox<>();
+ cb.addItem(COMPONENT_CB1);
+ cb.addItem(COMPONENT_CB2);
+ cb.addItem(COMPONENT_CB3);
+ message[2] = cb;
+
+ message[3] = COMPONENT_MESSAGE_2;
+
+ // Options
+ String[] options = {
+ COMPONENT_OP1, COMPONENT_OP2, COMPONENT_OP3, COMPONENT_OP4, COMPONENT_OP5};
+ int result = JOptionPane.showOptionDialog(
+ OptionPaneDemo.this, // the parent that the dialog blocks
+ message, // the dialog message array
+ COMPONENT_TITLE, // the title of the dialog window
+ JOptionPane.DEFAULT_OPTION, // option type
+ JOptionPane.INFORMATION_MESSAGE, // message type
+ null, // optional icon, use null to use the default icon
+ options, // options string array, will be made into buttons
+ options[3] // option that should be made into a default button
+ );
+ switch (result) {
+ case 0: // yes
+ JOptionPane.showMessageDialog(OptionPaneDemo.this, COMPONENT_R1);
+ break;
+ case 1: // no
+ JOptionPane.showMessageDialog(OptionPaneDemo.this, COMPONENT_R2);
+ break;
+ case 2: // maybe
+ JOptionPane.showMessageDialog(OptionPaneDemo.this, COMPONENT_R3);
+ break;
+ case 3: // probably
+ JOptionPane.showMessageDialog(OptionPaneDemo.this, COMPONENT_R4);
+ break;
+ default:
+ break;
+ }
+
+ }
+ };
+ return createButton(a);
+ }
+
+ private JButton createButton(Action a) {
+ JButton b = new JButton() {
+ @Override
+ public Dimension getMaximumSize() {
+ int width = Short.MAX_VALUE;
+ int height = super.getMaximumSize().height;
+ return new Dimension(width, height);
+ }
+ };
+ // setting the following client property informs the button to show
+ // the action text as it's name. The default is to not show the
+ // action text.
+ b.putClientProperty("displayActionText", Boolean.TRUE);
+ b.setAction(a);
+ // b.setAlignmentX(JButton.CENTER_ALIGNMENT);
+ return b;
+ }
+
+}
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/optionpane/resources/OptionPaneDemo.properties b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/optionpane/resources/OptionPaneDemo.properties
new file mode 100644
index 00000000000..e4cf7077992
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/optionpane/resources/OptionPaneDemo.properties
@@ -0,0 +1,42 @@
+### OptionPane Demo ###
+
+OptionPaneDemo.accessible_description=The OptionPane Demo shows examples of using JOptionPane to generate different common option dialog boxes
+OptionPaneDemo.tooltip=JOptionPane Demo
+OptionPaneDemo.name=Option Pane Demo
+
+OptionPaneDemo.warningbutton=Show Warning Dialog
+OptionPaneDemo.componentbutton=Show Component Dialog
+OptionPaneDemo.inputbutton=Show Input Dialog
+OptionPaneDemo.confirmbutton=Show Confirmation Dialog
+OptionPaneDemo.messagebutton=Show Message Dialog
+
+OptionPaneDemo.warningtitle=Warning Dialog Example
+OptionPaneDemo.warningtext=
This is a test of the Emergency Broadcast System. This is only a test. The webmaster of your local intranet, in voluntary cooperation with the Federal and State authorities, have developed this system to keep you informed in the event of an emergency. If this had been an actual emergency, the signal you just heard would have been followed by official information, news or instructions. This concludes this test of the Emergency Broadcast System.
Developer Note: This dialog demo used HTML for text formatting.
+
+OptionPaneDemo.messagetext=Message in a Bottle (yeah)
+
+OptionPaneDemo.confirmquestion=Is the sun shining outside today?
+OptionPaneDemo.confirmyes=Well what are you doing playing on the computer? Get outside! Take a trip to the beach! Get a little sun!
+OptionPaneDemo.confirmno=Well good thing you're inside protected from the elements!
+
+OptionPaneDemo.inputquestion=What is your favorite movie?
+OptionPaneDemo.inputresponse=That was a pretty good movie!
+
+OptionPaneDemo.componenttitle=Component Dialog Example
+OptionPaneDemo.componentmessage=JOptionPane can contain as many components as you want, such as a text field:
+OptionPaneDemo.componenttextfield=or a combobox:
+OptionPaneDemo.component_cb1=item 1
+OptionPaneDemo.component_cb2=item 2
+OptionPaneDemo.component_cb3=item 3
+OptionPaneDemo.componentmessage2=JOptionPane can also show as many options as you want:
+OptionPaneDemo.component_op1=Yes
+OptionPaneDemo.component_op2=No
+OptionPaneDemo.component_op3=Maybe
+OptionPaneDemo.component_op4=Probably
+OptionPaneDemo.component_op5=Cancel
+
+OptionPaneDemo.component_r1=Upbeat and positive! I like that! Good choice.
+OptionPaneDemo.component_r2=Definitely not, I wouldn't do it either.
+OptionPaneDemo.component_r3= Mmmm.. yes, the situation is unclear at this time. Check back when you know for sure.
+OptionPaneDemo.component_r4=You know you want to. I think you should have gone for broke and pressed "Yes".
+
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/optionpane/resources/images/OptionPaneDemo.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/optionpane/resources/images/OptionPaneDemo.gif
new file mode 100644
index 00000000000..114e1ab7bd3
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/optionpane/resources/images/OptionPaneDemo.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/optionpane/resources/images/bottle.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/optionpane/resources/images/bottle.gif
new file mode 100644
index 00000000000..e706c0c2fb9
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/optionpane/resources/images/bottle.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/progressbar/ProgressBarDemo.java b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/progressbar/ProgressBarDemo.java
new file mode 100644
index 00000000000..e49b47926ea
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/progressbar/ProgressBarDemo.java
@@ -0,0 +1,199 @@
+/*
+ * 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.
+ */
+package com.sun.swingset3.demos.progressbar;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import javax.swing.*;
+import javax.swing.border.BevelBorder;
+import javax.swing.border.SoftBevelBorder;
+
+import com.sun.swingset3.DemoProperties;
+import com.sun.swingset3.demos.ResourceManager;
+
+/**
+ * JProgressBar Demo
+ *
+ * @version 1.12 11/17/05
+ * @author Jeff Dinkins # @author Peter Korn (accessibility support)
+ */
+@DemoProperties(
+ value = "ProgressBar Demo",
+ category = "Controls",
+ description = "Demonstrates the JProgressBar, a control which displays progress to the user",
+ sourceFiles = {
+ "com/sun/swingset3/demos/progressbar/ProgressBarDemo.java",
+ "com/sun/swingset3/demos/ResourceManager.java",
+ "com/sun/swingset3/demos/progressbar/resources/ProgressBarDemo.properties",
+ "com/sun/swingset3/demos/progressbar/resources/images/ProgressBarDemo.gif"
+ }
+)
+public class ProgressBarDemo extends JPanel {
+
+ private static final ResourceManager resourceManager = new ResourceManager(ProgressBarDemo.class);
+ public static final String STOP_BUTTON = resourceManager.getString("ProgressBarDemo.stop_button");
+ public static final String START_BUTTON = resourceManager.getString("ProgressBarDemo.start_button");
+ public static final String DEMO_TITLE = ProgressBarDemo.class.getAnnotation(DemoProperties.class).value();
+
+ /**
+ * main method allows us to run as a standalone demo.
+ *
+ * @param args
+ */
+ public static void main(String[] args) {
+ JFrame frame = new JFrame(DEMO_TITLE);
+
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ frame.getContentPane().add(new ProgressBarDemo());
+ frame.setPreferredSize(new Dimension(800, 600));
+ frame.pack();
+ frame.setLocationRelativeTo(null);
+ frame.setVisible(true);
+ }
+
+ /**
+ * ProgressBarDemo Constructor
+ */
+ public ProgressBarDemo() {
+ createProgressPanel();
+ }
+
+ private final javax.swing.Timer timer = new javax.swing.Timer(18, createTextLoadAction());
+ private Action loadAction;
+ private Action stopAction;
+ private JProgressBar progressBar;
+ private JTextArea progressTextArea;
+
+ private void createProgressPanel() {
+ setLayout(new BorderLayout());
+
+ JPanel textWrapper = new JPanel(new BorderLayout());
+ textWrapper.setBorder(new SoftBevelBorder(BevelBorder.LOWERED));
+ textWrapper.setAlignmentX(LEFT_ALIGNMENT);
+ progressTextArea = new MyTextArea();
+
+ progressTextArea.getAccessibleContext().setAccessibleName(
+ resourceManager.getString("ProgressBarDemo.accessible_text_area_name"));
+ progressTextArea.getAccessibleContext().setAccessibleDescription(
+ resourceManager.getString("ProgressBarDemo.accessible_text_area_description"));
+ textWrapper.add(new JScrollPane(progressTextArea), BorderLayout.CENTER);
+
+ add(textWrapper, BorderLayout.CENTER);
+
+ JPanel progressPanel = new JPanel();
+ add(progressPanel, BorderLayout.SOUTH);
+
+ progressBar = new JProgressBar(JProgressBar.HORIZONTAL, 0, text.length()) {
+ @Override
+ public Dimension getPreferredSize() {
+ return new Dimension(300, super.getPreferredSize().height);
+ }
+ };
+ progressBar.getAccessibleContext().setAccessibleName(
+ resourceManager.getString("ProgressBarDemo.accessible_text_loading_progress"));
+
+ progressPanel.add(progressBar);
+ progressPanel.add(createLoadButton());
+ progressPanel.add(createStopButton());
+ }
+
+ private JButton createLoadButton() {
+ loadAction = new AbstractAction(START_BUTTON) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ loadAction.setEnabled(false);
+ stopAction.setEnabled(true);
+ if (progressBar.getValue() == progressBar.getMaximum()) {
+ progressBar.setValue(0);
+ textLocation = 0;
+ progressTextArea.setText("");
+ }
+ timer.start();
+ }
+ };
+ return createButton(loadAction);
+ }
+
+ private JButton createStopButton() {
+ stopAction = new AbstractAction(STOP_BUTTON) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ timer.stop();
+ loadAction.setEnabled(true);
+ stopAction.setEnabled(false);
+ }
+ };
+ return createButton(stopAction);
+ }
+
+ private static JButton createButton(Action a) {
+ JButton b = new JButton();
+ // setting the following client property informs the button to show
+ // the action text as it's name. The default is to not show the
+ // action text.
+ b.putClientProperty("displayActionText", Boolean.TRUE);
+ b.setAction(a);
+ return b;
+ }
+
+ private int textLocation = 0;
+
+ private final String text = resourceManager.getString("ProgressBarDemo.text");
+
+ private Action createTextLoadAction() {
+ return new AbstractAction("text load action") {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ if (progressBar.getValue() < progressBar.getMaximum()) {
+ progressBar.setValue(progressBar.getValue() + 1);
+ progressTextArea.append(text.substring(textLocation, textLocation + 1));
+ textLocation++;
+ } else {
+ timer.stop();
+ loadAction.setEnabled(true);
+ stopAction.setEnabled(false);
+ }
+ }
+ };
+ }
+
+ private static class MyTextArea extends JTextArea {
+
+ private MyTextArea() {
+ super(null, 0, 0);
+ setEditable(false);
+ setText("");
+ }
+
+ @Override
+ public float getAlignmentX() {
+ return LEFT_ALIGNMENT;
+ }
+
+ @Override
+ public float getAlignmentY() {
+ return TOP_ALIGNMENT;
+ }
+ }
+}
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/progressbar/resources/ProgressBarDemo.properties b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/progressbar/resources/ProgressBarDemo.properties
new file mode 100644
index 00000000000..7660e0b141e
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/progressbar/resources/ProgressBarDemo.properties
@@ -0,0 +1,35 @@
+### ProgressBar Demo ###
+
+ProgressBarDemo.accessible_description=This demo shows an example of using the JProgressBar component.
+ProgressBarDemo.tooltip=JProgressBar demo
+ProgressBarDemo.name=ProgressBar Demo
+ProgressBarDemo.start_button=Start Loading Text
+ProgressBarDemo.stop_button=Stop Loading Text
+ProgressBarDemo.accessible_text_loading_progress=Text loading progress
+ProgressBarDemo.accessible_text_area_name=Text progressively being loaded in
+
+ProgressBarDemo.accessible_text_area_description=This JTextArea is being filled with text from a buffer progressively a character at a time while the progress bar a the bottom of the window shows the loading progress
+
+ProgressBarDemo.text=\
+The saying goes: if an infinite number of monkeys typed on an infinite number of typewriters, eventually \n\
+all the great works of mankind would emerge. Now, with today's high speed computers, we can finally test \n\
+this theory... \n\n\
+\tLzskd jfy 92y;ho4 th;qlh sd 6yty;q2 hnlj 8sdf. Djfy 92y;ho4, th;qxhz d7yty; \n\
+\tQ0hnlj 23&^ (# ljask djf y92y; fy92y; Sd6y ty;q2h nl jk la gfa harvin garvel\n\
+\tlasdfsd a83sl la8z ks8l 92y;ho4 th;qlh sd 6yty;q2 hnlj 8sdf. Djfy 92y;ho4,\n\
+\tth;qxhz d7yty; Q0hnlj 23&^ nknod mrs88 jsd79lfm#%$JLaoz6df lso7dj f2 jfls\n\
+\t67d9ol1@2fou99s 1lkj2 @l.k1 2; a89o7aljf 1l3i7ou8 d8l3 lqwerty0092 #1!\n\
+\tja9o do8lkjj139rojsd9**!l6*hd # ljasd78 l2awkjad78 3ol7asljf 3 ldif & l.js\n\
+\tLl ls ewan la8uj 23lll7u 8l 3h hhxx8 8d lsd fixx 891lkjno99sl d8l@@@!!8#8\n\
+\tdfoil jarooda mklaoorj nowai the smisthliylka jkdlfjiw ladajadra lthhheeejfjl\n\
+\tdkddooolda bub mirznod of the koojgaf!! But 2 be or not to be... that is the\n\
+\tquestion. Then when shall we three meet again In thunder, lightning, or in\n\
+\train? When the hurlyburly's done, When the battle's lost and won. That will\n\
+\tbe ere the set of sun. Where the place? Upon the heath. There to meet with\n\
+\tMacbeth. But hath forth not to want..... a banana, or to be.... a banana.\n\
+\tBanana, I knew him banana. Banana banana. Banana banana banana banana.\n\
+\n\
+\n\
+\n\
+\n\
+Well... hmm.... it seemed like a good idea...
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/progressbar/resources/images/ProgressBarDemo.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/progressbar/resources/images/ProgressBarDemo.gif
new file mode 100644
index 00000000000..1aa706d257c
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/progressbar/resources/images/ProgressBarDemo.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/ScrollPaneDemo.java b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/ScrollPaneDemo.java
new file mode 100644
index 00000000000..5a492ea53fd
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/ScrollPaneDemo.java
@@ -0,0 +1,133 @@
+/*
+ * 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.
+ */
+package com.sun.swingset3.demos.scrollpane;
+
+import java.awt.*;
+import javax.swing.*;
+
+import com.sun.swingset3.DemoProperties;
+import com.sun.swingset3.demos.ResourceManager;
+
+/**
+ * Scroll Pane Demo
+ *
+ * @version 1.9 11/17/05
+ * @author Jeff Dinkins
+ */
+@DemoProperties(
+ value = "JScrollPane Demo",
+ category = "Containers",
+ description = "Demonstrates JScrollPane, a container for scrolling contents within a view port",
+ sourceFiles = {
+ "com/sun/swingset3/demos/scrollpane/ScrollPaneDemo.java",
+ "com/sun/swingset3/demos/ResourceManager.java",
+ "com/sun/swingset3/demos/scrollpane/resources/ScrollPaneDemo.properties",
+ "com/sun/swingset3/demos/scrollpane/resources/images/colheader.jpg",
+ "com/sun/swingset3/demos/scrollpane/resources/images/COPYRIGHT",
+ "com/sun/swingset3/demos/scrollpane/resources/images/crayons.jpg",
+ "com/sun/swingset3/demos/scrollpane/resources/images/lowerleft.jpg",
+ "com/sun/swingset3/demos/scrollpane/resources/images/rowheader.jpg",
+ "com/sun/swingset3/demos/scrollpane/resources/images/ScrollPaneDemo.gif",
+ "com/sun/swingset3/demos/scrollpane/resources/images/upperleft.jpg",
+ "com/sun/swingset3/demos/scrollpane/resources/images/upperright.jpg"}
+)
+public class ScrollPaneDemo extends JPanel {
+
+ private final ResourceManager resourceManager = new ResourceManager(this.getClass());
+ public static final String DEMO_TITLE = ScrollPaneDemo.class.getAnnotation(DemoProperties.class).value();
+
+ /**
+ * main method allows us to run as a standalone demo.
+ *
+ * @param args
+ */
+ public static void main(String[] args) {
+ JFrame frame = new JFrame(DEMO_TITLE);
+
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ frame.getContentPane().add(new ScrollPaneDemo());
+ frame.setPreferredSize(new Dimension(800, 600));
+ frame.pack();
+ frame.setLocationRelativeTo(null);
+ frame.setVisible(true);
+ }
+
+ /**
+ * ScrollPaneDemo Constructor
+ */
+ public ScrollPaneDemo() {
+ setLayout(new BorderLayout());
+
+ ImageIcon crayons = resourceManager.createImageIcon("crayons.jpg",
+ resourceManager.getString("ScrollPaneDemo.crayons"));
+ add(new ImageScroller(crayons), BorderLayout.CENTER);
+ }
+
+ /**
+ * ScrollPane class that demonstrates how to set the various column and row
+ * headers and corners.
+ */
+ private class ImageScroller extends JScrollPane {
+
+ public ImageScroller(Icon icon) {
+ super();
+
+ // Panel to hold the icon image
+ JPanel p = new JPanel(new BorderLayout());
+ p.add(new JLabel(icon), BorderLayout.CENTER);
+ getViewport().add(p);
+
+ // Create and add a column header to the scrollpane
+ JLabel colHeader = new JLabel(
+ resourceManager.createImageIcon("colheader.jpg", resourceManager.getString("ScrollPaneDemo.colheader")));
+ setColumnHeaderView(colHeader);
+
+ // Create and add a row header to the scrollpane
+ JLabel rowHeaderLabel = new JLabel(
+ resourceManager.createImageIcon("rowheader.jpg", resourceManager.getString("ScrollPaneDemo.rowheader")));
+ setRowHeaderView(rowHeaderLabel);
+
+ // Create and add the upper left corner
+ JLabel cornerUL = new JLabel(
+ resourceManager.createImageIcon("upperleft.jpg", resourceManager.getString("ScrollPaneDemo.upperleft")));
+ setCorner(UPPER_LEFT_CORNER, cornerUL);
+
+ // Create and add the upper right corner
+ JLabel cornerUR = new JLabel(
+ resourceManager.createImageIcon("upperright.jpg", resourceManager.getString("ScrollPaneDemo.upperright")));
+ setCorner(UPPER_RIGHT_CORNER, cornerUR);
+
+ // Create and add the lower left corner
+ JLabel cornerLL = new JLabel(
+ resourceManager.createImageIcon("lowerleft.jpg", resourceManager.getString("ScrollPaneDemo.lowerleft")));
+ setCorner(LOWER_LEFT_CORNER, cornerLL);
+
+ JScrollBar vsb = getVerticalScrollBar();
+ JScrollBar hsb = getHorizontalScrollBar();
+
+ vsb.setValue(icon.getIconHeight());
+ hsb.setValue(icon.getIconWidth() / 10);
+ }
+ }
+
+}
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/ScrollPaneDemo.properties b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/ScrollPaneDemo.properties
new file mode 100644
index 00000000000..4d33fb50162
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/ScrollPaneDemo.properties
@@ -0,0 +1,11 @@
+### ScrollPane Demo ###
+
+ScrollPaneDemo.accessible_description=JScrollPane Demo
+ScrollPaneDemo.name=Scroll Pane Demo
+ScrollPaneDemo.tooltip=JScrollPane demo
+ScrollPaneDemo.crayons=Lots of Crayons
+ScrollPaneDemo.colheader=Column Header
+ScrollPaneDemo.rowheader=Row Header
+ScrollPaneDemo.upperleft=Upper Left Corner
+ScrollPaneDemo.upperright=Upper Right Column Header Corner
+ScrollPaneDemo.lowerleft=Lower Left Row Header Corner
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/COPYRIGHT b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/COPYRIGHT
new file mode 100644
index 00000000000..a7bdd30d377
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/COPYRIGHT
@@ -0,0 +1,2 @@
+
+ All images in this directory are copyright 1995 by Jeff Dinkins.
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/ScrollPaneDemo.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/ScrollPaneDemo.gif
new file mode 100644
index 00000000000..95fcc12da47
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/ScrollPaneDemo.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/colheader.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/colheader.jpg
new file mode 100644
index 00000000000..774deed99a9
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/colheader.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/crayons.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/crayons.jpg
new file mode 100644
index 00000000000..922171db310
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/crayons.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/lowerleft.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/lowerleft.jpg
new file mode 100644
index 00000000000..b9e60474b99
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/lowerleft.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/rowheader.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/rowheader.jpg
new file mode 100644
index 00000000000..c791147c9f2
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/rowheader.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/upperleft.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/upperleft.jpg
new file mode 100644
index 00000000000..69e2a00c6f9
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/upperleft.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/upperright.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/upperright.jpg
new file mode 100644
index 00000000000..a40a1284923
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/resources/images/upperright.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/JMandelbrot.java b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/JMandelbrot.java
new file mode 100644
index 00000000000..c777ec80da9
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/JMandelbrot.java
@@ -0,0 +1,328 @@
+/*
+ * 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.
+ */
+package com.sun.swingset3.demos.spinner;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.*;
+import java.awt.geom.Point2D;
+import java.awt.image.BufferedImage;
+import java.awt.image.DataBufferInt;
+import java.util.List;
+
+import com.sun.swingset3.demos.ResourceManager;
+
+/**
+ * @author Mikhail Lapshin
+ */
+public class JMandelbrot extends JComponent {
+
+ private static final double EPSILON = 1E-16;
+ private static final int MIN_WIDTH = 50;
+ private static final int MIN_HEIGHT = 50;
+ private static final double ZOOM_RATE = 3;
+ private static final int NUM_OF_THREADS = 4;
+
+ private Point2D center;
+ public static final String CENTER_PROPERTY_NAME = "center";
+
+ private int maxIteration = 300;
+ public static final String MAX_ITERATION_PROPERTY_NAME = "maxIteration";
+
+ private Palette palette;
+ public static final String PALETTE_PROPERTY_NAME = "palette";
+
+ private BufferedImage buffer;
+ private final MandelbrotCalculator[] calculators
+ = new MandelbrotCalculator[NUM_OF_THREADS];
+
+ private double xLowLimit = -2;
+ private double xHighLimit = 2;
+ private double yLowLimit = -2;
+ private double yHighLimit = 2;
+ private double xScale = 100;
+ private double yScale = 100;
+ private int oldComponentWidth = (int) (xScale * (xHighLimit - xLowLimit));
+ private int oldComponentHeight = (int) (yScale * (yHighLimit - yLowLimit));
+
+ public JMandelbrot(int width, int height, Palette palette,
+ ResourceManager resourceManager) {
+ setPreferredSize(new Dimension(width, height));
+ setMinimumSize(new Dimension(MIN_WIDTH, MIN_HEIGHT));
+ calcConstants(width, height);
+ setPalette(palette);
+ setToolTipText(resourceManager.getString("SpinnerDemo.toolTip"));
+ installListeners();
+ }
+
+ private void calcConstants() {
+ calcConstants(getWidth(), getHeight());
+ }
+
+ private void calcConstants(int width, int height) {
+ if ((width >= MIN_WIDTH) && (height >= MIN_HEIGHT)) {
+ double oldIntervalWidth = xHighLimit - xLowLimit;
+ double oldIntervalHeight = yHighLimit - yLowLimit;
+ double newIntervalWidth
+ = width * oldIntervalWidth / oldComponentWidth;
+ double newIntervalHeight
+ = height * oldIntervalHeight / oldComponentHeight;
+ double xDiff = newIntervalWidth - oldIntervalWidth;
+ double yDiff = newIntervalHeight - oldIntervalHeight;
+ xLowLimit -= xDiff / 2;
+ xHighLimit += xDiff / 2;
+ yLowLimit -= yDiff / 2;
+ yHighLimit += yDiff / 2;
+ buffer = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+ oldComponentWidth = width;
+ oldComponentHeight = height;
+ setCenter(calcCenter());
+ }
+ }
+
+ private void installListeners() {
+ addMouseListener(new MouseAdapter() {
+ @Override
+ public void mousePressed(MouseEvent e) {
+ int xCoord = e.getX();
+ int yCoord = e.getY();
+ double intervalWidth = xHighLimit - xLowLimit;
+ double intervalHeight = yHighLimit - yLowLimit;
+ double x = intervalWidth * xCoord / getWidth() + xLowLimit;
+ double y = intervalHeight * yCoord / getHeight() + yLowLimit;
+
+ double newIntervalWidth;
+ double newIntervalHeight;
+ if (e.getButton() == MouseEvent.BUTTON1) {
+ boolean limitReached = false;
+ newIntervalWidth = intervalWidth / ZOOM_RATE;
+ if ((newIntervalWidth / getWidth()) < EPSILON) {
+ newIntervalWidth = intervalWidth;
+ limitReached = true;
+ }
+ newIntervalHeight = intervalHeight / ZOOM_RATE;
+ if ((newIntervalHeight / getHeight()) < EPSILON) {
+ newIntervalHeight = intervalHeight;
+ limitReached = true;
+ }
+ if (!limitReached) {
+ xLowLimit = x - (x - xLowLimit) / ZOOM_RATE;
+ yLowLimit = y - (y - yLowLimit) / ZOOM_RATE;
+ }
+ } else {
+ newIntervalWidth = intervalWidth * ZOOM_RATE;
+ newIntervalHeight = intervalHeight * ZOOM_RATE;
+ xLowLimit = x - (x - xLowLimit) * ZOOM_RATE;
+ yLowLimit = y - (y - yLowLimit) * ZOOM_RATE;
+ }
+
+ xHighLimit = xLowLimit + newIntervalWidth;
+ yHighLimit = yLowLimit + newIntervalHeight;
+
+ setCenter(calcCenter());
+
+ xScale = getWidth() / newIntervalWidth;
+ yScale = getHeight() / newIntervalHeight;
+
+ calculatePicture();
+ }
+ });
+
+ addComponentListener(new ComponentListener() {
+ @Override
+ public void componentResized(ComponentEvent e) {
+ calcConstants();
+ calculatePicture();
+ repaint();
+ }
+
+ @Override
+ public void componentMoved(ComponentEvent e) {
+ }
+
+ @Override
+ public void componentShown(ComponentEvent e) {
+ }
+
+ @Override
+ public void componentHidden(ComponentEvent e) {
+ }
+ });
+ }
+
+ //Use SwingWorker to asynchronously calculate parts of the picture
+ public void calculatePicture() {
+ int yStep = getHeight() / NUM_OF_THREADS;
+ int yStart = 0;
+ for (int i = 0; i < calculators.length; i++) {
+ if ((calculators[i] != null) && !calculators[i].isDone()) {
+ calculators[i].cancel(true);
+ }
+ int yEnd = i == calculators.length - 1 ? getHeight() : yStart + yStep;
+ calculators[i] = new MandelbrotCalculator(yStart, yEnd);
+ calculators[i].execute();
+ yStart = yEnd;
+ }
+ }
+ //
+
+ private Point2D calcCenter() {
+ return new Point2D.Double(xLowLimit + (xHighLimit - xLowLimit) / 2,
+ yLowLimit + (yHighLimit - yLowLimit) / 2);
+ }
+
+ @Override
+ protected void paintComponent(Graphics g) {
+ super.paintComponent(g);
+ g.drawImage(buffer, 0, 0, null);
+ }
+
+ //Use SwingWorker to asynchronously calculate parts of the picture
+ private class MandelbrotCalculator extends SwingWorker {
+
+ private final int yStart;
+ private final int yEnd;
+
+ public MandelbrotCalculator(int yStart, int yEnd) {
+ this.yStart = yStart;
+ this.yEnd = yEnd;
+ }
+
+ @Override
+ protected Object doInBackground() throws Exception {
+ int[] data = ((DataBufferInt) buffer.getRaster().getDataBuffer()).getData();
+
+ double xArr[] = new double[buffer.getWidth()];
+
+ for (int i = 0; i < xArr.length; i++) {
+ xArr[i] = i / xScale + xLowLimit;
+ }
+
+ double yArr[] = new double[yEnd - yStart];
+
+ for (int i = 0; i < yArr.length; i++) {
+ yArr[i] = (yStart + i) / yScale + yLowLimit;
+ }
+
+ int i = yStart * buffer.getWidth();
+
+ for (double y : yArr) {
+ for (double x : xArr) {
+ int value = calcValue(x, y);
+
+ data[i] = value == maxIteration ? 0 : palette.getRgbColor(value);
+
+ i++;
+ }
+ if (Thread.currentThread().isInterrupted()) {
+ return null;
+ }
+ publish();
+ }
+ return null;
+ }
+
+ private int calcValue(double x, double y) {
+ double x0 = x;
+ double y0 = y;
+
+ for (int i = 0; i < maxIteration; i++) {
+ double x2 = x * x;
+ double y2 = y * y;
+
+ if (x2 + y2 > 4) {
+ return i;
+ }
+
+ y = 2 * x * y + y0;
+ x = x2 - y2 + x0;
+ }
+
+ return maxIteration;
+ }
+
+ @Override
+ protected void process(List
+
+ // Getters and Setters
+ public int getMaxIteration() {
+ return maxIteration;
+ }
+
+ public void setMaxIteration(int maxIteration) {
+ int oldValue = this.maxIteration;
+ this.maxIteration = maxIteration;
+ firePropertyChange(MAX_ITERATION_PROPERTY_NAME, oldValue, maxIteration);
+ palette.setSize(maxIteration);
+ }
+
+ public double getXHighLimit() {
+ return xHighLimit;
+ }
+
+ public double getXLowLimit() {
+ return xLowLimit;
+ }
+
+ public double getYLowLimit() {
+ return yLowLimit;
+ }
+
+ public double getYHighLimit() {
+ return yHighLimit;
+ }
+
+ public Point2D getCenter() {
+ return center;
+ }
+
+ public void setCenter(Point2D coords) {
+ Point2D oldValue = this.center;
+ this.center = coords;
+
+ double width = xHighLimit - xLowLimit;
+ double height = yHighLimit - yLowLimit;
+
+ xLowLimit = coords.getX() - width / 2;
+ xHighLimit = xLowLimit + width;
+ yLowLimit = coords.getY() - height / 2;
+ yHighLimit = yLowLimit + height;
+
+ firePropertyChange(CENTER_PROPERTY_NAME, oldValue, coords);
+ }
+
+ public Palette getPalette() {
+ return palette;
+ }
+
+ public void setPalette(Palette palette) {
+ Palette oldValue = this.palette;
+ palette.setSize(maxIteration);
+ this.palette = palette;
+ firePropertyChange(PALETTE_PROPERTY_NAME, oldValue, palette);
+ }
+}
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/JPaletteShower.java b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/JPaletteShower.java
new file mode 100644
index 00000000000..fc305da03b0
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/JPaletteShower.java
@@ -0,0 +1,62 @@
+/*
+ * 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.
+ */
+package com.sun.swingset3.demos.spinner;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+ * @author Mikhail Lapshin
+ */
+public class JPaletteShower extends JComponent {
+
+ private Palette palette;
+
+ public JPaletteShower(Palette palette, int width, int height) {
+ setPreferredSize(new Dimension(width, height));
+ setMinimumSize(new Dimension(width, height));
+ this.palette = palette;
+ }
+
+ @Override
+ protected void paintComponent(Graphics g) {
+ super.paintComponent(g);
+ int w = getSize().width;
+ int h = getSize().height;
+ int maxIndex = palette.getSize() - 1;
+ double rate = (double) maxIndex / w;
+ for (int x = 0; x < w; x++) {
+ g.setColor(palette.getColor((int) (x * rate)));
+ g.fillRect(x, 0, 1, h);
+ }
+ }
+
+ public Palette getPalette() {
+ return palette;
+ }
+
+ public void setPalette(Palette palette) {
+ this.palette = palette;
+ repaint();
+ }
+}
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/JSpinnerPanel.java b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/JSpinnerPanel.java
new file mode 100644
index 00000000000..b3cfb0d3d95
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/JSpinnerPanel.java
@@ -0,0 +1,66 @@
+/*
+ * 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.
+ */
+package com.sun.swingset3.demos.spinner;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+ * Arranges labels and spinners into two vertical columns. Labels at the left,
+ * spinners at the right.
+ *
+ * @author Mikhail Lapshin
+ */
+//Helpful component for layout of labeled spinners
+public class JSpinnerPanel extends JPanel {
+
+ private final JPanel labelPanel;
+ private final JPanel spinnerPanel;
+
+ public JSpinnerPanel() {
+ setLayout(new BoxLayout(this, BoxLayout.X_AXIS));
+
+ labelPanel = new JPanel();
+ labelPanel.setLayout(new GridLayout(0, 1));
+
+ spinnerPanel = new JPanel();
+ spinnerPanel.setLayout(new GridLayout(0, 1));
+
+ add(labelPanel);
+ add(Box.createHorizontalStrut(5));
+ add(spinnerPanel);
+ }
+
+ public void addSpinner(String labelText, JSpinner spinner) {
+ JLabel label = new JLabel(labelText);
+ label.setHorizontalAlignment(SwingConstants.TRAILING);
+ labelPanel.add(label);
+
+ JPanel flowPanel = new JPanel();
+ flowPanel.setLayout(new FlowLayout(FlowLayout.LEADING, 5, 1));
+ flowPanel.add(spinner);
+ spinnerPanel.add(flowPanel);
+ }
+}
+//
+
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/MandelbrotControl.java b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/MandelbrotControl.java
new file mode 100644
index 00000000000..9773febbc1c
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/MandelbrotControl.java
@@ -0,0 +1,165 @@
+/*
+ * 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.
+ */
+package com.sun.swingset3.demos.spinner;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.ChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeEvent;
+
+import com.sun.swingset3.demos.ResourceManager;
+
+/**
+ * @author Mikhail Lapshin
+ */
+public class MandelbrotControl extends JPanel {
+
+ private final JMandelbrot mandelbrot;
+ private JSpinner iterSpinner;
+ private CoordSpinner xSpinner;
+ private CoordSpinner ySpinner;
+ private static final double COORD_SPINNER_STEP = 0.1d; // part of width or height
+ private final ResourceManager resourceManager;
+
+ public MandelbrotControl(JMandelbrot mandelbrot,
+ ResourceManager resourceManager) {
+ this.mandelbrot = mandelbrot;
+ this.resourceManager = resourceManager;
+ createUI();
+ installListeners();
+ }
+
+ private void createUI() {
+ setLayout(new FlowLayout(FlowLayout.LEADING, 5, 0));
+ setBorder(BorderFactory.createTitledBorder(
+ resourceManager.getString("SpinnerDemo.fractalControls")));
+ JSpinnerPanel spinnerPanel = new JSpinnerPanel();
+
+ //Create spinner
+ iterSpinner = new JSpinner(new SpinnerNumberModel(
+ mandelbrot.getMaxIteration(), 10, 100000, 50));
+ //
+ //Add change listener using anonymus inner class
+ iterSpinner.addChangeListener(new ChangeListener() {
+ @Override
+ public void stateChanged(ChangeEvent e) {
+ mandelbrot.setMaxIteration((Integer) iterSpinner.getValue());
+ mandelbrot.calculatePicture();
+ }
+ });
+ //
+ spinnerPanel.addSpinner(
+ resourceManager.getString("SpinnerDemo.iterations"), iterSpinner);
+
+ //Create spinner
+ final double xValue = mandelbrot.getCenter().getX();
+ double width = mandelbrot.getXHighLimit() - mandelbrot.getXLowLimit();
+ xSpinner = new CoordSpinner(xValue, width * COORD_SPINNER_STEP);
+ //
+ //Add change listener using anonymus inner class
+ xSpinner.addChangeListener(new ChangeListener() {
+ @Override
+ public void stateChanged(ChangeEvent e) {
+ Double newX = (Double) xSpinner.getValue();
+ mandelbrot.setCenter(new Point2D.Double(
+ newX, mandelbrot.getCenter().getY()));
+ mandelbrot.calculatePicture();
+ }
+ });
+ //
+ spinnerPanel.addSpinner(
+ resourceManager.getString("SpinnerDemo.x"), xSpinner);
+
+ //Create spinner
+ final double yValue = mandelbrot.getCenter().getY();
+ double height = mandelbrot.getYHighLimit() - mandelbrot.getYLowLimit();
+ ySpinner = new CoordSpinner(yValue, height * COORD_SPINNER_STEP);
+ //
+ //Add change listener using anonymus inner class
+ ySpinner.addChangeListener(new ChangeListener() {
+ @Override
+ public void stateChanged(ChangeEvent e) {
+ Double newY = (Double) ySpinner.getValue();
+ mandelbrot.setCenter(new Point2D.Double(
+ mandelbrot.getCenter().getX(), newY));
+ mandelbrot.calculatePicture();
+ }
+ });
+ //
+ spinnerPanel.addSpinner(
+ resourceManager.getString("SpinnerDemo.y"), ySpinner);
+
+ add(spinnerPanel);
+ }
+
+ private void installListeners() {
+ mandelbrot.addPropertyChangeListener(
+ JMandelbrot.CENTER_PROPERTY_NAME,
+ new PropertyChangeListener() {
+ @Override
+ public void propertyChange(PropertyChangeEvent evt) {
+ double width = mandelbrot.getXHighLimit()
+ - mandelbrot.getXLowLimit();
+ double newX = mandelbrot.getCenter().getX();
+ xSpinner.updateModel(newX, width * COORD_SPINNER_STEP);
+ double height = mandelbrot.getYHighLimit()
+ - mandelbrot.getYLowLimit();
+ double newY = mandelbrot.getCenter().getY();
+ ySpinner.updateModel(newY, height * COORD_SPINNER_STEP);
+ }
+ }
+ );
+ }
+
+ //Customized spinner class
+ // It uses special format for NumberEditor and has constant preferred width
+ private static class CoordSpinner extends JSpinner {
+
+ @Override
+ protected JComponent createEditor(SpinnerModel model) {
+ return new NumberEditor(this, "#.####################");
+ }
+
+ public CoordSpinner(double value, double stepSize) {
+ super(new SpinnerNumberModel(value, -100, 100, stepSize));
+ }
+
+ //A useful shortcut method
+ public void updateModel(double value, double stepSize) {
+ SpinnerNumberModel model = (SpinnerNumberModel) getModel();
+ model.setValue(value);
+ model.setStepSize(stepSize);
+ }
+
+ @Override
+ public Dimension getPreferredSize() {
+ Dimension prefSize = super.getPreferredSize();
+ prefSize.setSize(180, prefSize.getHeight());
+ return prefSize;
+ }
+ }
+ //
+}
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/Palette.java b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/Palette.java
new file mode 100644
index 00000000000..6e7ac6950fa
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/Palette.java
@@ -0,0 +1,95 @@
+/*
+ * 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.
+ */
+package com.sun.swingset3.demos.spinner;
+
+/**
+ * @author Mikhail Lapshin
+ */
+import java.awt.*;
+
+public class Palette {
+
+ private final int minColor;
+ private final int colorRange;
+ private Color[] colors;
+ private int[] rgbColors;
+ private final int rSteps;
+ private final int gSteps;
+ private final int bSteps;
+ private int totalRange;
+ private int rRange;
+ private int gRange;
+ private int bRange;
+ private final double rStart;
+ private final double gStart;
+ private final double bStart;
+
+ public Palette(int totalRange, int minColor, int maxColor, double rStart,
+ double gStart, double bStart, int rSteps, int gSteps, int bSteps) {
+ this.minColor = minColor;
+ this.colorRange = maxColor - minColor;
+ this.rStart = rStart;
+ this.gStart = gStart;
+ this.bStart = bStart;
+ this.rSteps = rSteps;
+ this.gSteps = gSteps;
+ this.bSteps = bSteps;
+ setSize(totalRange);
+ }
+
+ public void setSize(int newSize) {
+ totalRange = newSize;
+ rRange = totalRange / rSteps;
+ gRange = totalRange / gSteps;
+ bRange = totalRange / bSteps;
+ fillColorTable();
+ }
+
+ private void fillColorTable() {
+ colors = new Color[totalRange];
+ rgbColors = new int[totalRange];
+ for (int i = 0; i < totalRange; i++) {
+ double cosR = Math.cos(i * 2 * Math.PI / rRange + rStart);
+ double cosG = Math.cos(i * 2 * Math.PI / gRange + gStart);
+ double cosB = Math.cos(i * 2 * Math.PI / bRange + bStart);
+ Color color = new Color(
+ (int) ((cosR * colorRange) + colorRange) / 2 + minColor,
+ (int) ((cosG * colorRange) + colorRange) / 2 + minColor,
+ (int) ((cosB * colorRange) + colorRange) / 2 + minColor);
+ colors[i] = color;
+ rgbColors[i] = color.getRGB();
+ }
+ }
+
+ public Color getColor(int index) {
+ return colors[index];
+ }
+
+ public int getRgbColor(int index) {
+ return rgbColors[index];
+ }
+
+ public int getSize() {
+ return totalRange;
+ }
+}
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/PaletteChooser.java b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/PaletteChooser.java
new file mode 100644
index 00000000000..0a839dbd672
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/PaletteChooser.java
@@ -0,0 +1,166 @@
+/*
+ * 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.
+ */
+package com.sun.swingset3.demos.spinner;
+
+import javax.swing.*;
+import java.awt.*;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.ChangeEvent;
+
+import com.sun.swingset3.demos.ResourceManager;
+
+/**
+ * @author Mikhail Lapshin
+ */
+public class PaletteChooser extends JPanel {
+
+ private static final int MIN_COLOR = 50;
+ private static final int MAX_COLOR = 255;
+ private static final int R_STEPS = 5;
+ private static final int G_STEPS = 5;
+ private static final int B_STEPS = 5;
+ private static final int R_ANGLE = 270;
+ private static final int G_ANGLE = 90;
+ private static final int B_ANGLE = 0;
+
+ public static final String PALETTE_PROPERTY_NAME = "palette";
+
+ private final ResourceManager resourceManager;
+ private Palette palette;
+ private final JPaletteShower shower;
+ private final ChangeListener changeListener;
+
+ private JSpinner rsSpinner;
+ private JSpinner gsSpinner;
+ private JSpinner bsSpinner;
+ private JSpinner raSpinner;
+ private JSpinner gaSpinner;
+ private JSpinner baSpinner;
+
+ public PaletteChooser(ResourceManager resourceManager) {
+ this.resourceManager = resourceManager;
+ palette = new Palette(MAX_COLOR - MIN_COLOR, MIN_COLOR, MAX_COLOR,
+ Math.toRadians(R_ANGLE), Math.toRadians(G_ANGLE),
+ Math.toRadians(B_ANGLE), R_STEPS, G_STEPS, B_STEPS);
+ shower = new JPaletteShower(palette, 250, 25);
+
+ //Use single change listener for several spinners
+ changeListener = new ChangeListener() {
+ @Override
+ public void stateChanged(ChangeEvent e) {
+ setPalette(createPalette());
+ shower.setPalette(palette);
+ repaint();
+ }
+ };
+ //
+
+ setBorder(BorderFactory.createTitledBorder(
+ resourceManager.getString("SpinnerDemo.colorPalette")));
+ setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
+ add(shower);
+ add(createControlPanel());
+ }
+
+ private double toRadians(JSpinner spinner) {
+ return Math.toRadians(getIntValue(spinner));
+ }
+
+ private Palette createPalette() {
+ return new Palette(getWidth(), MIN_COLOR, MAX_COLOR,
+ toRadians(raSpinner), toRadians(gaSpinner),
+ toRadians(baSpinner), getIntValue(rsSpinner),
+ getIntValue(gsSpinner), getIntValue(bsSpinner));
+ }
+
+ private static int getIntValue(JSpinner spinner) {
+ return (Integer) spinner.getValue();
+ }
+
+ private JPanel createControlPanel() {
+ JPanel controlPanel = new JPanel();
+ controlPanel.setLayout(new GridLayout(1, 2));
+ controlPanel.add(createStepPanel());
+ controlPanel.add(createStartAnglePanel());
+ return controlPanel;
+ }
+
+ private JPanel createStartAnglePanel() {
+ JSpinnerPanel startAnglePanel = new JSpinnerPanel();
+ startAnglePanel.setBorder(BorderFactory.createTitledBorder(
+ resourceManager.getString("SpinnerDemo.startAngles")));
+
+ raSpinner = createAngleSpinner(R_ANGLE, "SpinnerDemo.r", startAnglePanel);
+ gaSpinner = createAngleSpinner(G_ANGLE, "SpinnerDemo.g", startAnglePanel);
+ baSpinner = createAngleSpinner(B_ANGLE, "SpinnerDemo.b", startAnglePanel);
+
+ return startAnglePanel;
+ }
+
+ private JPanel createStepPanel() {
+ JSpinnerPanel stepPanel = new JSpinnerPanel();
+ stepPanel.setBorder(BorderFactory.createTitledBorder(
+ resourceManager.getString("SpinnerDemo.steps")));
+
+ rsSpinner = createStepSpinner(R_STEPS, "SpinnerDemo.r", stepPanel);
+ gsSpinner = createStepSpinner(G_STEPS, "SpinnerDemo.g", stepPanel);
+ bsSpinner = createStepSpinner(B_STEPS, "SpinnerDemo.b", stepPanel);
+
+ return stepPanel;
+ }
+
+ private JSpinner createAngleSpinner(int startAngle, String resourceName,
+ JSpinnerPanel parent) {
+ SpinnerModel model = new SpinnerNumberModel(startAngle, 0, 360, 10);
+ return createSpinner(model, resourceName, parent);
+ }
+
+ private JSpinner createStepSpinner(int startSteps, String resourceName,
+ JSpinnerPanel parent) {
+ SpinnerModel model = new SpinnerNumberModel(startSteps, 1, 1000, 1);
+ return createSpinner(model, resourceName, parent);
+ }
+
+ private JSpinner createSpinner(SpinnerModel model, String resourceName,
+ JSpinnerPanel parent) {
+
+ //Create spinner
+ JSpinner spinner = new JSpinner(model);
+ //
+ //Use single change listener for several spinners
+ spinner.addChangeListener(changeListener);
+ //
+ parent.addSpinner(resourceManager.getString(resourceName), spinner);
+ return spinner;
+ }
+
+ public Palette getPalette() {
+ return palette;
+ }
+
+ private void setPalette(Palette palette) {
+ Palette oldValue = this.palette;
+ this.palette = palette;
+ firePropertyChange(PALETTE_PROPERTY_NAME, oldValue, palette);
+ }
+}
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/SpinnerDemo.java b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/SpinnerDemo.java
new file mode 100644
index 00000000000..0694a843341
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/SpinnerDemo.java
@@ -0,0 +1,101 @@
+/*
+ * 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.
+ */
+package com.sun.swingset3.demos.spinner;
+
+import javax.swing.*;
+import java.awt.*;
+import java.beans.PropertyChangeEvent;
+
+import com.sun.swingset3.DemoProperties;
+import com.sun.swingset3.demos.ResourceManager;
+
+/**
+ * Demonstrates JSpinner and SwingWorker
+ *
+ * @author Mikhail Lapshin
+ */
+@DemoProperties(
+ value = "Spinner Demo",
+ category = "Controls",
+ description = "Demonstrates JSpinner and SwingWorker",
+ sourceFiles = {
+ "com/sun/swingset3/demos/spinner/SpinnerDemo.java",
+ "com/sun/swingset3/demos/spinner/JMandelbrot.java",
+ "com/sun/swingset3/demos/spinner/JPaletteShower.java",
+ "com/sun/swingset3/demos/spinner/JSpinnerPanel.java",
+ "com/sun/swingset3/demos/spinner/MandelbrotControl.java",
+ "com/sun/swingset3/demos/spinner/Palette.java",
+ "com/sun/swingset3/demos/spinner/PaletteChooser.java",
+ "com/sun/swingset3/demos/ResourceManager.java",
+ "com/sun/swingset3/demos/spinner/resources/SpinnerDemo.properties",
+ "com/sun/swingset3/demos/spinner/resources/images/SpinnerDemo.gif"
+ }
+)
+public class SpinnerDemo extends JPanel {
+
+ private final ResourceManager resourceManager = new ResourceManager(getClass());
+ public static final String DEMO_TITLE = SpinnerDemo.class.getAnnotation(DemoProperties.class).value();
+
+ public static void main(String[] args) {
+ JFrame frame = new JFrame(DEMO_TITLE);
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ frame.getContentPane().add(new SpinnerDemo());
+ frame.setPreferredSize(new Dimension(800, 600));
+ frame.pack();
+ frame.setLocationRelativeTo(null);
+ frame.setVisible(true);
+ }
+
+ public SpinnerDemo() {
+ setLayout(new BorderLayout());
+
+ // Create main components
+ PaletteChooser chooser
+ = new PaletteChooser(resourceManager);
+ final JMandelbrot mandelbrot
+ = new JMandelbrot(400, 400, chooser.getPalette(), resourceManager);
+ MandelbrotControl mandelbrotControl
+ = new MandelbrotControl(mandelbrot, resourceManager);
+
+ // Connect palette chooser and mandelbrot component
+ chooser.addPropertyChangeListener(PaletteChooser.PALETTE_PROPERTY_NAME,
+ (PropertyChangeEvent evt) -> {
+ mandelbrot.setPalette((Palette) evt.getNewValue());
+ mandelbrot.calculatePicture();
+ });
+
+ // Layout components
+ add(mandelbrot);
+
+ JPanel controlPanel = new JPanel();
+ controlPanel.setLayout(new BorderLayout());
+ controlPanel.add(chooser, BorderLayout.NORTH);
+
+ JPanel mandelbrotControlPanel = new JPanel();
+ mandelbrotControlPanel.setLayout(new BorderLayout());
+ mandelbrotControlPanel.add(mandelbrotControl, BorderLayout.NORTH);
+ controlPanel.add(mandelbrotControlPanel, BorderLayout.CENTER);
+
+ add(controlPanel, BorderLayout.EAST);
+ }
+}
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/resources/SpinnerDemo.properties b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/resources/SpinnerDemo.properties
new file mode 100644
index 00000000000..c5372efe5fb
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/resources/SpinnerDemo.properties
@@ -0,0 +1,15 @@
+### Spinner Demo ###
+
+SpinnerDemo.toolTip=Use left and right mouse buttons to zoom in and zoom out
+SpinnerDemo.colorPalette=Color palette
+SpinnerDemo.steps=Steps 1..1000
+SpinnerDemo.startAngles=Start angle 0..360
+SpinnerDemo.iterations=Iterations
+SpinnerDemo.fractalControls=Fractal controls
+SpinnerDemo.zoomRate=Zoom rate
+SpinnerDemo.threads=Threads
+SpinnerDemo.x=X
+SpinnerDemo.y=Y
+SpinnerDemo.r=R
+SpinnerDemo.g=G
+SpinnerDemo.b=B
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/resources/images/SpinnerDemo.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/resources/images/SpinnerDemo.gif
new file mode 100644
index 00000000000..87d560def43
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/spinner/resources/images/SpinnerDemo.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/SplitPaneDemo.java b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/SplitPaneDemo.java
new file mode 100644
index 00000000000..0bc0cd78f0f
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/SplitPaneDemo.java
@@ -0,0 +1,292 @@
+/*
+ * 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.
+ */
+package com.sun.swingset3.demos.splitpane;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import com.sun.swingset3.DemoProperties;
+import com.sun.swingset3.demos.ResourceManager;
+
+/**
+ * Split Pane demo
+ *
+ * @version 1.12 11/17/05
+ * @author Scott Violet
+ * @author Jeff Dinkins
+ */
+@DemoProperties(
+ value = "JSplitPane Demo",
+ category = "Containers",
+ description = "Demonstrates JSplitPane, a container which lays out two components in an adjustable split view (horizontal or vertical)",
+ sourceFiles = {
+ "com/sun/swingset3/demos/splitpane/SplitPaneDemo.java",
+ "com/sun/swingset3/demos/ResourceManager.java",
+ "com/sun/swingset3/demos/splitpane/resources/SplitPaneDemo.properties",
+ "com/sun/swingset3/demos/splitpane/resources/images/day.jpg",
+ "com/sun/swingset3/demos/splitpane/resources/images/night.jpg",
+ "com/sun/swingset3/demos/splitpane/resources/images/SplitPaneDemo.gif"
+ }
+)
+public class SplitPaneDemo extends JPanel {
+
+ private static final ResourceManager resourceManager = new ResourceManager(SplitPaneDemo.class);
+ public static final String VERTICAL_SPLIT = resourceManager.getString("SplitPaneDemo.vert_split");
+ public static final String HORIZONTAL_SPLIT = resourceManager.getString("SplitPaneDemo.horz_split");
+ public static final String ONE_TOUCH_EXPANDABLE = resourceManager.getString("SplitPaneDemo.one_touch_expandable");
+ public static final String SECOND_COMPONENT_MIN_SIZE = resourceManager.getString("SplitPaneDemo.second_component_min_size");
+ public static final String FIRST_COMPONENT_MIN_SIZE = resourceManager.getString("SplitPaneDemo.first_component_min_size");
+ public static final String DIVIDER_SIZE = resourceManager.getString("SplitPaneDemo.divider_size");
+ public static final String DEMO_TITLE = SplitPaneDemo.class.getAnnotation(DemoProperties.class).value();
+
+ private static final Insets insets = new Insets(4, 8, 4, 8);
+
+ private final JSplitPane splitPane;
+ private final JLabel day;
+ private final JLabel night;
+
+ private JPanel controlPanel;
+ private GridBagLayout gridbag;
+ private GridBagConstraints c;
+
+ /**
+ * main method allows us to run as a standalone demo.
+ *
+ * @param args
+ */
+ public static void main(String[] args) {
+ JFrame frame = new JFrame(DEMO_TITLE);
+
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ frame.getContentPane().add(new SplitPaneDemo());
+ frame.setPreferredSize(new Dimension(800, 600));
+ frame.pack();
+ frame.setLocationRelativeTo(null);
+ frame.setVisible(true);
+ }
+
+ /**
+ * SplitPaneDemo Constructor
+ */
+ public SplitPaneDemo() {
+ setLayout(new BorderLayout());
+
+ //Create horizontal SplitPane with day and night
+ day = new JLabel(resourceManager.createImageIcon("day.jpg",
+ resourceManager.getString("SplitPaneDemo.day")));
+ night = new JLabel(resourceManager.createImageIcon("night.jpg",
+ resourceManager.getString("SplitPaneDemo.night")));
+
+ splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, day, night);
+ //
+
+ //Turn on continuous layout
+ splitPane.setContinuousLayout(true);
+ //
+
+ //Turn on one-touch expansion
+ splitPane.setOneTouchExpandable(true);
+ //
+
+ //Set divider location
+ splitPane.setDividerLocation(200);
+ //
+
+ //Set minimum size for each child
+ day.setMinimumSize(new Dimension(20, 20));
+ night.setMinimumSize(new Dimension(20, 20));
+ //
+
+ add(splitPane, BorderLayout.CENTER);
+ setBackground(Color.black);
+
+ add(createSplitPaneControls(), BorderLayout.SOUTH);
+ }
+
+ /**
+ * Creates controls to alter the JSplitPane.
+ *
+ * @return
+ */
+ protected final JPanel createSplitPaneControls() {
+
+ gridbag = new GridBagLayout();
+ c = new GridBagConstraints();
+ controlPanel = new JPanel(gridbag);
+
+ //Create radio box to edit splitpane orientation
+ Box box = Box.createHorizontalBox();
+ ButtonGroup group = new ButtonGroup();
+
+ OrientationListener orientationListener = new OrientationListener();
+
+ JRadioButton button = new JRadioButton(VERTICAL_SPLIT);
+ button.setActionCommand("vertical");
+ button.addActionListener(orientationListener);
+ group.add(button);
+ box.add(button);
+
+ button = new JRadioButton(HORIZONTAL_SPLIT);
+ button.setActionCommand("horizontal");
+ button.setSelected(true);
+ button.addActionListener(orientationListener);
+ group.add(button);
+ box.add(button);
+ //
+
+ addToGridbag(box, 0, 0, 1, 1,
+ GridBagConstraints.NONE, GridBagConstraints.WEST);
+
+ //Create checkbox to edit continuous layout
+ JCheckBox checkBox = new JCheckBox(resourceManager.getString("SplitPaneDemo.cont_layout"));
+ checkBox.setSelected(true);
+
+ checkBox.addChangeListener((ChangeEvent e) -> {
+ splitPane.setContinuousLayout(
+ ((JCheckBox) e.getSource()).isSelected());
+ });
+ //
+
+ c.gridy++;
+ addToGridbag(checkBox, 0, 1, 1, 1,
+ GridBagConstraints.NONE, GridBagConstraints.WEST);
+
+ //Create checkbox to edit one-touch-expandable
+ checkBox = new JCheckBox(ONE_TOUCH_EXPANDABLE);
+ checkBox.setSelected(true);
+
+ checkBox.addChangeListener((ChangeEvent e) -> {
+ splitPane.setOneTouchExpandable(
+ ((JCheckBox) e.getSource()).isSelected());
+ });
+ //
+
+ addToGridbag(checkBox, 0, 2, 1, 1,
+ GridBagConstraints.NONE, GridBagConstraints.WEST);
+
+ JSeparator separator = new JSeparator(JSeparator.VERTICAL);
+ addToGridbag(separator, 1, 0, 1, 3,
+ GridBagConstraints.VERTICAL, GridBagConstraints.CENTER);
+
+ //Create spinner to edit divider size
+ final JSpinner spinner = new JSpinner(
+ new SpinnerNumberModel(splitPane.getDividerSize(), 5, 50, 2));
+
+ spinner.addChangeListener((ChangeEvent event) -> {
+ SpinnerNumberModel model = (SpinnerNumberModel) spinner.getModel();
+ splitPane.setDividerSize(model.getNumber().intValue());
+ });
+ //
+
+ JLabel label = new JLabel(DIVIDER_SIZE);
+ label.setLabelFor(spinner);
+ addToGridbag(label, 2, 0, 1, 1,
+ GridBagConstraints.NONE, GridBagConstraints.EAST);
+ addToGridbag(spinner, 3, 0, 1, 1,
+ GridBagConstraints.NONE, GridBagConstraints.WEST);
+
+ //Create spinners to edit day & night's minimum sizes
+ JSpinner minSizeSpinner = new JSpinner(
+ new SpinnerNumberModel(day.getMinimumSize().width, 0, 300, 10));
+
+ minSizeSpinner.addChangeListener(new MinimumSizeListener(day));
+ //
+
+ label = new JLabel(FIRST_COMPONENT_MIN_SIZE);
+ label.setLabelFor(minSizeSpinner);
+ addToGridbag(label, 2, 1, 1, 1,
+ GridBagConstraints.NONE, GridBagConstraints.EAST);
+ addToGridbag(minSizeSpinner, 3, 1, 1, 1,
+ GridBagConstraints.NONE, GridBagConstraints.WEST);
+
+ //Create spinners to edit day & night's minimum sizes
+ minSizeSpinner = new JSpinner(
+ new SpinnerNumberModel(night.getMinimumSize().width, 0, 300, 10));
+
+ minSizeSpinner.addChangeListener(new MinimumSizeListener(night));
+ //
+
+ label = new JLabel(SECOND_COMPONENT_MIN_SIZE);
+ label.setLabelFor(minSizeSpinner);
+ addToGridbag(label, 2, 2, 1, 1,
+ GridBagConstraints.NONE, GridBagConstraints.EAST);
+ addToGridbag(minSizeSpinner, 3, 2, 1, 1,
+ GridBagConstraints.NONE, GridBagConstraints.WEST);
+
+ return controlPanel;
+ }
+
+ protected void addToGridbag(JComponent child, int gx, int gy,
+ int gwidth, int gheight, int fill, int anchor) {
+ c.insets = insets;
+ c.gridx = gx;
+ c.gridy = gy;
+ c.gridwidth = gwidth;
+ c.gridheight = gheight;
+ c.fill = fill;
+ c.anchor = anchor;
+ gridbag.addLayoutComponent(child, c);
+ controlPanel.add(child);
+
+ }
+
+ //Create radio box to edit splitpane orientation
+ private class OrientationListener implements ActionListener {
+
+ @Override
+ public void actionPerformed(ActionEvent event) {
+ splitPane.setOrientation(event.getActionCommand().equals("vertical")
+ ? JSplitPane.VERTICAL_SPLIT : JSplitPane.HORIZONTAL_SPLIT);
+ }
+
+ }
+ //
+
+ //Create spinners to edit day & night's minimum sizes
+ public class MinimumSizeListener implements ChangeListener {
+
+ private final JComponent component;
+
+ public MinimumSizeListener(JComponent c) {
+ this.component = c;
+ }
+
+ @Override
+ public void stateChanged(ChangeEvent event) {
+ JSpinner spinner = (JSpinner) event.getSource();
+ SpinnerNumberModel model = (SpinnerNumberModel) spinner.getModel();
+ int min = model.getNumber().intValue();
+ component.setMinimumSize(new Dimension(min, min));
+ }
+ }
+ //
+}
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/SplitPaneDemo.properties b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/SplitPaneDemo.properties
new file mode 100644
index 00000000000..ef61ebdbdfd
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/SplitPaneDemo.properties
@@ -0,0 +1,14 @@
+### SplitPane Demo ###
+
+SplitPaneDemo.accessible_description=JSplitPane Demo
+SplitPaneDemo.name=Split Pane Demo
+SplitPaneDemo.tooltip=JSplitPane demo
+SplitPaneDemo.day=San Francisco by day
+SplitPaneDemo.night=San Francisco by night
+SplitPaneDemo.vert_split=Vertical Split
+SplitPaneDemo.horz_split=Horizontal Split
+SplitPaneDemo.cont_layout=Continuous Layout
+SplitPaneDemo.one_touch_expandable=One-Touch expandable
+SplitPaneDemo.divider_size=Divider Size
+SplitPaneDemo.first_component_min_size=Day's Minimum Size
+SplitPaneDemo.second_component_min_size=Night's Minimum Size
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/images/SplitPaneDemo.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/images/SplitPaneDemo.gif
new file mode 100644
index 00000000000..945aa5b5e77
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/images/SplitPaneDemo.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/images/day.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/images/day.jpg
new file mode 100644
index 00000000000..a838c5ca619
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/images/day.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/images/night.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/images/night.jpg
new file mode 100644
index 00000000000..bc8738732c9
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/splitpane/resources/images/night.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/TabbedPaneDemo.java b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/TabbedPaneDemo.java
new file mode 100644
index 00000000000..9809d6babbe
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/TabbedPaneDemo.java
@@ -0,0 +1,257 @@
+/*
+ * 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.
+ */
+package com.sun.swingset3.demos.tabbedpane;
+
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Random;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+
+import com.sun.swingset3.DemoProperties;
+import com.sun.swingset3.demos.ResourceManager;
+
+/**
+ * JTabbedPane Demo
+ *
+ * @version 1.11 11/17/05
+ * @author Jeff Dinkins
+ */
+@DemoProperties(
+ value = "JTabbedPane Demo",
+ category = "Containers",
+ description = "Demonstrates JTabbedPane, a container which allows tabbed navigation of components",
+ sourceFiles = {
+ "com/sun/swingset3/demos/tabbedpane/TabbedPaneDemo.java",
+ "com/sun/swingset3/demos/ResourceManager.java",
+ "com/sun/swingset3/demos/tabbedpane/resources/TabbedPaneDemo.properties",
+ "com/sun/swingset3/demos/tabbedpane/resources/images/blake.gif",
+ "com/sun/swingset3/demos/tabbedpane/resources/images/brooke.gif",
+ "com/sun/swingset3/demos/tabbedpane/resources/images/camille.jpg",
+ "com/sun/swingset3/demos/tabbedpane/resources/images/david.gif",
+ "com/sun/swingset3/demos/tabbedpane/resources/images/ewan.gif",
+ "com/sun/swingset3/demos/tabbedpane/resources/images/ewan.jpg",
+ "com/sun/swingset3/demos/tabbedpane/resources/images/miranda.jpg",
+ "com/sun/swingset3/demos/tabbedpane/resources/images/matthew.gif",
+ "com/sun/swingset3/demos/tabbedpane/resources/images/stephen.gif",
+ "com/sun/swingset3/demos/tabbedpane/resources/images/TabbedPaneDemo.gif"
+ }
+)
+public class TabbedPaneDemo extends JPanel implements ActionListener {
+
+ private static final ResourceManager resourceManager = new ResourceManager(TabbedPaneDemo.class);
+ public static final String BOUNCE = resourceManager.getString("TabbedPaneDemo.bounce");
+ public static final String EWAN = resourceManager.getString("TabbedPaneDemo.ewan");
+ public static final String MIRANDA = resourceManager.getString("TabbedPaneDemo.miranda");
+ public static final String CAMILLE = resourceManager.getString("TabbedPaneDemo.camille");
+ public static final String TAB_PLACEMENT = resourceManager.getString("TabbedPaneDemo.label");
+ public static final String RIGHT = resourceManager.getString("TabbedPaneDemo.right");
+ public static final String BOTTOM = resourceManager.getString("TabbedPaneDemo.bottom");
+ public static final String LEFT = resourceManager.getString("TabbedPaneDemo.left");
+ public static final String TOP = resourceManager.getString("TabbedPaneDemo.top");
+ public static final String DEMO_TITLE = TabbedPaneDemo.class.getAnnotation(DemoProperties.class).value();
+
+ private final HeadSpin spin;
+
+ private final JTabbedPane tabbedpane;
+
+ private final ButtonGroup group;
+
+ private final JRadioButton top;
+ private final JRadioButton bottom;
+ private final JRadioButton left;
+ private final JRadioButton right;
+
+ /**
+ * main method allows us to run as a standalone demo.
+ *
+ * @param args
+ */
+ public static void main(String[] args) {
+ JFrame frame = new JFrame(DEMO_TITLE);
+
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ frame.getContentPane().add(new TabbedPaneDemo());
+ frame.setPreferredSize(new Dimension(800, 600));
+ frame.pack();
+ frame.setLocationRelativeTo(null);
+ frame.setVisible(true);
+ }
+
+ /**
+ * TabbedPaneDemo Constructor
+ */
+ public TabbedPaneDemo() {
+ setLayout(new BorderLayout());
+
+ // create tab position controls
+ JPanel tabControls = new JPanel();
+ tabControls.add(new JLabel(TAB_PLACEMENT));
+ top = (JRadioButton) tabControls.add(new JRadioButton(TOP));
+ left = (JRadioButton) tabControls.add(new JRadioButton(LEFT));
+ bottom = (JRadioButton) tabControls.add(new JRadioButton(BOTTOM));
+ right = (JRadioButton) tabControls.add(new JRadioButton(RIGHT));
+ add(tabControls, BorderLayout.NORTH);
+
+ group = new ButtonGroup();
+ group.add(top);
+ group.add(bottom);
+ group.add(left);
+ group.add(right);
+
+ top.setSelected(true);
+
+ top.addActionListener(this);
+ bottom.addActionListener(this);
+ left.addActionListener(this);
+ right.addActionListener(this);
+
+ // create tab
+ tabbedpane = new JTabbedPane();
+ add(tabbedpane, BorderLayout.CENTER);
+
+ String name = CAMILLE;
+ JLabel pix = new JLabel(resourceManager.createImageIcon("camille.jpg", name));
+ tabbedpane.add(name, pix);
+
+ name = MIRANDA;
+ pix = new JLabel(resourceManager.createImageIcon("miranda.jpg", name));
+ pix.setToolTipText(resourceManager.getString("TabbedPaneDemo.miranda.tooltip"));
+ tabbedpane.add(name, pix);
+
+ name = EWAN;
+ pix = new JLabel(resourceManager.createImageIcon("ewan.jpg", name));
+ tabbedpane.add(name, pix);
+
+ name = BOUNCE;
+ spin = new HeadSpin();
+ tabbedpane.add(name, spin);
+
+ tabbedpane.getModel().addChangeListener((ChangeEvent e) -> {
+ SingleSelectionModel model = (SingleSelectionModel) e.getSource();
+ if (model.getSelectedIndex() == tabbedpane.getTabCount() - 1) {
+ spin.go();
+ }
+ });
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ if (e.getSource() == top) {
+ tabbedpane.setTabPlacement(JTabbedPane.TOP);
+ } else if (e.getSource() == left) {
+ tabbedpane.setTabPlacement(JTabbedPane.LEFT);
+ } else if (e.getSource() == bottom) {
+ tabbedpane.setTabPlacement(JTabbedPane.BOTTOM);
+ } else if (e.getSource() == right) {
+ tabbedpane.setTabPlacement(JTabbedPane.RIGHT);
+ }
+ }
+
+ private class HeadSpin extends JComponent implements ActionListener {
+
+ private javax.swing.Timer animator;
+
+ private final ImageIcon[] icon = new ImageIcon[6];
+
+ private final static int numImages = 6;
+
+ private final double[] x = new double[numImages];
+ private final double[] y = new double[numImages];
+
+ private final int[] xh = new int[numImages];
+ private final int[] yh = new int[numImages];
+
+ private final double[] scale = new double[numImages];
+
+ private final Random rand = new Random();
+
+ public HeadSpin() {
+ setBackground(Color.black);
+ icon[0] = resourceManager.createImageIcon("ewan.gif", resourceManager.getString("TabbedPaneDemo.ewan"));
+ icon[1] = resourceManager.createImageIcon("stephen.gif", resourceManager.getString("TabbedPaneDemo.stephen"));
+ icon[2] = resourceManager.createImageIcon("david.gif", resourceManager.getString("TabbedPaneDemo.david"));
+ icon[3] = resourceManager.createImageIcon("matthew.gif", resourceManager.getString("TabbedPaneDemo.matthew"));
+ icon[4] = resourceManager.createImageIcon("blake.gif", resourceManager.getString("TabbedPaneDemo.blake"));
+ icon[5] = resourceManager.createImageIcon("brooke.gif", resourceManager.getString("TabbedPaneDemo.brooke"));
+
+ /*
+ for(int i = 0; i < 6; i++) {
+ x[i] = (double) rand.nextInt(500);
+ y[i] = (double) rand.nextInt(500);
+ }
+ */
+ }
+
+ public void go() {
+ animator = new javax.swing.Timer(22 + 22 + 22, this);
+ animator.start();
+ }
+
+ @Override
+ public void paint(Graphics g) {
+ g.setColor(getBackground());
+ g.fillRect(0, 0, getWidth(), getHeight());
+
+ for (int i = 0; i < numImages; i++) {
+ if (x[i] > 3 * i) {
+ nudge(i);
+ squish(g, icon[i], xh[i], yh[i], scale[i]);
+ } else {
+ x[i] += .05;
+ y[i] += .05;
+ }
+ }
+ }
+
+ public void nudge(int i) {
+ x[i] += (double) rand.nextInt(1000) / 8756;
+ y[i] += (double) rand.nextInt(1000) / 5432;
+ int tmpScale = (int) (Math.abs(Math.sin(x[i])) * 10);
+ scale[i] = (double) tmpScale / 10;
+ int nudgeX = (int) (((double) getWidth() / 2) * .8);
+ int nudgeY = (int) (((double) getHeight() / 2) * .60);
+ xh[i] = (int) (Math.sin(x[i]) * nudgeX) + nudgeX;
+ yh[i] = (int) (Math.sin(y[i]) * nudgeY) + nudgeY;
+ }
+
+ public void squish(Graphics g, ImageIcon icon, int x, int y, double scale) {
+ if (isVisible()) {
+ g.drawImage(icon.getImage(), x, y,
+ (int) (icon.getIconWidth() * scale),
+ (int) (icon.getIconHeight() * scale),
+ this);
+ }
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ if (isVisible()) {
+ repaint();
+ } else {
+ animator.stop();
+ }
+ }
+ }
+}
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/TabbedPaneDemo.properties b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/TabbedPaneDemo.properties
new file mode 100644
index 00000000000..f32d96330e0
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/TabbedPaneDemo.properties
@@ -0,0 +1,22 @@
+### TabbedPane Demo ###
+
+TabbedPaneDemo.accessible_description=This demo shows an example of using the JTabbedPane component.
+TabbedPaneDemo.tooltip=JTabbedPane demo
+TabbedPaneDemo.name=TabbedPane Demo
+
+TabbedPaneDemo.bounce=
Bouncing Babies!
+TabbedPaneDemo.stephen=Stephen
+TabbedPaneDemo.david=David
+TabbedPaneDemo.matthew=Matthew
+TabbedPaneDemo.ewan=Ewan
+TabbedPaneDemo.blake=Blake
+TabbedPaneDemo.brooke=Brooke
+TabbedPaneDemo.camille=Camille
+TabbedPaneDemo.miranda=Miranda
+TabbedPaneDemo.miranda.tooltip=Check out the Java code on her onesie!
+
+TabbedPaneDemo.label=Tab Placement:
+TabbedPaneDemo.top=Top
+TabbedPaneDemo.bottom=Bottom
+TabbedPaneDemo.left=Left
+TabbedPaneDemo.right=Right
\ No newline at end of file
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/TabbedPaneDemo.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/TabbedPaneDemo.gif
new file mode 100644
index 00000000000..9be6463cd04
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/TabbedPaneDemo.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/blake.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/blake.gif
new file mode 100644
index 00000000000..679639edf77
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/blake.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/brooke.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/brooke.gif
new file mode 100644
index 00000000000..815ce772553
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/brooke.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/camille.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/camille.jpg
new file mode 100644
index 00000000000..d00eabd779b
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/camille.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/david.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/david.gif
new file mode 100644
index 00000000000..46de559a228
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/david.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/ewan.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/ewan.gif
new file mode 100644
index 00000000000..82c8e58f524
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/ewan.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/ewan.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/ewan.jpg
new file mode 100644
index 00000000000..d19210eea28
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/ewan.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/matthew.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/matthew.gif
new file mode 100644
index 00000000000..812775e2b8a
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/matthew.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/miranda.jpg b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/miranda.jpg
new file mode 100644
index 00000000000..83df2778530
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/miranda.jpg differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/stephen.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/stephen.gif
new file mode 100644
index 00000000000..470c3bcb2e0
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tabbedpane/resources/images/stephen.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/textfield/JHistoryTextField.java b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/textfield/JHistoryTextField.java
new file mode 100644
index 00000000000..a6474bdefa2
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/textfield/JHistoryTextField.java
@@ -0,0 +1,265 @@
+/*
+ * 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.
+ */
+package com.sun.swingset3.demos.textfield;
+
+import java.awt.*;
+import java.awt.event.*;
+import java.util.*;
+import java.util.List;
+import javax.swing.*;
+import javax.swing.border.LineBorder;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
+/**
+ * JHistoryTextField
+ *
+ * @author Pavel Porvatov
+ */
+public class JHistoryTextField extends JTextField {
+
+ private static final int MAX_VISIBLE_ROWS = 8;
+
+ private final List history = new ArrayList();
+
+ private final JPopupMenu popup = new JPopupMenu() {
+ @Override
+ public Dimension getPreferredSize() {
+ Dimension dimension = super.getPreferredSize();
+
+ dimension.width = JHistoryTextField.this.getWidth();
+
+ return dimension;
+ }
+ };
+
+ private final JList list = new JList<>(new DefaultListModel<>());
+
+ private String userText;
+
+ private boolean notificationDenied;
+
+ public JHistoryTextField() {
+ JScrollPane scrollPane = new JScrollPane(list,
+ ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
+ ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+ scrollPane.setHorizontalScrollBar(null);
+ scrollPane.setBorder(null);
+
+ list.setFocusable(false);
+
+ popup.add(scrollPane);
+ popup.setFocusable(false);
+ popup.setBorder(new LineBorder(Color.BLACK, 1));
+
+ getDocument().addDocumentListener(new DocumentListener() {
+ @Override
+ public void insertUpdate(DocumentEvent e) {
+ onTextChanged();
+ }
+
+ @Override
+ public void removeUpdate(DocumentEvent e) {
+ onTextChanged();
+ }
+
+ @Override
+ public void changedUpdate(DocumentEvent e) {
+ onTextChanged();
+ }
+ });
+
+ list.addMouseMotionListener(new MouseAdapter() {
+ @Override
+ public void mouseMoved(MouseEvent e) {
+ int index = list.locationToIndex(e.getPoint());
+
+ if (index >= 0 && list.getSelectedIndex() != index) {
+ list.setSelectedIndex(index);
+ }
+ }
+ });
+
+ list.addMouseListener(new MouseAdapter() {
+ @Override
+ public void mouseReleased(MouseEvent e) {
+ if (SwingUtilities.isLeftMouseButton(e)) {
+ setTextWithoutNotification(list.getSelectedValue());
+
+ popup.setVisible(false);
+ }
+ }
+ });
+
+ addFocusListener(new FocusAdapter() {
+ @Override
+ public void focusLost(FocusEvent e) {
+ popup.setVisible(false);
+ }
+ });
+
+ addKeyListener(new KeyAdapter() {
+ @Override
+ public void keyPressed(KeyEvent e) {
+ if (popup.isShowing()) {
+ switch (e.getKeyCode()) {
+ case KeyEvent.VK_UP: {
+ changeListSelectedIndex(-1);
+
+ break;
+ }
+
+ case KeyEvent.VK_PAGE_UP: {
+ changeListSelectedIndex(-list.getVisibleRowCount());
+
+ break;
+ }
+
+ case KeyEvent.VK_DOWN: {
+ changeListSelectedIndex(1);
+
+ break;
+ }
+
+ case KeyEvent.VK_PAGE_DOWN: {
+ changeListSelectedIndex(list.getVisibleRowCount());
+
+ break;
+ }
+
+ case KeyEvent.VK_ESCAPE: {
+ popup.setVisible(false);
+
+ setTextWithoutNotification(userText);
+
+ break;
+ }
+
+ case KeyEvent.VK_ENTER:
+ case KeyEvent.VK_LEFT:
+ case KeyEvent.VK_RIGHT: {
+ popup.setVisible(false);
+
+ break;
+ }
+ }
+ } else if (e.getKeyCode() == KeyEvent.VK_DOWN
+ || e.getKeyCode() == KeyEvent.VK_UP
+ || e.getKeyCode() == KeyEvent.VK_PAGE_UP
+ || e.getKeyCode() == KeyEvent.VK_PAGE_DOWN) {
+ userText = getText();
+
+ showFilteredHistory();
+ }
+ }
+ });
+ }
+
+ private void changeListSelectedIndex(int delta) {
+ int size = list.getModel().getSize();
+ int index = list.getSelectedIndex();
+
+ int newIndex;
+
+ if (index < 0) {
+ newIndex = delta > 0 ? 0 : size - 1;
+ } else {
+ newIndex = index + delta;
+ }
+
+ if (newIndex >= size || newIndex < 0) {
+ newIndex = newIndex < 0 ? 0 : size - 1;
+
+ if (index == newIndex) {
+ newIndex = -1;
+ }
+ }
+
+ if (newIndex < 0) {
+ list.getSelectionModel().clearSelection();
+ list.ensureIndexIsVisible(0);
+
+ setTextWithoutNotification(userText);
+ } else {
+ list.setSelectedIndex(newIndex);
+ list.ensureIndexIsVisible(newIndex);
+
+ setTextWithoutNotification(list.getSelectedValue());
+ }
+ }
+
+ private void setTextWithoutNotification(String text) {
+ notificationDenied = true;
+
+ try {
+ setText(text);
+ } finally {
+ notificationDenied = false;
+ }
+ }
+
+ private void onTextChanged() {
+ if (!notificationDenied) {
+ userText = getText();
+
+ showFilteredHistory();
+ }
+ }
+
+ private void showFilteredHistory() {
+ list.getSelectionModel().clearSelection();
+
+ DefaultListModel model = (DefaultListModel) list.getModel();
+
+ model.clear();
+
+ for (String s : history) {
+ if (s.contains(userText)) {
+ model.addElement(s);
+ }
+ }
+
+ int size = model.size();
+
+ if (size == 0) {
+ popup.setVisible(false);
+ } else {
+ list.setVisibleRowCount(size < MAX_VISIBLE_ROWS ? size : MAX_VISIBLE_ROWS);
+
+ popup.pack();
+
+ if (!popup.isShowing()) {
+ popup.show(JHistoryTextField.this, 0, getHeight());
+ }
+ }
+ }
+
+ public List getHistory() {
+ return Collections.unmodifiableList(history);
+ }
+
+ public void setHistory(List history) {
+ this.history.clear();
+ this.history.addAll(history);
+ }
+}
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/textfield/TextFieldDemo.java b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/textfield/TextFieldDemo.java
new file mode 100644
index 00000000000..be7c9a7e7d0
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/textfield/TextFieldDemo.java
@@ -0,0 +1,175 @@
+/*
+ * 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.
+ */
+package com.sun.swingset3.demos.textfield;
+
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.util.*;
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
+import com.sun.swingset3.demos.JGridPanel;
+import com.sun.swingset3.demos.ResourceManager;
+import com.sun.swingset3.DemoProperties;
+
+/**
+ * JTextField Demo
+ *
+ * @author Pavel Porvatov
+ */
+@DemoProperties(
+ value = "TextField Demo",
+ category = "Text",
+ description = "Demonstrates the JTextField, a control which allows to input text",
+ sourceFiles = {
+ "com/sun/swingset3/demos/textfield/TextFieldDemo.java",
+ "com/sun/swingset3/demos/textfield/JHistoryTextField.java",
+ "com/sun/swingset3/demos/JGridPanel.java",
+ "com/sun/swingset3/demos/ResourceManager.java",
+ "com/sun/swingset3/demos/textfield/resources/TextFieldDemo.properties",
+ "com/sun/swingset3/demos/textfield/resources/images/TextFieldDemo.gif"
+ }
+)
+public class TextFieldDemo extends JPanel {
+
+ private static final ResourceManager resourceManager = new ResourceManager(TextFieldDemo.class);
+ public static final String DEMO_TITLE = TextFieldDemo.class.getAnnotation(DemoProperties.class).value();
+
+ private final JLabel lbHistoryTextField = new JLabel(resourceManager.getString("TextFieldDemo.historytextfield.text"));
+
+ private final JHistoryTextField tfHistory = new JHistoryTextField();
+
+ private final JLabel lbDow = new JLabel(resourceManager.getString("TextFieldDemo.dow.text"));
+
+ private final JFormattedTextField tfDow = new JFormattedTextField();
+
+ private final JButton btnGo = new JButton(GO);
+ public static final String GO = resourceManager.getString("TextFieldDemo.go.text");
+
+ private final JLabel lbDowResult = new JLabel();
+
+ private final JLabel lbPassword = new JLabel(resourceManager.getString("TextFieldDemo.password.text"));
+
+ private final JPasswordField tfPassword1 = new JPasswordField(20);
+
+ private final JPasswordField tfPassword2 = new JPasswordField(20);
+
+ private final DocumentListener passwordListener = new DocumentListener() {
+
+ @Override
+ public void insertUpdate(DocumentEvent e) {
+ highlightPasswords();
+ }
+
+ @Override
+ public void removeUpdate(DocumentEvent e) {
+ highlightPasswords();
+ }
+
+ @Override
+ public void changedUpdate(DocumentEvent e) {
+ highlightPasswords();
+ }
+
+ private void highlightPasswords() {
+ Color color;
+
+ if (tfPassword1.getPassword().length > 0
+ && Arrays.equals(tfPassword1.getPassword(), tfPassword2.getPassword())) {
+ color = Color.GREEN;
+ } else {
+ color = UIManager.getColor("TextField.background");
+ }
+
+ tfPassword1.setBackground(color);
+ tfPassword2.setBackground(color);
+ }
+ };
+
+ /**
+ * main method allows us to run as a standalone demo.
+ *
+ * @param args
+ */
+ public static void main(String[] args) {
+ JFrame frame = new JFrame(DEMO_TITLE);
+
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ frame.getContentPane().add(new TextFieldDemo());
+ frame.setPreferredSize(new Dimension(800, 600));
+ frame.pack();
+ frame.setLocationRelativeTo(null);
+ frame.setVisible(true);
+ }
+
+ public TextFieldDemo() {
+ setLayout(new BorderLayout());
+
+ initUI();
+
+ tfDow.setValue(new Date());
+
+ btnGo.addActionListener((ActionEvent e) -> {
+ Calendar calendar = Calendar.getInstance(Locale.ENGLISH);
+
+ calendar.setTime((Date) tfDow.getValue());
+
+ lbDowResult.setText(calendar.getDisplayName(Calendar.DAY_OF_WEEK, Calendar.LONG, Locale.ENGLISH));
+ });
+
+ tfPassword1.getDocument().addDocumentListener(passwordListener);
+
+ tfPassword2.getDocument().addDocumentListener(passwordListener);
+ }
+
+ private void initUI() {
+ tfHistory.setHistory(Arrays.asList(resourceManager.getString("TextFieldDemo.history.words").split("\\,")));
+
+ JGridPanel pnDow = new JGridPanel(3, 2);
+
+ pnDow.cell(tfDow).
+ cell(btnGo).
+ cell(lbDowResult);
+
+ JGridPanel pnPassword = new JGridPanel(3, 2);
+
+ pnPassword.cell(tfPassword1).
+ cell(tfPassword2).
+ cell();
+
+ JGridPanel pnContent = new JGridPanel(1, 0, 6);
+
+ pnContent.setBorderEqual(10);
+
+ pnContent.cell(lbHistoryTextField).
+ cell(tfHistory).
+ cell(lbDow, new Insets(20, 0, 0, 0)).
+ cell(pnDow).
+ cell(lbPassword, new Insets(20, 0, 0, 0)).
+ cell(pnPassword).
+ cell();
+
+ add(pnContent);
+ }
+}
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/textfield/resources/TextFieldDemo.properties b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/textfield/resources/TextFieldDemo.properties
new file mode 100644
index 00000000000..5bb7b0aba7c
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/textfield/resources/TextFieldDemo.properties
@@ -0,0 +1,7 @@
+### TextField Demo ###
+
+TextFieldDemo.historytextfield.text = This is an example of a text field with a history. To try it in action, type "cat".
+TextFieldDemo.history.words = armageddon,cars,cartoon,casanova,casino,castle,castlevania,cat,category,caterpillar,click,dog,magpie,hare,rabbit
+TextFieldDemo.dow.text = Enter a date and find out what day of the week it is.
+TextFieldDemo.go.text = Go
+TextFieldDemo.password.text = The text fields below become highlighted when they get identical values.
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/textfield/resources/images/TextFieldDemo.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/textfield/resources/images/TextFieldDemo.gif
new file mode 100644
index 00000000000..a4053d7e84a
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/textfield/resources/images/TextFieldDemo.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/DirectionPanel.java b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/DirectionPanel.java
new file mode 100644
index 00000000000..81d96b1019a
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/DirectionPanel.java
@@ -0,0 +1,140 @@
+/*
+ * 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.
+ */
+package com.sun.swingset3.demos.togglebutton;
+
+import java.awt.event.ActionListener;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.ButtonGroup;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.border.Border;
+
+/**
+ * @version 1.8 11/17/05
+ * @author Jeff Dinkins
+ * @author Chester Rose
+ * @author Brian Beck
+ */
+public class DirectionPanel extends JPanel {
+
+ private final ButtonGroup group;
+
+ public DirectionPanel(boolean enable, String selection, ActionListener l) {
+ setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
+ setAlignmentY(TOP_ALIGNMENT);
+ setAlignmentX(LEFT_ALIGNMENT);
+
+ Box firstThree = Box.createHorizontalBox();
+ Box secondThree = Box.createHorizontalBox();
+ Box thirdThree = Box.createHorizontalBox();
+
+ if (!enable) {
+ selection = "None";
+ }
+
+ group = new ButtonGroup();
+ DirectionButton b;
+ b = (DirectionButton) firstThree.add(new DirectionButton(tl_dot, tldn_dot, "NW", "Sets the orientation to the North-West", l, group, selection.equals("NW")));
+ b.setEnabled(enable);
+ b = (DirectionButton) firstThree.add(new DirectionButton(tm_dot, tmdn_dot, "N", "Sets the orientation to the North", l, group, selection.equals("N")));
+ b.setEnabled(enable);
+ b = (DirectionButton) firstThree.add(new DirectionButton(tr_dot, trdn_dot, "NE", "Sets the orientation to the North-East", l, group, selection.equals("NE")));
+ b.setEnabled(enable);
+ b = (DirectionButton) secondThree.add(new DirectionButton(ml_dot, mldn_dot, "W", "Sets the orientation to the West", l, group, selection.equals("W")));
+ b.setEnabled(enable);
+ b = (DirectionButton) secondThree.add(new DirectionButton(c_dot, cdn_dot, "C", "Sets the orientation to the Center", l, group, selection.equals("C")));
+ b.setEnabled(enable);
+ b = (DirectionButton) secondThree.add(new DirectionButton(mr_dot, mrdn_dot, "E", "Sets the orientation to the East", l, group, selection.equals("E")));
+ b.setEnabled(enable);
+ b = (DirectionButton) thirdThree.add(new DirectionButton(bl_dot, bldn_dot, "SW", "Sets the orientation to the South-West", l, group, selection.equals("SW")));
+ b.setEnabled(enable);
+ b = (DirectionButton) thirdThree.add(new DirectionButton(bm_dot, bmdn_dot, "S", "Sets the orientation to the South", l, group, selection.equals("S")));
+ b.setEnabled(enable);
+ b = (DirectionButton) thirdThree.add(new DirectionButton(br_dot, brdn_dot, "SE", "Sets the orientation to the South-East", l, group, selection.equals("SE")));
+ b.setEnabled(enable);
+
+ add(firstThree);
+ add(secondThree);
+ add(thirdThree);
+ }
+
+ // Chester's way cool layout buttons
+ private final ImageIcon bl_dot = loadImageIcon("bl.gif", "bottom left layout button");
+ private final ImageIcon bldn_dot = loadImageIcon("bldn.gif", "selected bottom left layout button");
+ private final ImageIcon bm_dot = loadImageIcon("bm.gif", "bottom middle layout button");
+ private final ImageIcon bmdn_dot = loadImageIcon("bmdn.gif", "selected bottom middle layout button");
+ private final ImageIcon br_dot = loadImageIcon("br.gif", "bottom right layout button");
+ private final ImageIcon brdn_dot = loadImageIcon("brdn.gif", "selected bottom right layout button");
+ private final ImageIcon c_dot = loadImageIcon("c.gif", "center layout button");
+ private final ImageIcon cdn_dot = loadImageIcon("cdn.gif", "selected center layout button");
+ private final ImageIcon ml_dot = loadImageIcon("ml.gif", "middle left layout button");
+ private final ImageIcon mldn_dot = loadImageIcon("mldn.gif", "selected middle left layout button");
+ private final ImageIcon mr_dot = loadImageIcon("mr.gif", "middle right layout button");
+ private final ImageIcon mrdn_dot = loadImageIcon("mrdn.gif", "selected middle right layout button");
+ private final ImageIcon tl_dot = loadImageIcon("tl.gif", "top left layout button");
+ private final ImageIcon tldn_dot = loadImageIcon("tldn.gif", "selected top left layout button");
+ private final ImageIcon tm_dot = loadImageIcon("tm.gif", "top middle layout button");
+ private final ImageIcon tmdn_dot = loadImageIcon("tmdn.gif", "selected top middle layout button");
+ private final ImageIcon tr_dot = loadImageIcon("tr.gif", "top right layout button");
+ private final ImageIcon trdn_dot = loadImageIcon("trdn.gif", "selected top right layout button");
+
+ private ImageIcon loadImageIcon(String filename, String description) {
+ String path = "resources/images/" + filename;
+ return new ImageIcon(getClass().getResource(path), description);
+ }
+
+ private static class DirectionButton extends JRadioButton {
+
+ /**
+ * A layout direction button
+ */
+ public DirectionButton(Icon icon, Icon downIcon, String direction,
+ String description, ActionListener l,
+ ButtonGroup group, boolean selected) {
+ super();
+ this.addActionListener(l);
+ setFocusPainted(false);
+ setHorizontalTextPosition(CENTER);
+ group.add(this);
+ setIcon(icon);
+ setSelectedIcon(downIcon);
+ setActionCommand(direction);
+ getAccessibleContext().setAccessibleName(direction);
+ getAccessibleContext().setAccessibleDescription(description);
+ setSelected(selected);
+ }
+
+ @Override
+ @Deprecated
+ public boolean isFocusTraversable() {
+ return false;
+ }
+
+ @Override
+ public void setBorder(Border b) {
+ }
+ }
+}
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/LayoutControlPanel.java b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/LayoutControlPanel.java
new file mode 100644
index 00000000000..c8c79bac29e
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/LayoutControlPanel.java
@@ -0,0 +1,281 @@
+/*
+ * 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.
+ */
+package com.sun.swingset3.demos.togglebutton;
+
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import javax.swing.*;
+
+import com.sun.swingset3.demos.ResourceManager;
+
+/*
+ * The LayoutControlPanel contains controls for setting an
+ * AbstractButton's horizontal and vertical text position and
+ * horizontal and vertical alignment.
+ */
+public final class LayoutControlPanel extends JPanel implements SwingConstants {
+
+ private static final Dimension VGAP20 = new Dimension(1, 20);
+ private static final ResourceManager resourceManager = ToggleButtonDemo.resourceManager;
+ public static final String CONTENT_ALIGNMENT = resourceManager.getString("LayoutControlPanel.contentalignment_label");
+ public static final String TEXT_POSITION = resourceManager.getString("LayoutControlPanel.textposition_label");
+ private final boolean absolutePositions;
+ private ToggleButtonDemo demo = null;
+
+ // private ComponentOrientChanger componentOrientChanger = null;
+ LayoutControlPanel(ToggleButtonDemo demo) {
+ this.demo = demo;
+
+ // this.componentOrientationChanger = componentOrientationChanger;
+ setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
+ setAlignmentX(LEFT_ALIGNMENT);
+ setAlignmentY(TOP_ALIGNMENT);
+
+ JLabel l;
+
+ // If SwingSet has a ComponentOrientationChanger, then include control
+ // for choosing between absolute and relative positioning. This will
+ // only happen when we're running on JDK 1.2 or above.
+ //
+ // if(componentOrientationChanger != null ) {
+ // l = new JLabel("Positioning:");
+ // add(l);
+ //
+ // ButtonGroup group = new ButtonGroup();
+ // PositioningListener positioningListener = new PositioningListener();
+ // JRadioButton absolutePos = new JRadioButton("Absolute");
+ // absolutePos.setMnemonic('a');
+ // absolutePos.setToolTipText("Text/Content positioning is independant of line direction");
+ // group.add(absolutePos);
+ // absolutePos.addItemListener(positioningListener);
+ // add(absolutePos);
+ //
+ // JRadioButton relativePos = new JRadioButton("Relative");
+ // relativePos.setMnemonic('r');
+ // relativePos.setToolTipText("Text/Content positioning depends on line direction.");
+ // group.add(relativePos);
+ // relativePos.addItemListener(positioningListener);
+ // add(relativePos);
+ //
+ // add(Box.createRigidArea(demo.VGAP20));
+ //
+ // absolutePositions = false;
+ // relativePos.setSelected(true);
+ //
+ // componentOrientationChanger.addActionListener( new OrientationChangeListener() );
+ //} else {
+ absolutePositions = true;
+ //}
+
+ DirectionPanel textPosition = new DirectionPanel(true, "E", new TextPositionListener());
+ DirectionPanel labelAlignment = new DirectionPanel(true, "C", new LabelAlignmentListener());
+
+ // Make sure the controls' text position and label alignment match
+ // the initial value of the associated direction panel.
+ for (JComponent control : demo.getCurrentControls()) {
+ setPosition(control, RIGHT, CENTER);
+ setAlignment(control, CENTER, CENTER);
+ }
+
+ l = new JLabel(TEXT_POSITION);
+ add(l);
+ add(textPosition);
+
+ add(Box.createRigidArea(VGAP20));
+
+ l = new JLabel(CONTENT_ALIGNMENT);
+ add(l);
+ add(labelAlignment);
+
+ add(Box.createGlue());
+ }
+
+ // Text Position Listener
+ private class TextPositionListener implements ActionListener {
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ JRadioButton rb = (JRadioButton) e.getSource();
+ if (!rb.isSelected()) {
+ return;
+ }
+ String cmd = rb.getActionCommand();
+ int hPos, vPos;
+ switch (cmd) {
+ case "NW":
+ hPos = LEFT;
+ vPos = TOP;
+ break;
+ case "N":
+ hPos = CENTER;
+ vPos = TOP;
+ break;
+ case "NE":
+ hPos = RIGHT;
+ vPos = TOP;
+ break;
+ case "W":
+ hPos = LEFT;
+ vPos = CENTER;
+ break;
+ case "C":
+ hPos = CENTER;
+ vPos = CENTER;
+ break;
+ case "E":
+ hPos = RIGHT;
+ vPos = CENTER;
+ break;
+ case "SW":
+ hPos = LEFT;
+ vPos = BOTTOM;
+ break;
+ case "S":
+ hPos = CENTER;
+ vPos = BOTTOM;
+ break;
+ /*if(cmd.equals("SE"))*/
+ default:
+ hPos = RIGHT;
+ vPos = BOTTOM;
+ break;
+ }
+ for (JComponent control : demo.getCurrentControls()) {
+ setPosition(control, hPos, vPos);
+ }
+ demo.invalidate();
+ demo.validate();
+ demo.repaint();
+ }
+ }
+
+ // Label Alignment Listener
+ private class LabelAlignmentListener implements ActionListener {
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ JRadioButton rb = (JRadioButton) e.getSource();
+ if (!rb.isSelected()) {
+ return;
+ }
+ String cmd = rb.getActionCommand();
+ int hPos, vPos;
+ switch (cmd) {
+ case "NW":
+ hPos = LEFT;
+ vPos = TOP;
+ break;
+ case "N":
+ hPos = CENTER;
+ vPos = TOP;
+ break;
+ case "NE":
+ hPos = RIGHT;
+ vPos = TOP;
+ break;
+ case "W":
+ hPos = LEFT;
+ vPos = CENTER;
+ break;
+ case "C":
+ hPos = CENTER;
+ vPos = CENTER;
+ break;
+ case "E":
+ hPos = RIGHT;
+ vPos = CENTER;
+ break;
+ case "SW":
+ hPos = LEFT;
+ vPos = BOTTOM;
+ break;
+ case "S":
+ hPos = CENTER;
+ vPos = BOTTOM;
+ break;
+ /*if(cmd.equals("SE"))*/
+ default:
+ hPos = RIGHT;
+ vPos = BOTTOM;
+ break;
+ }
+ for (JComponent control : demo.getCurrentControls()) {
+ setAlignment(control, hPos, vPos);
+ control.invalidate();
+ }
+ demo.invalidate();
+ demo.validate();
+ demo.repaint();
+ }
+ }
+
+ // Position
+ void setPosition(Component c, int hPos, int vPos) {
+ boolean ltr = c.getComponentOrientation().isLeftToRight();
+ if (absolutePositions) {
+ if (hPos == LEADING) {
+ hPos = ltr ? LEFT : RIGHT;
+ } else if (hPos == TRAILING) {
+ hPos = ltr ? RIGHT : LEFT;
+ }
+ } else if (hPos == LEFT) {
+ hPos = ltr ? LEADING : TRAILING;
+ } else if (hPos == RIGHT) {
+ hPos = ltr ? TRAILING : LEADING;
+ }
+ if (c instanceof AbstractButton) {
+ AbstractButton x = (AbstractButton) c;
+ x.setHorizontalTextPosition(hPos);
+ x.setVerticalTextPosition(vPos);
+ } else if (c instanceof JLabel) {
+ JLabel x = (JLabel) c;
+ x.setHorizontalTextPosition(hPos);
+ x.setVerticalTextPosition(vPos);
+ }
+ }
+
+ void setAlignment(Component c, int hPos, int vPos) {
+ boolean ltr = c.getComponentOrientation().isLeftToRight();
+ if (absolutePositions) {
+ if (hPos == LEADING) {
+ hPos = ltr ? LEFT : RIGHT;
+ } else if (hPos == TRAILING) {
+ hPos = ltr ? RIGHT : LEFT;
+ }
+ } else if (hPos == LEFT) {
+ hPos = ltr ? LEADING : TRAILING;
+ } else if (hPos == RIGHT) {
+ hPos = ltr ? TRAILING : LEADING;
+ }
+ if (c instanceof AbstractButton) {
+ AbstractButton x = (AbstractButton) c;
+ x.setHorizontalAlignment(hPos);
+ x.setVerticalAlignment(vPos);
+ } else if (c instanceof JLabel) {
+ JLabel x = (JLabel) c;
+ x.setHorizontalAlignment(hPos);
+ x.setVerticalAlignment(vPos);
+ }
+ }
+}
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/ToggleButtonDemo.java b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/ToggleButtonDemo.java
new file mode 100644
index 00000000000..5adf5f7a62b
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/ToggleButtonDemo.java
@@ -0,0 +1,563 @@
+/*
+ * 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.
+ */
+package com.sun.swingset3.demos.togglebutton;
+
+import java.awt.*;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.*;
+import java.util.List;
+import javax.swing.*;
+import javax.swing.border.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import com.sun.swingset3.DemoProperties;
+import com.sun.swingset3.demos.ResourceManager;
+
+/**
+ * JButton, JRadioButton, JToggleButton, JCheckBox Demos
+ *
+ * @version 1.15 11/17/05
+ * @author Jeff Dinkins
+ */
+@DemoProperties(
+ value = "ToggleButtons Demo",
+ category = "Controls",
+ description = "Demonstrates JCheckBox & JRadioButton",
+ sourceFiles = {
+ "com/sun/swingset3/demos/togglebutton/ToggleButtonDemo.java",
+ "com/sun/swingset3/demos/togglebutton/DirectionPanel.java",
+ "com/sun/swingset3/demos/togglebutton/LayoutControlPanel.java",
+ "com/sun/swingset3/demos/ResourceManager.java",
+ "com/sun/swingset3/demos/togglebutton/resources/ToggleButtonDemo.properties",
+ "com/sun/swingset3/demos/togglebutton/resources/images/b1.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/b1d.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/b1p.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/b1r.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/b2.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/b2d.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/b2p.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/b2r.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/b3.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/b3d.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/b3p.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/b3r.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/bl.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/bldn.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/bm.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/bmdn.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/br.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/brdn.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/c.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/cb.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/cbr.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/cbrs.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/cbs.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/cdn.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/ml.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/mldn.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/mr.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/mrdn.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/rb.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/rbp.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/rbr.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/rbrs.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/rbs.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/tl.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/tldn.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/tm.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/tmdn.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/ToggleButtonDemo.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/tr.gif",
+ "com/sun/swingset3/demos/togglebutton/resources/images/trdn.gif"
+ }
+)
+public class ToggleButtonDemo extends JPanel implements ChangeListener {
+
+ private static final Dimension HGAP10 = new Dimension(10, 1);
+ private static final Dimension HGAP20 = new Dimension(20, 1);
+ private static final Dimension VGAP20 = new Dimension(1, 20);
+ private static final Dimension VGAP30 = new Dimension(1, 30);
+
+ static final ResourceManager resourceManager = new ResourceManager(ToggleButtonDemo.class);
+ public static final String RADIO3 = resourceManager.getString("ToggleButtonDemo.radio3");
+ public static final String RADIO2 = resourceManager.getString("ToggleButtonDemo.radio2");
+ public static final String RADIO1 = resourceManager.getString("ToggleButtonDemo.radio1");
+ public static final String IMAGE_RADIO_BUTTONS = resourceManager.getString("ToggleButtonDemo.imageradiobuttons");
+ public static final String TEXT_RADIO_BUTTONS = resourceManager.getString("ToggleButtonDemo.textradiobuttons");
+ public static final String CHECK3 = resourceManager.getString("ToggleButtonDemo.check3");
+ public static final String CHECK2 = resourceManager.getString("ToggleButtonDemo.check2");
+ public static final String CHECK1 = resourceManager.getString("ToggleButtonDemo.check1");
+ public static final String CHECK_BOXES = resourceManager.getString("ToggleButtonDemo.checkboxes");
+ public static final String IMAGE_CHECKBOXES = resourceManager.getString("ToggleButtonDemo.imagecheckboxes");
+ public static final String TEXT_CHECKBOXES = resourceManager.getString("ToggleButtonDemo.textcheckboxes");
+ public static final String CONTENT_FILLED = resourceManager.getString("ToggleButtonDemo.contentfilled");
+ public static final String ENABLED = resourceManager.getString("ToggleButtonDemo.enabled");
+ public static final String PAINT_FOCUS = resourceManager.getString("ToggleButtonDemo.paintfocus");
+ public static final String PAINT_BORDER = resourceManager.getString("ToggleButtonDemo.paintborder");
+ public static final String DISPLAY_OPTIONS = resourceManager.getString("ToggleButtonDemo.controlpanel_label");
+ public static final String DEFAULT = resourceManager.getString("ToggleButtonDemo.default");
+ public static final String PAD_AMOUNT = resourceManager.getString("ToggleButtonDemo.padamount_label");
+
+ private final JTabbedPane tab;
+
+ private final JPanel checkboxPanel = new JPanel();
+ private final JPanel radioButtonPanel = new JPanel();
+
+ private final List buttons = new ArrayList<>();
+ private final List checkboxes = new ArrayList<>();
+ private final List radiobuttons = new ArrayList<>();
+ private final List togglebuttons = new ArrayList<>();
+
+ private List currentControls = buttons;
+
+ private final EmptyBorder border5 = new EmptyBorder(5, 5, 5, 5);
+
+ private ItemListener buttonDisplayListener = null;
+ private ItemListener buttonPadListener = null;
+
+ private final Insets insets0 = new Insets(0, 0, 0, 0);
+ private final Insets insets10 = new Insets(10, 10, 10, 10);
+
+ private final Border loweredBorder = new CompoundBorder(
+ new SoftBevelBorder(SoftBevelBorder.LOWERED), new EmptyBorder(5, 5, 5, 5));
+
+ /**
+ * main method allows us to run as a standalone demo.
+ *
+ * @param args
+ */
+ public static void main(String[] args) {
+ JFrame frame = new JFrame(ToggleButtonDemo.class.getAnnotation(DemoProperties.class).value());
+
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ frame.getContentPane().add(new ToggleButtonDemo());
+ frame.setPreferredSize(new Dimension(800, 600));
+ frame.pack();
+ frame.setLocationRelativeTo(null);
+ frame.setVisible(true);
+ }
+
+ /**
+ * ButtonDemo Constructor
+ */
+ public ToggleButtonDemo() {
+ setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
+
+ tab = new JTabbedPane();
+ tab.getModel().addChangeListener(this);
+
+ add(tab);
+
+ //addButtons();
+ addRadioButtons();
+ addCheckBoxes();
+ //addToggleButtons();
+ currentControls = checkboxes;
+ }
+
+ private void addRadioButtons() {
+ ButtonGroup group = new ButtonGroup();
+
+ tab.addTab(resourceManager.getString("ToggleButtonDemo.radiobuttons"), radioButtonPanel);
+ radioButtonPanel.setLayout(new BoxLayout(radioButtonPanel, BoxLayout.X_AXIS));
+ radioButtonPanel.setBorder(border5);
+
+ JPanel p1 = createVerticalPanel(true);
+ p1.setAlignmentY(TOP_ALIGNMENT);
+ radioButtonPanel.add(p1);
+
+ // Text Radio Buttons
+ JPanel p2 = createHorizontalPanel(false);
+ p1.add(p2);
+ p2.setBorder(new CompoundBorder(
+ new TitledBorder(
+ null, TEXT_RADIO_BUTTONS,
+ TitledBorder.LEFT, TitledBorder.TOP), border5)
+ );
+
+ JRadioButton radio = (JRadioButton) p2.add(new JRadioButton(RADIO1));
+ group.add(radio);
+ radiobuttons.add(radio);
+ p2.add(Box.createRigidArea(HGAP10));
+
+ radio = (JRadioButton) p2.add(new JRadioButton(RADIO2));
+ group.add(radio);
+ radiobuttons.add(radio);
+ p2.add(Box.createRigidArea(HGAP10));
+
+ radio = (JRadioButton) p2.add(new JRadioButton(RADIO3));
+ group.add(radio);
+ radiobuttons.add(radio);
+
+ // Image Radio Buttons
+ group = new ButtonGroup();
+ p1.add(Box.createRigidArea(VGAP30));
+ JPanel p3 = createHorizontalPanel(false);
+ p1.add(p3);
+ p3.setLayout(new BoxLayout(p3, BoxLayout.X_AXIS));
+ p3.setBorder(new TitledBorder(null, IMAGE_RADIO_BUTTONS,
+ TitledBorder.LEFT, TitledBorder.TOP));
+
+ // image radio button 1
+ String description = resourceManager.getString("ToggleButtonDemo.customradio");
+ String text = RADIO1;
+ radio = new JRadioButton(text, resourceManager.createImageIcon("rb.gif", description));
+ radio.setPressedIcon(resourceManager.createImageIcon("rbp.gif", description));
+ radio.setRolloverIcon(resourceManager.createImageIcon("rbr.gif", description));
+ radio.setRolloverSelectedIcon(resourceManager.createImageIcon("rbrs.gif", description));
+ radio.setSelectedIcon(resourceManager.createImageIcon("rbs.gif", description));
+ radio.setMargin(new Insets(0, 0, 0, 0));
+ group.add(radio);
+ p3.add(radio);
+ radiobuttons.add(radio);
+ p3.add(Box.createRigidArea(HGAP20));
+
+ // image radio button 2
+ text = RADIO2;
+ radio = new JRadioButton(text, resourceManager.createImageIcon("rb.gif", description));
+ radio.setPressedIcon(resourceManager.createImageIcon("rbp.gif", description));
+ radio.setRolloverIcon(resourceManager.createImageIcon("rbr.gif", description));
+ radio.setRolloverSelectedIcon(resourceManager.createImageIcon("rbrs.gif", description));
+ radio.setSelectedIcon(resourceManager.createImageIcon("rbs.gif", description));
+ radio.setMargin(new Insets(0, 0, 0, 0));
+ group.add(radio);
+ p3.add(radio);
+ radiobuttons.add(radio);
+ p3.add(Box.createRigidArea(HGAP20));
+
+ // image radio button 3
+ text = RADIO3;
+ radio = new JRadioButton(text, resourceManager.createImageIcon("rb.gif", description));
+ radio.setPressedIcon(resourceManager.createImageIcon("rbp.gif", description));
+ radio.setRolloverIcon(resourceManager.createImageIcon("rbr.gif", description));
+ radio.setRolloverSelectedIcon(resourceManager.createImageIcon("rbrs.gif", description));
+ radio.setSelectedIcon(resourceManager.createImageIcon("rbs.gif", description));
+ radio.setMargin(new Insets(0, 0, 0, 0));
+ group.add(radio);
+ radiobuttons.add(radio);
+ p3.add(radio);
+
+ // verticaly glue fills out the rest of the box
+ p1.add(Box.createVerticalGlue());
+
+ radioButtonPanel.add(Box.createHorizontalGlue());
+ currentControls = radiobuttons;
+ radioButtonPanel.add(createControls());
+ }
+
+ private void addCheckBoxes() {
+ tab.addTab(CHECK_BOXES, checkboxPanel);
+ checkboxPanel.setLayout(new BoxLayout(checkboxPanel, BoxLayout.X_AXIS));
+ checkboxPanel.setBorder(border5);
+
+ JPanel p1 = createVerticalPanel(true);
+ p1.setAlignmentY(TOP_ALIGNMENT);
+ checkboxPanel.add(p1);
+
+ // Text Radio Buttons
+ JPanel p2 = createHorizontalPanel(false);
+ p1.add(p2);
+ p2.setBorder(new CompoundBorder(
+ new TitledBorder(
+ null, TEXT_CHECKBOXES,
+ TitledBorder.LEFT, TitledBorder.TOP), border5)
+ );
+
+ JCheckBox checkBox1 = new JCheckBox(CHECK1);
+ checkboxes.add(checkBox1);
+ p2.add(checkBox1);
+ p2.add(Box.createRigidArea(HGAP10));
+
+ JCheckBox checkBox2 = new JCheckBox(CHECK2);
+ checkboxes.add(checkBox2);
+ p2.add(checkBox2);
+ p2.add(Box.createRigidArea(HGAP10));
+
+ JCheckBox checkBox3 = new JCheckBox(CHECK3);
+ checkboxes.add(checkBox3);
+ p2.add(checkBox3);
+
+ // Image Radio Buttons
+ p1.add(Box.createRigidArea(VGAP30));
+ JPanel p3 = createHorizontalPanel(false);
+ p1.add(p3);
+ p3.setLayout(new BoxLayout(p3, BoxLayout.X_AXIS));
+ p3.setBorder(new TitledBorder(null, IMAGE_CHECKBOXES,
+ TitledBorder.LEFT, TitledBorder.TOP));
+
+ // image checkbox 1
+ String description = resourceManager.getString("ToggleButtonDemo.customcheck");
+ String text = CHECK1;
+ JCheckBox check = new JCheckBox(text,
+ resourceManager.createImageIcon("cb.gif", description));
+ check.setRolloverIcon(resourceManager.createImageIcon("cbr.gif", description));
+ check.setRolloverSelectedIcon(resourceManager.createImageIcon("cbrs.gif", description));
+ check.setSelectedIcon(resourceManager.createImageIcon("cbs.gif", description));
+ check.setMargin(new Insets(0, 0, 0, 0));
+ p3.add(check);
+ checkboxes.add(check);
+ p3.add(Box.createRigidArea(HGAP20));
+
+ // image checkbox 2
+ text = CHECK2;
+ check = new JCheckBox(text, resourceManager.createImageIcon("cb.gif", description));
+ check.setRolloverIcon(resourceManager.createImageIcon("cbr.gif", description));
+ check.setRolloverSelectedIcon(resourceManager.createImageIcon("cbrs.gif", description));
+ check.setSelectedIcon(resourceManager.createImageIcon("cbs.gif", description));
+ check.setMargin(new Insets(0, 0, 0, 0));
+ p3.add(check);
+ checkboxes.add(check);
+ p3.add(Box.createRigidArea(HGAP20));
+
+ // image checkbox 3
+ text = CHECK3;
+ check = new JCheckBox(text, resourceManager.createImageIcon("cb.gif", description));
+ check.setRolloverIcon(resourceManager.createImageIcon("cbr.gif", description));
+ check.setRolloverSelectedIcon(resourceManager.createImageIcon("cbrs.gif", description));
+ check.setSelectedIcon(resourceManager.createImageIcon("cbs.gif", description));
+ check.setMargin(new Insets(0, 0, 0, 0));
+ p3.add(check);
+ checkboxes.add(check);
+
+ // verticaly glue fills out the rest of the box
+ p1.add(Box.createVerticalGlue());
+
+ checkboxPanel.add(Box.createHorizontalGlue());
+ currentControls = checkboxes;
+ checkboxPanel.add(createControls());
+ }
+
+ private JPanel createControls() {
+ JPanel controls = new JPanel() {
+ @Override
+ public Dimension getMaximumSize() {
+ return new Dimension(300, super.getMaximumSize().height);
+ }
+ };
+ controls.setLayout(new BoxLayout(controls, BoxLayout.Y_AXIS));
+ controls.setAlignmentY(TOP_ALIGNMENT);
+ controls.setAlignmentX(LEFT_ALIGNMENT);
+
+ JPanel buttonControls = createHorizontalPanel(true);
+ buttonControls.setAlignmentY(TOP_ALIGNMENT);
+ buttonControls.setAlignmentX(LEFT_ALIGNMENT);
+
+ JPanel leftColumn = createVerticalPanel(false);
+ leftColumn.setAlignmentX(LEFT_ALIGNMENT);
+ leftColumn.setAlignmentY(TOP_ALIGNMENT);
+
+ JPanel rightColumn = new LayoutControlPanel(this);
+
+ buttonControls.add(leftColumn);
+ buttonControls.add(Box.createRigidArea(HGAP20));
+ buttonControls.add(rightColumn);
+ buttonControls.add(Box.createRigidArea(HGAP20));
+
+ controls.add(buttonControls);
+
+ createListeners();
+
+ // Display Options
+ JLabel l = new JLabel(DISPLAY_OPTIONS);
+ leftColumn.add(l);
+
+ JCheckBox bordered = new JCheckBox(PAINT_BORDER);
+ bordered.setActionCommand("PaintBorder");
+ bordered.setToolTipText(resourceManager.getString("ToggleButtonDemo.paintborder_tooltip"));
+ bordered.setMnemonic(resourceManager.getMnemonic("ToggleButtonDemo.paintborder_mnemonic"));
+ if (currentControls == buttons) {
+ bordered.setSelected(true);
+ }
+ bordered.addItemListener(buttonDisplayListener);
+ leftColumn.add(bordered);
+
+ JCheckBox focused = new JCheckBox(PAINT_FOCUS);
+ focused.setActionCommand("PaintFocus");
+ focused.setToolTipText(resourceManager.getString("ToggleButtonDemo.paintfocus_tooltip"));
+ focused.setMnemonic(resourceManager.getMnemonic("ToggleButtonDemo.paintfocus_mnemonic"));
+ focused.setSelected(true);
+ focused.addItemListener(buttonDisplayListener);
+ leftColumn.add(focused);
+
+ JCheckBox enabled = new JCheckBox(ENABLED);
+ enabled.setActionCommand("Enabled");
+ enabled.setToolTipText(resourceManager.getString("ToggleButtonDemo.enabled_tooltip"));
+ enabled.setSelected(true);
+ enabled.addItemListener(buttonDisplayListener);
+ enabled.setMnemonic(resourceManager.getMnemonic("ToggleButtonDemo.enabled_mnemonic"));
+ leftColumn.add(enabled);
+
+ JCheckBox filled = new JCheckBox(CONTENT_FILLED);
+ filled.setActionCommand("ContentFilled");
+ filled.setToolTipText(resourceManager.getString("ToggleButtonDemo.contentfilled_tooltip"));
+ filled.setSelected(true);
+ filled.addItemListener(buttonDisplayListener);
+ filled.setMnemonic(resourceManager.getMnemonic("ToggleButtonDemo.contentfilled_mnemonic"));
+ leftColumn.add(filled);
+
+ leftColumn.add(Box.createRigidArea(VGAP20));
+
+ l = new JLabel(PAD_AMOUNT);
+ leftColumn.add(l);
+ ButtonGroup group = new ButtonGroup();
+ JRadioButton defaultPad = new JRadioButton(DEFAULT);
+ defaultPad.setToolTipText(resourceManager.getString("ToggleButtonDemo.default_tooltip"));
+ defaultPad.setMnemonic(resourceManager.getMnemonic("ToggleButtonDemo.default_mnemonic"));
+ defaultPad.addItemListener(buttonPadListener);
+ group.add(defaultPad);
+ defaultPad.setSelected(true);
+ leftColumn.add(defaultPad);
+
+ JRadioButton zeroPad = new JRadioButton(resourceManager.getString("ToggleButtonDemo.zero"));
+ zeroPad.setActionCommand("ZeroPad");
+ zeroPad.setToolTipText(resourceManager.getString("ToggleButtonDemo.zero_tooltip"));
+ zeroPad.addItemListener(buttonPadListener);
+ zeroPad.setMnemonic(resourceManager.getMnemonic("ToggleButtonDemo.zero_mnemonic"));
+ group.add(zeroPad);
+ leftColumn.add(zeroPad);
+
+ JRadioButton tenPad = new JRadioButton(resourceManager.getString("ToggleButtonDemo.ten"));
+ tenPad.setActionCommand("TenPad");
+ tenPad.setMnemonic(resourceManager.getMnemonic("ToggleButtonDemo.ten_mnemonic"));
+ tenPad.setToolTipText(resourceManager.getString("ToggleButtonDemo.ten_tooltip"));
+ tenPad.addItemListener(buttonPadListener);
+ group.add(tenPad);
+ leftColumn.add(tenPad);
+
+ leftColumn.add(Box.createRigidArea(VGAP20));
+ return controls;
+ }
+
+ private void createListeners() {
+ buttonDisplayListener = (ItemEvent e) -> {
+ JCheckBox cb = (JCheckBox) e.getSource();
+ String command = cb.getActionCommand();
+ switch (command) {
+ case "Enabled":
+ for (JComponent control : currentControls) {
+ control.setEnabled(cb.isSelected());
+ control.invalidate();
+ }
+ break;
+ case "PaintBorder":
+ if (currentControls.get(0) instanceof AbstractButton) {
+ for (JComponent control : currentControls) {
+ AbstractButton b = (AbstractButton) control;
+ b.setBorderPainted(cb.isSelected());
+ b.invalidate();
+ }
+ }
+ break;
+ case "PaintFocus":
+ if (currentControls.get(0) instanceof AbstractButton) {
+ for (JComponent control : currentControls) {
+ AbstractButton b = (AbstractButton) control;
+ b.setFocusPainted(cb.isSelected());
+ b.invalidate();
+ }
+ }
+ break;
+ case "ContentFilled":
+ if (currentControls.get(0) instanceof AbstractButton) {
+ for (JComponent control : currentControls) {
+ AbstractButton b = (AbstractButton) control;
+ b.setContentAreaFilled(cb.isSelected());
+ b.invalidate();
+ }
+ }
+ break;
+ }
+ invalidate();
+ validate();
+ repaint();
+ };
+
+ buttonPadListener = (ItemEvent e) -> {
+ // *** pad = 0
+ int pad = -1;
+ JRadioButton rb = (JRadioButton) e.getSource();
+ String command = rb.getActionCommand();
+ if ("ZeroPad".equals(command) && rb.isSelected()) {
+ pad = 0;
+ } else if ("TenPad".equals(command) && rb.isSelected()) {
+ pad = 10;
+ }
+
+ for (JComponent control : currentControls) {
+ AbstractButton b = (AbstractButton) control;
+ if (pad == -1) {
+ b.setMargin(null);
+ } else if (pad == 0) {
+ b.setMargin(insets0);
+ } else {
+ b.setMargin(insets10);
+ }
+ }
+ invalidate();
+ validate();
+ repaint();
+ };
+ }
+
+ @Override
+ public void stateChanged(ChangeEvent e) {
+ SingleSelectionModel model = (SingleSelectionModel) e.getSource();
+ if (model.getSelectedIndex() == 0) {
+ currentControls = buttons;
+ } else if (model.getSelectedIndex() == 1) {
+ currentControls = radiobuttons;
+ } else if (model.getSelectedIndex() == 2) {
+ currentControls = checkboxes;
+ } else {
+ currentControls = togglebuttons;
+ }
+ }
+
+ public List getCurrentControls() {
+ return currentControls;
+ }
+
+ private JPanel createHorizontalPanel(boolean threeD) {
+ JPanel p = new JPanel();
+ p.setLayout(new BoxLayout(p, BoxLayout.X_AXIS));
+ p.setAlignmentY(TOP_ALIGNMENT);
+ p.setAlignmentX(LEFT_ALIGNMENT);
+ if (threeD) {
+ p.setBorder(loweredBorder);
+ }
+ return p;
+ }
+
+ private JPanel createVerticalPanel(boolean threeD) {
+ JPanel p = new JPanel();
+ p.setLayout(new BoxLayout(p, BoxLayout.Y_AXIS));
+ p.setAlignmentY(TOP_ALIGNMENT);
+ p.setAlignmentX(LEFT_ALIGNMENT);
+ if (threeD) {
+ p.setBorder(loweredBorder);
+ }
+ return p;
+ }
+}
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/ToggleButtonDemo.properties b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/ToggleButtonDemo.properties
new file mode 100644
index 00000000000..241368aacaa
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/ToggleButtonDemo.properties
@@ -0,0 +1,69 @@
+### Button Demo ###
+
+ToggleButtonDemo.accessible_description=The ButtonDemo shows examples of using JButton, JRadioButton, JToggleButton, and JCheckBox
+ToggleButtonDemo.tooltip=JButton, JRadioButton, JToggleButton, JCheckbox demos
+ToggleButtonDemo.name=Button Demo
+
+ToggleButtonDemo.buttons=Buttons
+ToggleButtonDemo.checkboxes=Check Boxes
+ToggleButtonDemo.radiobuttons=Radio Buttons
+ToggleButtonDemo.togglebuttons=Toggle Buttons
+
+ToggleButtonDemo.textbuttons=Text Buttons
+ToggleButtonDemo.imagebuttons=Image Buttons
+ToggleButtonDemo.textradiobuttons=Text Radio Buttons
+ToggleButtonDemo.imageradiobuttons=Image Radio Buttons
+ToggleButtonDemo.texttogglebuttons=Text Toggle Buttons
+ToggleButtonDemo.imagetogglebuttons=Image Toggle Buttons
+ToggleButtonDemo.textcheckboxes=Text CheckBoxes
+ToggleButtonDemo.imagecheckboxes=Image CheckBoxes
+
+ToggleButtonDemo.button1=One
+ToggleButtonDemo.button2=Two
+ToggleButtonDemo.button3=Three!
+
+ToggleButtonDemo.radio1=Radio One
+ToggleButtonDemo.radio2=Radio Two
+ToggleButtonDemo.radio3=Radio Three
+ToggleButtonDemo.radioX=Three(HTML!)
+
+ToggleButtonDemo.check1=One
+ToggleButtonDemo.check2=Two
+ToggleButtonDemo.check3=Three
+ToggleButtonDemo.checkX=Three(HTML!)
+
+ToggleButtonDemo.customradio=A custom "chrome" radio button.
+ToggleButtonDemo.customcheck=A custom lightbulb checkbox.
+
+ToggleButtonDemo.phone=Phone
+ToggleButtonDemo.write=Write
+ToggleButtonDemo.peace=Peace
+
+ToggleButtonDemo.controlpanel_label=Display Options:
+ToggleButtonDemo.paintborder=Paint Border
+ToggleButtonDemo.paintborder_tooltip=Click here to turn border painting on or off.
+ToggleButtonDemo.paintborder_mnemonic=b
+ToggleButtonDemo.paintfocus=Paint Focus
+ToggleButtonDemo.paintfocus_tooltip=Click here to turn focus painting on or off.
+ToggleButtonDemo.paintfocus_mnemonic=f
+ToggleButtonDemo.enabled=Enabled
+ToggleButtonDemo.enabled_tooltip=Click here to enable or disable the buttons.
+ToggleButtonDemo.enabled_mnemonic=e
+ToggleButtonDemo.contentfilled=Content Filled
+ToggleButtonDemo.contentfilled_tooltip=Click here to control the filling of the content area.
+ToggleButtonDemo.contentfilled_mnemonic=i
+
+ToggleButtonDemo.padamount_label=Pad Amount:
+ToggleButtonDemo.default=Default
+ToggleButtonDemo.default_tooltip=Uses the default padding between the border and label.
+ToggleButtonDemo.default_mnemonic=d
+ToggleButtonDemo.zero=0
+ToggleButtonDemo.zero_mnemonic=0
+ToggleButtonDemo.zero_tooltip=Uses no padding between the border and label.
+ToggleButtonDemo.ten=10
+ToggleButtonDemo.ten_mnemonic=1
+ToggleButtonDemo.ten_tooltip=Uses a 10 pixel pad between the border and label.
+
+LayoutControlPanel.textposition_label=Text Position:
+LayoutControlPanel.contentalignment_label=Content Alignment:
+
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/ToggleButtonDemo.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/ToggleButtonDemo.gif
new file mode 100644
index 00000000000..35099bb894f
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/ToggleButtonDemo.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1.gif
new file mode 100644
index 00000000000..24a7dea299f
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1d.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1d.gif
new file mode 100644
index 00000000000..383404e7646
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1d.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1p.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1p.gif
new file mode 100644
index 00000000000..1f3fd66328b
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1p.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1r.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1r.gif
new file mode 100644
index 00000000000..2a669a24988
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b1r.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2.gif
new file mode 100644
index 00000000000..af6d626058a
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2d.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2d.gif
new file mode 100644
index 00000000000..b745943ed6c
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2d.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2p.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2p.gif
new file mode 100644
index 00000000000..0f4abf37992
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2p.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2r.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2r.gif
new file mode 100644
index 00000000000..21becb949f4
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b2r.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3.gif
new file mode 100644
index 00000000000..67876264d8f
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3d.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3d.gif
new file mode 100644
index 00000000000..4d397a394f4
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3d.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3p.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3p.gif
new file mode 100644
index 00000000000..0db029f56c3
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3p.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3r.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3r.gif
new file mode 100644
index 00000000000..7ddd2f9dc74
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/b3r.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bl.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bl.gif
new file mode 100644
index 00000000000..75fd0b9198d
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bl.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bldn.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bldn.gif
new file mode 100644
index 00000000000..546f06fee6b
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bldn.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bm.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bm.gif
new file mode 100644
index 00000000000..80f7352332b
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bm.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bmdn.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bmdn.gif
new file mode 100644
index 00000000000..3d42d0b9e15
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/bmdn.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/br.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/br.gif
new file mode 100644
index 00000000000..b02e4484fd0
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/br.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/brdn.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/brdn.gif
new file mode 100644
index 00000000000..58cf892514b
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/brdn.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/c.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/c.gif
new file mode 100644
index 00000000000..66d0276d98a
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/c.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cb.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cb.gif
new file mode 100644
index 00000000000..f3acd971132
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cb.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cbr.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cbr.gif
new file mode 100644
index 00000000000..278dab92f38
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cbr.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cbrs.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cbrs.gif
new file mode 100644
index 00000000000..0cd04d731b4
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cbrs.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cbs.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cbs.gif
new file mode 100644
index 00000000000..dbbd338a207
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cbs.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cdn.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cdn.gif
new file mode 100644
index 00000000000..8a2ca4b696e
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/cdn.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/ml.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/ml.gif
new file mode 100644
index 00000000000..d8ad5804623
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/ml.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/mldn.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/mldn.gif
new file mode 100644
index 00000000000..0902554010b
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/mldn.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/mr.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/mr.gif
new file mode 100644
index 00000000000..c94cc82db54
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/mr.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/mrdn.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/mrdn.gif
new file mode 100644
index 00000000000..3b700779b1e
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/mrdn.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rb.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rb.gif
new file mode 100644
index 00000000000..f6ff994ceee
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rb.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbp.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbp.gif
new file mode 100644
index 00000000000..e82d607a265
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbp.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbr.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbr.gif
new file mode 100644
index 00000000000..9836e0c450d
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbr.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbrs.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbrs.gif
new file mode 100644
index 00000000000..f48e799f448
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbrs.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbs.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbs.gif
new file mode 100644
index 00000000000..5c11fce0329
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/rbs.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tl.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tl.gif
new file mode 100644
index 00000000000..5d7a11c7357
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tl.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tldn.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tldn.gif
new file mode 100644
index 00000000000..5db2fc1a402
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tldn.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tm.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tm.gif
new file mode 100644
index 00000000000..c69edc99e5c
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tm.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tmdn.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tmdn.gif
new file mode 100644
index 00000000000..8f765b99f5f
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tmdn.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tr.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tr.gif
new file mode 100644
index 00000000000..42e601738f4
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/tr.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/trdn.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/trdn.gif
new file mode 100644
index 00000000000..8f3c186f2ad
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/togglebutton/resources/images/trdn.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tree/TreeDemo.java b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tree/TreeDemo.java
new file mode 100644
index 00000000000..1a4c555945e
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tree/TreeDemo.java
@@ -0,0 +1,144 @@
+/*
+ * 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.
+ */
+package com.sun.swingset3.demos.tree;
+
+import java.awt.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import javax.swing.*;
+import javax.swing.tree.DefaultMutableTreeNode;
+
+import com.sun.swingset3.DemoProperties;
+import com.sun.swingset3.demos.ResourceManager;
+
+/**
+ * JTree Demo
+ *
+ * @version 1.13 11/17/05
+ * @author Jeff Dinkins
+ */
+@DemoProperties(
+ value = "JTree Demo",
+ category = "Data",
+ description = "Demonstrates JTree, a component which supports display/editing of hierarchical data",
+ sourceFiles = {
+ "com/sun/swingset3/demos/tree/TreeDemo.java",
+ "com/sun/swingset3/demos/ResourceManager.java",
+ "com/sun/swingset3/demos/tree/resources/tree.txt",
+ "com/sun/swingset3/demos/tree/resources/TreeDemo.properties",
+ "com/sun/swingset3/demos/tree/resources/images/TreeDemo.gif"
+ }
+)
+public class TreeDemo extends JPanel {
+
+ private final ResourceManager resourceManager = new ResourceManager(this.getClass());
+ public static final String DEMO_TITLE = TreeDemo.class.getAnnotation(DemoProperties.class).value();
+
+ /**
+ * main method allows us to run as a standalone demo.
+ *
+ * @param args
+ */
+ public static void main(String[] args) {
+ JFrame frame = new JFrame(DEMO_TITLE);
+
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ frame.getContentPane().add(new TreeDemo());
+ frame.setPreferredSize(new Dimension(800, 600));
+ frame.pack();
+ frame.setLocationRelativeTo(null);
+ frame.setVisible(true);
+ }
+
+ /**
+ * TreeDemo Constructor
+ */
+ public TreeDemo() {
+ setLayout(new BorderLayout());
+
+ add(new JScrollPane(createTree()), BorderLayout.CENTER);
+ }
+
+ private JTree createTree() {
+ DefaultMutableTreeNode top = new DefaultMutableTreeNode(resourceManager.getString("TreeDemo.music"));
+ DefaultMutableTreeNode catagory = null;
+ DefaultMutableTreeNode artist = null;
+ DefaultMutableTreeNode record = null;
+
+ // open tree data
+ URL url = getClass().getResource("resources/tree.txt");
+
+ try {
+ // convert url to buffered string
+ InputStream is = url.openStream();
+ InputStreamReader isr = new InputStreamReader(is, "UTF-8");
+ BufferedReader reader = new BufferedReader(isr);
+
+ // read one line at a time, put into tree
+ String line = reader.readLine();
+ while (line != null) {
+ // System.out.println("reading in: ->" + line + "<-");
+ char linetype = line.charAt(0);
+ switch (linetype) {
+ case 'C':
+ catagory = new DefaultMutableTreeNode(line.substring(2));
+ top.add(catagory);
+ break;
+ case 'A':
+ if (catagory != null) {
+ catagory.add(artist = new DefaultMutableTreeNode(line.substring(2)));
+ }
+ break;
+ case 'R':
+ if (artist != null) {
+ artist.add(record = new DefaultMutableTreeNode(line.substring(2)));
+ }
+ break;
+ case 'S':
+ if (record != null) {
+ record.add(new DefaultMutableTreeNode(line.substring(2)));
+ }
+ break;
+ default:
+ break;
+ }
+ line = reader.readLine();
+ }
+ } catch (IOException ignored) {
+ }
+
+ JTree tree = new JTree(top) {
+ @Override
+ public Insets getInsets() {
+ return new Insets(5, 5, 5, 5);
+ }
+ };
+
+ tree.setEditable(true);
+
+ return tree;
+ }
+}
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tree/resources/TreeDemo.properties b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tree/resources/TreeDemo.properties
new file mode 100644
index 00000000000..77c6f82fc1e
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tree/resources/TreeDemo.properties
@@ -0,0 +1,8 @@
+### Tree Demo ###
+
+TreeDemo.accessible_description=This demo shows shows a sample usage of a JTree component.
+TreeDemo.tooltip=JTree demo
+TreeDemo.name=Tree Demo
+TreeDemo.music=Music
+
+
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tree/resources/images/TreeDemo.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tree/resources/images/TreeDemo.gif
new file mode 100644
index 00000000000..0f72dca4edf
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tree/resources/images/TreeDemo.gif differ
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tree/resources/tree.txt b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tree/resources/tree.txt
new file mode 100644
index 00000000000..2c92fcab4b7
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tree/resources/tree.txt
@@ -0,0 +1,628 @@
+################################################################################
+# Note: do not add blank lines, the data parser in TreeDemo.java cannot #
+# handle them. #
+# #
+# Key: #
+# Popular / Classical #
+# ---------------------------- #
+# A = Artist / Composer #
+# R = Record / Style #
+# S = Song Name / Composition #
+# C = Catagory #
+# #
+################################################################################
+C Classical
+A Beethoven
+R concertos
+S No. 1 - C
+S No. 2 - B-Flat Major
+S No. 3 - C Minor
+S No. 4 - G Major
+S No. 5 - E-Flat Major
+R Quartets
+S Six String Quartets
+S Three String Quartets
+S Grosse Fugue for String Quartets
+R Sonatas
+S Sonata in A Minor
+S Sonata in F Major
+R Symphonies
+S No. 1 - C Major
+S No. 2 - D Major
+S No. 3 - E-Flat Major
+S No. 4 - B-Flat Major
+S No. 5 - C Minor
+S No. 6 - F Major
+S No. 7 - A Major
+S No. 8 - F Major
+S No. 9 - D Minor
+A Brahms
+R Concertos
+S Violin Concerto
+S Double Concerto - A Minor
+S Piano Concerto No. 1 - D Minor
+S Piano Concerto No. 2 - B-Flat Major
+R Quartets
+S Piano Quartet No. 1 - G Minor
+S Piano Quartet No. 2 - A Major
+S Piano Quartet No. 3 - C Minor
+S String Quartet No. 3 - B-Flat Minor
+R Sonatas
+S Two Sonatas for Clarinet - F Minor
+S Two Sonatas for Clarinet - E-Flat Major
+R Symphonies
+S No. 1 - C Minor
+S No. 2 - D Minor
+S No. 3 - F Major
+S No. 4 - E Minor
+A Mozart
+R Concertos
+S Piano Concerto No. 12
+S Piano Concerto No. 17
+S Clarinet Concerto
+S Violin Concerto No. 5
+S Violin Concerto No. 4
+C Jazz
+A Albert Ayler
+R My Name is Albert Ayler
+S Bye Bye Blackbird
+S Billie's Bounce
+S Summertime
+S On Green Dolphin Street
+S C.T.
+R Swing Low Sweet Spiritual
+S Goin' Home
+S Old Man River
+S When The Saints Go Marching In
+S Deep River
+S Down By The Riverside
+S Spirits
+S Witches and Devils
+S Holy, Holy
+S Saints
+R Prophesy
+S Spirits
+S Wizard
+S Ghosts
+S Prophecy
+R New Grass
+S Free At Last
+S Everybody's Movin'
+S New Generation
+S Heart Love
+S Sun Watcher
+A Chet Baker
+R Sings and Plays
+S Let's Get Lost
+S This Is Always
+S Long Ago and Far Away
+S I Wish I Knew
+S Daybreak
+S Grey December
+S I Remember You
+R My Funny Valentine
+S My Funny Valentine
+S Someone To Watch Over Me
+S Moonlight Becomes You
+S I'm Glad There is You
+S This is Always
+S Time After Time
+S Sweet Lorraine
+S It's Always You
+S Moon Love
+S Like Someone In Love
+S I've Never Been In Love Before
+S Isn't it Romantic
+S I Fall In Love Too Easily
+R Grey December
+S Grey December
+S I Wish I Knew
+S Someone To Watch Over Me
+S Headline
+S Bockhanal
+S A Dandy Line
+S Pro Defunctus
+S Little Old Lady
+S Goodbye
+R The Route
+S Tynan Time
+S The Route
+S Minor Yours
+S Little Girl
+S Ol' Croix
+S The Great Lie
+S Sweet Lorrain
+S If I Should Lose You
+A John Coltrane
+R Blue Train
+S Blue Train
+S Moment's Notice
+S Locomotion
+S I'm Old Fashioned
+S Lazy Bird
+R Giant Steps
+S Giant Steps
+S Cousin Mary Steps
+S Countdown
+S Spiral
+S Syeeda's Song Flute
+S Naima
+S Mr. P.C.
+R My Favorite Things
+S My Favorite Things
+S Everytime We Say Goodbye
+S Summertime
+S But Not For Me
+R Crescent
+S Crescent
+S Wise One
+S Bessie's Blues
+S Lonnie's Lament
+S The Drum Thing
+R Interstellar Space
+S Mars
+S Leo
+S Venus
+S Jupiter Variation
+S Jupiter
+S Saturn
+A Miles Davis
+R Transition
+S Autumn Leaves
+S Two Bass Hit
+S Love, I've Found You
+S I Thought About You
+S All Blues
+S Seven Steps To Heaven
+R Quiet Nights
+S Once Upon a Summertime
+S Aos Pes Da Cruz
+S Wait Till You See Her
+S Corcovado
+S Summer Nights
+R My Funny Valentine
+S All of You
+S Stella By Starlight
+S All Blues
+S I Thought About You
+R Voodoo Down
+S Automn Leaves
+S Footprints
+S Directions
+S Bitches Brew
+S Hush
+C Rock
+A The Beatles
+R A Hard Day's Night
+S A Hard Day's Night
+S I Should Have Known Better
+S If I Fell
+S I'm Happy Just To Dance With You
+S And I Love Her
+S Tell Me Why
+S Can't Buy Me Love
+S Any Time At All
+S I'll Cry Instead
+S Things We Said Today
+S When I Get Home
+S You Can't Do That
+R Beatles For Sale
+S No Reply
+S I'm a Loser
+S Baby's In Black
+S Rock And Roll Music
+S I'll Follow the Sun
+S Mr. Moonlight
+S Kansas City/Hey Hey Hey Hey
+S Eight Days a Week
+S Words Of Love
+S Honey Don't
+S Every Little Thing
+S I Don't Want To Spoil the Party
+S What You're Doing
+S Everybody's Trying To Be My Baby
+R Help!
+S Help!
+S The Night Before
+S You've Got To Hide Your Love Away
+S I Need You
+S Another Girl
+S You're Going To Lose That Girl
+S Ticket To Ride
+S Act Naturally
+S It's Only Love
+S You Like Me Too Much
+S Tell Me What You See
+S I've Just Seen a Face
+S Yesterday
+S Dizzy Miss Lizzie
+R Rubber Soul
+S Drive My Car
+S Norwegian Wood
+S You Won't See Me
+S Nowhere Man
+S Think For Yourself
+S The Word
+S Michelle
+S What Goes On?
+S Girl
+S I'm Looking Through You
+S In My Life
+S Wait
+S If I Needed Someone
+S Run For Your Life
+R Revolver
+S Taxman
+S Rigby
+S I'm Only Sleeping
+S For You To
+S Here There And Everywhere
+S Yellow Submarine
+S She Said She Said
+S Good Day Sunshine
+S And Your Bird Can Sing
+S For No One
+S Doctor Robert
+S I Want To Tell You
+S Got To Get You Into My Life
+S Tomorrow Never Knows
+R Sgt. Pepper's Lonely Hearts Club Band
+S Sgt. Pepper's Lonely Hearts Club Band
+S With a Little Help From My Friends
+S Lucy in the Sky With Diamonds
+S Getting Better
+S Fixing a Hole
+S She's Leaving Home
+S Being For the Benefit of Mr. Kite
+S Within You Without You
+S When I'm Sixty Four
+S Lovely Rita
+S Good Morning
+S Sgt. Pepper's Reprise
+S A Day In The Life
+R Magical Mystery Tour
+S Magical Mystery Tour
+S Fool on the Hill
+S Flying
+S Blue Jay Way
+S Your Mother Should Know
+S I Am The Walrus
+S Hello Goodbye
+S Strawberry Fields Forever
+S Penny Lane
+S Baby You're a Rich Man
+S All You Need Is Love
+R The White Album
+S Back in the USSR
+S Dear Prudence
+S Glass Onion
+S Wild Honey Pie
+S Bungalow Bill
+S While My Guitar Gently Weeps
+S Martha My Dear
+S I'm So Tired
+S Blackbird
+S Piggies
+S Rocky Raccoon
+S Don't Pass Me By
+S Why Don't We Do It In The Road
+S I Will
+S Julia
+S Birthday
+S Yer Blues
+S Mother Nature's Son
+S Sexy Sadie
+S Helter Skelter
+S Long Long Long
+S Revolution 1
+S Honey Pie
+S Savoy Truffle
+S Cry Baby Cry
+S Revolution 9
+S Good Night
+R Abbey Road
+S Come Together
+S Something
+S Maxwell's Silver Hammer
+S Octopus's Garden
+S She's So Heavy
+S Here Comes The Sun
+S Because
+S You Never Give Me Your Money
+S Sun King
+S Mean Mr. Mustard
+S Polythene Pam
+S She Came In Through The Bathroom Window
+S Golden Slumbers
+S Carry That Weight
+S The End
+S Her Majesty
+R Let It Be
+S Two of Us
+S Dig A Pony
+S Across the Universe
+S I Me Mine
+S Dig It
+S Let It Be
+S Maggie Mae
+S I've Got A Feeling
+S One After 909
+S The Long and Winding Road
+S For You Blue
+S Get Back
+A Crowded House
+R Crowded House
+S Mean To Me
+S World Where You Live
+S Now We're Getting Somewhere
+S Don't Dream It's Over
+S Love You Til The Day I Die
+S Something So Strong
+S Hole In The River
+S Can't Carry On
+S I Walk Away
+S Tombstone
+S That's What I Call Live
+R Temple of Low Men
+S I Feel Possessed
+S Kill Eye
+S Into Temptation
+S Mansion In The Slums
+S When You Come
+S Never Be The Same
+S Love This Life
+S Sister Madly
+S In The Lowlands
+S Better Be Home Soon
+R Woodface
+S Chocolate Cake
+S It's Only Natural
+S Fall At Your Feet
+S Tall Trees
+S Weather With You
+S Whispers and Moans
+S Four Seasons in One Day
+S There Goes God
+S Fame Is
+S All I Ask
+S As Sure As I Am
+S Italian Plastic
+S She Goes On
+S How Will You Go
+R Together Alone
+S Kare Kare
+S In My Command
+S Nails In My Feet
+S Black & White Boy
+S Fingers of Love
+S Pineapple Head
+S Locked Out
+S Private Universe
+S Walking on the Spot
+S Distant Sun
+S Catherine Wheels
+S Skin Feeling
+S Together Alone
+A The Fixx
+R Shuttered Room
+S Some People
+S Stand or Fall
+S Cameras In Paris
+S Shuttered Room
+S The Fool
+S Lost Planes
+S I Live
+S Sinking Island
+S Time in a Glass
+S Red Skies
+R Reach The Beach
+S One Thing Leads To Another
+S The Sign of Fire
+S Running
+S Saved By Zero
+S Opinions
+S Reach The Beach
+S Changing
+S Liner
+S Privilege
+S Outside
+R Phantoms
+S Lose Face
+S Less Cities, More Moving People
+S Sunshine in the Shade
+S Woman on a Train
+S Wish
+S Lost in Battle Overseas
+S Question
+S In Suspense
+S Facing the Wind
+S Are We Ourselves
+S I Will
+S Phantom Living
+R Walkabout
+S Secret Separation
+S Built for the Future
+S Treasure It
+S Can't Finish
+S Walkabout
+S One Look Up
+S Read Between The Lines
+S Sense The Adventure
+S Camphor
+S Peace On Earth/Do What You Can
+R Calm Animals
+S I'm Life
+S Driven Out
+S Subterranean
+S Precious Stone
+S Gypsy Feet
+S Calm Animals
+S Shred of Evidence
+S The Flow
+S World Weary
+S Caused To Be Alarmed
+R Ink
+S All is Fair
+S How much Is Enough
+S No One Has To Cry
+S Crucified
+S Falling In Love
+S Shut It Out
+S Still Around
+S All The Best Things
+S Yesterday, Today
+S One Jungle
+S Climb The Hill
+S Make No Plans
+R Elemental
+S Two Different Views
+S Going Without
+S Is That It?
+S Happy Landings
+S Silent House
+S Fatal Shore
+S Ocean Blue
+S You Know Me
+S We Once Held Hands
+S Life's What's Killing Me
+A Harvin Garvel
+R Harvin Garvel I
+S Body
+S What You Said
+S All Rights Reserved
+S High Purity
+S Lies
+S Get Real
+S Gradma Cries
+S First Feel
+S Somethings wrong
+S Shoes
+S Spice Rack
+S Dark Feel
+S Tug of War
+S Ant Song
+R Harvin Garvel II
+S We Ain't Through
+S Trash and Spend
+S Kick
+S The Garden
+S One & Only
+S Squid Frenzy
+S Soul In Soul
+S The Desert
+S He Grew Up
+S Talk
+S Image
+S Tomorrow
+S R70
+R Full Grown Dog
+S I Am
+S Say
+S Is This Real
+S What She Said
+S Mirror Lies
+S Girls
+S Your Will
+S Slow Motion Sunday
+S Simple Life
+S The Road Song
+S The Same Way
+S Stop Tryin
+R Persia
+S Exonic
+S Drift
+S Cruise
+S MugWump
+S Smear
+S Everything
+S Keep
+S Circle
+R Sensative Beak
+S Whatcha Gotta Do
+S Somewhere In This World
+S Awaken
+S Just A Dog
+S I Can Dance
+S Tomorrow
+S Love Who?
+S Is There Something
+S I Like It
+S Easy Chair
+S As We Are One
+S Far Away
+S Leaving Science
+S What A Life
+A Komeda
+R Plan 714 Till
+S Fuego De La Vida
+S Herbamore
+S Som I Fjol
+S En Spricka I Taket
+R Genius Of
+S More Is More
+S Fire
+S Rocket Plane (Music On The Moon)
+S Boogie Woogie/Rock 'N' Roll
+S Disko
+S Top Star
+S Light O' My Life
+S If
+S Frolic
+S In Orbit
+S Arbogast
+S New New No
+R What Makes It Go
+S Binario
+S It's Alright, Baby
+S Curious
+S Cul de Sac
+S Living Things
+S Flabbergast
+S Campfire
+S Happyment
+S Our Hospitality
+S Focus
+S A Simple Formality
+A Steve Miller Band
+R Circle Of Love
+S Heart Like A Wheel
+S Get On Home
+S Baby Wanna Dance
+S Circle Of Love
+S Macho City
+R Fly Like An Eagle
+S Space Intro
+S Fly Like An Eagle
+S Wild Mountain Honey
+S Serenade
+S Dance, Dance, Dance
+S Mercury Blues
+S Take the Money and Run
+S Rockin' Me
+S You Send Me
+S Blue Odyssey
+S Sweet Maree
+S The Window
+R Book Of Dreams
+S Threshold
+S Jet Airliner
+S Winter Time
+S Swingtown
+S True Fine Love
+S Wish Upon A Star
+S Jungle Love
+S Electrolux Imbroglio
+S Sacrifice
+S The Stake
+S My Own Space
+S Babes In The Wood
+R Joker
+S Sugar, Babe
+S Mary Lou
+S Shu Ba Da Du Ma
+S Your Cash Ain't Nothin' But Trash
+S The Joker
+S The Lovin' Cup
+S Come On In My Kitchen
+S Evil
+S Something To Believe In
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/window/WindowDemo.java b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/window/WindowDemo.java
new file mode 100644
index 00000000000..cf83135d1e8
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/window/WindowDemo.java
@@ -0,0 +1,159 @@
+/*
+ * 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.
+ */
+package com.sun.swingset3.demos.window;
+
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import javax.swing.*;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.LineBorder;
+
+import com.sun.swingset3.DemoProperties;
+import com.sun.swingset3.demos.DemoUtilities;
+
+/**
+ * @author aim
+ */
+@DemoProperties(
+ value = "JWindow Demo",
+ category = "Toplevel Containers",
+ description = "Demonstrates JWindow, a toplevel container with no system border.",
+ sourceFiles = {
+ "com/sun/swingset3/demos/window/WindowDemo.java",
+ "com/sun/swingset3/demos/DemoUtilities.java",
+ "com/sun/swingset3/demos/window/resources/WindowDemo.html",
+ "com/sun/swingset3/demos/window/resources/images/WindowDemo.gif"
+ }
+)
+public final class WindowDemo extends JPanel {
+
+ public static final String SHOW_J_WINDOW = "Show JWindow...";
+ public static final String I_HAVE_NO_SYSTEM_BORDER = "I have no system border.";
+
+ private JWindow window;
+
+ private JComponent windowSpaceholder;
+
+ public WindowDemo() {
+ initComponents();
+ }
+
+ protected void initComponents() {
+ window = createWindow();
+
+ setLayout(new BorderLayout());
+ add(createControlPanel(), BorderLayout.WEST);
+ windowSpaceholder = createWindowSpaceholder(window);
+ add(windowSpaceholder, BorderLayout.CENTER);
+ }
+
+ protected JComponent createControlPanel() {
+ Box controlPanel = Box.createVerticalBox();
+ controlPanel.setBorder(new EmptyBorder(8, 8, 8, 8));
+
+ // Create button to control visibility of frame
+ JButton showButton = new JButton(SHOW_J_WINDOW);
+ showButton.addActionListener(new ShowActionListener());
+ controlPanel.add(showButton);
+
+ return controlPanel;
+ }
+
+ private static JComponent createWindowSpaceholder(JWindow window) {
+ JPanel windowPlaceholder = new JPanel();
+ Dimension prefSize = window.getPreferredSize();
+ prefSize.width += 12;
+ prefSize.height += 12;
+ windowPlaceholder.setPreferredSize(prefSize);
+
+ return windowPlaceholder;
+ }
+
+ private static JWindow createWindow() {
+
+ //Create window
+ JWindow window = new JWindow();
+ //
+
+ //Add a border to the window
+ window.getRootPane().setBorder(new LineBorder(Color.BLACK, 1));
+ //
+
+ //Add window's content
+ JLabel label = new JLabel(I_HAVE_NO_SYSTEM_BORDER);
+ label.setHorizontalAlignment(JLabel.CENTER);
+ label.setPreferredSize(new Dimension(250, 200));
+ window.add(label);
+ //
+
+ //Initialize window's size
+ // which will shrink-to-fit its contents
+ window.pack();
+ //
+
+ return window;
+ }
+
+ public void start() {
+ DemoUtilities.setToplevelLocation(window, windowSpaceholder, SwingConstants.CENTER);
+ showWindow();
+ }
+
+ public void stop() {
+ //Hide window
+ window.setVisible(false);
+ //
+ }
+
+ public void showWindow() {
+ //Show window
+ // if window already visible, then bring to the front
+ if (window.isShowing()) {
+ window.toFront();
+ } else {
+ window.setVisible(true);
+ }
+ //
+ }
+
+ private class ShowActionListener implements ActionListener {
+
+ @Override
+ public void actionPerformed(ActionEvent actionEvent) {
+ showWindow();
+ }
+ }
+
+ public static void main(String args[]) {
+ EventQueue.invokeLater(() -> {
+ JFrame frame = new JFrame();
+ WindowDemo demo = new WindowDemo();
+ frame.add(demo);
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ frame.pack();
+ frame.setVisible(true);
+ demo.start();
+ });
+ }
+}
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/window/resources/WindowDemo.html b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/window/resources/WindowDemo.html
new file mode 100644
index 00000000000..e075e5d4505
--- /dev/null
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/window/resources/WindowDemo.html
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+ Show how Swing's top-level container,
+ JWindow, can be used to create areas on the screen which
+ do not have system-supplied borders and therefore cannot be moved or resized
+ by the user like frames or dialogs. JWindow is commonly used to implement menus,
+ tooltips, and popups.
+
+
+
diff --git a/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/window/resources/images/WindowDemo.gif b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/window/resources/images/WindowDemo.gif
new file mode 100644
index 00000000000..4eef882938b
Binary files /dev/null and b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/window/resources/images/WindowDemo.gif differ
diff --git a/jdk/test/sanity/client/lib/jemmy/README b/jdk/test/sanity/client/lib/jemmy/README
new file mode 100644
index 00000000000..b3318ecfcb6
--- /dev/null
+++ b/jdk/test/sanity/client/lib/jemmy/README
@@ -0,0 +1,3 @@
+This src folder contains a copy of Jemmy 2 library sources from https://jemmy.java.net/.
+
+Do NOT modify files in it.
\ No newline at end of file
diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Action.java b/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Action.java
new file mode 100644
index 00000000000..1d5c359b533
--- /dev/null
+++ b/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Action.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 1997, 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.
+ */
+package org.netbeans.jemmy;
+
+/**
+ *
+ * Defines an action to be executed by {@code ActionProducer} instance.
+ *
+ * @see org.netbeans.jemmy.ActionProducer
+ *
+ * @author Alexandre Iline (alexandre.iline@oracle.com)
+ */
+public interface Action {
+
+ /**
+ * Executes this action.
+ *
+ * @param obj action argument. This argument might be the method parameter
+ * in an invocation of {@code ActionProducer.produceAction(Object)}.
+ * @return action result.
+ */
+ public R launch(P obj);
+
+ /**
+ * Returns the description value.
+ *
+ * @return Action description.
+ */
+ public String getDescription();
+}
diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ActionProducer.java b/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ActionProducer.java
new file mode 100644
index 00000000000..4af9d0d88c4
--- /dev/null
+++ b/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/ActionProducer.java
@@ -0,0 +1,335 @@
+/*
+ * Copyright (c) 1997, 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.
+ */
+package org.netbeans.jemmy;
+
+import java.util.Optional;
+
+/**
+ *
+ * Runs actions with or without waiting.
+ *
+ *
Timeouts used:
+ * ActionProducer.MaxActionTime - time action should be finished in.
+ *
+ * @see Action
+ * @see Timeouts
+ *
+ * @author Alexandre Iline (alexandre.iline@oracle.com)
+ */
+public class ActionProducer extends Thread
+ implements Action, Waitable, P>, Timeoutable {
+
+ private final static long ACTION_TIMEOUT = 10000;
+
+ private Action action;
+ private boolean needWait = true;
+ private P parameter;
+ private boolean finished;
+ private R result = null;
+ private Timeouts timeouts;
+ private Waiter, P> waiter;
+ private TestOut output;
+ private Throwable exception;
+
+ /**
+ * Creates a producer for an action.
+ *
+ * @param a Action implementation.
+ */
+ public ActionProducer(Action a) {
+ super();
+ waiter = new Waiter<>(this);
+ action = a;
+ setTimeouts(JemmyProperties.getProperties().getTimeouts());
+ setOutput(JemmyProperties.getProperties().getOutput());
+ finished = false;
+ exception = null;
+ }
+
+ /**
+ * Creates a producer for an action.
+ *
+ * @param a Action implementation.
+ * @param nw Defines if {@code produceAction} method should wait for
+ * the end of action.
+ */
+ public ActionProducer(Action a, boolean nw) {
+ super();
+ waiter = new Waiter<>(this);
+ action = a;
+ needWait = nw;
+ setTimeouts(JemmyProperties.getProperties().getTimeouts());
+ setOutput(JemmyProperties.getProperties().getOutput());
+ finished = false;
+ exception = null;
+ }
+
+ /**
+ * Creates a producer. {@code produceAction} must be overridden.
+ */
+ protected ActionProducer() {
+ super();
+ waiter = new Waiter<>(this);
+ setTimeouts(JemmyProperties.getProperties().getTimeouts());
+ setOutput(JemmyProperties.getProperties().getOutput());
+ finished = false;
+ exception = null;
+ }
+
+ /**
+ * Creates a producer. {@code produceAction} must be overridden.
+ *
+ * @param nw Defines if {@code produceAction} method should wait for
+ * the end of action.
+ */
+ protected ActionProducer(boolean nw) {
+ super();
+ waiter = new Waiter<>(this);
+ needWait = nw;
+ setTimeouts(JemmyProperties.getProperties().getTimeouts());
+ setOutput(JemmyProperties.getProperties().getOutput());
+ finished = false;
+ exception = null;
+ }
+
+ static {
+ Timeouts.initDefault("ActionProducer.MaxActionTime", ACTION_TIMEOUT);
+ }
+
+ /**
+ * Set all the time outs used by sleeps or waits used by the launched
+ * action.
+ *
+ * @param ts An object containing timeout information.
+ * @see org.netbeans.jemmy.Timeouts
+ * @see org.netbeans.jemmy.Timeoutable
+ * @see #getTimeouts
+ */
+ @Override
+ public void setTimeouts(Timeouts ts) {
+ timeouts = ts;
+ }
+
+ /**
+ * Get all the time outs used by sleeps or waits used by the launched
+ * action.
+ *
+ * @return an object containing information about timeouts.
+ * @see org.netbeans.jemmy.Timeouts
+ * @see org.netbeans.jemmy.Timeoutable
+ * @see #setTimeouts
+ */
+ @Override
+ public Timeouts getTimeouts() {
+ return timeouts;
+ }
+
+ /**
+ * Identity of the streams or writers used for print output.
+ *
+ * @param out An object containing print output assignments for output and
+ * error streams.
+ * @see org.netbeans.jemmy.TestOut
+ * @see org.netbeans.jemmy.Outputable
+ */
+ public void setOutput(TestOut out) {
+ output = out;
+ waiter.setOutput(output);
+ }
+
+ /**
+ * Returns the exception value.
+ *
+ * @return a Throwable object representing the exception value
+ */
+ public Throwable getException() {
+ return exception;
+ }
+
+ /**
+ * Defines action priority in terms of thread priority. Increase (decrease)
+ * parameter value to Thread.MIN_PRIORITY(MAX_PRIORITY) in case if it is
+ * less(more) then it.
+ *
+ * @param newPriority New thread priority.
+ */
+ public void setActionPriority(int newPriority) {
+ int priority;
+ if (newPriority < Thread.MIN_PRIORITY) {
+ priority = MIN_PRIORITY;
+ } else if (newPriority > Thread.MAX_PRIORITY) {
+ priority = MAX_PRIORITY;
+ } else {
+ priority = newPriority;
+ }
+ try {
+ setPriority(priority);
+ } catch (IllegalArgumentException | SecurityException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * Get the result of a launched action.
+ *
+ * @return a launched action's result. without waiting in case if
+ * {@code getFinished()}
+ * @see #getFinished()
+ */
+ public R getResult() {
+ return result;
+ }
+
+ /**
+ * Check if a launched action has finished.
+ *
+ * @return {@code true} if the launched action has completed, either
+ * normally or with an exception; {@code false} otherwise.
+ */
+ public boolean getFinished() {
+ synchronized (this) {
+ return finished;
+ }
+ }
+
+ /**
+ * Does nothing; the method should be overridden by inheritors.
+ *
+ * @param obj An object used to modify execution. This might be a
+ * {@code java.lang.String[]} that lists a test's command line
+ * arguments.
+ * @return An object - result of the action.
+ * @see org.netbeans.jemmy.Action
+ */
+ @Override
+ public R launch(P obj) {
+ return null;
+ }
+
+ /**
+ * @return this {@code ActionProducer}'s description.
+ * @see Action
+ */
+ @Override
+ public String getDescription() {
+ if (action != null) {
+ return action.getDescription();
+ } else {
+ return "Unknown action";
+ }
+ }
+
+ /**
+ * Starts execution. Uses ActionProducer.MaxActionTime timeout.
+ *
+ * @param obj Parameter to be passed into action's
+ * {@code launch(Object)} method. This parameter might be a
+ * {@code java.lang.String[]} that lists a test's command line
+ * arguments.
+ * @param actionTimeOrigin is used for timeout reporting, if non-null.
+ * @return {@code launch(Object)} result.
+ * @throws TimeoutExpiredException
+ * @exception InterruptedException
+ */
+ public R produceAction(P obj, String actionTimeOrigin) throws InterruptedException {
+ parameter = obj;
+ synchronized (this) {
+ finished = false;
+ }
+ start();
+ if (needWait) {
+ waiter.setTimeoutsToCloneOf(timeouts, "ActionProducer.MaxActionTime", actionTimeOrigin);
+ try {
+ waiter.waitAction(null);
+ } catch (TimeoutExpiredException e) {
+ output.printError("Timeout for \"" + getDescription()
+ + "\" action has been expired. Thread has been interrupted.");
+ interrupt();
+ throw (e);
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Launch an action in a separate thread of execution. When the action
+ * finishes, record that fact. If the action finishes normally, store it's
+ * result. Use {@code getFinished()} and {@code getResult} to
+ * answer questions about test completion and return value, respectively.
+ *
+ * @see #getFinished()
+ * @see #getResult()
+ * @see java.lang.Runnable
+ */
+ @Override
+ public final void run() {
+ result = null;
+ try {
+ result = launchAction(parameter);
+ } catch (Throwable e) {
+ exception = e;
+ }
+ synchronized (this) {
+ finished = true;
+ }
+ }
+
+ /**
+ * Inquire for a reference to the object returned by a launched action.
+ *
+ * @param obj Not used.
+ * @return the result returned when a launched action finishes normally.
+ * @see org.netbeans.jemmy.Waitable
+ */
+ @Override
+ public final Optional actionProduced(P obj) {
+ synchronized (this) {
+ if (finished) {
+ return Optional.ofNullable(result);
+ } else {
+ return null;
+ }
+ }
+ }
+
+ /**
+ * Launch some action. Pass the action parameters and get it's return value,
+ * too.
+ *
+ * @param obj Parameter used to configure the execution of whatever this
+ * {@code ActionProducer} puts into execution.
+ * @return the return value of the action.
+ */
+ private R launchAction(P obj) {
+ if (action != null) {
+ return action.launch(obj);
+ } else {
+ return launch(obj);
+ }
+ }
+
+ @Override
+ public String toString() {
+ return "ActionProducer{" + "action=" + action + ", needWait=" + needWait + ", parameter=" + parameter + ", finished=" + finished + ", result=" + result + ", exception=" + exception + '}';
+ }
+}
diff --git a/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Bundle.java b/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Bundle.java
new file mode 100644
index 00000000000..19a15024c92
--- /dev/null
+++ b/jdk/test/sanity/client/lib/jemmy/src/org/netbeans/jemmy/Bundle.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 1997, 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.
+ */
+package org.netbeans.jemmy;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.util.Enumeration;
+import java.util.Properties;
+import java.util.jar.JarFile;
+import java.util.zip.ZipException;
+import java.util.zip.ZipFile;
+
+/**
+ *
+ * Load string resources from file. Resources should be stored in
+ * {@code name=value} format.
+ *
+ * @see org.netbeans.jemmy.BundleManager
+ *
+ * @author Alexandre Iline (alexandre.iline@oracle.com)
+ */
+public class Bundle extends Object {
+
+ private Properties resources;
+
+ /**
+ * Bunble constructor.
+ */
+ public Bundle() {
+ resources = new Properties();
+ }
+
+ /**
+ * Loads resources from an input stream.
+ *
+ * @param stream Stream to load resources from.
+ * @exception IOException
+ */
+ public void load(InputStream stream)
+ throws IOException {
+ resources.load(stream);
+ }
+
+ /**
+ * Loads resources from a simple file.
+ *
+ * @param fileName Name of the file to load resources from.
+ * @exception IOException
+ * @exception FileNotFoundException
+ */
+ public void loadFromFile(String fileName)
+ throws IOException, FileNotFoundException {
+ try (FileInputStream fileInputStream = new FileInputStream(fileName)) {
+ load(fileInputStream);
+ }
+ }
+
+ /**
+ * Loads resources from a file in a jar archive.
+ *
+ * @param fileName Name of the jar archive.
+ * @param entryName ?enryName? Name of the file to load resources from.
+ * @exception IOException
+ * @exception FileNotFoundException
+ */
+ public void loadFromJar(String fileName, String entryName)
+ throws IOException, FileNotFoundException {
+ try (JarFile jFile = new JarFile(fileName);
+ InputStream inputStream = jFile.getInputStream(jFile.getEntry(entryName))) {
+ load(inputStream);
+ }
+ }
+
+ /**
+ * Loads resources from a file in a zip archive.
+ *
+ * @param fileName Name of the zip archive.
+ * @param entryName ?enryName? Name of the file to load resources from.
+ * @exception ZipException
+ * @exception IOException
+ * @exception FileNotFoundException
+ */
+ public void loadFromZip(String fileName, String entryName)
+ throws IOException, FileNotFoundException, ZipException {
+ try (ZipFile zFile = new ZipFile(fileName);
+ InputStream inputStream = zFile.getInputStream(zFile.getEntry(entryName))) {
+ load(inputStream);
+ }
+ }
+
+ /**
+ * Prints bundle contents.
+ *
+ * @param writer Writer to print data in.
+ */
+ public void print(PrintWriter writer) {
+ Enumeration