r2208 - trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing - Jaxx-commits

16 Feb 2011

Author: tchemit
Date: 2011-02-16 11:41:47 +0100 (Wed, 16 Feb 2011)
New Revision: 2208

Url: http://nuiton.org/repositories/revision/jaxx/2208

Log:
fix demos

Modified:
   trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JProgressBarDemo.jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonMenuItemDemo.jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JTextAreaDemo.jaxx

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JProgressBarDemo.jaxx
===================================================================

--- trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JProgressBarDemo.jaxx	2011-02-15 19:53:57 UTC (rev 2207)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JProgressBarDemo.jaxx	2011-02-16 10:41:47 UTC (rev 2208)
@@ -25,47 +25,61 @@
 
 <jaxx.demo.DemoPanel layout='{new BorderLayout()}'>
   <import>
+    java.awt.Color
+    javax.swing.Timer
     javax.swing.UIManager
-    java.awt.Color
   </import>
-  <script><![CDATA[
-    import javax.swing.Timer;
-    
-    int red = 0;
-    int green = 0;
-    int blue = 0;
-    int speed = 2;
-    int redDirection = 1;
-    int greenDirection = 1;
-    int blueDirection = 1;
-    
-    Timer redTimer = new Timer(5, new ActionListener() {
-        public void actionPerformed(ActionEvent e) {
-            red = Math.max(0, Math.min(255, red + speed * redDirection));
-            if (red == 0 || red == 255)
-                redDirection = -redDirection;
-        }
-    });
 
-    Timer greenTimer = new Timer(50, new ActionListener() {
-        public void actionPerformed(ActionEvent e) {
-            green = Math.max(0, Math.min(255, green + speed * greenDirection));
-            if (green == 0 || green == 255)
-                greenDirection = -greenDirection;
-        }
-    });
+  <Integer id='red' javaBean='0'/>
+  <Integer id='green' javaBean='0'/>
+  <Integer id='blue' javaBean='0'/>
+  <Integer id='speed' initializer='2'/>
+  <Integer id='redDirection' initializer='1'/>
+  <Integer id='greenDirection' initializer='1'/>
+  <Integer id='blueDirection' initializer='1'/>
+  <Timer id='redTimer' constructorParams='5, null'
+         onActionPerformed='changeRedValue()'/>
+  <Timer id='greenTimer' constructorParams='50, null'
+         onActionPerformed='changeGreenValue()'/>
+  <Timer id='blueTimer' constructorParams='500, null'
+         onActionPerformed='changeBlueValue()'/>
 
-    Timer blueTimer = new Timer(500, new ActionListener() {
-        public void actionPerformed(ActionEvent e) {
-            blue = Math.max(0, Math.min(255, blue + speed * blueDirection));
-            if (blue == 0 || blue == 255)
-                blueDirection = -blueDirection;
-        }
-    });
-    
+
+  <script><![CDATA[
+void startTimers() {
     redTimer.start();
     greenTimer.start();
     blueTimer.start();
+}
+
+void stopTimers() {
+    redTimer.stop();
+    greenTimer.stop();
+    blueTimer.stop();
+}
+
+void $afterCompleteSetup() {
+    startTimers();
+}
+
+protected void changeRedValue() {
+    setRed(Math.max(0, Math.min(255, red + speed * redDirection)));
+    if (red == 0 || red == 255) {
+        redDirection = -redDirection;
+    }
+}
+protected void changeGreenValue() {
+    setGreen(Math.max(0, Math.min(255, green + speed * greenDirection)));
+    if (green == 0 || green == 255) {
+        greenDirection = -greenDirection;
+    }
+}
+protected void changeBlueValue() {
+    setBlue(Math.max(0, Math.min(255, blue + speed * blueDirection)));
+    if (blue == 0 || blue == 255) {
+        blueDirection = -blueDirection;
+    }
+}
   ]]></script>
 
   <Table insets='6' constraints='BorderLayout.CENTER'>
@@ -73,39 +87,36 @@
       <cell columns='3'>
         <JLabel text='Welcome to the JAXX framework!'
                 font='{UIManager.getFont("Label.font").deriveFont(18f)}'
-                foreground='{new Color(red, green, blue)}'/>
+                foreground='{new Color(getRed(), getGreen(), getBlue())}'/>
       </cell>
     </row>
-
     <row>
       <cell columns='3' fill='horizontal'>
-        <JProgressBar foreground='{new Color(red, 0, 0)}' value='{red}'
-                      maximum='255'/>
+        <JProgressBar id='redProgressBar'
+                      foreground='{new Color(getRed(), 0, 0)}'
+                      value='{getRed()}' maximum='255'/>
       </cell>
     </row>
-
     <row>
       <cell columns='3' fill='horizontal'>
-        <JProgressBar foreground='{new Color(0, green, 0)}' value='{green}'
-                      maximum='255'/>
+        <JProgressBar id='greenProgressBar'
+                      foreground='{new Color(0, getGreen(), 0)}'
+                      value='{getGreen()}' maximum='255'/>
       </cell>
     </row>
-
     <row>
       <cell columns='3' fill='horizontal'>
-        <JProgressBar foreground='{new Color(0, 0, blue)}' value='{blue}'
-                      maximum='255'/>
+        <JProgressBar id='blueProgressBar'
+                      foreground='{new Color(0, 0, getBlue())}'
+                      value='{getBlue()}' maximum='255'/>
       </cell>
     </row>
-
     <row>
       <cell weightx='1' anchor='east'>
-        <JButton text='Start'
-                 onActionPerformed='redTimer.start(); greenTimer.start(); blueTimer.start()'/>
+        <JButton text='Start' onActionPerformed='startTimers()'/>
       </cell>
       <cell>
-        <JButton text='Stop'
-                 onActionPerformed='redTimer.stop(); greenTimer.stop(); blueTimer.stop()'/>
+        <JButton text='Stop' onActionPerformed='stopTimers()'/>
       </cell>
     </row>
   </Table>

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonMenuItemDemo.jaxx
===================================================================
--- trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonMenuItemDemo.jaxx	2011-02-15 19:53:57 UTC (rev 2207)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonMenuItemDemo.jaxx	2011-02-16 10:41:47 UTC (rev 2208)
@@ -54,5 +54,4 @@
   <JLabel id='demoMessage' text='Font size: {fontSize.getSelectedValue()}'
           horizontalAlignment='center'
           font='{updateFont(fontSize.getSelectedValue())}'/>
-  <!--font='{UIManager.getFont("Label.font").deriveFont(fontSize.getSelectedValue() != null ? (float) ((Integer) fontSize.getSelectedValue()).intValue() : 12)}'/>-->
 </JMenuItemDemo>

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JTextAreaDemo.jaxx
===================================================================
--- trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JTextAreaDemo.jaxx	2011-02-15 19:53:57 UTC (rev 2207)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JTextAreaDemo.jaxx	2011-02-16 10:41:47 UTC (rev 2208)
@@ -24,15 +24,15 @@
   -->
 
 <jaxx.demo.DemoPanel>
-  <Table anchor='northwest'>
+  <Table constraints='BorderLayout.CENTER'>
     <row>
       <cell>
         <JLabel text='Normal text:' displayedMnemonic='N'
                 labelFor='{textArea}'/>
       </cell>
 
-      <cell weightx='1' fill='both'>
-        <JScrollPane height='120'>
+      <cell weightx='1' fill='both' anchor='east'>
+        <JScrollPane>
           <JTextArea id='textArea' text='Try typing some text here.'/>
         </JScrollPane>
       </cell>
@@ -40,21 +40,15 @@
 
     <row>
       <cell>
-        <JLabel text='Upper case text:'/>
+        <JLabel text='Upper case text:' labelFor='{upperTextArea}'/>
       </cell>
 
       <cell weightx='1' fill='both'>
-        <JScrollPane height='120'>
-          <JTextArea editable='false' background='{null}'
+        <JScrollPane>
+          <JTextArea id='upperTextArea' editable='false' background='{null}'
                      text='{textArea.getText().toUpperCase()}'/>
         </JScrollPane>
       </cell>
     </row>
-
-    <row>
-      <cell weighty='1'>
-        <JPanel/>
-      </cell>
-    </row>
   </Table>
 </jaxx.demo.DemoPanel>

    

r2208 - trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing

tchemit＠users.nuiton.org

tags

participants (1)