This is an automated email from the git hooks/post-receive script. New commit to annotated tag v2.0.0-beta-1 in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit 26dbf5e85e8f5b8059a8ae23b3a91030e34d9f48 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Oct 28 07:29:27 2009 +0000 update demo from changes in compiler and runtime --- .../demo/component/jaxx/editor/I18nEditorDemo.jaxx | 2 +- .../jaxx/demo/component/swing/JComboBoxDemo.jaxx | 4 ++-- .../feature/validation/ValidationListDemo.jaxx | 22 +++++++++++----------- .../feature/validation/ValidationTableDemo.jaxx | 14 +++++++------- .../src/main/java/jaxx/demo/fun/CounterDemo.jaxx | 2 +- .../main/resources/i18n/jaxx-demo-en_GB.properties | 3 +++ .../main/resources/i18n/jaxx-demo-fr_FR.properties | 3 +++ 7 files changed, 28 insertions(+), 22 deletions(-) diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx index 3bb2676..c2d3af4 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx @@ -79,7 +79,7 @@ protected Border getPopupBorder(String text) { <row> <cell> <JLabel border='{new TitledBorder(_("jaxxdemo.i18neditor.selected.locale"))}' - text='{editor.getSelectedLocale()}'/> + text='{editor.getSelectedLocale().toString()}'/> </cell> </row> </Table> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JComboBoxDemo.jaxx b/jaxx-demo/src/main/java/jaxx/demo/component/swing/JComboBoxDemo.jaxx index eec1619..5fe2420 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/swing/JComboBoxDemo.jaxx +++ b/jaxx-demo/src/main/java/jaxx/demo/component/swing/JComboBoxDemo.jaxx @@ -43,7 +43,7 @@ private void $afterCompleteSetup() { </cell> <cell> - <JButton text='{jaxxComboBox.getSelectedItem()}'/> + <JButton text='{String.valueOf(jaxxComboBox.getSelectedItem())}'/> </cell> </row> <row> @@ -58,7 +58,7 @@ private void $afterCompleteSetup() { </cell> <cell> - <JButton text='{comboBox.getSelectedItem()}'/> + <JButton text='{comboBox.getSelectedItem()+""}'/> </cell> </row> </Table> diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationListDemo.jaxx b/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationListDemo.jaxx index cbdafa7..1a02f57 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationListDemo.jaxx +++ b/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationListDemo.jaxx @@ -21,7 +21,7 @@ <jaxx.demo.DemoPanel> <style source="Validation.css"/> -<script><![CDATA[ + <script><![CDATA[ import static org.nuiton.i18n.I18n.n_; import jaxx.runtime.validator.swing.SwingValidatorMessageListRenderer; @@ -32,7 +32,7 @@ protected String[] getSources() { return new String[]{ getDefaultSource(), "Validation.css", "Model.java", "Identity.java" }; } ]]> -</script> + </script> <!-- models --> <Model id='model1'/> <Model id='model2'/> @@ -92,7 +92,7 @@ protected String[] getSources() { <JLabel text='Ratio:'/> </cell> <cell> - <JSlider id='ratio' minimum='0' maximum='100' + <JSlider id='ratio' minimum='0' maximum='100' value='{model1.getRatio()}' _validatorLabel='{n_("form.ratio")}' onStateChanged='model1.setRatio(ratio.getValue())'/> @@ -127,7 +127,7 @@ protected String[] getSources() { <JLabel text='Ratio:'/> </cell> <cell> - <JLabel text='{model1.getRatio()}'/> + <JLabel text='{model1.getRatio()+""}'/> </cell> </row> </Table> @@ -165,7 +165,7 @@ protected String[] getSources() { <JLabel text='Ratio:'/> </cell> <cell> - <JSlider id='_ratio' minimum='0' maximum='100' + <JSlider id='_ratio' minimum='0' maximum='100' value='{model2.getRatio()}' _validatorLabel='{n_("form2.ratio")}' onStateChanged='model2.setRatio(_ratio.getValue())'/> @@ -200,7 +200,7 @@ protected String[] getSources() { <JLabel text='Ratio:'/> </cell> <cell> - <JLabel text='{model2.getRatio()}'/> + <JLabel text='{model2.getRatio()+""}'/> </cell> </row> </Table> @@ -254,7 +254,7 @@ protected String[] getSources() { <JLabel text='Config file :'/> </cell> <cell> - <JTextField id='config' text='{identity.getConfig()}' + <JTextField id='config' text='{identity.getConfig()+""}' onKeyReleased='identity.setConfig(new java.io.File(config.getText()))'/> </cell> </row> @@ -263,7 +263,7 @@ protected String[] getSources() { <JLabel text='Working directory:'/> </cell> <cell> - <JTextField id='dir' text='{identity.getDir()}' + <JTextField id='dir' text='{identity.getDir()+""}' onKeyReleased='identity.setDir(new java.io.File(dir.getText()))'/> </cell> </row> @@ -303,7 +303,7 @@ protected String[] getSources() { <JLabel text='Age:'/> </cell> <cell> - <JLabel text='{identity.getAge()}'/> + <JLabel text='{identity.getAge()+""}'/> </cell> </row> <row> @@ -311,7 +311,7 @@ protected String[] getSources() { <JLabel text='Config file:'/> </cell> <cell> - <JLabel text='{identity.getConfig()}'/> + <JLabel text='{identity.getConfig()+""}'/> </cell> </row> <row> @@ -319,7 +319,7 @@ protected String[] getSources() { <JLabel text='Directory file:'/> </cell> <cell> - <JLabel text='{identity.getDir()}'/> + <JLabel text='{identity.getDir()+""}'/> </cell> </row> </Table> diff --git a/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationTableDemo.jaxx b/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationTableDemo.jaxx index 6d56abf..ae50fcd 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationTableDemo.jaxx +++ b/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationTableDemo.jaxx @@ -133,7 +133,7 @@ protected String[] getSources() { <JLabel text='Ratio:'/> </cell> <cell> - <JLabel text='{model1.getRatio()}'/> + <JLabel text='{model1.getRatio()+""}'/> </cell> </row> </Table> @@ -206,7 +206,7 @@ protected String[] getSources() { <JLabel text='Ratio:'/> </cell> <cell> - <JLabel text='{model2.getRatio()}'/> + <JLabel text='{model2.getRatio()+""}'/> </cell> </row> </Table> @@ -260,7 +260,7 @@ protected String[] getSources() { <JLabel text='Config file :'/> </cell> <cell> - <JTextField id='config' text='{identity.getConfig()}' + <JTextField id='config' text='{identity.getConfig()+""}' onKeyReleased='identity.setConfig(new java.io.File(config.getText()))'/> </cell> </row> @@ -269,7 +269,7 @@ protected String[] getSources() { <JLabel text='Working directory:'/> </cell> <cell> - <JTextField id='dir' text='{identity.getDir()}' + <JTextField id='dir' text='{identity.getDir()+""}' onKeyReleased='identity.setDir(new java.io.File(dir.getText()))'/> </cell> </row> @@ -309,7 +309,7 @@ protected String[] getSources() { <JLabel text='Age:'/> </cell> <cell> - <JLabel text='{identity.getAge()}'/> + <JLabel text='{identity.getAge()+""}'/> </cell> </row> <row> @@ -317,7 +317,7 @@ protected String[] getSources() { <JLabel text='Config file:'/> </cell> <cell> - <JLabel text='{identity.getConfig()}'/> + <JLabel text='{identity.getConfig()+""}'/> </cell> </row> <row> @@ -325,7 +325,7 @@ protected String[] getSources() { <JLabel text='Directory file:'/> </cell> <cell> - <JLabel text='{identity.getDir()}'/> + <JLabel text='{identity.getDir()+""}'/> </cell> </row> </Table> diff --git a/jaxx-demo/src/main/java/jaxx/demo/fun/CounterDemo.jaxx b/jaxx-demo/src/main/java/jaxx/demo/fun/CounterDemo.jaxx index a2960e9..93c79e1 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/fun/CounterDemo.jaxx +++ b/jaxx-demo/src/main/java/jaxx/demo/fun/CounterDemo.jaxx @@ -21,7 +21,7 @@ <jaxx.demo.DemoPanel> <script>int count;</script> <JPanel id='demoPanel'> - <JTextField text='{count}' constraints='BorderLayout.NORTH'/> + <JTextField text='{count+""}' constraints='BorderLayout.NORTH'/> <HBox constraints='BorderLayout.SOUTH'> <JButton text='Dec (-)' onActionPerformed='count--'/> <JButton text='Reset' onActionPerformed='count = 0'/> diff --git a/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.properties b/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.properties index 882b626..c3a689e 100644 --- a/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.properties +++ b/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.properties @@ -42,6 +42,7 @@ Fancy\ Button= First\ Name\:= FirstName\:= Font\ size= +Font\ size\:\ = Fool\ me\ once= Fool\ me\ twice= Green= @@ -81,6 +82,7 @@ Stop= Supported\ Swing\ components\:= Text2\:= Text\:= +Total\:\ = Underline= Upper\ case\ text\:= Use\ the\ spinner\ to= @@ -90,6 +92,7 @@ View= Welcome\ to\ the\ JAXX\ framework\!= Working\ directory\:= Yellow= +You\ entered\:\ = Your\ name\:= \\u00f7= actors= diff --git a/jaxx-demo/src/main/resources/i18n/jaxx-demo-fr_FR.properties b/jaxx-demo/src/main/resources/i18n/jaxx-demo-fr_FR.properties index 76ec4c2..79f942f 100644 --- a/jaxx-demo/src/main/resources/i18n/jaxx-demo-fr_FR.properties +++ b/jaxx-demo/src/main/resources/i18n/jaxx-demo-fr_FR.properties @@ -42,6 +42,7 @@ Fancy\ Button=Bouton 'Fancy' First\ Name\:=Pr\u00E9nom FirstName\:=Pr\u00E9nom \: Font\ size=Taille de la police +Font\ size\:\ = Fool\ me\ once= Fool\ me\ twice= Green=Vert @@ -81,6 +82,7 @@ Stop=Arr\u00EAter Supported\ Swing\ components\:=Composants Swing support\u00E9s Text2\:=Text 2 Text\:=Texte \: +Total\:\ = Underline=soulign\u00E9 Upper\ case\ text\:=Texte en majuscule Use\ the\ spinner\ to=Utiliser la jauge pour @@ -90,6 +92,7 @@ View=Vue Welcome\ to\ the\ JAXX\ framework\!=Bienvenu dans le framework JAXX Working\ directory\:=R\u00E9pertoire de travail Yellow=Jaune +You\ entered\:\ = Your\ name\:=Votre nom \: \\u00f7= actors=Acteurs -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.