Add validate to UIElement. Remove one last reference to the peer for its validate method. Comment out references to java.swing.UIManager.

Author: Allan Jacobs

examples/src/main/scala/scala/swing/examples/tutorials/components/ButtonDemo.scala

@@ -104,7 +104,7 @@ object ButtonDemo extends SimpleSwingApplication {
 
   lazy val top = new MainFrame() {
     title = "ButtonDemo"
-    javax.swing.UIManager.put("swing.boldMetal", false)
+    //TD javax.swing.UIManager.put("swing.boldMetal", false)
 
     contents = new ButtonDemo()
   }

examples/src/main/scala/scala/swing/examples/tutorials/components/LabelDemo.scala

@@ -69,15 +69,15 @@ class LabelDemo extends GridPanel(3, 1) {
 }
 
 object LabelDemo extends SimpleSwingApplication {
-  UIManager.put("swing.boldMetal", false)
+  //TD UIManager.put("swing.boldMetal", false)
   /** Returns an ImageIcon option, or None if the path was invalid. */
   def createImageIcon(path: String, desc:String ): Option[javax.swing.ImageIcon] =
     Option(resourceFromClassloader(path)).map(imgURL => Swing.Icon(imgURL))
 
   lazy val top = new MainFrame() {
     title = "LabelDemo"
     //Create and set up the content pane.
-    javax.swing.UIManager.put("swing.boldMetal", false)
+    //TD javax.swing.UIManager.put("swing.boldMetal", false)
     contents = new LabelDemo()
   }
 }

examples/src/main/scala/scala/swing/examples/tutorials/components/SliderDemo.scala

@@ -161,7 +161,7 @@ class SliderDemo(window: Window) extends BoxPanel(Orientation.Vertical) with Act
 }
 
 object SliderDemo extends SimpleSwingApplication {
-  UIManager.put("swing.boldMetal", false)
+  //TD UIManager.put("swing.boldMetal", false)
   /** Returns an ImageIcon, or null if the path was invalid. */
   def createImageIcon(path: String): Option[javax.swing.ImageIcon] = {
     Option(resourceFromClassloader(path)).map(imgURL => Swing.Icon(imgURL))

examples/src/main/scala/scala/swing/examples/tutorials/layout/BorderLayoutDemo.scala

@@ -31,7 +31,7 @@
 package scala.swing.examples.tutorials.layout
 
 import scala.swing._
-import javax.swing.{SwingUtilities, UIManager}
+import javax.swing.UIManager
 import java.awt.{ ComponentOrientation, Dimension }
 
 /**
@@ -63,9 +63,9 @@ class BorderLayoutDemo extends BorderPanel {
 object BorderLayoutDemo extends SimpleSwingApplication {
   val RightToLeft = true
   /* Use an appropriate Look and Feel */
-  UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel")
+  // UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel")
   /* Turn off metal's use bold fonts */
-  UIManager.put("swing.boldMetal", false)
+  //TD UIManager.put("swing.boldMetal", false)
   //Create and set up the window.
   lazy val top = new MainFrame {
     title = "BorderLayoutDemo"

examples/src/main/scala/scala/swing/examples/tutorials/layout/FlowLayoutDemo.scala

@@ -54,11 +54,13 @@ class FlowLayoutDemo extends BorderPanel {
   val RtoLbutton = new RadioButton(RtoL)
 
   //Add buttons to the experiment layout
-  compsToExperiment.contents += new Button("Button 1")
-  compsToExperiment.contents += new Button("Button 2")
-  compsToExperiment.contents += new Button("Button 3")
-  compsToExperiment.contents += new Button("Long Named Button 4")
-  compsToExperiment.contents += new Button("5")
+  val buttonSeq = Seq[Button](
+      new Button("Button 1"),
+      new Button("Button 2"),
+      new Button("Button 3"),
+      new Button("Long Named Button 4"),
+      new Button("5") )
+  compsToExperiment.contents ++= buttonSeq
 
   //Left to right component orientation is selected by default
   compsToExperiment.componentOrientation = ComponentOrientation.LEFT_TO_RIGHT
@@ -78,22 +80,19 @@ class FlowLayoutDemo extends BorderPanel {
   listenTo(applyButton)
   reactions += {
     case ButtonClicked(`applyButton`) =>
-      if (LtoRbutton.selected) {
-        compsToExperiment.componentOrientation = ComponentOrientation.LEFT_TO_RIGHT
-      }
-      else {
-        compsToExperiment.componentOrientation = ComponentOrientation.RIGHT_TO_LEFT
-      }
-      compsToExperiment.peer.validate()
+      compsToExperiment.componentOrientation = 
+        if (LtoRbutton.selected) ComponentOrientation.LEFT_TO_RIGHT
+        else ComponentOrientation.RIGHT_TO_LEFT
+      compsToExperiment.validate()
       compsToExperiment.repaint()
   }
 }
 
 object FlowLayoutDemo extends SimpleSwingApplication {
   /* Use an appropriate Look and Feel */
-  UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel")
+  //TD UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel")
   /* Turn off metal's use of bold fonts */
-  UIManager.put("swing.boldMetal", false)
+  //TD UIManager.put("swing.boldMetal", false)
   lazy val top = new MainFrame() {
     title = "FlowLayoutDemo"
     contents = new FlowLayoutDemo()

examples/src/main/scala/scala/swing/examples/tutorials/misc/FocusConceptsDemo.scala

@@ -89,15 +89,15 @@ class FocusConceptsDemo extends BorderPanel {
 object FocusConceptsDemo extends SimpleSwingApplication {
 
   /* Use an appropriate Look and Feel */
-  try {
-    //UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
-    //UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
-    UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
-  } catch {
-    case NonFatal(ex) => ex.printStackTrace()
-  }
+  //TD try {
+  //   // UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
+  //   //UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
+  //   UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
+  // } catch {
+  //   case NonFatal(ex) => ex.printStackTrace()
+  // }
   /* Turn off metal's use of bold fonts */
-  UIManager.put("swing.boldMetal", false);
+  //TD UIManager.put("swing.boldMetal", false);
   //Create and set up the window.
   lazy val top = new MainFrame() {
     title = "FocusConceptsDemo"

src/main/scala/scala/swing/UIElement.scala

@@ -111,6 +111,7 @@ trait UIElement extends Proxy with LazyPublisher {
   def showing: Boolean = peer.isShowing
   def displayable: Boolean = peer.isDisplayable
 
+  def validate() { peer.validate }
   def repaint() { peer.repaint }
   def repaint(rect: Rectangle) { peer.repaint(rect.x, rect.y, rect.width, rect.height) }
   def ignoreRepaint: Boolean = peer.getIgnoreRepaint