r2058 - in trunk/jaxx-demo/src/main: java/jaxx/demo java/jaxx/demo/component/jaxx java/jaxx/demo/component/jaxx/editor java/jaxx/demo/tree resources resources/i18n - Jaxx-commits

4 Sep 2010

Author: tchemit
Date: 2010-09-04 22:13:40 +0200 (Sat, 04 Sep 2010)
New Revision: 2058

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

Log:
Evolution #846: Improve jaxx demo

Added:
   trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.css
   trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.css
   trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemoModel.java
Modified:
   trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.css
   trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemoModel.java
   trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java
   trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.properties
   trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-fr_FR.properties
   trunk/jaxx-demo/src/main/resources/log4j.properties

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.css
===================================================================

--- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.css	2010-09-04 20:13:26 UTC (rev 2057)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.css	2010-09-04 20:13:40 UTC (rev 2058)
@@ -56,7 +56,6 @@
     toolTipText:"jaxxdemo.action.configuration.tip";
     actionIcon:"config";
     mnemonic:C;
-    /*enabled:false;*/
     _help:{"ui.main.menu.file.configuration"};
 }
 

Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.css
===================================================================
--- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.css	                        (rev 0)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.css	2010-09-04 20:13:40 UTC (rev 2058)
@@ -0,0 +1,39 @@
+#layerUI  {
+    blockIcon:{SwingUtil.createImageIcon("action-block.png")};
+    acceptIcon:{SwingUtil.createImageIcon("action-accept.png")};
+    useIcon:true;
+    blockingColor:{new Color(50,50,50)};
+}
+
+#layerUI2 {
+    blockIcon:{SwingUtil.createImageIcon("action-block.png")};
+    acceptIcon:{SwingUtil.createImageIcon("action-accept.png")};
+}
+
+#buttonPane {
+    layout:{new GridLayout(0,2)};
+}
+
+#buttonA {
+    text:"button A";
+    _clickedText:{"button A was clicked"};
+}
+
+#buttonB {
+    text:"button B";
+    _clickedText:{"button B was clicked"};
+}
+
+#buttonC {
+    text:"button C (full block)";
+    _clickedText:{"button C was clicked"};
+}
+
+#buttonD {
+    text:"button D (full block 2)";
+    _clickedText:{"button D was clicked"};
+}
+
+#messages {
+    model:{new DefaultListModel()};
+}

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx
===================================================================
--- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx	2010-09-04 20:13:26 UTC (rev 2057)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx	2010-09-04 20:13:40 UTC (rev 2058)
@@ -24,22 +24,23 @@
   -->
 
 
-<jaxx.demo.DemoPanel>
-  <jaxx.runtime.swing.BlockingLayerUI id='layerUI'
-                                      blockIcon='{SwingUtil.createImageIcon("action-block.png")}'
-                                      acceptIcon='{SwingUtil.createImageIcon("action-accept.png")}'
-                                      useIcon='true'
-                                      blockingColor='{new Color(50,50,50)}'
-                                      acceptAction='{new AbstractAction() { private static final long serialVersionUID = 1L;
+<jaxx.demo.DemoPanel layout='{new BorderLayout()}'>
+
+  <import>
+    jaxx.runtime.swing.BlockingLayerUI
+    jaxx.runtime.swing.BlockingLayerUI2
+  </import>
+  <BlockingLayerUI id='layerUI'
+                   acceptAction='{new AbstractAction() {
+                     private static final long serialVersionUID = 1L;
                      @Override
                      public void actionPerformed(ActionEvent e) {
                         accept(e, "from icon of layer");
                      }
                      }}'/>
-  <jaxx.runtime.swing.BlockingLayerUI2 id='layerUI2'
-                                       blockIcon='{SwingUtil.createImageIcon("action-block.png")}'
-                                       acceptIcon='{SwingUtil.createImageIcon("action-accept.png")}'
-                                       acceptAction='{new AbstractAction() { private static final long serialVersionUID = 1L;
+  <BlockingLayerUI2 id='layerUI2'
+                    acceptAction='{new AbstractAction() {
+                     private static final long serialVersionUID = 1L;
                      @Override
                      public void actionPerformed(ActionEvent e) {
                         accept(e, "from icon of layer");
@@ -47,15 +48,21 @@
                      }}'/>
   <script><![CDATA[
 
+
+@Override
+protected String[] getSources() {
+    return new String[]{ getDefaultSource(), "BoxedDecoratorDemo.css" };
+}
+
 void $afterCompleteSetup() {
     for (JComponent boxed : SwingUtil.getLayeredComponents(this)) {
-        if (boxed == d) {
+        if (boxed == buttonD) {
             SwingUtil.getLayer(boxed).setUI(layerUI2);
             continue;
         }
 
-        jaxx.runtime.swing.BlockingLayerUI ui = layerUI.clone();
-        if ( boxed == c) {
+        BlockingLayerUI ui = layerUI.clone();
+        if (boxed == buttonC) {
             ui.setBlock(true);
         }
         SwingUtil.getLayer(boxed).setUI(ui);
@@ -64,11 +71,11 @@
 
 public void setLayer(boolean active) {
     for (JComponent boxed : SwingUtil.getLayeredComponents(this)) {
-        if (boxed == d) {
+        if (boxed == buttonD) {
             continue;
         }
-        jaxx.runtime.swing.BlockingLayerUI ui = (jaxx.runtime.swing.BlockingLayerUI)SwingUtil.getLayer(boxed).getUI();
-        if ( boxed == c) {
+        BlockingLayerUI ui = (BlockingLayerUI)SwingUtil.getLayer(boxed).getUI();
+        if (boxed == buttonC) {
             ui.setBlock(active);
         } 
         ui.setUseIcon(active);
@@ -82,7 +89,7 @@
     ((DefaultListModel)messages.getModel()).addElement(msg);
 }]]>
   </script>
-  <Table fill='both' weightx='1'>
+  <Table fill='both' weightx='1' constraints='BorderLayout.CENTER'>
     <row>
       <cell>
         <JCheckBox id='toggle' selected='true'
@@ -92,18 +99,15 @@
     </row>
     <row>
       <cell weighty='0.5'>
-        <JPanel layout='{new GridLayout(1,3,3,3)}'>
-          <JButton text='button A' decorator='boxed'
+        <JPanel id='buttonPane'>
+          <JButton id='buttonA' decorator='boxed'
                    _clickedText='"button A was clicked"'
                    onActionPerformed='accept(event, "from button (no layer)")'/>
-          <JButton text='button B' decorator='boxed'
-                   _clickedText='"button B was clicked"'
+          <JButton id='buttonB' decorator='boxed'
                    onActionPerformed='accept(event, "from button (no layer)")'/>
-          <JButton id='c' text='button C (full block)' decorator='boxed'
-                   _clickedText='"button C was clicked"'
+          <JButton id='buttonC' decorator='boxed'
                    onActionPerformed='accept(event, "from button (no layer)");'/>
-          <JButton id='d' text='button D (full block 2)' decorator='boxed'
-                   _clickedText='"button D was clicked"'
+          <JButton id='buttonD' decorator='boxed'
                    onActionPerformed='accept(event, "from button (no layer)");'/>
         </JPanel>
       </cell>
@@ -111,7 +115,7 @@
     <row>
       <cell weighty='0.5'>
         <JScrollPane>
-          <JList id='messages' model='{new DefaultListModel()}'/>
+          <JList id='messages'/>
         </JScrollPane>
       </cell>
     </row>

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx
===================================================================
--- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx	2010-09-04 20:13:26 UTC (rev 2057)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx	2010-09-04 20:13:40 UTC (rev 2058)
@@ -25,11 +25,12 @@
 
 
 <jaxx.demo.DemoPanel>
+  <import>
+    jaxx.runtime.swing.editor.I18nEditor
+    org.nuiton.i18n.I18n
+    java.util.Arrays
+  </import>
   <script><![CDATA[
-import jaxx.runtime.swing.editor.I18nEditor;
-import org.nuiton.i18n.I18n;
-import java.util.Arrays;
-
 protected Border getPopupBorder(String text) {
     if (text==null || text.trim().isEmpty()) {
         return null;
@@ -65,7 +66,7 @@
             <JLabel text='jaxxdemo.i18neditor.popupBorderText'
                     labelFor='{popupBorderText}'/>
             <JTextField id='popupBorderText'
-                        text='{_("i18neditor.popup.title")}'/>
+                        text='{_("jaxxdemo.i18neditor.popup.title")}'/>
           </JPanel>
 
         </JPanel>

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx
===================================================================
--- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx	2010-09-04 20:13:26 UTC (rev 2057)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx	2010-09-04 20:13:40 UTC (rev 2058)
@@ -23,21 +23,29 @@
   #L%
   -->
 
+<jaxx.demo.DemoPanel layout='{new BorderLayout()}'>
 
-<jaxx.demo.DemoPanel>
+  <import>
+    jaxx.runtime.swing.editor.NumberEditor
+  </import>
+
+  <!-- model -->
+  <NumberEditorDemoModel id='demoModel'/>
+
   <script><![CDATA[
-import jaxx.runtime.swing.editor.NumberEditor;
 
+@Override
+protected String[] getSources() {
+    return new String[]{ getDefaultSource(), "NumberEditorDemoModel.java" };
+}
+
 void $afterCompleteSetup() {
     editor.init();
 }
 ]]>
   </script>
 
-  <!-- model -->
-  <NumberEditorDemoModel id='demoModel'/>
-
-  <Table insets='0' fill='both'>
+  <Table insets='0' fill='both' weightx='1' constraints='BorderLayout.NORTH'>
     <row>
       <cell>
         <JPanel

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemoModel.java
===================================================================
--- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemoModel.java	2010-09-04 20:13:26 UTC (rev 2057)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemoModel.java	2010-09-04 20:13:40 UTC (rev 2058)
@@ -44,11 +44,6 @@
 
     protected float floatProperty;
 
-//    protected int positifInteger;
-//    protected int normalInteger;
-//    protected float positifFloat;
-//    protected float normalFloat;
-
     public NumberEditorDemoModel() {
         p = new PropertyChangeSupport(this);
     }
@@ -73,47 +68,6 @@
         p.firePropertyChange(INTEGER_PROPERTY, old, integerProperty);
     }
 
-//
-//    public float getNormalFloat() {
-//        return normalFloat;
-//    }
-//
-//    public int getNormalInteger() {
-//        return normalInteger;
-//    }
-//
-//    public float getPositifFloat() {
-//        return positifFloat;
-//    }
-//
-//    public int getPositifInteger() {
-//        return positifInteger;
-//    }
-//
-//    public void setNormalFloat(float normalFloat) {
-//        float old = this.normalFloat;
-//        this.normalFloat = normalFloat;
-//        p.firePropertyChange("normalFloat", old, normalFloat);
-//    }
-//
-//    public void setNormalInteger(int normalInteger) {
-//        int old = this.normalInteger;
-//        this.normalInteger = normalInteger;
-//        p.firePropertyChange("normalInteger", old, normalInteger);
-//    }
-//
-//    public void setPositifFloat(float positifFloat) {
-//        float old = this.positifFloat;
-//        this.positifFloat = positifFloat;
-//        p.firePropertyChange("positifFloat", old, positifFloat);
-//    }
-//
-//    public void setPositifInteger(int positifInteger) {
-//        int old = this.positifInteger;
-//        this.positifInteger = positifInteger;
-//        p.firePropertyChange("positifInteger", old, positifInteger);
-//    }
-
     public void addPropertyChangeListener(PropertyChangeListener listener) {
         p.addPropertyChangeListener(listener);
     }

Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.css
===================================================================
--- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.css	                        (rev 0)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.css	2010-09-04 20:13:40 UTC (rev 2058)
@@ -0,0 +1,26 @@
+#configPanel {
+    border:{new TitledBorder(_("jaxxdemo.numbereditor.configuration"))};
+    layout:{new GridLayout(0,1)};
+}
+
+#labelConfigLabel {
+    text:"jaxxdemo.timeeditor.label";
+}
+
+#labelConfig {
+    text:{_("jaxxdemo.timeeditor.editor")};
+}
+
+/*FIXME tchemit 2010-09-02 make this works
+#editor {
+    property:"time";
+    border:{new TitledBorder(_("jaxxdemo.timeeditor.editor"))};
+    bean:{demoModel};
+    date:{demoModel.getTime()};
+    label:{labelConfig.getText()};
+}*/
+
+#resultPane {
+    border:{new TitledBorder(_("jaxxdemo.timeeditor.model"))};
+    layout:{new BorderLayout()};
+}

Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jaxx
===================================================================
--- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jaxx	                        (rev 0)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jaxx	2010-09-04 20:13:40 UTC (rev 2058)
@@ -0,0 +1,90 @@
+<jaxx.demo.DemoPanel layout='{new BorderLayout()}'>
+
+  <import>
+    jaxx.runtime.swing.editor.TimeEditor
+  </import>
+
+  <!-- model -->
+  <TimeEditorDemoModel id='demoModel'/>
+
+  <script><![CDATA[
+
+@Override
+protected String[] getSources() {
+    return new String[]{ getDefaultSource(),
+                         "TimeEditorDemoModel.java",
+                         "TimeEditorDemo.css"
+    };
+}
+
+void $afterCompleteSetup() {
+
+    // init time editor
+    editor.init();
+
+    // set current time in model
+    demoModel.setTime(new java.util.Date());
+}
+]]>
+  </script>
+
+
+  <Table insets='0' fill='both' weightx='1' constraints='BorderLayout.NORTH'>
+    <row>
+      <cell>
+        <JPanel id="configPanel">
+
+          <!--JCheckBox id='useFloat'
+                     text='jaxxdemo.numbereditor.useFloat'
+                     selected='true'/>
+
+          <JCheckBox id='useSign'
+                     text='jaxxdemo.numbereditor.useSign'
+                     selected='true'/>
+
+          <JCheckBox id='showPopupButton'
+                     text='jaxxdemo.numbereditor.showPopupButton'
+                     selected='true'/>
+
+          <JCheckBox id='showResetButton'
+                     text='jaxxdemo.numbereditor.showReset'
+                     selected='true'/>
+
+          <JCheckBox id='autoPopup'
+                     text='jaxxdemo.numbereditor.autoPopup'
+                     selected='false'/-->
+
+          <JPanel layout='{new BorderLayout()}'>
+
+            <JLabel id='labelConfigLabel' constraints='BorderLayout.WEST'/>
+
+            <JTextField id='labelConfig' constraints='BorderLayout.CENTER'/>
+          </JPanel>
+
+        </JPanel>
+      </cell>
+    </row>
+    <row>
+      <cell>
+        <TimeEditor id='editor' constructorParams='this' property='time'
+                    border='{new TitledBorder(_("jaxxdemo.timeeditor.editor"))}'
+                    bean='{demoModel}'
+                    date="{demoModel.getTime()}"
+                    label="{labelConfig.getText()}"/>
+      </cell>
+    </row>
+    <row>
+      <cell>
+
+        <JPanel id='resultPane'>
+
+          <JLabel constraints='BorderLayout.CENTER'
+                  text='{_("jaxxdemo.timeeditor.value", demoModel.getTime())}'/>
+        </JPanel>
+
+      </cell>
+    </row>
+  </Table>
+
+
+</jaxx.demo.DemoPanel>
\ No newline at end of file

Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemoModel.java
===================================================================
--- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemoModel.java	                        (rev 0)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemoModel.java	2010-09-04 20:13:40 UTC (rev 2058)
@@ -0,0 +1,55 @@
+package jaxx.demo.component.jaxx.editor;
+
+import jaxx.runtime.swing.editor.TimeEditor;
+
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.util.Date;
+
+/**
+ * Model of a bean using the {@link TimeEditor}.
+ *
+ * @author tchemit <chemit@codelutin.com>
+ * @since 2.2
+ */
+public class TimeEditorDemoModel {
+
+    public static final String TIME_PROPERTY = "time";
+
+    protected final PropertyChangeSupport p;
+
+    protected Date time;
+
+    public TimeEditorDemoModel() {
+        p = new PropertyChangeSupport(this);
+    }
+
+    public Date getTime() {
+        return time;
+    }
+
+    public void setTime(Date time) {
+        Date old = this.time;
+        this.time = time;
+        p.firePropertyChange(TIME_PROPERTY, old, time);
+    }
+
+    public void addPropertyChangeListener(PropertyChangeListener listener) {
+        p.addPropertyChangeListener(listener);
+    }
+
+    public void addPropertyChangeListener(String propertyName,
+                                          PropertyChangeListener listener) {
+        p.addPropertyChangeListener(propertyName, listener);
+    }
+
+    public void removePropertyChangeListener(PropertyChangeListener listener) {
+        p.removePropertyChangeListener(listener);
+    }
+
+    public void removePropertyChangeListener(String propertyName,
+                                             PropertyChangeListener listener) {
+        p.removePropertyChangeListener(propertyName, listener);
+    }
+
+}

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java
===================================================================
--- trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java	2010-09-04 20:13:26 UTC (rev 2057)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java	2010-09-04 20:13:40 UTC (rev 2058)
@@ -30,6 +30,7 @@
 import jaxx.demo.component.jaxx.editor.ComboEditorDemo;
 import jaxx.demo.component.jaxx.editor.I18nEditorDemo;
 import jaxx.demo.component.jaxx.editor.NumberEditorDemo;
+import jaxx.demo.component.jaxx.editor.TimeEditorDemo;
 import jaxx.demo.component.swing.HidorButtonDemo;
 import jaxx.demo.component.swing.JButtonDemo;
 import jaxx.demo.component.swing.JCheckBoxDemo;
@@ -85,7 +86,9 @@
 
         mapping = new HashMap<String, List<Object>>();
 
-        log.info("for " + this);
+        if (log.isDebugEnabled()) {
+            log.debug("for " + this);
+        }
 
         addMapping("jaxxdemo.tree",
                    n_("jaxxdemo.component.swing"),
@@ -141,12 +144,12 @@
         addMapping(n_("jaxxdemo.component.jaxx"),
                    HidorButtonDemo.class,
                    n_("jaxxdemo.component.jaxx.editor"),
-                   n_("jaxxdemo.component.jaxx.tree"),
                    StatusMessagePanelDemo.class,
                    BoxedDecoratorDemo.class
         );
 
         addMapping(n_("jaxxdemo.component.jaxx.editor"),
+                   TimeEditorDemo.class,
                    NumberEditorDemo.class,
                    ComboEditorDemo.class,
                    I18nEditorDemo.class
@@ -181,8 +184,8 @@
 
     protected void addMapping(String packageName, Object... classes) {
         List<Object> list = Arrays.asList(classes);
-        if (log.isInfoEnabled()) {
-            log.info("Adding mapping [" + packageName + "] : " + list);
+        if (log.isDebugEnabled()) {
+            log.debug("Adding mapping [" + packageName + "] : " + list);
         }
         mapping.put(packageName, list);
     }

Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.properties
===================================================================
--- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.properties	2010-09-04 20:13:26 UTC (rev 2057)
+++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.properties	2010-09-04 20:13:40 UTC (rev 2058)
@@ -93,7 +93,6 @@
 You\ entered\:\ =
 Your\ name\:=
 \\u00f7=
-actors=
 adjust\ the\ spacing=
 between\ these\ lines=
 button\ A=
@@ -130,7 +129,6 @@
 getT0().isSelected()\ &&\ getT1().isSelected()=
 getT0().isSelected()\ ||\ getT1().isSelected()=
 getT1().isSelected()=
-i18neditor.popup.title=
 isF0()=
 isF0()\ &&\ isF1()=
 isF0()\ ||\ isF1()=
@@ -145,7 +143,7 @@
 jaxxdemo.action.exit.tip=Quit JAXXDemo
 jaxxdemo.action.fullscreen=Full screen
 jaxxdemo.action.fullscreen.tip=Change to full screen mode
-jaxxdemo.action.help=Help
+jaxxdemo.action.help=
 jaxxdemo.action.help.tip=Display help
 jaxxdemo.action.locale.fr=French
 jaxxdemo.action.locale.fr.tip=Change to french language
@@ -182,6 +180,7 @@
 jaxxdemo.feature.validation=Validation
 jaxxdemo.fun=Fun
 jaxxdemo.i18neditor.configuration=Configuration
+jaxxdemo.i18neditor.popup.title=Title of popup
 jaxxdemo.i18neditor.popupBorderText=Popup title
 jaxxdemo.i18neditor.selected.locale=Selected Language
 jaxxdemo.i18neditor.showIcon=Show icons
@@ -200,15 +199,19 @@
 jaxxdemo.navigation.actors.title=Actors
 jaxxdemo.navigation.movie.title=Movie
 jaxxdemo.navigation.movies.title=Movies
-jaxxdemo.numbereditor.autoPopup=
-jaxxdemo.numbereditor.configuration=
-jaxxdemo.numbereditor.model=
-jaxxdemo.numbereditor.model.float=
-jaxxdemo.numbereditor.model.int=
-jaxxdemo.numbereditor.showPopupButton=
-jaxxdemo.numbereditor.showReset=
-jaxxdemo.numbereditor.useFloat=
-jaxxdemo.numbereditor.useSign=
+jaxxdemo.numbereditor.autoPopup=Show automatic popup
+jaxxdemo.numbereditor.configuration=Configuration
+jaxxdemo.numbereditor.model=Result
+jaxxdemo.numbereditor.model.float=Float result \: %1$s
+jaxxdemo.numbereditor.model.int=Integer result \: %1$s
+jaxxdemo.numbereditor.showPopupButton=Show Popup button
+jaxxdemo.numbereditor.showReset=Show reset button
+jaxxdemo.numbereditor.useFloat=Use float
+jaxxdemo.numbereditor.useSign=Use Sign
+jaxxdemo.timeeditor.editor=Time Editor
+jaxxdemo.timeeditor.label=Label
+jaxxdemo.timeeditor.model=Result
+jaxxdemo.timeeditor.value=Selected time \: %1$tH\:%1$tM
 jaxxdemo.title.about=About JAXXDemo...
 jaxxdemo.tree.age=Age
 jaxxdemo.tree.firstName=First name
@@ -231,7 +234,6 @@
 model1.isF0()\ &&\ model1.isF1()=
 model1.isF0()\ ||\ model1.isF1()=
 model1.isF1()=
-movies=Movies
 t0.isSelected()=
 t0.isSelected()\ &&\ t1.isSelected()=
 t0.isSelected()\ ||\ t1.isSelected()=

Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-fr_FR.properties
===================================================================
--- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-fr_FR.properties	2010-09-04 20:13:26 UTC (rev 2057)
+++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-fr_FR.properties	2010-09-04 20:13:40 UTC (rev 2058)
@@ -93,7 +93,6 @@
 You\ entered\:\ =
 Your\ name\:=Votre nom \:
 \\u00f7=
-actors=Acteurs
 adjust\ the\ spacing=
 between\ these\ lines=
 button\ A=Bouton A
@@ -130,7 +129,6 @@
 getT0().isSelected()\ &&\ getT1().isSelected()=
 getT0().isSelected()\ ||\ getT1().isSelected()=
 getT1().isSelected()=
-i18neditor.popup.title=
 isF0()=
 isF0()\ &&\ isF1()=
 isF0()\ ||\ isF1()=
@@ -182,6 +180,7 @@
 jaxxdemo.feature.validation=Validation
 jaxxdemo.fun=Fun
 jaxxdemo.i18neditor.configuration=Configuration
+jaxxdemo.i18neditor.popup.title=Titre de la popup
 jaxxdemo.i18neditor.popupBorderText=Titre de la popup
 jaxxdemo.i18neditor.selected.locale=Langue s\u00E9lectionn\u00E9e
 jaxxdemo.i18neditor.showIcon=Afficher les icones
@@ -209,6 +208,10 @@
 jaxxdemo.numbereditor.showReset=Afficher le boutton de reset
 jaxxdemo.numbereditor.useFloat=Utiliser les d\u00E9cimales
 jaxxdemo.numbereditor.useSign=Utiliser le signe
+jaxxdemo.timeeditor.editor=Editeur de temps
+jaxxdemo.timeeditor.label=Label
+jaxxdemo.timeeditor.model=R\u00E9sultat
+jaxxdemo.timeeditor.value=Heure s\u00E9lectionn\u00E9e \: %1$tH\:%1$tM
 jaxxdemo.title.about=A propos de JAXX Demo...
 jaxxdemo.tree.age=Age / ann\u00E9e
 jaxxdemo.tree.firstName=Prenom
@@ -231,7 +234,6 @@
 model1.isF0()\ &&\ model1.isF1()=
 model1.isF0()\ ||\ model1.isF1()=
 model1.isF1()=
-movies=Films
 t0.isSelected()=
 t0.isSelected()\ &&\ t1.isSelected()=
 t0.isSelected()\ ||\ t1.isSelected()=

Modified: trunk/jaxx-demo/src/main/resources/log4j.properties
===================================================================
--- trunk/jaxx-demo/src/main/resources/log4j.properties	2010-09-04 20:13:26 UTC (rev 2057)
+++ trunk/jaxx-demo/src/main/resources/log4j.properties	2010-09-04 20:13:40 UTC (rev 2058)
@@ -5,11 +5,12 @@
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n
 
-log4j.logger.jaxx.demo=INFO
+log4j.logger.jaxx=INFO
+#log4j.logger.jaxx.demo=INFO
 log4j.logger.jaxx.demo.tree=DEBUG
 log4j.logger.jaxx.runtime.swing.tree=DEBUG
 #log4j.logger.jaxx.demo.component.jaxx.tree=DEBUG
 #log4j.logger.jaxx.demo.config.DemoConfig=DEBUG
-log4j.logger.jaxx.runtime.swing.editor.config=INFO
+#log4j.logger.jaxx.runtime.swing.editor.config=INFO
 #log4j.logger.jaxx.runtime.swing.editor.config.model.ConfigUIModelBuilder=DEBUG
 log4j.logger.org.nuiton=WARN

    

r2058 - in trunk/jaxx-demo/src/main: java/jaxx/demo java/jaxx/demo/component/jaxx java/jaxx/demo/component/jaxx/editor java/jaxx/demo/tree resources resources/i18n

tchemit＠users.nuiton.org

tags

participants (1)