Changeset 6953 for lang/scala

Timestamp:

02/20/08 02:09:11 (9 months ago)

Author:

keisuken

Message:

SwingBuilder? updated. SwingCommand? trait add and framework rules fix.

Files:

• lang/scala/sandbox/src/jp/ne/cappuccino/keisuken/scl/swing/SwingBuilder.scala (modified) (6 diffs)

lang/scala/sandbox/src/jp/ne/cappuccino/keisuken/scl/swing/SwingBuilder.scala

@@ -13 +13 @@
 object SwingBuilder {
 
+  trait SwingCommand {
+    def exec(commands: AnyRef*): Unit = exec(commands.toArray)
+    def exec(commands: Array[AnyRef]): Unit
+  }
+
   class ActionAdapter(proc: ActionEvent => Unit) extends ActionListener {
     def actionPerformed(e: ActionEvent) = proc(e)
   }
 
-  def Frame(commands: AnyRef*): JFrame = Frame(commands.toArray)
+  def action(proc: ActionEvent => Unit) = ('action, proc)
 
-  def Frame(commands: Array[AnyRef]): JFrame = {
-    val frame = new JFrame()
-    for(command <- commands) command match {
-      case ('title, title: String) =>
-        frame.setTitle(title)
-      case ('exitOnClose, b: Boolean) =>
-        if(b)
-          frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE)
-        else
-          frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE)
-      case pane: java.awt.Component =>
-        frame.getContentPane.add(pane)
-      case ('size, (width: Int, height: Int)) =>
-        frame.setSize(width, height)
-      case 'pack =>
-        frame.pack
-      case ('visible, b: Boolean) =>
-        frame.setVisible(b)
-      case command: Any => {
-        command match {
-          case (name: Symbol, value: AnyRef) =>
-            println("NG: (" + name.getClass.getName + ", " + value.getClass.getName + ")")
-          case value: Any =>
-            println("NG: " + value.getClass.getName)
+  class Frame extends JFrame with SwingCommand {
+    def this(commands: Array[AnyRef]) {
+      this()
+      exec(commands)
+    }
+    def exec(commands: Array[AnyRef]) {
+      for(command <- commands) command match {
+        case ('title, title: String) =>
+          setTitle(title)
+        case 'exitOnClose =>
+          setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE)
+        case pane: java.awt.Component =>
+          getContentPane.add(pane)
+        case ('size, (width: Int, height: Int)) =>
+          setSize(width, height)
+        case 'pack =>
+          pack
+        case ('visible, b: Boolean) =>
+          setVisible(b)
+        case command: Any => {
+          command match {
+            case (name: Symbol, value: AnyRef) =>
+              println("NG: (" + name.getClass.getName + ", " + value.getClass.getName + ")")
+            case value: Any =>
+              println("NG: " + value.getClass.getName)
+          }
         }
       }
     }
-    frame
   }
+
+  class Button(text: String) extends JButton(text) with SwingCommand {
+    def this(text: String, commands: Array[AnyRef]) {
+      this(text)
+      exec(commands)
+    }
+    def exec(commands: Array[AnyRef]) {
+      for(command <- commands) {
+        command match {
+          case ('action, proc: (ActionEvent => Unit)) =>
+            addActionListener(new ActionAdapter(proc))
+          case ('text, text: String) =>
+            setText(text)
+          case _ => println("NG: " + command)
+        }
+      }
+    }
+  }
+
+  def Frame(commands: AnyRef*): Frame = new Frame(commands.toArray)
 
   def TabbedPane(tabs: (String,TablePanel)*): JTabbedPane = {
@@ -65 +91 @@
     cols.map(_.asInstanceOf[java.lang.Object]).toArray
 
-  def button(name: String): JButton = {
-    new JButton(name)
-  }
-
-  def button(name: String, action: ActionEvent => Unit): JButton = {
-    val button = new JButton(name)
-    button.addActionListener(new ActionAdapter(action))
-    button
-  }
+  def Button(text: String, commands: AnyRef*): Button =
+    new Button(text, commands.toArray)
 
   def showDialogMessage(
@@ -86 +105 @@
   }
 
+  def FileChooser(commands: Any*): JFileChooser = {
+    val chooser = new JFileChooser()
+    for(command <- commands)
+      command match {
+        case ('name, name: String) =>
+          chooser.setName(name)
+        case ('dialogTitle, title: String) =>
+          chooser.setDialogTitle(title)
+        case ('showOpen, parent: java.awt.Component) =>
+          chooser.showOpenDialog(parent)
+        case ('showSave, parent: java.awt.Component) =>
+          chooser.showSaveDialog(parent)
+        case ('action, proc: (ActionEvent => Unit)) =>
+          chooser.addActionListener(new ActionAdapter(proc))
+        case _ =>
+          println("NG: " + command)
+      }
+    chooser
+  }
+
   /**
    * Sample codes.
@@ -91 +130 @@
   def main(args: Array[String]) {
     val frame = Frame(
-      'exitOnClose -> true,
+      'exitOnClose,
       'title -> "Hello, world",
       'size -> (320, 240),
@@ -103 +142 @@
         ("Boo",
           TablePanel(
-            line(button("abc"), button("cde")),
+            line(Button("abc"), Button("cde")),
             line(
-              button("efg"),
-              button("Hello",
-                {e => showDialogMessage(e.getSource, "Info", "Hello!")
-                }
+              Button("efg"),
+              Button("Hello",
+                action(e =>
+                  showDialogMessage(e.getSource, "Info", "Hello!")
+                )
               )
             )
@@ -117 +157 @@
       'visible -> true
     )
+    val fileChooser = FileChooser(
+      'name -> "Foo",
+      action(e => println(e)),
+      'showOpen -> frame
+    )
     println(frame)
   }