From tchemit@users.nuiton.org Wed Feb 16 11:41:47 2011
From: tchemit@users.nuiton.org
To: jaxx-commits@list.nuiton.org
Subject: [Jaxx-commits] r2208 -
	trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing
Date: Wed, 16 Feb 2011 11:41:47 +0100
Message-ID: <20110216104147.552E21694B@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2014113297795822533=="

--===============2014113297795822533==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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.j=
axx
   trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonMenuIt=
emDemo.jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JTextAreaDemo.jaxx

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JProgressBa=
rDemo.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 @@
=20
 <jaxx.demo.DemoPanel layout=3D'{new BorderLayout()}'>
   <import>
+    java.awt.Color
+    javax.swing.Timer
     javax.swing.UIManager
-    java.awt.Color
   </import>
-  <script><![CDATA[
-    import javax.swing.Timer;
-   =20
-    int red =3D 0;
-    int green =3D 0;
-    int blue =3D 0;
-    int speed =3D 2;
-    int redDirection =3D 1;
-    int greenDirection =3D 1;
-    int blueDirection =3D 1;
-   =20
-    Timer redTimer =3D new Timer(5, new ActionListener() {
-        public void actionPerformed(ActionEvent e) {
-            red =3D Math.max(0, Math.min(255, red + speed * redDirection));
-            if (red =3D=3D 0 || red =3D=3D 255)
-                redDirection =3D -redDirection;
-        }
-    });
=20
-    Timer greenTimer =3D new Timer(50, new ActionListener() {
-        public void actionPerformed(ActionEvent e) {
-            green =3D Math.max(0, Math.min(255, green + speed * greenDirecti=
on));
-            if (green =3D=3D 0 || green =3D=3D 255)
-                greenDirection =3D -greenDirection;
-        }
-    });
+  <Integer id=3D'red' javaBean=3D'0'/>
+  <Integer id=3D'green' javaBean=3D'0'/>
+  <Integer id=3D'blue' javaBean=3D'0'/>
+  <Integer id=3D'speed' initializer=3D'2'/>
+  <Integer id=3D'redDirection' initializer=3D'1'/>
+  <Integer id=3D'greenDirection' initializer=3D'1'/>
+  <Integer id=3D'blueDirection' initializer=3D'1'/>
+  <Timer id=3D'redTimer' constructorParams=3D'5, null'
+         onActionPerformed=3D'changeRedValue()'/>
+  <Timer id=3D'greenTimer' constructorParams=3D'50, null'
+         onActionPerformed=3D'changeGreenValue()'/>
+  <Timer id=3D'blueTimer' constructorParams=3D'500, null'
+         onActionPerformed=3D'changeBlueValue()'/>
=20
-    Timer blueTimer =3D new Timer(500, new ActionListener() {
-        public void actionPerformed(ActionEvent e) {
-            blue =3D Math.max(0, Math.min(255, blue + speed * blueDirection)=
);
-            if (blue =3D=3D 0 || blue =3D=3D 255)
-                blueDirection =3D -blueDirection;
-        }
-    });
-   =20
+
+  <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 =3D=3D 0 || red =3D=3D 255) {
+        redDirection =3D -redDirection;
+    }
+}
+protected void changeGreenValue() {
+    setGreen(Math.max(0, Math.min(255, green + speed * greenDirection)));
+    if (green =3D=3D 0 || green =3D=3D 255) {
+        greenDirection =3D -greenDirection;
+    }
+}
+protected void changeBlueValue() {
+    setBlue(Math.max(0, Math.min(255, blue + speed * blueDirection)));
+    if (blue =3D=3D 0 || blue =3D=3D 255) {
+        blueDirection =3D -blueDirection;
+    }
+}
   ]]></script>
=20
   <Table insets=3D'6' constraints=3D'BorderLayout.CENTER'>
@@ -73,39 +87,36 @@
       <cell columns=3D'3'>
         <JLabel text=3D'Welcome to the JAXX framework!'
                 font=3D'{UIManager.getFont("Label.font").deriveFont(18f)}'
-                foreground=3D'{new Color(red, green, blue)}'/>
+                foreground=3D'{new Color(getRed(), getGreen(), getBlue())}'/>
       </cell>
     </row>
-
     <row>
       <cell columns=3D'3' fill=3D'horizontal'>
-        <JProgressBar foreground=3D'{new Color(red, 0, 0)}' value=3D'{red}'
-                      maximum=3D'255'/>
+        <JProgressBar id=3D'redProgressBar'
+                      foreground=3D'{new Color(getRed(), 0, 0)}'
+                      value=3D'{getRed()}' maximum=3D'255'/>
       </cell>
     </row>
-
     <row>
       <cell columns=3D'3' fill=3D'horizontal'>
-        <JProgressBar foreground=3D'{new Color(0, green, 0)}' value=3D'{gree=
n}'
-                      maximum=3D'255'/>
+        <JProgressBar id=3D'greenProgressBar'
+                      foreground=3D'{new Color(0, getGreen(), 0)}'
+                      value=3D'{getGreen()}' maximum=3D'255'/>
       </cell>
     </row>
-
     <row>
       <cell columns=3D'3' fill=3D'horizontal'>
-        <JProgressBar foreground=3D'{new Color(0, 0, blue)}' value=3D'{blue}'
-                      maximum=3D'255'/>
+        <JProgressBar id=3D'blueProgressBar'
+                      foreground=3D'{new Color(0, 0, getBlue())}'
+                      value=3D'{getBlue()}' maximum=3D'255'/>
       </cell>
     </row>
-
     <row>
       <cell weightx=3D'1' anchor=3D'east'>
-        <JButton text=3D'Start'
-                 onActionPerformed=3D'redTimer.start(); greenTimer.start(); =
blueTimer.start()'/>
+        <JButton text=3D'Start' onActionPerformed=3D'startTimers()'/>
       </cell>
       <cell>
-        <JButton text=3D'Stop'
-                 onActionPerformed=3D'redTimer.stop(); greenTimer.stop(); bl=
ueTimer.stop()'/>
+        <JButton text=3D'Stop' onActionPerformed=3D'stopTimers()'/>
       </cell>
     </row>
   </Table>

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

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


--===============2014113297795822533==--