From tchemit@users.nuiton.org Tue Feb  1 18:43:44 2011
From: tchemit@users.nuiton.org
To: jaxx-commits@list.nuiton.org
Subject: [Jaxx-commits] r2189 - in trunk: jaxx-demo/src/main/java/jaxx/demo
	jaxx-demo/src/main/java/jaxx/demo/component/jaxx
	jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor
	jaxx-demo/src/main/java/jaxx/demo/component/swing
	jaxx-demo/src/main/java/jaxx/demo/entities
	jaxx-demo/src/main/java/jaxx/demo/feature/databinding
	jaxx-demo/src/main/java/jaxx/demo/feature/nav
	jaxx-demo/src/main/java/jaxx/demo/feature/nav/content
	jaxx-widgets/src/main/java/jaxx/runtime/swing
	jaxx-widgets/src/main/java/jaxx/runtime/swing/e
Date: Tue, 01 Feb 2011 18:43:44 +0100
Message-ID: <20110201174344.1EDB7158C6@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2992664864406038093=="

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

Author: tchemit
Date: 2011-02-01 18:43:44 +0100 (Tue, 01 Feb 2011)
New Revision: 2189

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

Log:
optimize widgets code and demo too\!

Modified:
   trunk/jaxx-demo/src/main/java/jaxx/demo/DemoPanel.jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSources.jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/DemoTab.jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.css
   trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.=
jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ComboEditorD=
emo.jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonMenuIt=
emDemo.jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JSpinnerDemo.jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/entities/AbstractDemoBean.java
   trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BaseBeanDataBi=
nding.jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemo.jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/AbstractConten=
tUI.jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorsContentU=
I.jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MoviesContentU=
I.jaxx
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanel.jaxx
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ErrorDialogUI.jaxx
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/FontSizor.jaxx
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButton.jaxx
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/MemoryStatusWidget.jaxx
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/StatusMessagePanel.jaxx
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditor.jaxx
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.ja=
xx
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboB=
ox.jaxx
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHe=
ader.jaxx
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCa=
llBackUI.jaxx
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCa=
tegoryUI.jaxx

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	2011-02-01 17:43:1=
7 UTC (rev 2188)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoPanel.jaxx	2011-02-01 17:43:4=
4 UTC (rev 2189)
@@ -25,11 +25,15 @@
=20
 <JPanel id=3D'top' abstract=3D'true'>
=20
+  <import>
+    org.nuiton.util.StringUtil
+  </import>
+ =20
   <script><![CDATA[
=20
 protected String[] getSources() {
-    if (getClass() =3D=3D DemoPanel.class) {
-        return new String[0];
+    if (DemoPanel.class.equals(getClass())) {
+        return StringUtil.EMPTY_STRING_ARRAY;
     }
     return new String[]{ getDefaultSource() };
 }

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSources.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	2011-02-01 17:43=
:17 UTC (rev 2188)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSources.jaxx	2011-02-01 17:43=
:44 UTC (rev 2189)
@@ -26,15 +26,16 @@
 <JPanel layout=3D'{new BorderLayout()}'>
=20
   <import>
-    org.fife.ui.rsyntaxtextarea.RSyntaxTextArea
+    jaxx.runtime.SwingUtil
     jaxx.runtime.swing.FontSizor
+
+    java.awt.RenderingHints
     javax.swing.DefaultComboBoxModel
-    java.awt.RenderingHints
+   =20
+    org.fife.ui.rsyntaxtextarea.RSyntaxTextArea
   </import>
  =20
   <script><![CDATA[
-import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
-import jaxx.runtime.swing.FontSizor;
=20
 public void init() {
     //fontSizor.setDefaultFontSize(getConfig().getFontSize());
@@ -65,7 +66,7 @@
=20
   <DemoSourcesHandler id=3D'handler'/>
=20
-  <Class id=3D'incomingClass' javaBean=3D'null'/>
+  <Class id=3D'incomingClass' javaBean=3D'null' genericType=3D'?'/>
=20
   <String id=3D'currentSource' javaBean=3D'null'/>
=20
@@ -91,7 +92,7 @@
                constraints=3D'BorderLayout.CENTER'>
     <RSyntaxTextArea id=3D'editor'
                      font-size=3D'{getConfig().getFontSize()}'
-                     minimumSize=3D"{jaxx.runtime.SwingUtil.newMinDimension(=
)}"
+                     minimumSize=3D"{SwingUtil.newMinDimension()}"
                      textAntiAliasHint=3D'{RenderingHints.KEY_ANTIALIASING.t=
oString()}'
                      editable=3D"false"
                      wrapStyleWord=3D"false"

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoTab.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/DemoTab.jaxx	2011-02-01 17:43:17 =
UTC (rev 2188)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoTab.jaxx	2011-02-01 17:43:44 =
UTC (rev 2189)
@@ -26,6 +26,7 @@
 <JTabbedPane id=3D'top'>
=20
   <import>
+    java.util.Arrays
     javax.swing.SwingUtilities
   </import>
  =20
@@ -53,7 +54,7 @@
=20
   <tab id=3D'tabDemoSources' title=3D'Sources'>
     <DemoSources id=3D'sourceTabs'
-                 sources=3D'{java.util.Arrays.asList(demoPanel.getSources())=
}'
+                 sources=3D'{Arrays.asList(demoPanel.getSources())}'
                  incomingClass=3D'{demoPanel.getClass()}'
                  constructorParams=3D'demoPanel'/>
   </tab>

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.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/DemoUI.css	2011-02-01 17:43:17 UT=
C (rev 2188)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.css	2011-02-01 17:43:44 UT=
C (rev 2189)
@@ -37,7 +37,7 @@
=20
 #mainFrame {
     title:"JAXX Demo";
-    iconImage:{jaxx.runtime.SwingUtil.createIcon(getConfig().getOption("appl=
ication.icon.path")).getImage()};
+    iconImage:{SwingUtil.createIcon(getConfig().getOption("application.icon.=
path")).getImage()};
     undecorated:{getConfig().isFullScreen()};
 }
=20

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.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/DemoUI.jaxx	2011-02-01 17:43:17 U=
TC (rev 2188)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx	2011-02-01 17:43:44 U=
TC (rev 2189)
@@ -29,12 +29,14 @@
         onWindowClosing=3D'getHandler().close(mainFrame)'>
=20
   <import>
-    java.awt.Dimension
     jaxx.demo.tree.DemoTreeHelper
     jaxx.demo.tree.DemoCellRenderer
+   =20
+    jaxx.runtime.SwingUtil
     jaxx.runtime.swing.CardLayout2
     jaxx.runtime.swing.StatusMessagePanel
-   =20
+
+    java.awt.Dimension
     java.util.Locale
   </import>
=20

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecorat=
orDemo.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/BoxedDecoratorDemo=
.jaxx	2011-02-01 17:43:17 UTC (rev 2188)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo=
.jaxx	2011-02-01 17:43:44 UTC (rev 2189)
@@ -27,13 +27,16 @@
 <jaxx.demo.DemoPanel layout=3D'{new BorderLayout()}'>
=20
   <import>
+    jaxx.runtime.SwingUtil
     jaxx.runtime.swing.BlockingLayerUI
     jaxx.runtime.swing.BlockingLayerUI2
-    javax.swing.JComponent
-    javax.swing.DefaultListModel
+
     java.awt.Color
+    java.awt.event.ActionEvent
+   =20
     javax.swing.AbstractAction
-    java.awt.event.ActionEvent
+    javax.swing.DefaultListModel
+    javax.swing.JComponent
   </import>
   <BlockingLayerUI id=3D'layerUI'
                    acceptAction=3D'{new AbstractAction() {

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/Combo=
EditorDemo.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/ComboEditor=
Demo.jaxx	2011-02-01 17:43:17 UTC (rev 2188)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ComboEditor=
Demo.jaxx	2011-02-01 17:43:44 UTC (rev 2189)
@@ -25,6 +25,12 @@
=20
=20
 <jaxx.demo.DemoPanel>
+
+  <import>
+    org.nuiton.i18n.LanguageEnum
+    org.nuiton.i18n.CountryEnum
+  </import>
+
   <Table fill=3D'both'>
     <row>
       <cell>
@@ -40,8 +46,8 @@
         <JLabel text=3D'EnumEditor (language) :' labelFor=3D'{languageEditor=
}'/>
       </cell>
       <cell>
-        <EnumEditor id=3D'languageEditor'
-                    constructorParams=3D'org.nuiton.i18n.LanguageEnum.class'=
/>
+        <EnumEditor id=3D'languageEditor' genericType=3D'LanguageEnum'
+                    constructorParams=3D'LanguageEnum.class'/>
       </cell>
     </row>
     <row>
@@ -49,8 +55,8 @@
         <JLabel text=3D'EnumEditor (country) :' labelFor=3D'{countryEditor}'=
/>
       </cell>
       <cell>
-        <EnumEditor id=3D'countryEditor'
-                    constructorParams=3D'org.nuiton.i18n.CountryEnum.class'/>
+        <EnumEditor id=3D'countryEditor' genericType=3D'CountryEnum'
+                    constructorParams=3D'CountryEnum.class'/>
       </cell>
     </row>
     <row>

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButto=
nMenuItemDemo.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonMenuI=
temDemo.jaxx	2011-02-01 17:43:17 UTC (rev 2188)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonMenuI=
temDemo.jaxx	2011-02-01 17:43:44 UTC (rev 2189)
@@ -38,15 +38,15 @@
   </script>
   <JMenuBar id=3D'menuBar'>
     <JMenu text=3D'Font size'>
-      <JRadioButtonMenuItem text=3D'10' value=3D'{new Integer(10)}'
+      <JRadioButtonMenuItem text=3D'10' value=3D'{10}'
                             buttonGroup=3D'fontSize'/>
-      <JRadioButtonMenuItem text=3D'12' value=3D'{new Integer(12)}'
+      <JRadioButtonMenuItem text=3D'12' value=3D'{12}'
                             buttonGroup=3D'fontSize' selected=3D'true'/>
-      <JRadioButtonMenuItem text=3D'14' value=3D'{new Integer(14)}'
+      <JRadioButtonMenuItem text=3D'14' value=3D'{14}'
                             buttonGroup=3D'fontSize'/>
-      <JRadioButtonMenuItem text=3D'18' value=3D'{new Integer(18)}'
+      <JRadioButtonMenuItem text=3D'18' value=3D'{18}'
                             buttonGroup=3D'fontSize'/>
-      <JRadioButtonMenuItem text=3D'24' value=3D'{new Integer(24)}'
+      <JRadioButtonMenuItem text=3D'24' value=3D'{24}'
                             buttonGroup=3D'fontSize'/>
     </JMenu>
   </JMenuBar>

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JSpinnerDem=
o.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JSpinnerDemo.jaxx=
	2011-02-01 17:43:17 UTC (rev 2188)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JSpinnerDemo.jaxx=
	2011-02-01 17:43:44 UTC (rev 2189)
@@ -24,15 +24,12 @@
   -->
=20
 <jaxx.demo.DemoPanel>
-  <import>
-    javax.swing.SpinnerNumberModel
-  </import>
- =20
+
   <JLabel text=3D'Spacing:' displayedMnemonic=3D'S' labelFor=3D'{spinner}'/>
=20
   <JSpinner minimum=3D'0' maximum=3D'50' id=3D'spinner'/>
=20
-  <VBox spacing=3D'{((Integer) spinner.getValue()).intValue()}'>
+  <VBox spacing=3D'{(Integer) spinner.getValue()}'>
     <JLabel text=3D'Use the spinner to'/>
     <JLabel text=3D'adjust the spacing'/>
     <JLabel text=3D'between these lines'/>

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/entities/AbstractDemoBean.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/entities/AbstractDemoBean.java	20=
11-02-01 17:43:17 UTC (rev 2188)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/entities/AbstractDemoBean.java	20=
11-02-01 17:43:44 UTC (rev 2189)
@@ -47,6 +47,8 @@
=20
     public static final String PROPERTY_IMAGE =3D "image";
=20
+    private static final long serialVersionUID =3D 1L;
+
     protected String id;
=20
     protected String image;

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BaseBea=
nDataBinding.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/BaseBeanDataB=
inding.jaxx	2011-02-01 17:43:17 UTC (rev 2188)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BaseBeanDataB=
inding.jaxx	2011-02-01 17:43:44 UTC (rev 2189)
@@ -34,14 +34,18 @@
   <String id=3D'contentMessage' javaBean=3D'"message..."'/>
=20
   <script>
-    void $afterCompleteSetup(){}
-    public Boolean isEditing2() { return editing2; }
+    void $afterCompleteSetup(){
+    }
=20
-    public void setEditing2(Boolean newValue) {
-    Boolean oldValue =3D this.editing2;
-    this.editing2 =3D newValue;
-    firePropertyChange("editing2", oldValue, newValue) ;
+    public Boolean isEditing2() {
+        return editing2;
     }
+
+    public void setEditing2(Boolean editing2) {
+        Boolean oldValue =3D this.editing2;
+        this.editing2 =3D editing2;
+        firePropertyChange("editing2", oldValue, editing2);
+    }
   </script>
=20
 </jaxx.demo.DemoPanel>

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemo.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/nav/NavDemo.jaxx	2011-02-=
01 17:43:17 UTC (rev 2188)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemo.jaxx	2011-02-=
01 17:43:44 UTC (rev 2189)
@@ -25,17 +25,10 @@
 <jaxx.demo.DemoPanel layout=3D'{new BorderLayout()}'>
=20
   <import>
-    jaxx.demo.feature.nav.content.*
-    jaxx.demo.feature.nav.tree.*
-    jaxx.demo.feature.nav.treetable.*
-    jaxx.demo.entities.*
-    jaxx.runtime.decorator.DecoratorProvider
-    jaxx.runtime.swing.nav.NavNode
-    jaxx.runtime.swing.editor.bean.BeanListHeader
+    jaxx.demo.feature.nav.tree.NavDemoTreeHelper
+    jaxx.demo.feature.nav.treetable.NavDemoTreeTableHelper
=20
     org.jdesktop.swingx.JXTreeTable
-    javax.swing.tree.TreePath
-    java.lang.reflect.Constructor
   </import>
=20
   <CardLayout2 id=3D'contentLayout'/>

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/Abstrac=
tContentUI.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/nav/content/AbstractConte=
ntUI.jaxx	2011-02-01 17:43:17 UTC (rev 2188)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/AbstractConte=
ntUI.jaxx	2011-02-01 17:43:44 UTC (rev 2189)
@@ -24,7 +24,7 @@
=20
 <JPanel abstract=3D'true'
         layout=3D'{new BorderLayout()}'
-        genericType=3D'B extends Object'>
+        genericType=3D'B'>
=20
   <import>
     jaxx.demo.feature.nav.NavDemoHandler

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorsC=
ontentUI.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/nav/content/ActorsContent=
UI.jaxx	2011-02-01 17:43:17 UTC (rev 2188)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorsContent=
UI.jaxx	2011-02-01 17:43:44 UTC (rev 2189)
@@ -22,9 +22,10 @@
   #L%
   -->
=20
-<AbstractContentUI superGenericType=3D'java.util.List&lt;People&gt;'>
+<AbstractContentUI superGenericType=3D'List&lt;People&gt;'>
=20
   <import>
+    java.util.List
     jaxx.demo.entities.People
     jaxx.runtime.swing.editor.bean.BeanListHeader
     jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MoviesC=
ontentUI.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/nav/content/MoviesContent=
UI.jaxx	2011-02-01 17:43:17 UTC (rev 2188)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MoviesContent=
UI.jaxx	2011-02-01 17:43:44 UTC (rev 2189)
@@ -22,9 +22,10 @@
   #L%
   -->
=20
-<AbstractContentUI superGenericType=3D'java.util.List&lt;Movie&gt;'>
+<AbstractContentUI superGenericType=3D'List&lt;Movie&gt;'>
=20
   <import>
+    java.util.List
     jaxx.demo.entities.Movie
     jaxx.runtime.swing.editor.bean.BeanListHeader
     jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanel.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-widgets/src/main/java/jaxx/runtime/swing/AboutPanel.jaxx	2011-=
02-01 17:43:17 UTC (rev 2188)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanel.jaxx	2011-=
02-01 17:43:44 UTC (rev 2189)
@@ -51,133 +51,28 @@
   <Color id=3D'backgroundColor' javaBean=3D'null'/>
=20
   <script><![CDATA[
-
-/*final Action closeAction =3D new AbstractAction("close") {
-    private static final long serialVersionUID =3D 1L;
-
-    @Override
-    public void actionPerformed(ActionEvent e) {
-        JDialog container =3D getParentContainer(JDialog.class);
-        if (container !=3D null) {
-            container.dispose();
-        } else {
-            setVisible(false);
-        }
-    }
-};*/
-
 public void setLicenseFile(String filename) {
     handler.setLicenseFile(filename);
-    //String load =3D load(filename);
-    //setLicenseText(load);
 }
=20
 public void setThirdpartyFile(String filename) {
     handler.setThirdpartyFile(filename);
-    //String load =3D load(filename);
-    //setThirdpartyText(load);
 }
=20
 public void buildTopPanel() {
     handler.buildTopPanel();
-    // image
-    //JLabel labelIcon;
-    //if (iconPath !=3D null) {
-    //    Icon logoIcon =3D Resource.getIcon(iconPath);
-    //    labelIcon =3D new JLabel(logoIcon);
-    //} else {
-    //    labelIcon =3D new JLabel();
-    //}
-    //topPanel.add(labelIcon);
 }
=20
 public void init() {
     handler.init();
-    /*if (getAboutText() =3D=3D null) {
-        tabs.remove(aboutContent);
-    }
-    if (getLicenseText() =3D=3D null) {
-        tabs.remove(licenseContent);
-    } else {
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                licenseTextArea.setCaretPosition(0);
-            }
-        });
-
-    }
-    if (getThirdpartyText() =3D=3D null) {
-        tabs.remove(thirdpartyContent);
-    } else {
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                thirdpartyTextArea.setCaretPosition(0);
-            }
-        });
-    }*/
 }
=20
 public void showInDialog(Frame ui, boolean undecorated) {
     handler.showInDialog(ui, undecorated);
-    /*JDialog f =3D new JDialog(ui, true);
-    f.add(this);
-    if (iconPath !=3D null) {
-        f.setIconImage(SwingUtil.createIcon(iconPath).getImage());
-    }
-    f.setResizable(false);
-    f.setSize(550, 450);
-    f.setUndecorated(undecorated);
-    JRootPane rootPane =3D f.getRootPane();
-    rootPane.setDefaultButton(close);
-    rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.ge=
tKeyStroke("ESCAPE"), "close");
-    rootPane.getActionMap().put("close", closeAction);
-    f.addWindowListener(new WindowAdapter() {
-        @Override
-        public void windowClosed(WindowEvent e) {
-            Component ui =3D (Component) e.getSource();
-            if (log.isInfoEnabled()) {
-                log.info("destroy ui "+ ui);
-            }
-            JAXXUtil.destroy(ui);
-            JAXXUtil.destroy(AboutPanel.this);
-        }
-    });
-    SwingUtil.center(ui, f);
-    f.setVisible(true);*/
 }
=20
-/*protected String load(String filename) {
-    InputStream licenseStream =3D getClass().getResourceAsStream("/" + filen=
ame);
-    String result =3D null;
-    try {
-        if (licenseStream !=3D null) {
-            result =3D IOUtils.toString(licenseStream);
-        }
-    } catch (IOException ex) {
-       // ignore it
-    } finally {
-        if (licenseStream !=3D null) {
-            try {
-                licenseStream.close();
-            } catch (IOException ex) {
-                log.error("could not close file " + filename);
-            }
-        }
-    }
-    if (result =3D=3D null) {
-        result =3D "resource " + filename + " not found";
-    }
-    return result;
-}*/
-
 void $afterCompleteSetup() {
     handler.$afterCompleteSetup();
-    //buildTopPanel();
-    //close.setText(_("aboutframe.ok"));
 }
=20
 ]]>

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ErrorDialogUI.j=
axx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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-widgets/src/main/java/jaxx/runtime/swing/ErrorDialogUI.jaxx	20=
11-02-01 17:43:17 UTC (rev 2188)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ErrorDialogUI.jaxx	20=
11-02-01 17:43:44 UTC (rev 2189)
@@ -36,31 +36,13 @@
=20
 public static void init(Frame frame) {
     ErrorDialogUIHandler.init(frame);
-    /*disposeUI();
-    instance =3D new ErrorDialogUI(frame);
-    instance.setModalityType(ModalityType.TOOLKIT_MODAL);*/
 }
=20
 public static void showError(Exception e) {
     ErrorDialogUIHandler.showError(e);
-    /*if (instance =3D=3D null) {
-        instance =3D new ErrorDialogUI();
-    }
-    instance.getErrorMessage().setText(e.getMessage());
-    StringWriter w =3D new StringWriter();
-    e.printStackTrace(new PrintWriter(w));
-    instance.getErrorStack().setText(w.toString());
-    instance.getErrorStack().setCaretPosition(0);
-    instance.pack();
-    jaxx.runtime.SwingUtil.center(instance.getContextValue(JFrame.class,"par=
ent"), instance);
-    instance.setVisible(true);*/
 }
 public static void disposeUI() {
     ErrorDialogUIHandler.disposeUI();
-    /*if (instance !=3D null) {
-        JAXXUtil.destroy(instance);
-    }
-    instance=3Dnull;*/
 }
=20
 public ErrorDialogUI(Frame frame) {
@@ -69,17 +51,11 @@
         setContextValue(frame);
         setContextValue(frame,"parent");
     }
-
 }
=20
 void $afterCompleteSetup() {
     handler.$afterCompleteSetup();
 }
-
-/*JRootPane rootPane =3D getRootPane();
-rootPane.setDefaultButton(close);
-rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKey=
Stroke("ESCAPE"), "close");
-rootPane.getActionMap().put("close", close.getAction());*/
     ]]></script>
   <Table>
     <row fill=3D'both'>

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/FontSizor.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-widgets/src/main/java/jaxx/runtime/swing/FontSizor.jaxx	2011-0=
2-01 17:43:17 UTC (rev 2188)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/FontSizor.jaxx	2011-0=
2-01 17:43:44 UTC (rev 2189)
@@ -22,14 +22,8 @@
   <http://www.gnu.org/licenses/lgpl-3.0.html>.
   #L%
   -->
-
-
 <JPanel layout=3D'{new BorderLayout()}'>
=20
-  <!--import>
-    java.awt.BorderLayout
-  </import-->
-
   <FontSizorHandler id=3D'handler' constructorParams=3D'this'/>
=20
   <!-- default size of font -->
@@ -43,50 +37,20 @@
   <Boolean id=3D'showFontSize' javaBean=3D'false'/>
=20
   <script><![CDATA[
-/*
-public static final String BINDING_FONT_SIZE_CALL_BACK =3D "fontSize.callBac=
k";
-public static final String BINDING_DEFAULT_FONT_SIZE_CALL_BACK =3D "defaultF=
ontSize.callBack";
-*/
-
 public void init() {
     handler.init();
-    /*if (fontSize =3D=3D null) {
-        setFontSize(defaultFontSize);
-    }*/
 }
=20
 boolean updateDefaultSizeEnabled(Float fontSize, Float defaultFontSize, bool=
ean enabled) {
    return handler.updateDefaultSizeEnabled( fontSize,defaultFontSize, enable=
d);
-   /*if (fontSize=3D=3Dnull || defaultFontSize=3D=3Dnull) {
-      return false;
-   }
-   return !fontSize.equals(defaultFontSize) && enabled;*/
 }
=20
-public void setCallBack(final Runnable action) {
+public void setCallBack(Runnable action) {
     handler.setCallBack(action);
-    /*removeDataBinding(BINDING_FONT_SIZE_CALL_BACK);
-    registerDataBinding(new SimpleJAXXObjectBinding(this, BINDING_FONT_SIZE_=
CALL_BACK, true ,"fontSize") {
-
-        @Override
-        public void processDataBinding() {
-            action.run();
-        }
-    });
-    applyDataBinding(BINDING_FONT_SIZE_CALL_BACK);*/
 }
=20
 void $afterCompleteSetup() {
-    handler.$afterCompleteSetup();
-    /*registerDataBinding(new SimpleJAXXObjectBinding(this, BINDING_DEFAULT_=
FONT_SIZE_CALL_BACK, true ,"defaultFontSize") {
-
-        @Override
-        public void processDataBinding() {
-            setFontSize(defaultFontSize);
-        }
-    });
-    //applyDataBinding(BINDING_DEFAULT_FONT_SIZE_CALL_BACK);
-    */
+    handler.$afterCompleteSetup();   =20
 }
   ]]>
   </script>

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButton.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-widgets/src/main/java/jaxx/runtime/swing/HidorButton.jaxx	2011=
-02-01 17:43:17 UTC (rev 2188)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButton.jaxx	2011=
-02-01 17:43:44 UTC (rev 2189)
@@ -59,20 +59,6 @@
     myHandler.$afterCompleteSetup();
 }
=20
-/*addPropertyChangeListener("targetVisible", new PropertyChangeListener() {
-
-    @Override
-    public void propertyChange(PropertyChangeEvent evt) {
-        if (log.isDebugEnabled()) {
-            log.debug("target visible changed <" + evt.getOldValue() + ":" +=
 evt.getNewValue() + ">");
-        }
-        boolean newValue =3D (Boolean) evt.getNewValue();
-        if (target !=3D null) {
-            target.setVisible(newValue);
-        }
-    }
-});*/
-
 public void setTarget(JComponent target) {
     JComponent oldValue =3D this.target;
     this.target =3D target;
@@ -86,21 +72,6 @@
 public void setHideIcon(Icon icon) {
     putClientProperty("hideIcon", icon);
 }
-
-/*protected String updateToolTipText(boolean c) {
-    String i =3D c ? hideTip : showTip;
-    return i;
-}
-
-protected String updateText(boolean c) {
-    String i =3D c ? hideText : showText;
-    return i;
-}
-
-protected Icon updateIcon(boolean c) {
-   String key =3D c ? "hideIcon" : "showIcon";
-   return (Icon) getClientProperty(key);
-}*/
 ]]>
   </script>
 </JToggleButton>

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.=
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-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx	2=
011-02-01 17:43:17 UTC (rev 2188)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx	2=
011-02-01 17:43:44 UTC (rev 2189)
@@ -46,7 +46,7 @@
=20
   <script><![CDATA[
=20
-public void setHandler(ListSelectorHandler handler) {
+public void setHandler(ListSelectorHandler<B> handler) {
     this.handler =3D handler;
 }
=20

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/MemoryStatusWid=
get.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-widgets/src/main/java/jaxx/runtime/swing/MemoryStatusWidget.ja=
xx	2011-02-01 17:43:17 UTC (rev 2188)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/MemoryStatusWidget.ja=
xx	2011-02-01 17:43:44 UTC (rev 2189)
@@ -31,9 +31,6 @@
   <import>
     java.awt.Color
     java.awt.Graphics
-    java.awt.font.FontRenderContext
-    java.awt.font.LineMetrics
-    java.awt.geom.Rectangle2D
     java.awt.event.ActionEvent
     javax.swing.Timer
   </import>
@@ -47,18 +44,7 @@
=20
   <script><![CDATA[
=20
-  /*
-import java.awt.font.FontRenderContext;
-import java.awt.font.LineMetrics;
-import java.awt.geom.Rectangle2D;
=20
-private final static String memoryTestStr =3D "99999/99999Mb";
-
-private FontRenderContext frc =3D new FontRenderContext(null, false, false);
-
-private LineMetrics lm =3D new JLabel().getFont().getLineMetrics(memoryTestS=
tr, frc);
-*/
-
 @Override
 public void actionPerformed(ActionEvent evt) {
     repaint();
@@ -84,48 +70,11 @@
 @Override
 public void paintComponent(Graphics g) {
     handler.paintComponent(g);
-    /*Insets insets =3D new Insets(0, 0, 0, 0);
-    Runtime runtime =3D Runtime.getRuntime();
-    int freeMemory =3D (int) (runtime.freeMemory() / 1024L);
-    int totalMemory =3D (int) (runtime.totalMemory() / 1024L);
-    int usedMemory =3D totalMemory - freeMemory;
-    int width =3D getWidth() - insets.left - insets.right;
-    int height =3D getHeight() - insets.top - insets.bottom - 1;
-    float fraction =3D (float) usedMemory / (float) totalMemory;
-    g.setColor(progressBackground);
-    g.fillRect(insets.left, insets.top, (int) ((float) width * fraction), he=
ight);
-    // No i18n string was :
-    // String str =3D usedMemory / 1024 + "/" + totalMemory / 1024 + "Mb";
-    String str =3D _("memorywidget.memory", usedMemory / 1024, totalMemory /=
 1024);
-    //FontRenderContext frc =3D new FontRenderContext(null, false, false);
-    Rectangle2D bounds =3D g.getFont().getStringBounds(str, frc);
-    Graphics g2 =3D g.create();
-    g2.setClip(insets.left, insets.top,
-            (int) ((float) width * fraction), height);
-    g2.setColor(progressForeground);
-    g2.drawString(str, insets.left
-            + (int) ((double) width - bounds.getWidth()) / 2,
-            (int) ((float) insets.top + lm.getAscent()));
-    g2.dispose();
-    g2 =3D g.create();
-    g2.setClip(insets.left + (int) ((float) width * fraction),
-            insets.top, getWidth() - insets.left
-                    - (int) ((float) width * fraction), height);
-    g2.setColor(getForeground());
-    g2.drawString(str, insets.left
-            + (int) ((double) width - bounds.getWidth()) / 2,
-            (int) ((float) insets.top + lm.getAscent()));
-    g2.dispose();*/
 }
=20
=20
 void $afterCompleteSetup() {
     handler.$afterCompleteSetup();
-    /*setFont(new JLabel().getFont());
-    Rectangle2D bounds =3D getFont().getStringBounds(memoryTestStr, frc);
-    Dimension dim =3D new Dimension((int) bounds.getWidth(), (int) bounds .g=
etHeight());
-    setPreferredSize(dim);
-    setMaximumSize(dim);*/
 }
 ]]>
   </script>

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/StatusMessagePa=
nel.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-widgets/src/main/java/jaxx/runtime/swing/StatusMessagePanel.ja=
xx	2011-02-01 17:43:17 UTC (rev 2188)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/StatusMessagePanel.ja=
xx	2011-02-01 17:43:44 UTC (rev 2189)
@@ -42,16 +42,13 @@
=20
 public void clearStatus() {
     handler.clearStatus();
-    /*handler.stopStatusFader(this);
-    getStatusLabel().setText(EMPTY_STATUS);
-    //getStatusLabel().setString(EMPTY_STATUS);*/
 }
=20
 public void startProgress() {
     startProgress(null);
 }
=20
-public void startProgress(final String status) {
+public void startProgress(String status) {
     setBusy(true);
     setStatus(status);
 }
@@ -67,15 +64,6 @@
=20
 public void setStatus(String status) {
     handler.setStatus(status);
-    /*if (status !=3D null) {
-        handler.stopStatusFader(this);
-        getStatusLabel().setText(status);
-        //getStatusLabel().setString(status);
-    }
-   =20
-    if (!isBusy()) {
-        handler.startStatusFader(this);
-    }*/
 }
=20
 @Override
@@ -102,19 +90,10 @@
=20
 public void init() {
     handler.init();
-    /*if (isShowBusy()) {
-        Dimension dim =3D new Dimension(30, 15);
-        //Dimension dim =3D new Dimension(30, (int) statusLabel.getPreferred=
Size().getHeight());
-        //log.info("dimension of busy =3D "+ dim);
-        //busyWidget.setPreferredSize(dim);
-        busyWidget.setMaximumSize(dim);
-        busyWidget.setMinimumSize(dim);
-    }*/
 }
=20
 void $afterCompleteSetup() {
-handler.$afterCompleteSetup();
-  //init();
+    handler.$afterCompleteSetup();
 }
 ]]>
   </script>

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEdit=
or.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-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditor.jax=
x	2011-02-01 17:43:17 UTC (rev 2188)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditor.jax=
x	2011-02-01 17:43:44 UTC (rev 2189)
@@ -31,6 +31,9 @@
         onFocusLost=3D'setPopupVisible(false)'>
=20
   <import>
+
+    jaxx.runtime.SwingUtil
+   =20
     java.awt.BorderLayout
     java.awt.event.ItemEvent
     java.awt.event.ActionEvent
@@ -92,12 +95,6 @@
                onStateChanged=3D'log.info(indexes.getSelectedValue())'/>
=20
   <script><![CDATA[
-import java.util.Locale;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import jaxx.runtime.swing.renderer.LocaleListCellRenderer;
-import static org.nuiton.i18n.I18n.n_;
-
 public static final String DEFAULT_SELECTED_TOOLTIP =3D n_("i18neditor.selec=
ted");
 public static final String DEFAULT_NOT_SELECTED_TOOLTIP =3D n_("i18neditor.u=
nselected");
=20
@@ -114,181 +111,37 @@
=20
 void $afterCompleteSetup() {
     handler.$afterCompleteSetup();
-    //buildTopPanel();
-    //close.setText(_("aboutframe.ok"));
 }
=20
 @Override
 public void propertyChange(PropertyChangeEvent evt) {
     handler.propertyChange(evt);
-    /*String name =3D evt.getPropertyName();
-    if (log.isDebugEnabled()) {
-        log.debug(name+" <old:"+evt.getOldValue()+" - new:"+evt.getNewValue(=
)+">");
-    }
-    log.info(name + " <old:"+evt.getOldValue()+" - new:"+evt.getNewValue()+"=
>");
-    if (LOCALES_PROPERTY.equals(name)) {
-        java.util.Collection<?> newLocales =3D (java.util.Collection<?>) evt=
.getNewValue();
-        // mise a jour de la popup
-        boolean oldShowText =3D renderer.isShowText();
-        try {
-            renderer.setShowText(true);
-            popup.removeAll();
-            for (Object o : newLocales) {
-                Locale l =3D (Locale) o;
-                boolean selected =3D l.equals(selectedLocale);
-                String text =3D isShowPopupText() ? renderer.getText(l) : nu=
ll;
-                Icon icon =3D isShowPopupIcon() ? renderer.getIcon(l) : null;
-                JRadioButtonMenuItem b =3D new JRadioButtonMenuItem(text, ic=
on, selected);
-                popup.add(b);
-                b.addActionListener(this);
-                b.putClientProperty("locale", l);
-                b.setToolTipText(getTip(l));
-                b.putClientProperty(JAXXButtonGroup.BUTTON8GROUP_CLIENT_PROP=
ERTY, getIndexes());
-                b.putClientProperty(JAXXButtonGroup.VALUE_CLIENT_PROPERTY, l=
);
-            }
-        } finally {
-            renderer.setShowText(oldShowText);
-            popup.invalidate();
-        }
-        return;
-    }
-    if (SHOW_ICON_PROPERTY.equals(name)) {
-        renderer.setShowIcon((Boolean) evt.getNewValue());
-        processDataBinding("button.icon");
-        return;
-    }
-    if (SHOW_TEXT_PROPERTY.equals(name)) {
-        renderer.setShowText((Boolean) evt.getNewValue());
-        processDataBinding("button.text");
-        return;
-    }
-    if (SHOW_POPUP_ICON_PROPERTY.equals(name)) {
-        rebuildPopup();
-        return;
-    }
-    if (SHOW_POPUP_TEXT_PROPERTY.equals(name)) {
-        rebuildPopup();
-        return;
-    }
-    if (POPUP_BORDER_PROPERTY.equals(name)) {
-        popup.setBorder((Border)evt.getNewValue());
-        return;
-    }
-    if (POPUP_VISIBLE_PROPERTY.equals(name)) {
-        Boolean newValue =3D (Boolean) evt.getNewValue();
-        if (newValue =3D=3D null || !newValue) {
-            if (getPopup() !=3D null && getPopup().isVisible()) {
-                getPopup().setVisible(false);
-            }
-            return;
-        }
-        if (!getPopup().isVisible()) {
-            SwingUtilities.invokeLater(showPopupRunnable);
-        }
-        return;
-    }
-    if (SELECTED_LOCALE_PROPERTY.equals(name)) {
-        Locale newLocale =3D (Locale) evt.getNewValue();
-        // mise a jour de la popup
-        try {
-            for (Component c : popup.getComponents()) {
-                if (c instanceof JRadioButtonMenuItem) {
-                    JRadioButtonMenuItem b =3D (JRadioButtonMenuItem) c;
-                    Locale l =3D (Locale) b.getClientProperty("locale");
-                    b.setSelected(newLocale.equals(l));
-                }
-            }
-        } finally {
-            popup.invalidate();
-        }
-        return;
-    }*/
 }
=20
 @Override
 public void actionPerformed(ActionEvent event) {
     handler.actionPerformed(event);
-    /*Locale value =3D (Locale)
-        ((JComponent)event.getSource()).getClientProperty("locale");
-    if (log.isDebugEnabled()) {
-        log.debug("new locale : " + value);
-    }
-    setSelectedLocale(value);*/
 }
=20
 public void loadI18nBundles() {
     handler.loadI18nBundles();
-    /*Locale[] locales =3D org.nuiton.i18n.I18n.getStore().getLocales();
-    setLocales(java.util.Arrays.asList(locales));*/
 }
=20
 protected void rebuildPopup() {
     handler.rebuildPopup();
-    /*log.debug("start rebuild");
-    try {
-        for (Component c : popup.getComponents()) {
-            if (c instanceof JRadioButtonMenuItem) {
-                JRadioButtonMenuItem b =3D (JRadioButtonMenuItem) c;
-                Locale l =3D (Locale) b.getClientProperty("locale");
-                String text =3D isShowPopupText() ? renderer.getSafeText(l) =
: null;
-                Icon icon =3D isShowPopupIcon() ? renderer.getSafeIcon(l) : =
null;
-                b.setIcon(icon);
-                b.setText(text);
-                log.debug("text=3D" + text);
-                log.debug("icon=3D" + icon);
-            }
-        }       =20
-    } finally {
-        popup.invalidate();
-    }*/
 }
=20
 protected String getTip(Locale l) {
     return handler.getTip(l);
-    /*boolean selected =3D l.equals(selectedLocale);
-    String tip =3D selected ? getSelectedTip(l):getNotSelectedTip(l);
-    return tip;*/
 }
=20
 protected String getSelectedTip(Locale l) {
     return handler.getSelectedTip(l);
-    /*String selectedTip =3D getSelectedToolTipText();
-    if (selectedTip =3D=3D null) {
-        // use default selected tip text
-        selectedTip =3D DEFAULT_SELECTED_TOOLTIP;
-    }
-    String tip =3D renderer.getToolTipText(l);
-    tip =3D _(selectedTip, tip);
-    return tip;*/
 }
=20
 protected String getNotSelectedTip(Locale l) {
     return handler.getNotSelectedTip(l);
-    /*String selectedTip =3D getNotSelectedToolTipText();
-    if (selectedTip =3D=3D null) {
-        // use default not selected tip text
-        selectedTip =3D DEFAULT_NOT_SELECTED_TOOLTIP;
-    }
-    String tip =3D renderer.getToolTipText(l);
-    tip =3D _(selectedTip, tip);
-    return tip;*/
 }
-
-/*protected Runnable showPopupRunnable =3D new Runnable() {
-    @Override
-    public void run() {
-        getPopup().pack();
-        JToggleButton invoker =3D getButton();
-        Dimension dim =3D getPopup().getPreferredSize();
-        Dimension invokerDim =3D invoker.getSize();
-        getPopup().show(invoker, (int) (invokerDim.getWidth() - dim.getWidth=
()), invoker.getHeight());
-//        getPopup().setVisible(true);
-    }
-};*/
-
-/*
-addPropertyChangeListener(this);*/
-
 ]]>
   </script>
 </JPanel>

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEd=
itor.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-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.j=
axx	2011-02-01 17:43:17 UTC (rev 2188)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.j=
axx	2011-02-01 17:43:44 UTC (rev 2189)
@@ -50,7 +50,7 @@
   <Number id=3D"model" javaBean=3D'null'/>
=20
   <!-- editor model type (specify it when you want to use a special type oth=
er than Integer or Float)-->
-  <Class id=3D"modelType" javaBean=3D'null'/>
+  <Class id=3D"modelType" genericType=3D'?' javaBean=3D'null'/>
=20
   <!-- useFloat property -->
   <Boolean id=3D'useFloat' javaBean=3D'false'/>

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/Bea=
nComboBox.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-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanCombo=
Box.jaxx	2011-02-01 17:43:17 UTC (rev 2188)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanCombo=
Box.jaxx	2011-02-01 17:43:44 UTC (rev 2189)
@@ -28,7 +28,6 @@
        onFocusLost=3D'hidePopup()'>
=20
   <import>
-    static org.nuiton.i18n.I18n.n_
     jaxx.runtime.decorator.JXPathDecorator
     javax.swing.border.TitledBorder
   </import>
@@ -103,7 +102,7 @@
   </JPopupMenu>
=20
   <script><![CDATA[
-public void init(JXPathDecorator<O> decorator, java.util.List<O> data) {
+public void init(JXPathDecorator<O> decorator, List<O> data) {
     handler.init(decorator, data);
 }
=20

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/Bea=
nListHeader.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-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListH=
eader.jaxx	2011-02-01 17:43:17 UTC (rev 2188)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListH=
eader.jaxx	2011-02-01 17:43:44 UTC (rev 2189)
@@ -26,7 +26,6 @@
 <JPanel id=3D'top' layout=3D'{new BorderLayout()}' genericType=3D'O'>
=20
   <import>
-    static org.nuiton.i18n.I18n.n_
     jaxx.runtime.decorator.JXPathDecorator
     javax.swing.border.TitledBorder
   </import>
@@ -100,7 +99,7 @@
=20
   <script><![CDATA[
  =20
-public void init(JXPathDecorator<O> decorator, java.util.List<O> data) {
+public void init(JXPathDecorator<O> decorator, List<O> data) {
     handler.init(decorator, data);
 }
=20

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/C=
onfigCallBackUI.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-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigC=
allBackUI.jaxx	2011-02-01 17:43:17 UTC (rev 2188)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigC=
allBackUI.jaxx	2011-02-01 17:43:44 UTC (rev 2189)
@@ -25,12 +25,10 @@
 <JPanel layout=3D'{new BorderLayout()}'>
=20
   <!--import>
-    java.awt.BorderLayout
+    jaxx.runtime.swing.editor.config.model.*
   </import-->
=20
   <script><![CDATA[
-    import jaxx.runtime.swing.editor.config.model.*;
-
     /**
      * Init the ui.
      */

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/C=
onfigCategoryUI.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-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigC=
ategoryUI.jaxx	2011-02-01 17:43:17 UTC (rev 2188)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigC=
ategoryUI.jaxx	2011-02-01 17:43:44 UTC (rev 2189)
@@ -29,6 +29,9 @@
     java.awt.Font
     javax.swing.DefaultListSelectionModel
     javax.swing.ScrollPaneConstants
+    jaxx.runtime.swing.editor.config.model.CategoryModel
+    jaxx.runtime.swing.editor.config.model.ConfigTableModel
+    jaxx.runtime.swing.editor.config.model.ConfigUIModel
     jaxx.runtime.swing.editor.config.model.OptionModel
     static org.nuiton.i18n.I18n.n_
   </import>
@@ -36,8 +39,6 @@
   <!--<style source=3D'ConfigCategoryUI.css'/>-->
=20
   <script><![CDATA[
-import jaxx.runtime.swing.editor.config.model.*;
-import static org.nuiton.i18n.I18n.n_;
=20
 void $afterCompleteSetup() {
     // prepare table
@@ -57,9 +58,6 @@
     int width =3D SwingUtil.computeTableColumnWidth(table, f, 0, "___*");
     SwingUtil.fixTableColumnWidth(table, 0, width);
     SwingUtil.setTableColumnEditor(table, 1, new ConfigTableEditor((ConfigTa=
bleModel) table.getModel()));
-    //TODO to be continued...
-    //columnSelector.setMyTable(table);
-    //tablePane.setCorner(ScrollPaneConstants.UPPER_RIGHT_CORNER, columnSele=
ctor);
 }
=20
 protected void updateDescriptionText() {


--===============2992664864406038093==--