scala · andy1138 · Oct 7, 2014 · Sep 24, 2014 · Sep 24, 2014 · Sep 25, 2014
diff --git a/.gitignore b/.gitignore
@@ -32,6 +32,9 @@ build.properties
 /.cache
 /.idea
 /.settings
+/examples/.classpath
+/examples/.project
+scala-swing.iml
 
 # bak files produced by ./cleanup-commit
 *.bak
@@ -42,4 +45,4 @@ qbin
 # Mac specific, but that is common enough a dev platform to warrant inclusion.
 .DS_Store
 
-target/
+target/
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: scala
 script:
-  - sbt ++$TRAVIS_SCALA_VERSION clean update compile test
+  - sbt ++$TRAVIS_SCALA_VERSION clean update compile test examples/compile
 scala:
   - 2.11.1
 

diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/TextSamplerDemoHelp.html b/examples/src/main/resources/scala/swing/examples/tutorials/TextSamplerDemoHelp.html
@@ -0,0 +1,32 @@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html lang="en-us">
+<title>Styled Text Sample</title>
+<body>
+<img src="images/dukeWaveRed.gif" width="64" height="64" alt="Waving Duke icon"/>
+<p>This is an uneditable <code>EditorPane</code>,
+which was <em>initialized</em>
+with <strong>HTML</strong> text <font size=-2>from</font> a
+<font size=+2>URL</font>.
+</p>
+An editor pane uses specialized editor kits
+to read, write, display, and edit text of
+different formats.
+The Swing text package includes editor kits
+for plain text, HTML, and RTF.
+You can also develop 
+custom editor kits for other formats.
+<!-- Start SiteCatalyst code   -->
+<script type="text/javascript" language="JavaScript" src="http://www.oracle.com/ocom/groups/systemobject/@mktg_admin/documents/systemobject/s_code_download.js"></script>
+<script type="text/javascript" language="JavaScript" src="http://www.oracle.com/ocom/groups/systemobject/@mktg_admin/documents/systemobject/s_code.js"></script>
+<noscript>
+A browser with JavaScript enabled is required for this page to operate properly.
+</noscript>
+
+<!-- ********** DO NOT ALTER ANYTHING BELOW THIS LINE ! *********** -->
+<!--  Below code will send the info to Omniture server -->
+<script type="text/javascript" language="javascript">var s_code=s.t();if(s_code)document.write(s_code)</script>
+
+<!-- End SiteCatalyst code -->
+</body>
+</html>
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/Back24.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/Back24.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/Bird.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/Bird.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/Cat.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/Cat.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/Dog.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/Dog.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/FD.jpg b/examples/src/main/resources/scala/swing/examples/tutorials/images/FD.jpg
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/Forward24.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/Forward24.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/Open16.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/Open16.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/Pig.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/Pig.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/Rabbit.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/Rabbit.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/Save16.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/Save16.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/Up24.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/Up24.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/blue.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/blue.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/doggy/T0.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/doggy/T0.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/doggy/T1.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/doggy/T1.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/doggy/T10.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/doggy/T10.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/doggy/T11.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/doggy/T11.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/doggy/T12.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/doggy/T12.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/doggy/T13.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/doggy/T13.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/doggy/T2.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/doggy/T2.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/doggy/T3.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/doggy/T3.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/doggy/T4.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/doggy/T4.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/doggy/T5.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/doggy/T5.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/doggy/T6.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/doggy/T6.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/doggy/T7.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/doggy/T7.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/doggy/T8.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/doggy/T8.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/doggy/T9.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/doggy/T9.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/dukeWaveRed.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/dukeWaveRed.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/flyingBee.jpg b/examples/src/main/resources/scala/swing/examples/tutorials/images/flyingBee.jpg
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/geek-cght.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/geek-cght.gif
diff --git a/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek-----.gif b/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek-----.gif
diff --git a/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek----t.gif b/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek----t.gif
diff --git a/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek---h-.gif b/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek---h-.gif
diff --git a/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek---ht.gif b/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek---ht.gif
diff --git a/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek--g--.gif b/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek--g--.gif
diff --git a/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek--g-t.gif b/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek--g-t.gif
diff --git a/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek--gh-.gif b/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek--gh-.gif
diff --git a/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek--ght.gif b/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek--ght.gif
diff --git a/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek-c---.gif b/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek-c---.gif
diff --git a/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek-c--t.gif b/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek-c--t.gif
diff --git a/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek-c-h-.gif b/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek-c-h-.gif
diff --git a/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek-c-ht.gif b/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek-c-ht.gif
diff --git a/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek-cg--.gif b/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek-cg--.gif
diff --git a/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek-cg-t.gif b/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek-cg-t.gif
diff --git a/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek-cgh-.gif b/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek-cgh-.gif
diff --git a/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek-cght.gif b/...les/src/main/resources/scala/swing/examples/tutorials/images/geek/geek-cght.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/gifIcon.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/gifIcon.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/green.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/green.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/jpgIcon.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/jpgIcon.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/kathyCosmo.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/kathyCosmo.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/lainesTongue.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/lainesTongue.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/left.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/left.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/middle.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/middle.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/pngIcon.png b/examples/src/main/resources/scala/swing/examples/tutorials/images/pngIcon.png
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/red.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/red.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/right.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/right.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/scala-stairs.jpg b/examples/src/main/resources/scala/swing/examples/tutorials/images/scala-stairs.jpg
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/sound.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/sound.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/stickerface.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/stickerface.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/sunw01.jpg b/examples/src/main/resources/scala/swing/examples/tutorials/images/sunw01.jpg
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/sunw02.jpg b/examples/src/main/resources/scala/swing/examples/tutorials/images/sunw02.jpg
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/sunw03.jpg b/examples/src/main/resources/scala/swing/examples/tutorials/images/sunw03.jpg
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/sunw04.jpg b/examples/src/main/resources/scala/swing/examples/tutorials/images/sunw04.jpg
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/sunw05.jpg b/examples/src/main/resources/scala/swing/examples/tutorials/images/sunw05.jpg
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/tiffIcon.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/tiffIcon.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T1.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T1.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T10.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T10.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T11.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T11.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T12.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T12.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T13.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T13.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T14.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T14.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T15.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T15.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T16.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T16.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T17.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T17.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T2.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T2.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T3.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T3.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T4.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T4.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T5.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T5.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T6.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T6.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T7.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T7.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T8.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T8.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T9.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/tumble/T9.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/wavy.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/wavy.gif
diff --git a/examples/src/main/resources/scala/swing/examples/tutorials/images/yellow.gif b/examples/src/main/resources/scala/swing/examples/tutorials/images/yellow.gif
diff --git a/examples/src/main/scala/scala/swing/examples/tutorials/components/BorderDemo.scala b/examples/src/main/scala/scala/swing/examples/tutorials/components/BorderDemo.scala
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   - Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   - Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ *   - Neither the name of Oracle or the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package scala.swing.examples.tutorials.components
+
+import scala.swing._
+import java.awt.Color
+
+/**
+ * Tutorial: How to Use Borders
+ * [[http://docs.oracle.com/javase/tutorial/uiswing/components/border.html]]
+ *
+ * Source code reference:
+ * [[http://docs.oracle.com/javase/tutorial/uiswing/examples/components/BorderDemoProject/src/components/BorderDemo.java]]
+ *
+ * BorderDemo.scala requires the following file:
+ *    scala/swing/examples/tutorials/images/wavy.gif
+ */
+class BorderDemo extends GridPanel(1, 0) {
+
+  val paneEdge = Swing.EmptyBorder(0, 10, 10, 10)
+  val blackline = Swing.LineBorder(Color.black)
+  val raisedetched = Swing.EtchedBorder(Swing.Raised)
+  val loweredetched = Swing.EtchedBorder(Swing.Lowered)
+  val raisedbevel = Swing.BeveledBorder(Swing.Raised)
+  val loweredbevel = Swing.BeveledBorder(Swing.Lowered)
+  val empty = Swing.EmptyBorder
+
+
+  def addCompForBorder(bord: javax.swing.border.Border, description: String): Seq[Component] =
+    List(Swing.RigidBox(new Dimension(0, 10)), new GridPanel(1, 1) {
+      contents += new Label(description, Swing.EmptyIcon, Alignment.Center)
+      border = bord
+    })
+
+  //First pane: simple borders
+  val simpleBorders = new BoxPanel(Orientation.Vertical) {
+    contents ++=
+      addCompForBorder(blackline, "line border") ++
+        addCompForBorder(raisedetched, "raised etched border") ++
+        addCompForBorder(loweredetched, "lowered etched border") ++
+        addCompForBorder(raisedbevel, "raised bevel border") ++
+        addCompForBorder(loweredbevel, "lowered bevel border") ++
+        addCompForBorder(empty, "empty border")
+  }
+
+  //Second pane: matte borders
+  val matteBorders = new BoxPanel(Orientation.Vertical) {
+    border = paneEdge
+
+    val icon = BorderDemo.createImageIcon("/scala/swing/examples/tutorials/images/wavy.gif", "wavy-line border icon")
+
+    contents ++=
+      addCompForBorder(
+        Swing.MatteBorder(-1, -1, -1, -1, icon.getOrElse(null.asInstanceOf[javax.swing.Icon])),
+        "matte border (-1,-1,-1,-1,icon)") ++
+        addCompForBorder(
+          Swing.MatteBorder(1, 5, 1, 1, Color.red),
+          "matte border (1,5,1,1,Color.red)") ++
+        addCompForBorder(
+          Swing.MatteBorder(0, 20, 0, 0, icon.getOrElse(null.asInstanceOf[javax.swing.Icon])),
+          "matte border (0,20,0,0,icon)")
+  }
+
+  //Third pane: titled borders
+  val titledBorders = new BoxPanel(Orientation.Vertical) {
+    border = paneEdge
+
+    def titleBorder(border: javax.swing.border.Border, justification: Int, position: Int): javax.swing.border.Border = {
+      val titled = Swing.TitledBorder(border, "title")
+      titled.setTitleJustification(justification)
+      titled.setTitlePosition(position)
+      titled
+    }
+
+    contents ++=
+      addCompForBorder(
+        titleBorder(blackline, javax.swing.border.TitledBorder.CENTER, javax.swing.border.TitledBorder.DEFAULT_POSITION),
+        "titled line border (centered, default pos.)") ++
+        addCompForBorder(
+          titleBorder(loweredetched, javax.swing.border.TitledBorder.RIGHT, javax.swing.border.TitledBorder.DEFAULT_POSITION),
+          "titled lowered etched border (right just., default pos.)") ++
+        addCompForBorder(
+          titleBorder(loweredbevel, javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.ABOVE_TOP),
+          "titled lowered bevel border (default just., above top)") ++
+        addCompForBorder(
+          titleBorder(empty, javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.BOTTOM),
+          "titled empty border (default just., bottom)")
+  }
+
+  //Fourth pane: compound borders
+  val compoundBorders = new BoxPanel(Orientation.Vertical) {
+    border = paneEdge
+
+    val titledCompound = Swing.TitledBorder(Swing.CompoundBorder(Swing.LineBorder(Color.red), Swing.CompoundBorder(Swing.BeveledBorder(Swing.Raised), Swing.BeveledBorder(Swing.Lowered))), "title")
+    titledCompound.setTitleJustification(javax.swing.border.TitledBorder.CENTER)
+    titledCompound.setTitlePosition(javax.swing.border.TitledBorder.BELOW_BOTTOM)
+
+    contents ++=
+      addCompForBorder(
+        Swing.CompoundBorder(raisedbevel, loweredbevel),
+        "compound border (two bevels)") ++
+        addCompForBorder(
+          Swing.CompoundBorder(Swing.LineBorder(Color.red), Swing.CompoundBorder(raisedbevel, loweredbevel)),
+          "compound border (add a red outline)") ++
+        addCompForBorder(
+          titledCompound,
+          "titled compound border (centered, below bottom)")
+  }
+
+
+  contents += new TabbedPane() {
+    tooltip = "<html>Blue Wavy Line border art crew:<br>&nbsp;&nbsp;&nbsp;Bill Pauley<br>&nbsp;&nbsp;&nbsp;Cris St. Aubyn<br>&nbsp;&nbsp;&nbsp;Ben Wronsky<br>&nbsp;&nbsp;&nbsp;Nathan Walrath<br>&nbsp;&nbsp;&nbsp;Tommy Adams, special consultant</html>"
+
+    pages += new TabbedPane.Page("Simple", simpleBorders)
+    pages += new TabbedPane.Page("Matte", matteBorders)
+    pages += new TabbedPane.Page("Titled", titledBorders)
+    pages += new TabbedPane.Page("Compound", compoundBorders)
+
+    selection.index = 0
+  }
+}
+
+object BorderDemo extends SimpleSwingApplication {
+  def createImageIcon(path: String, description: String): Option[javax.swing.ImageIcon] =
+    Option(resourceFromClassloader(path)).map(imgURL => Swing.Icon(imgURL))
+
+  lazy val top = new MainFrame() {
+    title = "BorderDemo"
+    //Create and set up the content pane.
+    contents = new BorderDemo()
+  }
+}
diff --git a/examples/src/main/scala/scala/swing/examples/tutorials/components/ButtonDemo.scala b/examples/src/main/scala/scala/swing/examples/tutorials/components/ButtonDemo.scala
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   - Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   - Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ *   - Neither the name of Oracle or the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package scala.swing.examples.tutorials.components
+
+import scala.swing._
+import scala.swing.event.ButtonClicked
+
+/**
+ * Tutorial: How to Use Buttons, Check Boxes, and Radio Buttons
+ * [[http://docs.oracle.com/javase/tutorial/uiswing/components/button.html]]
+ * 
+ * Source code reference:
+ * [[http://docs.oracle.com/javase/tutorial/uiswing/examples/components/ButtonDemoProject/src/components/ButtonDemo.java]]
+ *
+ * ButtonDemo.scala requires the following files:
+ *   /scala/swing/examples/tutorials/images/right.gif
+ *   /scala/swing/examples/tutorials/images/middle.gif
+ *   /scala/swing/examples/tutorials/images/left.gif
+ */
+class ButtonDemo extends FlowPanel {
+  val leftButtonIcon = ButtonDemo.createImageIcon("/scala/swing/examples/tutorials/images/right.gif")
+  val middleButtonIcon = ButtonDemo.createImageIcon("/scala/swing/examples/tutorials/images/middle.gif")
+  val rightButtonIcon = ButtonDemo.createImageIcon("/scala/swing/examples/tutorials/images/left.gif")
+
+  val disable: Button = new Button("Disable middle button") {
+    leftButtonIcon.foreach(  icon = _)
+    verticalTextPosition = Alignment.Center
+    horizontalTextPosition = Alignment.Leading
+    mnemonic = event.Key.D
+    tooltip = "Click this button to disable the middle button."
+  }
+
+  val middle: Button = new Button("Middle button") {
+    middleButtonIcon.foreach(  icon = _ )
+    verticalTextPosition = Alignment.Bottom
+    horizontalTextPosition = Alignment.Center
+    mnemonic = event.Key.M
+    tooltip = "This middle button does nothing when you click it."
+  }
+
+  val enable: Button = new Button("Enable middle button") {
+    rightButtonIcon.foreach( icon = _  )
+    enabled = false
+    mnemonic = event.Key.E
+    tooltip = "Click this button to enable the middle button."
+  }
+
+  contents += disable
+  contents += middle
+  contents += enable
+
+  listenTo(disable)
+  listenTo(enable)
+
+  reactions += {
+    case ButtonClicked(`enable`) => enableMiddle()
+    case ButtonClicked(`disable`) => disableMiddle()
+  }
+
+  def enableMiddle(): Unit = {
+    enable.enabled = false
+    middle.enabled = true
+    disable.enabled = true
+  }
+
+  def disableMiddle(): Unit  = {
+    enable.enabled = true
+    middle.enabled = false
+    disable.enabled = false
+  }
+}
+
+object ButtonDemo extends SimpleSwingApplication {
+  def createImageIcon(path: String): Option[javax.swing.ImageIcon] =
+    Option(resourceFromClassloader(path)).map(imgURL => Swing.Icon(imgURL))
+
+  lazy val top = new MainFrame() {
+    title = "ButtonDemo"
+    javax.swing.UIManager.put("swing.boldMetal", false)
+
+    contents = new ButtonDemo()
+  }
+}