--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/scrollpane/ScrollPaneDemo.java	Wed Mar 30 19:05:58 2016 -0700
@@ -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);
+        }
+    }
+
+}