From tchemit@users.nuiton.org Wed Oct 28 08:29:28 2009
From: tchemit@users.nuiton.org
To: jaxx-commits@list.nuiton.org
Subject: [Jaxx-commits] r1608 - in branches/jaxx-2.X/jaxx-demo/src/main:
	java/jaxx/demo/component/jaxx/editor java/jaxx/demo/component/swing
	java/jaxx/demo/feature/validation java/jaxx/demo/fun resources/i18n
Date: Wed, 28 Oct 2009 08:29:27 +0100
Message-ID: <20091028072927.DB0331693E@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2154710911507542985=="

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

Author: tchemit
Date: 2009-10-28 08:29:27 +0100 (Wed, 28 Oct 2009)
New Revision: 1608

Modified:
   branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/=
I18nEditorDemo.jaxx
   branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/swing/JCombo=
BoxDemo.jaxx
   branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/feature/validation/Val=
idationListDemo.jaxx
   branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/feature/validation/Val=
idationTableDemo.jaxx
   branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/fun/CounterDemo.jaxx
   branches/jaxx-2.X/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.proper=
ties
   branches/jaxx-2.X/jaxx-demo/src/main/resources/i18n/jaxx-demo-fr_FR.proper=
ties
Log:
update demo from changes in compiler and runtime

Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/=
editor/I18nEditorDemo.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
--- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor=
/I18nEditorDemo.jaxx	2009-10-28 07:20:17 UTC (rev 1607)
+++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor=
/I18nEditorDemo.jaxx	2009-10-28 07:29:27 UTC (rev 1608)
@@ -79,7 +79,7 @@
         <row>
             <cell>
                 <JLabel border=3D'{new TitledBorder(_("jaxxdemo.i18neditor.s=
elected.locale"))}'
-                        text=3D'{editor.getSelectedLocale()}'/>
+                        text=3D'{editor.getSelectedLocale().toString()}'/>
             </cell>
         </row>
     </Table>

Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/swing=
/JComboBoxDemo.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
--- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/swing/JComb=
oBoxDemo.jaxx	2009-10-28 07:20:17 UTC (rev 1607)
+++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/swing/JComb=
oBoxDemo.jaxx	2009-10-28 07:29:27 UTC (rev 1608)
@@ -43,7 +43,7 @@
             </cell>
=20
             <cell>
-                <JButton text=3D'{jaxxComboBox.getSelectedItem()}'/>
+                <JButton text=3D'{String.valueOf(jaxxComboBox.getSelectedIte=
m())}'/>
             </cell>
         </row>
         <row>
@@ -58,7 +58,7 @@
             </cell>
=20
             <cell>
-                <JButton text=3D'{comboBox.getSelectedItem()}'/>
+                <JButton text=3D'{comboBox.getSelectedItem()+""}'/>
             </cell>
         </row>
     </Table>

Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/feature/validat=
ion/ValidationListDemo.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
--- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/feature/validation/Va=
lidationListDemo.jaxx	2009-10-28 07:20:17 UTC (rev 1607)
+++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/feature/validation/Va=
lidationListDemo.jaxx	2009-10-28 07:29:27 UTC (rev 1608)
@@ -21,7 +21,7 @@
 <jaxx.demo.DemoPanel>
     <style source=3D"Validation.css"/>
=20
-<script><![CDATA[
+    <script><![CDATA[
 import static org.nuiton.i18n.I18n.n_;
 import jaxx.runtime.validator.swing.SwingValidatorMessageListRenderer;
=20
@@ -32,7 +32,7 @@
     return new String[]{ getDefaultSource(), "Validation.css", "Model.java",=
 "Identity.java" };
 }
 ]]>
-</script>
+    </script>
     <!-- models -->
     <Model id=3D'model1'/>
     <Model id=3D'model2'/>
@@ -92,7 +92,7 @@
                                 <JLabel text=3D'Ratio:'/>
                             </cell>
                             <cell>
-                                <JSlider id=3D'ratio' minimum=3D'0' maximum=
=3D'100'=20
+                                <JSlider id=3D'ratio' minimum=3D'0' maximum=
=3D'100'
                                          value=3D'{model1.getRatio()}'
                                          _validatorLabel=3D'{n_("form.ratio"=
)}'
                                          onStateChanged=3D'model1.setRatio(r=
atio.getValue())'/>
@@ -127,7 +127,7 @@
                                 <JLabel text=3D'Ratio:'/>
                             </cell>
                             <cell>
-                                <JLabel text=3D'{model1.getRatio()}'/>
+                                <JLabel text=3D'{model1.getRatio()+""}'/>
                             </cell>
                         </row>
                     </Table>
@@ -165,7 +165,7 @@
                                 <JLabel text=3D'Ratio:'/>
                             </cell>
                             <cell>
-                                <JSlider id=3D'_ratio' minimum=3D'0' maximum=
=3D'100'=20
+                                <JSlider id=3D'_ratio' minimum=3D'0' maximum=
=3D'100'
                                          value=3D'{model2.getRatio()}'
                                          _validatorLabel=3D'{n_("form2.ratio=
")}'
                                          onStateChanged=3D'model2.setRatio(_=
ratio.getValue())'/>
@@ -200,7 +200,7 @@
                                 <JLabel text=3D'Ratio:'/>
                             </cell>
                             <cell>
-                                <JLabel text=3D'{model2.getRatio()}'/>
+                                <JLabel text=3D'{model2.getRatio()+""}'/>
                             </cell>
                         </row>
                     </Table>
@@ -254,7 +254,7 @@
                                 <JLabel text=3D'Config file :'/>
                             </cell>
                             <cell>
-                                <JTextField id=3D'config' text=3D'{identity.=
getConfig()}'
+                                <JTextField id=3D'config' text=3D'{identity.=
getConfig()+""}'
                                             onKeyReleased=3D'identity.setCon=
fig(new java.io.File(config.getText()))'/>
                             </cell>
                         </row>
@@ -263,7 +263,7 @@
                                 <JLabel text=3D'Working directory:'/>
                             </cell>
                             <cell>
-                                <JTextField id=3D'dir' text=3D'{identity.get=
Dir()}'
+                                <JTextField id=3D'dir' text=3D'{identity.get=
Dir()+""}'
                                             onKeyReleased=3D'identity.setDir=
(new java.io.File(dir.getText()))'/>
                             </cell>
                         </row>
@@ -303,7 +303,7 @@
                                 <JLabel text=3D'Age:'/>
                             </cell>
                             <cell>
-                                <JLabel text=3D'{identity.getAge()}'/>
+                                <JLabel text=3D'{identity.getAge()+""}'/>
                             </cell>
                         </row>
                         <row>
@@ -311,7 +311,7 @@
                                 <JLabel text=3D'Config file:'/>
                             </cell>
                             <cell>
-                                <JLabel text=3D'{identity.getConfig()}'/>
+                                <JLabel text=3D'{identity.getConfig()+""}'/>
                             </cell>
                         </row>
                         <row>
@@ -319,7 +319,7 @@
                                 <JLabel text=3D'Directory file:'/>
                             </cell>
                             <cell>
-                                <JLabel text=3D'{identity.getDir()}'/>
+                                <JLabel text=3D'{identity.getDir()+""}'/>
                             </cell>
                         </row>
                     </Table>

Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/feature/validat=
ion/ValidationTableDemo.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
--- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/feature/validation/Va=
lidationTableDemo.jaxx	2009-10-28 07:20:17 UTC (rev 1607)
+++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/feature/validation/Va=
lidationTableDemo.jaxx	2009-10-28 07:29:27 UTC (rev 1608)
@@ -133,7 +133,7 @@
                                 <JLabel text=3D'Ratio:'/>
                             </cell>
                             <cell>
-                                <JLabel text=3D'{model1.getRatio()}'/>
+                                <JLabel text=3D'{model1.getRatio()+""}'/>
                             </cell>
                         </row>
                     </Table>
@@ -206,7 +206,7 @@
                                 <JLabel text=3D'Ratio:'/>
                             </cell>
                             <cell>
-                                <JLabel text=3D'{model2.getRatio()}'/>
+                                <JLabel text=3D'{model2.getRatio()+""}'/>
                             </cell>
                         </row>
                     </Table>
@@ -260,7 +260,7 @@
                                 <JLabel text=3D'Config file :'/>
                             </cell>
                             <cell>
-                                <JTextField id=3D'config' text=3D'{identity.=
getConfig()}'
+                                <JTextField id=3D'config' text=3D'{identity.=
getConfig()+""}'
                                             onKeyReleased=3D'identity.setCon=
fig(new java.io.File(config.getText()))'/>
                             </cell>
                         </row>
@@ -269,7 +269,7 @@
                                 <JLabel text=3D'Working directory:'/>
                             </cell>
                             <cell>
-                                <JTextField id=3D'dir' text=3D'{identity.get=
Dir()}'
+                                <JTextField id=3D'dir' text=3D'{identity.get=
Dir()+""}'
                                             onKeyReleased=3D'identity.setDir=
(new java.io.File(dir.getText()))'/>
                             </cell>
                         </row>
@@ -309,7 +309,7 @@
                                 <JLabel text=3D'Age:'/>
                             </cell>
                             <cell>
-                                <JLabel text=3D'{identity.getAge()}'/>
+                                <JLabel text=3D'{identity.getAge()+""}'/>
                             </cell>
                         </row>
                         <row>
@@ -317,7 +317,7 @@
                                 <JLabel text=3D'Config file:'/>
                             </cell>
                             <cell>
-                                <JLabel text=3D'{identity.getConfig()}'/>
+                                <JLabel text=3D'{identity.getConfig()+""}'/>
                             </cell>
                         </row>
                         <row>
@@ -325,7 +325,7 @@
                                 <JLabel text=3D'Directory file:'/>
                             </cell>
                             <cell>
-                                <JLabel text=3D'{identity.getDir()}'/>
+                                <JLabel text=3D'{identity.getDir()+""}'/>
                             </cell>
                         </row>
                     </Table>

Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/fun/CounterDemo=
.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
--- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/fun/CounterDemo.jaxx	=
2009-10-28 07:20:17 UTC (rev 1607)
+++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/fun/CounterDemo.jaxx	=
2009-10-28 07:29:27 UTC (rev 1608)
@@ -21,7 +21,7 @@
 <jaxx.demo.DemoPanel>
     <script>int count;</script>
     <JPanel id=3D'demoPanel'>
-        <JTextField text=3D'{count}' constraints=3D'BorderLayout.NORTH'/>
+        <JTextField text=3D'{count+""}' constraints=3D'BorderLayout.NORTH'/>
         <HBox constraints=3D'BorderLayout.SOUTH'>
             <JButton text=3D'Dec (-)' onActionPerformed=3D'count--'/>
             <JButton text=3D'Reset' onActionPerformed=3D'count =3D 0'/>

Modified: branches/jaxx-2.X/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB=
.properties
=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
--- branches/jaxx-2.X/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.prope=
rties	2009-10-28 07:20:17 UTC (rev 1607)
+++ branches/jaxx-2.X/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.prope=
rties	2009-10-28 07:29:27 UTC (rev 1608)
@@ -42,6 +42,7 @@
 First\ Name\:=3D
 FirstName\:=3D
 Font\ size=3D
+Font\ size\:\ =3D
 Fool\ me\ once=3D
 Fool\ me\ twice=3D
 Green=3D
@@ -81,6 +82,7 @@
 Supported\ Swing\ components\:=3D
 Text2\:=3D
 Text\:=3D
+Total\:\ =3D
 Underline=3D
 Upper\ case\ text\:=3D
 Use\ the\ spinner\ to=3D
@@ -90,6 +92,7 @@
 Welcome\ to\ the\ JAXX\ framework\!=3D
 Working\ directory\:=3D
 Yellow=3D
+You\ entered\:\ =3D
 Your\ name\:=3D
 \\u00f7=3D
 actors=3D

Modified: branches/jaxx-2.X/jaxx-demo/src/main/resources/i18n/jaxx-demo-fr_FR=
.properties
=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
--- branches/jaxx-2.X/jaxx-demo/src/main/resources/i18n/jaxx-demo-fr_FR.prope=
rties	2009-10-28 07:20:17 UTC (rev 1607)
+++ branches/jaxx-2.X/jaxx-demo/src/main/resources/i18n/jaxx-demo-fr_FR.prope=
rties	2009-10-28 07:29:27 UTC (rev 1608)
@@ -42,6 +42,7 @@
 First\ Name\:=3DPr\u00E9nom
 FirstName\:=3DPr\u00E9nom \:
 Font\ size=3DTaille de la police
+Font\ size\:\ =3D
 Fool\ me\ once=3D
 Fool\ me\ twice=3D
 Green=3DVert
@@ -81,6 +82,7 @@
 Supported\ Swing\ components\:=3DComposants Swing support\u00E9s
 Text2\:=3DText 2
 Text\:=3DTexte \:
+Total\:\ =3D
 Underline=3Dsoulign\u00E9
 Upper\ case\ text\:=3DTexte en majuscule
 Use\ the\ spinner\ to=3DUtiliser la jauge pour
@@ -90,6 +92,7 @@
 Welcome\ to\ the\ JAXX\ framework\!=3DBienvenu dans le framework JAXX
 Working\ directory\:=3DR\u00E9pertoire de travail
 Yellow=3DJaune
+You\ entered\:\ =3D
 Your\ name\:=3DVotre nom \:
 \\u00f7=3D
 actors=3DActeurs


--===============2154710911507542985==--