From tchemit@users.nuiton.org Mon Dec 21 21:11:58 2009
From: tchemit@users.nuiton.org
To: jaxx-commits@list.nuiton.org
Subject: [Jaxx-commits] r1692 - in trunk/jaxx-demo/src/main: java/jaxx/demo
	java/jaxx/demo/component/jaxx/editor	java/jaxx/demo/feature/databinding
 java/jaxx/demo/fun resources/i18n
Date: Mon, 21 Dec 2009 21:11:58 +0100
Message-ID: <20091221201158.12A0815D8D@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8270754908927953707=="

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

Author: tchemit
Date: 2009-12-21 21:11:57 +0100 (Mon, 21 Dec 2009)
New Revision: 1692

Added:
   trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSources.jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSourcesHandler.java
   trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BindingExtreme=
Demo.jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/DefaultDemoUIM=
odel.java
   trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/DemoUIModel.ja=
va
Modified:
   trunk/jaxx-demo/src/main/java/jaxx/demo/DemoPanel.jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/DemoTreeHelper.java
   trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditor=
Demo.jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/fun/Calculator.css
   trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.properties
   trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-fr_FR.properties
Log:
add FontSizor widget + ExtremeDatabinding demo + use FontSizor on sources

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoPanel.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/DemoPanel.jaxx	2009-12-21 20:11:0=
1 UTC (rev 1691)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoPanel.jaxx	2009-12-21 20:11:5=
7 UTC (rev 1692)
@@ -22,8 +22,6 @@
 <JTabbedPane id=3D'top'>
=20
     <script><![CDATA[
-import org.apache.commons.io.IOUtils;
-import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
=20
 protected String[] getSources() {
     if (getClass() =3D=3D DemoPanel.class) {
@@ -48,20 +46,6 @@
     return getLabel() + " Demo";
 }
=20
-public String loadSource(String filename) {
-    try {
-        if (log.isDebugEnabled()) {
-            log.debug(filename + " from " + getClass());
-        }
-        String result =3D IOUtils.toString(getClass().getResourceAsStream(fi=
lename));
-
-        return result;
-    } catch (Exception e) {
-        log.error("could not load file " + filename, e);
-        return "could not load file " + filename;
-    }
-}
-
 private void $afterCompleteSetup() {
     SwingUtilities.invokeLater(new Runnable() {
=20
@@ -71,48 +55,20 @@
                top.remove(sourceTabs);
                return;
             }
-            for (String extra : getSources()) {
-                JScrollPane pane =3D new JScrollPane(
-                    JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
-                    JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-                pane.setBorder(null);
-                //pane.setMinimumSize(jaxx.runtime.SwingUtil.newMinDimension=
());
-                // creation du contenu du fichier
-                RSyntaxTextArea content =3D new RSyntaxTextArea();
-                if (extra.matches(".*\\.jaxx") || extra.matches(".*\\.xml")){
-                    content.setSyntaxEditingStyle(RSyntaxTextArea.SYNTAX_STY=
LE_XML);
-                } else if (extra.matches(".*\\.java")){
-                    content.setSyntaxEditingStyle(RSyntaxTextArea.SYNTAX_STY=
LE_JAVA);
-                } else if (extra.matches(".*\\.css")){
-                    content.setSyntaxEditingStyle(RSyntaxTextArea.SYNTAX_STY=
LE_CSS);
-                }
-                content.setFont(content.getFont().deriveFont((float) 11));
-                content.setMinimumSize(jaxx.runtime.SwingUtil.newMinDimensio=
n());
-                content.setEditable(false);
-                content.setWrapStyleWord(false);
-                content.setText(loadSource(extra));
-                content.setColumns(80);
-                content.setLineWrap(true);
-                pane.getViewport().add(content);
-                content.setCaretPosition(0);
-                // ajout de l'onglet
-                sourceTabs.addTab(extra, pane);
-                int index =3D sourceTabs.indexOfComponent(pane);
-                JLabel l =3D new JLabel(extra);
-                l.setFont(l.getFont().deriveFont((float) 10));
-                sourceTabs.setTabComponentAt(index,l);
-            }
+            sourceTabs.init();
         }
     });
 }
   ]]>
     </script>
=20
-    <tab title=3D'{getDemoTabTitle()}'>
+    <tab id=3D'tabDemoPanel' title=3D'{getDemoTabTitle()}'>
         <JPanel id=3D'demoPanel'/>
     </tab>
=20
-    <tab title=3D'Sources'>
-        <JTabbedPane id=3D'sourceTabs' tabPlacement=3D'{JTabbedPane.BOTTOM}'=
/>           =20
+    <tab id=3D'tabDemoSources' tabComponent=3D'{sourceTabs.getSourcesHeader(=
)}'>
+        <DemoSources id=3D'sourceTabs'
+                     sources=3D'{java.util.Arrays.asList(getSources())}'
+                     incomingClass=3D'{getClass()}'/>
     </tab>
-</JTabbedPane>
+</JTabbedPane>
\ No newline at end of file

Copied: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSources.jaxx (from rev 16=
86, trunk/jaxx-demo/src/main/java/jaxx/demo/DemoPanel.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/DemoSources.jaxx	                =
        (rev 0)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSources.jaxx	2009-12-21 20:11=
:57 UTC (rev 1692)
@@ -0,0 +1,64 @@
+<!--
+  *##%=20
+  JAXX Demo
+  Copyright (C) 2008 - 2009 CodeLutin
+=20
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as
+  published by the Free Software Foundation, either version 3 of the
+  License, or (at your option) any later version.
+=20
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Lesser Public License for more details.
+=20
+  You should have received a copy of the GNU General Lesser Public
+  License along with this program.  If not, see
+  <http://www.gnu.org/licenses/lgpl-3.0.html>.
+  ##%*
+-->
+<JPanel layout=3D'{new BorderLayout()}'>
+
+    <script><![CDATA[
+import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
+import jaxx.runtime.swing.FontSizor;
+
+public void init() {
+    fontSizor.init();
+    handler.init(this);   =20
+}
+  ]]>
+    </script>
+
+    <JPanel id=3D"sourcesHeader" opaque=3D'false'>
+        <JLabel text=3D'Sources' opaque=3D'false'/>
+        <FontSizor id=3D'fontSizor' opaque=3D'false' showFontSize=3D'true' d=
efaultFontSize=3D'10f' fontSize=3D'10f'/>
+    </JPanel>
+
+    <DemoSourcesHandler id=3D'handler'/>
+
+    <Class id=3D'incomingClass' javaBean=3D'null'/>
+
+    <String id=3D'currentSource' javaBean=3D'null'/>
+
+    <java.util.List id=3D'sources' genericType=3D'String' javaBean=3D'null'/>
+
+    <JTabbedPane id=3D'sourceTabs'
+                 constraints=3D'BorderLayout.CENTER'
+                 tabPlacement=3D'{JTabbedPane.BOTTOM}'
+                 onStateChanged=3D'handler.updateSource(this)'/>
+
+    <RSyntaxTextArea id=3D'editor'
+                     constraints=3D'BorderLayout.SOUTH'
+                     font-size=3D'{fontSizor.getFontSize()}'
+                     text=3D'{handler.getSourceContent(DemoSources.this, get=
CurrentSource())}'
+                     syntaxEditingStyle=3D'{handler.getSourceEditingStyle(De=
moSources.this, getCurrentSource())}'
+                     minimumSize=3D"{jaxx.runtime.SwingUtil.newMinDimension(=
)}"
+                     textAntiAliasHint=3D'{RenderingHints.KEY_ANTIALIASING.t=
oString()}'
+                     editable=3D"false"
+                     wrapStyleWord=3D"false"
+                     columns=3D"80"
+                     lineWrap=3D"true"/>
+
+</JPanel>
\ No newline at end of file

Added: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSourcesHandler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/DemoSourcesHandler.java	         =
               (rev 0)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSourcesHandler.java	2009-12-2=
1 20:11:57 UTC (rev 1692)
@@ -0,0 +1,124 @@
+package jaxx.demo;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+/**
+ * Created: 21 d=C3=A9c. 2009
+ *
+ * @author Tony Chemit <chemit@codelutin.com> Copyright Code Lutin
+ * @version $Revision$
+ *          <p/>
+ *          Mise a jour: $Date$ par :
+ *          $Author: tchemit $
+ */
+public class DemoSourcesHandler {
+
+    /**
+     * Logger
+     */
+    private static final Log log =3D LogFactory.getLog(DemoSourcesHandler.cl=
ass);
+
+    protected Map<String, String> sourcesCache;
+
+    public Map<String, String> getSourcesCache() {
+        if (sourcesCache =3D=3D null) {
+            sourcesCache =3D new TreeMap<String, String>();
+        }
+        return sourcesCache;
+    }
+
+    public String getSourceContent(DemoSources ui, String name) {
+        if (name =3D=3D null) {
+            return "";
+        }
+        String result =3D getSourcesCache().get(name);
+        if (result =3D=3D null) {
+            try {
+                if (log.isDebugEnabled()) {
+                    log.debug(name + " from " + getClass());
+                }
+                result =3D IOUtils.toString(ui.getIncomingClass().getResourc=
eAsStream(name));
+                if (log.isDebugEnabled()) {
+                    log.debug("source [" + name + "], loaded content =3D\n" =
+ result);
+                }
+            } catch (Exception e) {
+                log.error("could not load file " + name, e);
+                result =3D "could not load file " + name;
+            }
+            getSourcesCache().put(name, result);
+        }
+        return result;
+    }
+
+    public String getSourceEditingStyle(DemoSources ui, String source) {
+
+        if (source =3D=3D null) {
+            return "";
+        }
+        String s =3D null;
+        if (source.matches(".*\\.jaxx") || source.matches(".*\\.xml")) {
+            s =3D RSyntaxTextArea.SYNTAX_STYLE_XML;
+        } else if (source.matches(".*\\.java")) {
+            s =3D RSyntaxTextArea.SYNTAX_STYLE_JAVA;
+        } else if (source.matches(".*\\.css")) {
+            s =3D RSyntaxTextArea.SYNTAX_STYLE_CSS;
+        }
+        if (log.isInfoEnabled()) {
+            log.info("source [" + source + "] style =3D " + s);
+        }
+        return s;
+    }
+
+    public void init(DemoSources ui) {
+        List<String> sources =3D ui.getSources();
+        if (sources =3D=3D null) {
+            return;
+        }
+        for (String source : sources) {
+
+            if (log.isInfoEnabled()) {
+                log.info("adding tab for resource " + source);
+            }
+            JScrollPane pane =3D new JScrollPane(
+                    JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
+                    JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+            pane.setBorder(null);
+            // ajout de l'onglet
+            ui.sourceTabs.addTab(source, pane);
+            int index =3D ui.sourceTabs.indexOfComponent(pane);
+            JLabel l =3D new JLabel(source);
+            l.setFont(l.getFont().deriveFont((float) 10));
+            ui.sourceTabs.setTabComponentAt(index, l);
+        }
+    }
+
+    public void updateSource(DemoSources ui) {
+        JTabbedPane sourceTabs =3D ui.getSourceTabs();
+        int index =3D sourceTabs.getSelectedIndex();
+        String sourceName =3D sourceTabs.getTitleAt(index);
+
+        if (log.isInfoEnabled()) {
+            log.info("new current Source : " + sourceName);
+        }
+        // attach editor to correct selected tab and reset it
+        JScrollPane pane =3D (JScrollPane) sourceTabs.getComponentAt(index);
+        pane.getViewport().add(ui.getEditor());
+        ui.getEditor().setText("");
+        ui.getEditor().setCaretPosition(0);
+        ui.getEditor().setTextAntiAliasHint(RenderingHints.KEY_ANTIALIASING.=
toString());
+
+        // change the current source to release the editor
+        ui.setCurrentSource(sourceName);
+
+    }
+
+}


Property changes on: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSourcesHandl=
er.java
___________________________________________________________________
Added: svn:keywords
   + "Author Date Id Revision HeadURL

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoTreeHelper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/DemoTreeHelper.java	2009-12-21 20=
:11:01 UTC (rev 1691)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoTreeHelper.java	2009-12-21 20=
:11:57 UTC (rev 1692)
@@ -29,6 +29,7 @@
 import jaxx.demo.component.jaxx.navigation.item.ItemTreeNavigationDemo;
 import jaxx.demo.component.swing.*;
 import jaxx.demo.feature.databinding.BeanDataBindingDemo;
+import jaxx.demo.feature.databinding.BindingExtremeDemo;
 import jaxx.demo.feature.validation.ValidationListDemo;
 import jaxx.demo.feature.validation.ValidationTableDemo;
 import jaxx.demo.fun.CalculatorDemo;
@@ -116,6 +117,7 @@
                 goUp().
                 addText(n_("jaxxdemo.tree.feature")).
                 addText(n_("jaxxdemo.tree.features.databinding")).
+                addDemo(BindingExtremeDemo.class).
                 addDemo(BeanDataBindingDemo.class).
                 goUp().
                 addText(n_("jaxxdemo.tree.features.validation")).

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/Numbe=
rEditorDemo.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/jaxx/editor/NumberEdito=
rDemo.jaxx	2009-12-21 20:11:01 UTC (rev 1691)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEdito=
rDemo.jaxx	2009-12-21 20:11:57 UTC (rev 1692)
@@ -86,97 +86,4 @@
         </row>
     </Table>
 </jaxx.demo.DemoPanel>
-        <!--row>
-            <cell>
-                <NumberEditor id=3D'positifIntegerEditor'
-                              property=3D'positifInteger'
-                              constructorParams=3D'this'
-                              bean=3D'{demoModel}'
-                              autoPopup=3D'false'
-                              showPopupButton=3D'true'
-                              showReset=3D'true'/>
-            </cell>
-            <cell>
-                <NumberEditor id=3D'positifIntegerEditor2'
-                              property=3D'positifInteger'
-                              constructorParams=3D'this'
-                              bean=3D'{demoModel}'
-                              autoPopup=3D'true'
-                              showPopupButton=3D'true'
-                              showReset=3D'true'/>
-            </cell>
-        </row>
-        <row>
-            <cell>
-                <JLabel text=3D'{_("numbereditor.normal.int", demoModel.getN=
ormalInteger())}'/>
-            </cell>
-            <cell>
-                <NumberEditor id=3D'normalIntegerEditor'
-                              property=3D'normalInteger'
-                              constructorParams=3D'this'
-                              bean=3D'{demoModel}'
-                              autoPopup=3D'false'
-                              showPopupButton=3D'true'
-                              showReset=3D'true'
-                              useSign=3D'true'/>
-            </cell>
-            <cell>
-                <NumberEditor id=3D'normalIntegerEditor2'
-                              property=3D'normalInteger'
-                              constructorParams=3D'this'
-                              bean=3D'{demoModel}'
-                              autoPopup=3D'true'
-                              showPopupButton=3D'true'
-                              showReset=3D'true'
-                              useSign=3D'true'/>
-            </cell>
-        </row>
-        <row>
-            <cell>
-                <JLabel text=3D'{_("numbereditor.positive.float", demoModel.=
getPositifFloat())}'/>
-            </cell>
-            <cell>
-                <NumberEditor id=3D'positifFloatEditor'
-                              property=3D'positifFloat'
-                              constructorParams=3D'this'
-                              bean=3D'{demoModel}'
-                              autoPopup=3D'false'
-                              showPopupButton=3D'true'
-                              showReset=3D'true'/>
-            </cell>
-            <cell>
-                <NumberEditor id=3D'positifFloatEditor2'
-                              property=3D'positifFloat'
-                              constructorParams=3D'this'
-                              bean=3D'{demoModel}'
-                              autoPopup=3D'true'
-                              showPopupButton=3D'true'
-                              showReset=3D'true'/>
-            </cell>
-        </row>
-        <row>
-            <cell>
-                <JLabel text=3D'{_("numbereditor.normal.float", demoModel.ge=
tNormalFloat())}'/>
-            </cell>
-            <cell>
-                <NumberEditor id=3D'normalFloatEditor'
-                              property=3D'normalFloat'
-                              constructorParams=3D'this'
-                              bean=3D'{demoModel}'
-                              autoPopup=3D'false'
-                              showPopupButton=3D'true'
-                              showReset=3D'true'
-                              useSign=3D'true'/>
-            </cell>
-            <cell>
-                <NumberEditor id=3D'normalFloatEditor2'
-                              property=3D'normalFloat'
-                              constructorParams=3D'this'
-                              bean=3D'{demoModel}'
-                              autoPopup=3D'true'
-                              showPopupButton=3D'true'
-                              showReset=3D'true'
-                              useSign=3D'true'/>
-            </cell>
-        </row-->
        =20

Added: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BindingExt=
remeDemo.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/feature/databinding/BindingExtrem=
eDemo.jaxx	                        (rev 0)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BindingExtrem=
eDemo.jaxx	2009-12-21 20:11:57 UTC (rev 1692)
@@ -0,0 +1,243 @@
+<!--
+  *##%=20
+  JAXX Demo
+  Copyright (C) 2008 - 2009 CodeLutin
+=20
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as
+  published by the Free Software Foundation, either version 3 of the
+  License, or (at your option) any later version.
+=20
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Lesser Public License for more details.
+=20
+  You should have received a copy of the GNU General Lesser Public
+  License along with this program.  If not, see
+  <http://www.gnu.org/licenses/lgpl-3.0.html>.
+  ##%*
+-->
+
+<jaxx.demo.DemoPanel id=3D'mainFrame' implements=3D'DemoUIModel'>
+
+    <style>
+        JTextArea { editable:false; }
+
+        JCheckBox { enabled:false; }
+
+        .nobinding { background:{Color.GRAY}; }
+    </style>
+
+    <script><![CDATA[
+public JToggleButton getT3() { return t0; }
+
+private void $afterCompleteSetup() {
+    for (Object o : $objectMap.values()) {
+        if (o instanceof JCheckBox) {
+            JCheckBox c =3D (JCheckBox) o;
+            c.setBackground($bindings.containsKey(c.getName() + ".selected")=
 ? Color.WHITE : Color.RED);
+        }
+    }
+    SwingUtilities.invokeLater(new Runnable() {
+
+        @Override
+        public void run() {
+            DefaultListModel m =3D (DefaultListModel) bindings.getModel();
+            for (JAXXBinding b : getDataBindings()) {
+                m.addElement(b.getId());
+            }
+        }
+    });
+}
+@Override
+protected String[] getSources() {
+    return new String[]{ getDefaultSource(), "DemoUIModel.java", "DefaultDem=
oUIModel.java" };
+}
+  ]]>
+    </script>
+
+    <Boolean id=3D'f0' javaBean=3D'Boolean.FALSE'/>
+    <Boolean id=3D'f1' javaBean=3D'Boolean.FALSE'/>
+    <java.io.File id=3D'file' javaBean=3D'new java.io.File(".")'/>
+
+    <DefaultDemoUIModel id=3D'model0' initializer=3D'new DefaultDemoUIModel(=
)'/>
+
+    <DemoUIModel id=3D'model1' javaBean=3D'new DefaultDemoUIModel()'/>
+
+
+    <Table id=3D'demoPanel' fill=3D"both" constraints=3D'BorderLayout.NORTH'>
+        <row>
+            <cell columns=3D"3">
+                <JPanel layout=3D"{new GridLayout(1,0)}">
+                    <JCheckBox id=3D'cf0' selected=3D'{isF0()}' text=3D'isF0=
()'/>
+                    <JCheckBox id=3D'cf1' selected=3D'{isF1()}' text=3D'isF1=
()'/>
+                    <JCheckBox id=3D'cf0O1' selected=3D'{isF0() || isF1()}' =
text=3D'isF0() || isF1()'/>
+                    <JCheckBox id=3D'cf0A1' selected=3D'{isF0() &amp;&amp; i=
sF1()}' text=3D'isF0() &amp;&amp; isF1()'/>
+                </JPanel>
+            </cell>
+        </row>
+        <row>
+            <cell columns=3D"3">
+                <JPanel layout=3D"{new GridLayout(1,0)}">
+                    <JCheckBox id=3D'ct0' selected=3D'{t0.isSelected()}' tex=
t=3D't0.isSelected()'/>
+                    <JCheckBox id=3D'ct1' selected=3D'{t1.isSelected()}' tex=
t=3D't1.isSelected()'/>
+                    <JCheckBox id=3D'ct0O1' selected=3D'{t0.isSelected() || =
t1.isSelected()}'
+                               text=3D't0.isSelected() || t1.isSelected()'/>
+                    <JCheckBox id=3D'ct0A1' selected=3D'{t0.isSelected() &am=
p;&amp; t1.isSelected()}'
+                               text=3D't0.isSelected() &amp;&amp; t1.isSelec=
ted()'/>
+                </JPanel>
+            </cell>
+        </row>
+        <row>
+            <cell columns=3D"3">
+                <JPanel layout=3D"{new GridLayout(1,0)}">
+                    <JCheckBox id=3D'cgett0' selected=3D'{getT0().isSelected=
()}' text=3D'getT0().isSelected()'/>
+                    <JCheckBox id=3D'cgett1' selected=3D'{getT1().isSelected=
()}' text=3D'getT1().isSelected()'/>
+                    <JCheckBox id=3D'cgett0O1' selected=3D'{getT0().isSelect=
ed() || getT1().isSelected()}'
+                               text=3D'getT0().isSelected() || getT1().isSel=
ected()'/>
+                    <JCheckBox id=3D'cgett0A1' selected=3D'{getT0().isSelect=
ed() &amp;&amp; getT1().isSelected()}'
+                               text=3D'getT0().isSelected() &amp;&amp; getT1=
().isSelected()'/>
+                </JPanel>
+            </cell>
+        </row>
+        <row>
+            <cell columns=3D"3">
+                <JPanel layout=3D"{new GridLayout(1,0)}">
+                    <JTextArea id=3D'cfile' border=3D'{new TitledBorder("fil=
e.getAbsolutePath()")}'
+                               text=3D'{file.getAbsolutePath()}' visible=3D'=
{!$bindings.containsKey("cfile.text")}'
+                               styleClass=3D"nobinding"/>
+                    <JTextArea id=3D'cgetfile' border=3D'{new TitledBorder("=
getFile().getAbsolutePath()")}'
+                               text=3D'{getFile().getAbsolutePath()}'
+                               visible=3D'{$bindings.containsKey("cgetfile.t=
ext")}'/>
+                </JPanel>
+            </cell>
+        </row>
+        <row weightx=3D'1'>
+            <cell>
+                <JToggleButton id=3D't0' text=3D'f0' onActionPerformed=3D'se=
tF0(!f0)'/>
+            </cell>
+            <cell>
+                <JToggleButton id=3D't1' text=3D'f1' onActionPerformed=3D'se=
tF1(!f1)' javaBean=3D'new JToggleButton()'/>
+            </cell>
+            <cell>
+                <JButton text=3D"file..."
+                         onActionPerformed=3D'setFile(org.nuiton.util.FileUt=
il.getFile(this, new String[0]))'/>
+            </cell>
+        </row>
+
+        <row>
+            <cell columns=3D"3">
+                <JPanel layout=3D"{new GridLayout(1,0)}">
+                    <JCheckBox id=3D'cmt0' selected=3D'{model0.isF0()}' text=
=3D'model0.isF0()'/>
+                    <JCheckBox id=3D'cmt1' selected=3D'{model0.isF1()}' text=
=3D'model0.isF1()'/>
+                    <JCheckBox id=3D'cmt0O1' selected=3D'{model0.isF0() || m=
odel0.isF1()}'
+                               text=3D'model0.isF0() || model0.isF1()'/>
+                    <JCheckBox id=3D'cmt0A1' selected=3D'{model0.isF0() &amp=
;&amp; model0.isF1()}'
+                               text=3D'model0.isF0() &amp;&amp; model0.isF1(=
)'/>
+                </JPanel>
+            </cell>
+        </row>
+        <row>
+            <cell columns=3D"3">
+                <JPanel layout=3D"{new GridLayout(1,0)}">
+                    <JCheckBox id=3D'cmgett0' selected=3D'{getModel0().isF0(=
)}' text=3D'getModel0().isF0()'/>
+                    <JCheckBox id=3D'cmgett1' selected=3D'{getModel0().isF1(=
)}' text=3D'getModel0().isF1()'/>
+                    <JCheckBox id=3D'cmgett0O1' selected=3D'{getModel0().isF=
0() || getModel0().isF1()}'
+                               text=3D'getModel0().isF0() || getModel0().isF=
1()'/>
+                    <JCheckBox id=3D'cmgett0A1' selected=3D'{getModel0().isF=
0() &amp;&amp; getModel0().isF1()}'
+                               text=3D'getModel0().isF0() &amp;&amp; getMode=
l0().isF1()'/>
+                </JPanel>
+            </cell>
+        </row>
+        <row>
+            <cell columns=3D"3">
+                <JPanel layout=3D"{new GridLayout(1,0)}">
+                    <JTextArea id=3D'cMfile' border=3D'{new TitledBorder("mo=
del0.getFile().getAbsolutePath()")}'
+                               text=3D'{model0.getFile().getAbsolutePath()}'
+                               visible=3D'{$bindings.containsKey("cMfile.tex=
t")}'/>
+                    <JTextArea id=3D'cMgetfile' border=3D'{new TitledBorder(=
"getModel0().getFile().getAbsolutePath()")}'
+                               text=3D'{getModel0().getFile().getAbsolutePat=
h()}'
+                               visible=3D'{$bindings.containsKey("cMgetfile.=
text")}'/>
+                </JPanel>
+            </cell>
+        </row>
+        <row>
+            <cell>
+                <JToggleButton id=3D'Mt0' text=3D'model0.f0' onActionPerform=
ed=3D'model0.setF0(!model0.isF0())'/>
+            </cell>
+            <cell>
+                <JToggleButton id=3D'Mt1' text=3D'model0.f1' onActionPerform=
ed=3D'model0.setF1(!model0.isF1())'
+                               javaBean=3D'new JToggleButton()'/>
+            </cell>
+            <cell>
+                <JButton text=3D"model0.file..."
+                         onActionPerformed=3D'model0.setFile(org.nuiton.util=
.FileUtil.getFile(this,new String[0]))'/>
+            </cell>
+        </row>
+
+        <row>
+            <cell columns=3D"3">
+                <JPanel layout=3D"{new GridLayout(1,0)}">
+                    <JCheckBox id=3D'cit0' selected=3D'{((DemoUIModel)model1=
).isF0()}' text=3D'model1.isF0()'/>
+                    <JCheckBox id=3D'cit1' selected=3D'{((DemoUIModel)model1=
).isF1()}' text=3D'model1.isF1()'/>
+                    <JCheckBox id=3D'cit0O1' selected=3D'{((DemoUIModel)mode=
l1).isF0() || ((DemoUIModel)model1).isF1()}'
+                               text=3D'model1.isF0() || model1.isF1()'/>
+                    <JCheckBox id=3D'cit0A1'
+                               selected=3D'{((DemoUIModel)model1).isF0() &am=
p;&amp; ((DemoUIModel)model1).isF1()}'
+                               text=3D'model1.isF0() &amp;&amp; model1.isF1(=
)'/>
+                </JPanel>
+            </cell>
+        </row>
+        <row>
+            <cell columns=3D"3">
+                <JPanel layout=3D"{new GridLayout(1,0)}">
+                    <JCheckBox id=3D'cigett0' selected=3D'{getModel1().isF0(=
)}' text=3D'getModel1().isF0()'/>
+                    <JCheckBox id=3D'cigett1' selected=3D'{getModel1().isF1(=
)}' text=3D'getModel1().isF1()'/>
+                    <JCheckBox id=3D'cigett0O1' selected=3D'{getModel1().isF=
0() || getModel1().isF1()}'
+                               text=3D'getModel1().isF0() || getModel1().isF=
1()'/>
+                    <JCheckBox id=3D'cigett0A1' selected=3D'{getModel1().isF=
0() &amp;&amp; getModel1().isF1()}'
+                               text=3D'getModel1().isF0() &amp;&amp; getMode=
l1().isF1()'/>
+                </JPanel>
+            </cell>
+        </row>
+        <row>
+            <cell columns=3D"3">
+                <JPanel layout=3D"{new GridLayout(1,0)}">
+                    <JTextArea id=3D'cIfile' border=3D'{new TitledBorder("mo=
del1.getFile().getAbsolutePath()")}'
+                               text=3D'{model1.getFile().getAbsolutePath()}'
+                               visible=3D'{$bindings.containsKey("cIfile.tex=
t")}'/>
+                    <JTextArea id=3D'cIgetfile' border=3D'{new TitledBorder(=
"getModel1().getFile().getAbsolutePath()")}'
+                               text=3D'{getModel1().getFile().getAbsolutePat=
h()}'
+                               visible=3D'{$bindings.containsKey("cIgetfile.=
text")}'/>
+                </JPanel>
+            </cell>
+        </row>
+        <row>
+            <cell>
+                <JToggleButton id=3D'It0' text=3D'model1.f0' onActionPerform=
ed=3D'model1.setF0(!model1.isF0())'/>
+            </cell>
+            <cell>
+                <JToggleButton id=3D'It1' text=3D'model1.f1' onActionPerform=
ed=3D'model1.setF1(!model1.isF1())'
+                               javaBean=3D'new JToggleButton()'/>
+            </cell>
+            <cell>
+                <JButton text=3D"model1.file..."
+                         onActionPerformed=3D'model1.setFile(org.nuiton.util=
.FileUtil.getFile(this,new String[0]))'/>
+            </cell>
+        </row>
+
+        <row>
+            <cell columns=3D"3">
+                <JPanel layout=3D"{new BorderLayout()}">
+                    <JTextArea id=3D"bindingsLabel" editable=3D'false' text=
=3D'{$bindings.size() + " bindings."}'/>
+                    <JScrollPane constraints=3D'BorderLayout.CENTER' columnH=
eaderView=3D'{bindingsLabel}'>
+                        <JList id=3D"bindings" model=3D'{new DefaultListMode=
l()}' font-size=3D'10'/>
+                    </JScrollPane>
+                </JPanel>
+            </cell>
+        </row>
+    </Table>
+
+
+</jaxx.demo.DemoPanel>

Added: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/DefaultDem=
oUIModel.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/feature/databinding/DefaultDemoUI=
Model.java	                        (rev 0)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/DefaultDemoUI=
Model.java	2009-12-21 20:11:57 UTC (rev 1692)
@@ -0,0 +1,137 @@
+package jaxx.demo.feature.databinding;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+
+/**
+ * Created: 3 d=C3=A9c. 2009
+ *
+ * @author Tony Chemit <chemit@codelutin.com> Copyright Code Lutin
+ * @version $Revision$
+ *          <p/>
+ *          Mise a jour: $Date$ par :
+ *          $Author: tchemit $
+ */
+public class DefaultDemoUIModel implements DemoUIModel {
+
+
+    protected java.io.File file;
+    protected java.io.File file1;
+    protected java.lang.Boolean f1 =3D false;
+    protected java.lang.Boolean f0 =3D false;
+
+    protected javax.swing.JToggleButton t1;
+    protected javax.swing.JToggleButton t0;
+
+    public static final String PROPERTY_T1 =3D "t1";
+    public static final String PROPERTY_F1 =3D "f1";
+    public static final String PROPERTY_F0 =3D "f0";
+    public static final String PROPERTY_FILE =3D "file";
+
+    protected final PropertyChangeSupport pcs =3D new PropertyChangeSupport(=
this);
+
+    protected static final Log log =3D LogFactory.getLog(DefaultDemoUIModel.=
class);
+
+    /*----------------------------------------------------------------------=
-----------*/
+    /*-- public acessor methods --------------------------------------------=
-----------*/
+    /*----------------------------------------------------------------------=
-----------*/
+
+    public java.lang.Boolean getF0() {
+        return f0;
+    }
+
+    public java.lang.Boolean getF1() {
+        return f1;
+    }
+
+    @Override
+    public java.io.File getFile() {
+        return file;
+    }
+
+    public java.io.File getFile1() {
+        return file1;
+    }
+
+    @Override
+    public javax.swing.JToggleButton getT0() {
+        return t0;
+    }
+
+    @Override
+    public javax.swing.JToggleButton getT1() {
+        return t1;
+    }
+
+    @Override
+    public java.lang.Boolean isF0() {
+        return f0 !=3D null && f0;
+    }
+
+    @Override
+    public java.lang.Boolean isF1() {
+        return f1 !=3D null && f1;
+    }
+
+    /*----------------------------------------------------------------------=
-----------*/
+    /*-- public mutator methods --------------------------------------------=
-----------*/
+    /*----------------------------------------------------------------------=
-----------*/
+
+    @Override
+    public void setF0(java.lang.Boolean newValue) {
+        java.lang.Boolean oldValue =3D this.f0;
+        this.f0 =3D newValue;
+        firePropertyChange(PROPERTY_F0, oldValue, newValue);
+    }
+
+    @Override
+    public void setF1(java.lang.Boolean newValue) {
+        java.lang.Boolean oldValue =3D this.f1;
+        this.f1 =3D newValue;
+        firePropertyChange(PROPERTY_F1, oldValue, newValue);
+    }
+
+    @Override
+    public void setFile(java.io.File newValue) {
+        java.io.File oldValue =3D this.file;
+        this.file =3D newValue;
+        firePropertyChange(PROPERTY_FILE, oldValue, newValue);
+    }
+
+
+    public void setT1(javax.swing.JToggleButton newValue) {
+        javax.swing.JToggleButton oldValue =3D this.t1;
+        this.t1 =3D newValue;
+        firePropertyChange(PROPERTY_T1, oldValue, newValue);
+    }
+
+    @Override
+    public void firePropertyChange(String name, Object oldValue, Object newV=
alue) {
+        pcs.firePropertyChange(name, oldValue, newValue);
+    }
+
+    @Override
+    public void addPropertyChangeListener(PropertyChangeListener listener) {
+        pcs.addPropertyChangeListener(listener);
+    }
+
+    @Override
+    public void addPropertyChangeListener(String property, PropertyChangeLis=
tener listener) {
+        pcs.addPropertyChangeListener(property, listener);
+    }
+
+    @Override
+    public void removePropertyChangeListener(PropertyChangeListener listener=
) {
+        pcs.removePropertyChangeListener(listener);
+    }
+
+    @Override
+    public void removePropertyChangeListener(String property, PropertyChange=
Listener listener) {
+        pcs.removePropertyChangeListener(property, listener);
+    }
+
+
+}


Property changes on: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databind=
ing/DefaultDemoUIModel.java
___________________________________________________________________
Added: svn:keywords
   + "Author Date Id Revision HeadURL

Added: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/DemoUIMode=
l.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/feature/databinding/DemoUIModel.j=
ava	                        (rev 0)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/DemoUIModel.j=
ava	2009-12-21 20:11:57 UTC (rev 1692)
@@ -0,0 +1,74 @@
+package jaxx.demo.feature.databinding;
+
+import javax.swing.*;
+import java.io.File;
+
+/**
+ * Created: 2 d=C3=A9c. 2009
+ *
+ * @author Tony Chemit <chemit@codelutin.com> Copyright Code Lutin
+ * @version $Revision$
+ *          <p/>
+ *          Mise a jour: $Date$ par :
+ *          $Author: tchemit $
+ */
+public interface DemoUIModel {
+
+    Boolean isF0();
+
+    Boolean isF1();
+
+    void setF0(Boolean b);
+
+    void setF1(Boolean b);
+
+    JToggleButton getT0();
+
+    JToggleButton getT1();
+
+    File getFile();
+
+    void setFile(File newValue);
+
+    /**
+     * All <code>JAXXObject</code> implements are capable of broadcasting <c=
ode>PropertyChangeEvent</code>, and
+     * furthermore (for technical reasons) must allow code in outside packag=
es, specifically the JAXX runtime,
+     * to trigger these events.
+     *
+     * @param name     the name of the property which changed
+     * @param oldValue the old value of the property
+     * @param newValue the new value of the property
+     */
+    void firePropertyChange(String name, Object oldValue, Object newValue);
+
+    /**
+     * Register a general {@link java.beans.PropertyChangeListener}.
+     *
+     * @param listener the listener to register
+     */
+    void addPropertyChangeListener(java.beans.PropertyChangeListener listene=
r);
+
+    /**
+     * Register a  {@link java.beans.PropertyChangeListener}. for the given =
{@code propertyName}.
+     *
+     * @param property the property name to listen
+     * @param listener the listener to register
+     */
+    void addPropertyChangeListener(String property, java.beans.PropertyChang=
eListener listener);
+
+    /**
+     * Unregister a general {@link java.beans.PropertyChangeListener}.
+     *
+     * @param listener the listener to unregister
+     */
+    void removePropertyChangeListener(java.beans.PropertyChangeListener list=
ener);
+
+    /**
+     * Unregister a  {@link java.beans.PropertyChangeListener}. for the give=
n {@code propertyName}.
+     *
+     * @param property the property name to listen
+     * @param listener the listener to unregister
+     */
+    void removePropertyChangeListener(String property, java.beans.PropertyCh=
angeListener listener);
+
+}


Property changes on: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databind=
ing/DemoUIModel.java
___________________________________________________________________
Added: svn:keywords
   + "Author Date Id Revision HeadURL

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/fun/Calculator.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/fun/Calculator.css	2009-12-21 20:=
11:01 UTC (rev 1691)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/fun/Calculator.css	2009-12-21 20:=
11:57 UTC (rev 1692)
@@ -39,8 +39,12 @@
     foreground: red;
 }
=20
-JButton:mouseover {
+/*JButton:mouseover {
     font-weight: bold;
+}*/
+
+JButton.operator:mouseover {
+    font-weight: bold;
 }
=20
 JButton.operator:mouseover {

Modified: trunk/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
--- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.properties	2009-1=
2-21 20:11:01 UTC (rev 1691)
+++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.properties	2009-1=
2-21 20:11:57 UTC (rev 1692)
@@ -112,13 +112,32 @@
 edit2=3DEdit 2
 edit3=3DEdit 3
 editor.getSelectedLocale()=3D
+f0=3D
+f1=3D
+file...=3D
 form.ratio=3DRatio
 form.text=3DText
 form.text2=3DText 2
 form2.ratio=3DForm 2 Ratio
 form2.text=3DForm 2 Text
 form2.text2=3DForm 2 Text 2
+getModel0().isF0()=3D
+getModel0().isF0()\ &&\ getModel0().isF1()=3D
+getModel0().isF0()\ ||\ getModel0().isF1()=3D
+getModel0().isF1()=3D
+getModel1().isF0()=3D
+getModel1().isF0()\ &&\ getModel1().isF1()=3D
+getModel1().isF0()\ ||\ getModel1().isF1()=3D
+getModel1().isF1()=3D
+getT0().isSelected()=3D
+getT0().isSelected()\ &&\ getT1().isSelected()=3D
+getT0().isSelected()\ ||\ getT1().isSelected()=3D
+getT1().isSelected()=3D
 i18neditor.popup.title=3D
+isF0()=3D
+isF0()\ &&\ isF1()=3D
+isF0()\ ||\ isF1()=3D
+isF1()=3D
 jaxxdemo.about.message=3D<h3>JAXX Demo</h3><hr/>For more informations, viste=
 the <a href\=3D"http\://maven-site.nuiton.org/jaxx/jaxx-demo">website of the=
 project</a>.
 jaxxdemo.action.about=3DAbout...
 jaxxdemo.action.about.tip=3DAbout JAXXDemo...
@@ -194,6 +213,20 @@
 jaxxdemo.tree.fun=3DFun
 jaxxdemo.warning.nimbus.landf=3DCould not init nymbus look and feel, you nee=
d at leasr version 1.6u10 of java.
 jaxxdemo.warning.no.ui=3DNo ui environnement detected
+model0.f0=3D
+model0.f1=3D
+model0.file...=3D
+model0.isF0()=3D
+model0.isF0()\ &&\ model0.isF1()=3D
+model0.isF0()\ ||\ model0.isF1()=3D
+model0.isF1()=3D
+model1.f0=3D
+model1.f1=3D
+model1.file...=3D
+model1.isF0()=3D
+model1.isF0()\ &&\ model1.isF1()=3D
+model1.isF0()\ ||\ model1.isF1()=3D
+model1.isF1()=3D
 movies=3DMovies
 numbereditor.normal.float=3DSigned float
 numbereditor.normal.int=3DSigned integer
@@ -204,6 +237,10 @@
 numbereditor.without.auto.popup=3DWithout auto popup
 show/hide\ label1=3D
 show/hide\ label2=3D
+t0.isSelected()=3D
+t0.isSelected()\ &&\ t1.isSelected()=3D
+t0.isSelected()\ ||\ t1.isSelected()=3D
+t1.isSelected()=3D
 test=3D
 valid=3D
 x=3D

Modified: trunk/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
--- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-fr_FR.properties	2009-1=
2-21 20:11:01 UTC (rev 1691)
+++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-fr_FR.properties	2009-1=
2-21 20:11:57 UTC (rev 1692)
@@ -112,13 +112,32 @@
 edit2=3DEditer 2
 edit3=3DEditer 3
 editor.getSelectedLocale()=3D
+f0=3D
+f1=3D
+file...=3D
 form.ratio=3DForm \: ratio
 form.text=3DForm \: text
 form.text2=3DForm \: text2
 form2.ratio=3DForm2 \: ratio
 form2.text=3DForm2 \: text
 form2.text2=3DForm2 \: text2
+getModel0().isF0()=3D
+getModel0().isF0()\ &&\ getModel0().isF1()=3D
+getModel0().isF0()\ ||\ getModel0().isF1()=3D
+getModel0().isF1()=3D
+getModel1().isF0()=3D
+getModel1().isF0()\ &&\ getModel1().isF1()=3D
+getModel1().isF0()\ ||\ getModel1().isF1()=3D
+getModel1().isF1()=3D
+getT0().isSelected()=3D
+getT0().isSelected()\ &&\ getT1().isSelected()=3D
+getT0().isSelected()\ ||\ getT1().isSelected()=3D
+getT1().isSelected()=3D
 i18neditor.popup.title=3D
+isF0()=3D
+isF0()\ &&\ isF1()=3D
+isF0()\ ||\ isF1()=3D
+isF1()=3D
 jaxxdemo.about.message=3D<h3>JAXX Demo</h3><hr/>Pour plus d'informations, vo=
us pouvez visiter le <a href\=3D"http\://maven-site.nuiton.org/jaxx/jaxx-demo=
">site du projet</a>.
 jaxxdemo.action.about=3DA propos
 jaxxdemo.action.about.tip=3DA propos de JAXX Demo...
@@ -194,6 +213,20 @@
 jaxxdemo.tree.fun=3DFun
 jaxxdemo.warning.nimbus.landf=3DLe look and Feel Nimbus n'a pas \u00E9t\u00E=
9 trouv\u00E9, il faut au moins la version 1.6u10 de java.
 jaxxdemo.warning.no.ui=3DAucun environnement graphique d\u00E9tect\u00E9
+model0.f0=3D
+model0.f1=3D
+model0.file...=3D
+model0.isF0()=3D
+model0.isF0()\ &&\ model0.isF1()=3D
+model0.isF0()\ ||\ model0.isF1()=3D
+model0.isF1()=3D
+model1.f0=3D
+model1.f1=3D
+model1.file...=3D
+model1.isF0()=3D
+model1.isF0()\ &&\ model1.isF1()=3D
+model1.isF0()\ ||\ model1.isF1()=3D
+model1.isF1()=3D
 movies=3DFilms
 numbereditor.normal.float=3DD\u00E9cimal primitif \: [%1$s]
 numbereditor.normal.int=3DEntier primitif \: [%1$s]
@@ -204,6 +237,10 @@
 numbereditor.without.auto.popup=3DSans popup auto
 show/hide\ label1=3D
 show/hide\ label2=3D
+t0.isSelected()=3D
+t0.isSelected()\ &&\ t1.isSelected()=3D
+t0.isSelected()\ ||\ t1.isSelected()=3D
+t1.isSelected()=3D
 test=3D
 valid=3Dvalide
 x=3Dx


--===============8270754908927953707==--