Changeset 6961 for lang/scala

Timestamp:

02/20/08 03:43:41 (9 months ago)

Author:

kmizu

Message:

 

Location:

lang/scala/sandbox

Files:

• lib/scala-sandbox.jar (modified) (previous)
• src/jp/gr/java_conf/mizu/gui/GUIBuilder.scala (modified) (4 diffs)
• webpages/lib/scala-sandbox.jar (modified) (previous)

lang/scala/sandbox/src/jp/gr/java_conf/mizu/gui/GUIBuilder.scala

@@ -7 +7 @@
 import java.awt.event.ActionEvent
 import java.awt.event.ActionListener
+import javax.swing.AbstractAction
+import javax.swing.Action
+import javax.swing.Box
+import javax.swing.BoxLayout
+import javax.swing.JButton
 import javax.swing.JFrame
-import javax.swing.JButton
+import javax.swing.JLabel
+import javax.swing.JPanel
 import javax.swing.JTextField
-import javax.swing.Action
-import javax.swing.AbstractAction
 import jp.gr.java_conf.mizu.util.ReflectionWrapper.invoke
 
@@ -21 +25 @@
     _context.withValue(value)(thunk)
   }
-        def setProperty(target :AnyRef, property :Symbol, value :Any) {
-          invoke(target, "set" + property.name.capitalize, value)
-        }
+  def setProperty(target :AnyRef, property :Symbol, value :Any) {
+    invoke(target, "set" + property.name.capitalize, value)
+  }
         def getProperty(target :AnyRef, property :Symbol, value :Any) :Any = {
           invoke(target, "get" + property.name.capitalize, value)
@@ -29 +33 @@
         def asContainer :Container = {
                 context match {
-                case frame:JFrame => frame.getContentPane
-                case container:Container => container
+                  case frame:JFrame => frame.getContentPane
+                  case container:Container => container
                 }
   }
   def frame(params :Any*)(thunk : => Unit) : JFrame = {
-    val frame = new JFrame
+    val widget = new JFrame
     params.foreach {
-    case title:String => frame.setTitle(title)
-    case (property:Symbol, value:Any) => setProperty(frame, property, value)
+      case title:String => widget.setTitle(title)
+      case (property:Symbol, value:Any) => setProperty(widget, property, value)
     }
-    withContext(frame)(thunk)
-    frame
+    withContext(widget)(thunk)
+    widget
   }
         def button(params :Any*) :JButton = {
-          val button = new JButton
-                asContainer.add(button)
+          val widget = new JButton
+                asContainer.add(widget)
                 params.foreach {
-                case text:String => button.setText(text)
-    case handler:ActionListener => button.addActionListener(handler)
-                case (property:Symbol, value) => setProperty(button, property, value)
+                  case text:String => widget.setText(text)
+      case handler:ActionListener => widget.addActionListener(handler)
+                  case (property:Symbol, value) => setProperty(widget, property, value)
                 }
-                button
+    widget
         }
   def textField(params :Any*) :JTextField = {
@@ -56 +60 @@
     asContainer.add(widget)
     params.foreach {
-    case text:String => widget.setText(text)
-    case (property:Symbol, value) => setProperty(widget, property, value)
+      case text:String => widget.setText(text)
+      case (property:Symbol, value) => setProperty(widget, property, value)
     }
+    widget
+  }
+  def label(params :Any*): JLabel = {
+    val widget = new JLabel
+    asContainer.add(widget)
+    params.foreach {
+      case (property:Symbol, value) => setProperty(widget, property, value)
+    }
+    widget
+  }
+  def panel(params :Any*)(thunk : => Unit) :JPanel = {
+    val widget = new JPanel
+    asContainer.add(widget)
+    params.foreach {
+      case (property:Symbol, value) => setProperty(widget, property, value)
+    }
+    withContext(widget)(thunk)
+    widget
+  }
+  def hbox(params :Any*)(thunk : => Unit) :Box = {
+    val widget = new Box(BoxLayout.X_AXIS)
+    asContainer.add(widget)
+    params.foreach {
+      case (property:Symbol, value) => setProperty(widget, property, value)
+    }
+    withContext(widget)(thunk)
+    widget
+  }
+  def vbox(params :Any*)(thunk : => Unit) :Box = {
+    val widget = new Box(BoxLayout.Y_AXIS)
+    asContainer.add(widget)
+    params.foreach {
+      case (property:Symbol, value) => setProperty(widget, property, value)
+    }
+    withContext(widget)(thunk)
     widget
   }