From tchemit@users.nuiton.org Tue Sep  7 12:46:24 2010
From: tchemit@users.nuiton.org
To: jaxx-commits@list.nuiton.org
Subject: [Jaxx-commits] r2072 - in trunk/jaxx-demo/src/main:
	java/jaxx/demo/feature/nav java/jaxx/demo/feature/nav/content
	java/jaxx/demo/feature/nav/tree	java/jaxx/demo/feature/nav/treetable
 resources/i18n
Date: Tue, 07 Sep 2010 12:46:24 +0200
Message-ID: <20100907104624.4388615A04@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7150418840639129362=="

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

Author: tchemit
Date: 2010-09-07 12:46:24 +0200 (Tue, 07 Sep 2010)
New Revision: 2072

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

Log:
improve nav demo (no script, i18n, optimize code, use BeanListHeader, ...)

Added:
   trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java
Modified:
   trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemo.jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoDataProvider.ja=
va
   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/ActorContentUI=
.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/MovieContentUI=
.jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MoviesContentU=
I.jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/ActorsTreeNodeLoa=
dor.java
   trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/MoviesTreeNodeLoa=
dor.java
   trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeCellRe=
nderer.java
   trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeHelper=
.java
   trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/ActorsTreeTa=
bleNodeLoador.java
   trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/MoviesTreeTa=
bleNodeLoador.java
   trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeT=
ableHelper.java
   trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeT=
ableModel.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

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	2010-09-=
07 10:45:13 UTC (rev 2071)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemo.jaxx	2010-09-=
07 10:46:24 UTC (rev 2072)
@@ -31,6 +31,7 @@
     jaxx.demo.entities.*
     jaxx.runtime.decorator.DecoratorProvider
     jaxx.runtime.swing.nav.NavNode
+    jaxx.runtime.swing.editor.bean.BeanListHeader
=20
     org.jdesktop.swingx.JXTreeTable
     javax.swing.tree.TreePath
@@ -46,11 +47,15 @@
   <NavDemoTreeTableHelper id=3D'treeTableHelper'
                           constructorParams=3D'getDataProvider()'/>
=20
+  <NavDemoHandler id=3D'handler' constructorParams=3D'this'/>
+
   <script><![CDATA[
=20
 @Override
 protected String[] getSources() {
     return new String[]{ getDefaultSource(),
+            "NavDemoHandler.java",
+            "NavDemoDataProvider.java",
             "tree/NavDemoTreeNode.java",
             "tree/NavDemoTreeHelper.java",
             "tree/NavDemoTreeCellRenderer.java",
@@ -64,155 +69,8 @@
 }
=20
 private void $afterCompleteSetup() {
-    setContextValue(treeHelper, "treeHelper");
-    setContextValue(treeTableHelper, "treeTableHelper");
-
-    // Creation of selection listener to open ui when tree selection change
-    TreeSelectionListener treeSelectionListener =3D new TreeSelectionListene=
r() {
-        @Override
-        public void valueChanged(TreeSelectionEvent event) {
-            TreePath path =3D event.getPath();
-            NavDemoTreeNode demoNode =3D (NavDemoTreeNode) path.getLastPathC=
omponent();
-
-            if (log.isDebugEnabled()) {
-                log.debug("Select demoNode " + demoNode);
-            }
-
-            // Do nothing for root
-            if (demoNode.isRoot()) {
-                return;
-            }
-            openUI(demoNode);
-        }
-    };
-
-    // Creation of selection listener to open ui when tree selection change
-    TreeSelectionListener treeTableSelectionListener =3D new TreeSelectionLi=
stener() {
-        @Override
-        public void valueChanged(TreeSelectionEvent event) {
-            TreePath path =3D event.getPath();
-            NavDemoTreeTableNode demoNode =3D (NavDemoTreeTableNode) path.ge=
tLastPathComponent();
-
-            if (log.isDebugEnabled()) {
-                log.debug("Select demoNode " + demoNode);
-            }
-
-            // Do nothing for root
-            if (demoNode.isRoot()) {
-                return;
-            }
-            openUI(demoNode);
-        }
-    };
-
-    // Register decorator
-    DecoratorProvider decoratorProvider =3D getContextValue(DecoratorProvide=
r.class);
-
-    // Attach renderer
-    navigationTree.setCellRenderer(new NavDemoTreeCellRenderer(decoratorProv=
ider, dataProvider));
-
-    // Register tree
-    treeHelper.setUI(navigationTree, true, treeSelectionListener);
-
-    // Register tree table
-    treeTableHelper.setUI(navigationTreeTable, true, treeTableSelectionListe=
ner);
-
-    SwingUtilities.invokeLater(new Runnable() {
-
-        @Override
-        public void run() {
-            navigationTree.setSelectionInterval(0, 0);
-            splitPane.resetToPreferredSizes();
-        }
-    });
-
-    // expand the tree
-    SwingUtil.expandTree(navigationTree);
-    SwingUtil.expandTreeTable(navigationTreeTable);
-
-    // auto-expand demoNode when selected
-    SwingUtil.addExpandOnClickListener(navigationTree);
-    SwingUtil.addExpandOnClickListener(navigationTreeTable);
+    getHandler().$afterCompleteSetup();
 }
-
-protected void openUI(NavNode demoNode) {
-
-    // Get demoNode type
-    Class<?> editType =3D demoNode.getInternalClass();
-    String id =3D demoNode.getId();
-
-    // If it's category demoNode
-    if (editType.equals(String.class)) {
-
-        // Actors categorie demoNode
-        if (NavDemoTreeHelper.ACTORS_CATEGORY_NODE.equals(id)) {
-
-            java.util.List<People> peoples =3D dataProvider.getPeoples();
-            showUI(peoples, ActorsContentUI.class);
-
-        // Movies categorie demoNode
-        } else if (NavDemoTreeHelper.MOVIES_CATEGORY_NODE.equals(id)) {
-
-            java.util.List<Movie> movies =3D dataProvider.getMovies();
-            showUI(movies, MoviesContentUI.class);
-        }
-
-    // People demoNode
-    } else if (editType.equals(People.class)) {
-        People people =3D dataProvider.getPeople(id);
-        showUI(people, ActorContentUI.class);
-
-    // Movie demoNode
-    } else if (editType.equals(Movie.class)) {
-        Movie movie =3D dataProvider.getMovie(id);
-        showUI(movie, MovieContentUI.class);
-    }
-}
-
-// Create by introspection content ui
-protected <B> void showUI(B bean, Class<? extends AbstractContentUI> uiClass=
) {
-
-    // Verify if instance is existing
-    AbstractContentUI ui =3D getContentIfExist(uiClass);
-
-    // Get layout identifier
-    String contentName =3D uiClass.getName();
-   =20
-    if (ui =3D=3D null) {
-        try {
-            // Get constructor
-            Constructor<? extends AbstractContentUI> constructor =3D
-                    uiClass.getConstructor(JAXXContext.class);
-
-            // Invoke instance creation
-            ui =3D constructor.newInstance(this);
-        } catch (Exception eee) {
-            log.error(eee);
-            ErrorDialogUI.showError(eee);
-        }
-
-        // Add to content panel
-        content.add(ui, contentName);
-    }
-
-    // Attach bean
-    ui.setData(bean);
-
-    // show ui
-    contentLayout.show(content, contentName);
-}
-
-// Get content if exist in content, else return null
-protected <E extends Component> E getContentIfExist(Class<E> uiClass) {
-    String contentName =3D uiClass.getName();
-    if (log.isDebugEnabled()) {
-        log.debug("Get content if exist " + contentName);
-    }
-    if (!contentLayout.contains(contentName)) {
-        return null;
-    }
-    return (E) contentLayout.getComponent(content, contentName);
-}
  ]]>
   </script>
=20

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoDataProv=
ider.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/nav/NavDemoDataProvider.j=
ava	2010-09-07 10:45:13 UTC (rev 2071)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoDataProvider.j=
ava	2010-09-07 10:46:24 UTC (rev 2072)
@@ -54,10 +54,12 @@
         movies =3D new HashMap<String, Movie>();
         peoples =3D new HashMap<String, People>();
=20
-        log.info("for " + this);
-        People a =3D new People("0", "Jack", "Black", 0, "/jaxx/demo/images/=
jack.jpg");
-        People a2 =3D new People("1", "H=C3=A9ctor", "Jim=C3=A9nez", 0, "/ja=
xx/demo/images/hector.jpg");
-        People a3 =3D new People("2", "Ana", "de la Reguera", 0, "/jaxx/demo=
/images/ana.jpg");
+        if (log.isDebugEnabled()) {
+            log.debug("for " + this);
+        }
+        People a =3D new People("0", "Jack", "Black", 35, "/jaxx/demo/images=
/jack.jpg");
+        People a2 =3D new People("1", "H=C3=A9ctor", "Jim=C3=A9nez", 28, "/j=
axx/demo/images/hector.jpg");
+        People a3 =3D new People("2", "Ana", "de la Reguera", 34, "/jaxx/dem=
o/images/ana.jpg");
=20
         Movie m =3D new Movie("0", "Nacho libre", 1996, "/jaxx/demo/images/n=
acho.jpg");
         m.addActor(a);

Added: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.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/nav/NavDemoHandler.java	 =
                       (rev 0)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java	2=
010-09-07 10:46:24 UTC (rev 2072)
@@ -0,0 +1,275 @@
+package jaxx.demo.feature.nav;
+
+import jaxx.demo.entities.AbstractDemoBean;
+import jaxx.demo.entities.Movie;
+import jaxx.demo.entities.People;
+import jaxx.demo.feature.nav.content.AbstractContentUI;
+import jaxx.demo.feature.nav.content.ActorContentUI;
+import jaxx.demo.feature.nav.content.ActorsContentUI;
+import jaxx.demo.feature.nav.content.MovieContentUI;
+import jaxx.demo.feature.nav.content.MoviesContentUI;
+import jaxx.demo.feature.nav.tree.NavDemoTreeCellRenderer;
+import jaxx.demo.feature.nav.tree.NavDemoTreeNode;
+import jaxx.demo.feature.nav.treetable.NavDemoTreeTableNode;
+import jaxx.runtime.JAXXContext;
+import jaxx.runtime.SwingUtil;
+import jaxx.runtime.decorator.DecoratorProvider;
+import jaxx.runtime.decorator.JXPathDecorator;
+import jaxx.runtime.swing.CardLayout2;
+import jaxx.runtime.swing.ErrorDialogUI;
+import jaxx.runtime.swing.nav.NavNode;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jdesktop.swingx.JXTreeTable;
+
+import javax.swing.ImageIcon;
+import javax.swing.JPanel;
+import javax.swing.JTree;
+import javax.swing.SwingUtilities;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import javax.swing.tree.TreePath;
+import java.awt.Component;
+import java.lang.reflect.Constructor;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.nuiton.i18n.I18n.n_;
+
+/**
+ * Handler of all uis in the Nave demo.
+ *
+ * @author tchemit <chemit@codelutin.com>
+ * @since 2.2
+ */
+public class NavDemoHandler {
+
+    private static final Log log =3D LogFactory.getLog(NavDemoHandler.class);
+
+    protected final NavDemo ui;
+
+    public static String MOVIES_CATEGORY_NODE =3D n_("jaxxdemo.common.movies=
");
+
+    public static String ACTORS_CATEGORY_NODE =3D n_("jaxxdemo.common.actors=
");
+
+    public NavDemoHandler(NavDemo ui) {
+        this.ui =3D ui;
+    }
+
+    public void initUI(MoviesContentUI contentUI) {
+        DecoratorProvider provider =3D
+                contentUI.getContextValue(DecoratorProvider.class);
+        JXPathDecorator<Movie> decorator =3D
+                (JXPathDecorator<Movie>) provider.getDecorator(Movie.class);
+        contentUI.getListHeader().init(decorator, new ArrayList<Movie>());
+    }
+
+    public void initUI(ActorsContentUI contentUI) {
+        DecoratorProvider provider =3D
+                contentUI.getContextValue(DecoratorProvider.class);
+        JXPathDecorator<People> decorator =3D
+                (JXPathDecorator<People>) provider.getDecorator(People.class=
);
+        contentUI.getListHeader().init(decorator, new ArrayList<People>());
+    }
+
+    public void selectChild(AbstractContentUI<?> contentUI,
+                            AbstractDemoBean selected) {
+        contentUI.getTreeHelper().selectNode(selected.getId());
+        contentUI.getTreeTableHelper().selectNode(selected.getId());
+    }
+
+    public String getContent(AbstractDemoBean data) {
+        if (data =3D=3D null) {
+            return "no content";
+        }
+        StringBuilder buffer =3D new StringBuilder();
+        buffer.append(data);
+        return buffer.toString();
+    }
+
+    public ImageIcon getImage(AbstractDemoBean data) {
+        return data =3D=3D null ? null : SwingUtil.createIcon(data.getImage(=
));
+    }
+
+    /** To init the {@link NavDemo} ui. */
+    public void $afterCompleteSetup() {
+
+        // share in context
+
+        ui.setContextValue(this);
+        ui.setContextValue(ui.getTreeHelper(), "treeHelper");
+        ui.setContextValue(ui.getTreeTableHelper(), "treeTableHelper");
+
+        // Creation of selection listener to open ui when tree selection cha=
nge
+        TreeSelectionListener treeSelectionListener =3D new TreeSelectionLis=
tener() {
+            @Override
+            public void valueChanged(TreeSelectionEvent event) {
+                TreePath path =3D event.getPath();
+                NavDemoTreeNode demoNode =3D
+                        (NavDemoTreeNode) path.getLastPathComponent();
+
+                if (log.isDebugEnabled()) {
+                    log.debug("Select demoNode " + demoNode);
+                }
+
+                // Do nothing for root
+                if (demoNode.isRoot()) {
+                    return;
+                }
+                openUI(demoNode);
+            }
+        };
+
+        // Creation of selection listener to open ui when tree selection cha=
nge
+        TreeSelectionListener treeTableSelectionListener =3D new TreeSelecti=
onListener() {
+            @Override
+            public void valueChanged(TreeSelectionEvent event) {
+                TreePath path =3D event.getPath();
+                NavDemoTreeTableNode demoNode =3D
+                        (NavDemoTreeTableNode) path.getLastPathComponent();
+
+                if (log.isDebugEnabled()) {
+                    log.debug("Select demoNode " + demoNode);
+                }
+
+                // Do nothing for root
+                if (demoNode.isRoot()) {
+                    return;
+                }
+                openUI(demoNode);
+            }
+        };
+
+        final JTree tree =3D ui.getNavigationTree();
+        JXTreeTable table =3D ui.getNavigationTreeTable();
+
+        // Attach renderer
+        NavDemoTreeCellRenderer renderer =3D new NavDemoTreeCellRenderer(
+                ui.getContextValue(DecoratorProvider.class),
+                ui.getDataProvider()
+        );
+        tree.setCellRenderer(renderer);
+
+        // Register tree
+        ui.getTreeHelper().setUI(tree, true, treeSelectionListener);
+
+        // Register tree table
+        ui.getTreeTableHelper().setUI(table, true, treeTableSelectionListene=
r);
+
+        SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+                tree.setSelectionInterval(0, 0);
+                ui.getSplitPane().resetToPreferredSizes();
+            }
+        });
+
+        // expand the tree
+        SwingUtil.expandTree(tree);
+        SwingUtil.expandTreeTable(table);
+
+        // auto-expand demoNode when selected
+        SwingUtil.addExpandOnClickListener(tree);
+        SwingUtil.addExpandOnClickListener(table);
+    }
+
+    protected void openUI(NavNode demoNode) {
+
+        // Get demoNode type
+        Class<?> editType =3D demoNode.getInternalClass();
+        String id =3D demoNode.getId();
+
+        // If it's category demoNode
+        NavDemoDataProvider provider =3D ui.getDataProvider();
+        if (editType.equals(String.class)) {
+
+            // Actors categorie demoNode
+            if (ACTORS_CATEGORY_NODE.equals(id)) {
+
+                List<People> peoples =3D provider.getPeoples();
+                showUI(peoples, ActorsContentUI.class);
+
+                // Movies categorie demoNode
+            } else if (MOVIES_CATEGORY_NODE.equals(id)) {
+
+                List<Movie> movies =3D provider.getMovies();
+                showUI(movies, MoviesContentUI.class);
+            }
+
+            // People demoNode
+        } else if (editType.equals(People.class)) {
+            People people =3D provider.getPeople(id);
+            showUI(people, ActorContentUI.class);
+
+            // Movie demoNode
+        } else if (editType.equals(Movie.class)) {
+            Movie movie =3D provider.getMovie(id);
+            showUI(movie, MovieContentUI.class);
+        }
+    }
+
+    // Create by introspection content ui
+
+    protected <B> void showUI(B bean,
+                              Class<? extends AbstractContentUI<B>> uiClass)=
 {
+
+        // Verify if instance is existing
+        AbstractContentUI<B> ui =3D getContentIfExist(uiClass);
+
+        // Get layout identifier
+        String contentName =3D uiClass.getName();
+
+        JPanel content =3D this.ui.getContent();
+        if (ui =3D=3D null) {
+            try {
+                // Get constructor
+                Constructor<? extends AbstractContentUI<B>> constructor =3D
+                        uiClass.getConstructor(JAXXContext.class);
+
+                // Invoke instance creation
+                ui =3D constructor.newInstance(this.ui);
+            } catch (Exception eee) {
+                log.error("Could not create ui of type " + uiClass, eee);
+                ErrorDialogUI.showError(eee);
+                return;
+            }
+
+            // Add to content panel
+            content.add(ui, contentName);
+        }
+
+        // Attach bean
+        ui.setData(bean);
+
+        // show ui
+        this.ui.getContentLayout().show(content, contentName);
+
+        // revalidate container
+        SwingUtilities.invokeLater(revalidateContent);
+
+    }
+
+    // Get content if exist in content, else return null
+
+    protected <E extends Component> E getContentIfExist(Class<E> uiClass) {
+        String contentName =3D uiClass.getName();
+        if (log.isDebugEnabled()) {
+            log.debug("Get content if exist " + contentName);
+        }
+        CardLayout2 layout2 =3D ui.getContentLayout();
+        if (!layout2.contains(contentName)) {
+            return null;
+        }
+        return (E) layout2.getComponent(ui.getContent(), contentName);
+    }
+
+    private final Runnable revalidateContent =3D new Runnable() {
+
+        @Override
+        public void run() {
+            ui.revalidate();
+        }
+    };
+
+}
\ No newline at end of file

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	2010-09-07 10:45:13 UTC (rev 2071)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/AbstractConte=
ntUI.jaxx	2010-09-07 10:46:24 UTC (rev 2072)
@@ -27,6 +27,7 @@
         genericType=3D'B extends Object'>
=20
   <import>
+    jaxx.demo.feature.nav.NavDemoHandler
     jaxx.demo.feature.nav.tree.NavDemoTreeHelper
     jaxx.demo.feature.nav.treetable.NavDemoTreeTableHelper
   </import>
@@ -37,6 +38,8 @@
   <NavDemoTreeTableHelper id=3D'treeTableHelper'
                           initializer=3D'getContextValue(NavDemoTreeTableHel=
per.class,"treeTableHelper")'/>
=20
+  <NavDemoHandler id=3D'handler'
+                  initializer=3D'getContextValue(NavDemoHandler.class)'/>
   <script><![CDATA[
=20
 public abstract B getData();

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorCo=
ntentUI.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/ActorContentU=
I.jaxx	2010-09-07 10:45:13 UTC (rev 2071)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorContentU=
I.jaxx	2010-09-07 10:46:24 UTC (rev 2072)
@@ -30,23 +30,6 @@
=20
   <People id=3D'data' javaBean=3D'null'/>
=20
-  <script><![CDATA[
-
-String getContent(People data) {
-   if (data =3D=3D null) {
-       return "no content";
-   }
-   StringBuilder buffer =3D new StringBuilder();
-   buffer.append(data);
-   return buffer.toString();
-}
-
-ImageIcon getImage(People data) {
-    return data =3D=3D null? null :SwingUtil.createIcon(data.getImage());
-}
-
-]]></script>
-
   <JSplitPane id=3D'splitPane'
               orientation=3D'{JSplitPane.VERTICAL_SPLIT}'
               resizeWeight=3D'0.5'
@@ -61,7 +44,7 @@
         border=3D'{new TitledBorder(_("jaxxdemo.navigation.actor.title"))}'
         editable=3D'false'
         font-size=3D'11'
-        text=3D'{getContent(getData())}'/>
+        text=3D'{getHandler().getContent(getData())}'/>
     </JScrollPane>
=20
     <JScrollPane border=3D'{new TitledBorder("Picture")}'
@@ -70,7 +53,7 @@
                  minimumSize=3D'{SwingUtil.newMinDimension()}'>
=20
       <JLabel horizontalAlignment=3D'center'
-              icon=3D'{getImage(getData())}'/>
+              icon=3D'{getHandler().getImage(getData())}'/>
=20
     </JScrollPane>
=20

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	2010-09-07 10:45:13 UTC (rev 2071)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorsContent=
UI.jaxx	2010-09-07 10:46:24 UTC (rev 2072)
@@ -26,43 +26,16 @@
=20
   <import>
     jaxx.demo.entities.*
+    jaxx.runtime.swing.editor.bean.BeanListHeader
     jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer
-    jaxx.runtime.binding.SimpleJAXXObjectBinding
-    java.beans.PropertyChangeEvent
-    java.beans.PropertyChangeListener
-
   </import>
=20
   <java.util.List id=3D'data' genericType=3D'People' javaBean=3D'null'/>
=20
   <script><![CDATA[
-
 private void $afterCompleteSetup() {
-
-    addPropertyChangeListener(PROPERTY_DATA, new PropertyChangeListener(){
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            java.util.List<People> ps =3D getData();
-
-            if (ps !=3D null) {
-                DefaultListModel model =3D (DefaultListModel) list.getModel(=
);
-                for (People p : ps) {
-                    model.addElement(p);
-                }
-            } else {
-                // clean list model
-                DefaultListModel model =3D (DefaultListModel) list.getModel(=
);
-                model.removeAllElements();
-            }
-        }
-    });
+    getHandler().initUI(this);
 }
-
-protected void selectChild() {
-    People selected =3D (People)list.getSelectedValue();
-    getTreeHelper().selectNode(selected.getId());
-    getTreeTableHelper().selectNode(selected.getId());
-}
  ]]></script>
=20
   <JPanel layout=3D'{new BorderLayout()}'>
@@ -73,20 +46,37 @@
       columnHeaderView=3D'{toolbar}'
       horizontalScrollBarPolicy=3D'{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}'
       verticalScrollBarPolicy=3D'{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}'>
-      <JList id=3D'list' model=3D'{new DefaultListModel()}'
+
+      <!-- list of actors -->
+      <JList id=3D'list'
              cellRenderer=3D'{getContextValue(DecoratorProviderListCellRende=
rer.class)}'/>
+
+      <!-- list header -->
+      <JToolBar id=3D'toolbar' floatable=3D'false' layout=3D'{new BorderLayo=
ut()}'>
+        <JPanel layout=3D'{new GridLayout(1,0)}'
+                constraints=3D'BorderLayout.CENTER'>
+
+          <!-- to show the selected actor -->
+          <JButton text=3D'jaxxdemo.action.show'
+                   enabled=3D'{list.getSelectedIndex()!=3D-1}'
+                   onActionPerformed=3D'getHandler().selectChild(this, (Peop=
le) list.getSelectedValue())'/>
+
+          <!-- to show a new actor -->
+          <JButton text=3D'jaxxdemo.action.add'/>
+
+          <!-- to delete the selected actor -->
+          <JButton text=3D'jaxxdemo.action.remove'
+                   enabled=3D'{list.getSelectedIndex()!=3D-1}'/>
+        </JPanel>
+       =20
+        <BeanListHeader id=3D'listHeader' constraints=3D'BorderLayout.EAST'
+                        i18nPrefix=3D'jaxxdemo.common.'
+                        data=3D'{getData()}' genericType=3D'People'
+                        list=3D'{list}' showReset=3D'true'
+                        beanType=3D'{People.class}'/>
+      </JToolBar>
+
     </JScrollPane>
-    <JToolBar id=3D'toolbar' constraints=3D'BorderLayout.SOUTH'
-              floatable=3D'false'>
-      <JPanel layout=3D'{new GridLayout(1,0)}'>
-        <JButton text=3D'jaxxdemo.action.show'
-                 enabled=3D'{list.getSelectedIndex()!=3D-1}'
-                 onActionPerformed=3D'selectChild()'/>
-        <JButton text=3D'jaxxdemo.action.add'/>
-        <JButton text=3D'jaxxdemo.action.remove'
-                 enabled=3D'{list.getSelectedIndex()!=3D-1}'/>
-      </JPanel>
-    </JToolBar>
=20
   </JPanel>
 </AbstractContentUI>
\ No newline at end of file

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MovieCo=
ntentUI.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/MovieContentU=
I.jaxx	2010-09-07 10:45:13 UTC (rev 2071)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MovieContentU=
I.jaxx	2010-09-07 10:46:24 UTC (rev 2072)
@@ -30,22 +30,6 @@
=20
   <Movie id=3D'data' javaBean=3D'null'/>
=20
-  <script><![CDATA[
-
-String getContent(Movie data) {
-   if (data =3D=3D null) {
-       return "no content";
-   }
-   StringBuilder buffer =3D new StringBuilder();
-   buffer.append(data);
-   return buffer.toString();
-}
-
-ImageIcon getImage(Movie data) {
-    return data =3D=3D null? null :SwingUtil.createIcon(data.getImage());
-}
-]]></script>
-
   <JSplitPane id=3D'splitPane'
               orientation=3D'{JSplitPane.VERTICAL_SPLIT}'
               resizeWeight=3D'0.5'
@@ -60,7 +44,7 @@
         border=3D'{new TitledBorder(_("jaxxdemo.navigation.movie.title"))}'
         editable=3D'false'
         font-size=3D'11'
-        text=3D'{getContent(getData())}'/>
+        text=3D'{getHandler().getContent(getData())}'/>
     </JScrollPane>
=20
     <JScrollPane border=3D'{new TitledBorder("Picture")}'
@@ -68,7 +52,7 @@
                  verticalScrollBarPolicy=3D'{JScrollPane.VERTICAL_SCROLLBAR_=
AS_NEEDED}'
                  minimumSize=3D'{SwingUtil.newMinDimension()}'>
=20
-      <JLabel horizontalAlignment=3D'center' icon=3D'{getImage(getData())}'/>
+      <JLabel horizontalAlignment=3D'center' icon=3D'{getHandler().getImage(=
getData())}'/>
=20
     </JScrollPane>
=20

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	2010-09-07 10:45:13 UTC (rev 2071)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MoviesContent=
UI.jaxx	2010-09-07 10:46:24 UTC (rev 2072)
@@ -22,44 +22,18 @@
   #L%
   -->
=20
-<AbstractContentUI
-  superGenericType=3D'java.util.List&lt;Movie&gt;'>
+<AbstractContentUI superGenericType=3D'java.util.List&lt;Movie&gt;'>
=20
   <import>
-      jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer
-      jaxx.demo.entities.*
-      jaxx.runtime.binding.SimpleJAXXObjectBinding
-      java.beans.PropertyChangeEvent
-      java.beans.PropertyChangeListener
+    jaxx.demo.entities.*
+    jaxx.runtime.swing.editor.bean.BeanListHeader
+    jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer
   </import>
   <script><![CDATA[
=20
 private void $afterCompleteSetup() {
-
-    addPropertyChangeListener(PROPERTY_DATA, new PropertyChangeListener(){
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            java.util.List<Movie> ms =3D getData();
-
-            if (ms !=3D null) {
-                DefaultListModel model =3D (DefaultListModel) list.getModel(=
);
-                for (Movie m : ms) {
-                    model.addElement(m);
-                }
-            } else {
-                // clean list model
-                DefaultListModel model =3D (DefaultListModel) list.getModel(=
);
-                model.removeAllElements();
-            }
-        }
-    });
+    getHandler().initUI(this);   =20
 }
-
-protected void selectChild() {
-    Movie selected =3D (Movie)list.getSelectedValue();
-    getTreeHelper().selectNode(selected.getId());
-    getTreeTableHelper().selectNode(selected.getId());
-}
  ]]></script>
=20
   <java.util.List id=3D'data' genericType=3D'Movie' javaBean=3D'null'/>
@@ -73,23 +47,35 @@
       horizontalScrollBarPolicy=3D'{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}'
       verticalScrollBarPolicy=3D'{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}'>
=20
-      <JList id=3D'list' model=3D'{new DefaultListModel()}'
+      <!-- list of movies -->
+      <JList id=3D'list'
              cellRenderer=3D'{getContextValue(DecoratorProviderListCellRende=
rer.class)}'/>
=20
-    </JScrollPane>
+      <!-- list header -->
+      <JToolBar id=3D'toolbar' floatable=3D'false' layout=3D'{new BorderLayo=
ut()}'>
+        <JPanel layout=3D'{new GridLayout(1,0)}'
+                constraints=3D'BorderLayout.CENTER'>
=20
-    <JToolBar id=3D'toolbar' opaque=3D'false' constraints=3D'BorderLayout.SO=
UTH'
-              floatable=3D'false'>
+          <!-- to show the selected actor -->
+          <JButton text=3D'jaxxdemo.action.show'
+                   enabled=3D'{list.getSelectedIndex()!=3D-1}'
+                   onActionPerformed=3D'getHandler().selectChild(this, (Movi=
e) list.getSelectedValue())'/>
=20
-      <JPanel layout=3D'{new GridLayout(1,0)}'>
-        <JButton text=3D'jaxxdemo.action.show'
-                 enabled=3D'{list.getSelectedIndex()!=3D-1}'
-                 onActionPerformed=3D'selectChild()'/>
-        <JButton text=3D'jaxxdemo.action.add'/>
-        <JButton text=3D'jaxxdemo.action.remove'
-                 enabled=3D'{list.getSelectedIndex()!=3D-1}'/>
-      </JPanel>
-    </JToolBar>
+          <!-- to show a new actor -->
+          <JButton text=3D'jaxxdemo.action.add'/>
=20
+          <!-- to delete the selected actor -->
+          <JButton text=3D'jaxxdemo.action.remove'
+                   enabled=3D'{list.getSelectedIndex()!=3D-1}'/>
+        </JPanel>
+
+        <BeanListHeader id=3D'listHeader' constraints=3D'BorderLayout.EAST'
+                        i18nPrefix=3D'jaxxdemo.common.'
+                        data=3D'{getData()}' genericType=3D'Movie'
+                        list=3D'{list}' showReset=3D'true'
+                        beanType=3D'{Movie.class}'/>
+      </JToolBar>
+    </JScrollPane>
+
   </JPanel>
 </AbstractContentUI>
\ No newline at end of file

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/ActorsTree=
NodeLoador.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/nav/tree/ActorsTreeNodeLo=
ador.java	2010-09-07 10:45:13 UTC (rev 2071)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/ActorsTreeNodeLo=
ador.java	2010-09-07 10:46:24 UTC (rev 2072)
@@ -63,7 +63,6 @@
         return provider.getPeoples();
     }
=20
-    @SuppressWarnings({"unchecked"})
     @Override
     public NavDemoTreeNode createNode(People data, NavDataProvider dataProvi=
der) {
=20

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/MoviesTree=
NodeLoador.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/nav/tree/MoviesTreeNodeLo=
ador.java	2010-09-07 10:45:13 UTC (rev 2071)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/MoviesTreeNodeLo=
ador.java	2010-09-07 10:46:24 UTC (rev 2072)
@@ -27,6 +27,7 @@
=20
 import jaxx.demo.feature.nav.NavDemoDataProvider;
 import jaxx.demo.entities.Movie;
+import jaxx.demo.feature.nav.NavDemoHandler;
 import jaxx.runtime.swing.nav.NavDataProvider;
 import jaxx.runtime.swing.nav.NavHelper;
 import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador;
@@ -65,7 +66,6 @@
         return provider.getMovies();
     }
=20
-    @SuppressWarnings({"unchecked"})
     @Override
     public NavDemoTreeNode createNode(Movie data, NavDataProvider dataProvid=
er) {
=20
@@ -83,7 +83,7 @@
         // Create clients category node
         actorsCategoryNode =3D new NavDemoTreeNode(
                 String.class,
-                n_(NavDemoTreeHelper.ACTORS_CATEGORY_NODE),
+                n_(NavDemoHandler.ACTORS_CATEGORY_NODE),
                 null,
                 NavHelper.getChildLoador(ActorsTreeNodeLoador.class)
         );

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTre=
eCellRenderer.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/nav/tree/NavDemoTreeCellR=
enderer.java	2010-09-07 10:45:13 UTC (rev 2071)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeCellR=
enderer.java	2010-09-07 10:46:24 UTC (rev 2072)
@@ -50,7 +50,8 @@
=20
     protected DecoratorProvider decoratorProvider;
=20
-    public NavDemoTreeCellRenderer(DecoratorProvider decoratorProvider, NavD=
emoDataProvider provider) {
+    public NavDemoTreeCellRenderer(DecoratorProvider decoratorProvider,
+                                   NavDemoDataProvider provider) {
         setDataProvider(provider);
         this.decoratorProvider =3D decoratorProvider;
     }

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTre=
eHelper.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/nav/tree/NavDemoTreeHelpe=
r.java	2010-09-07 10:45:13 UTC (rev 2071)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeHelpe=
r.java	2010-09-07 10:46:24 UTC (rev 2072)
@@ -26,32 +26,26 @@
 package jaxx.demo.feature.nav.tree;
=20
 import jaxx.demo.feature.nav.NavDemoDataProvider;
+import jaxx.demo.feature.nav.NavDemoHandler;
 import jaxx.runtime.swing.nav.tree.NavTreeHelper;
=20
 import javax.swing.tree.DefaultTreeModel;
=20
-import static org.nuiton.i18n.I18n.n_;
-
 /**
  * @author sletellier <letellier@codelutin.com>
  * @since 2.1
  */
 public class NavDemoTreeHelper extends NavTreeHelper<NavDemoTreeNode> {
=20
-    public static String MOVIES_CATEGORY_NODE =3D "movies";
-
-    public static String ACTORS_CATEGORY_NODE =3D "actors";
-
     public NavDemoTreeHelper(NavDemoDataProvider provider) {
         setDataProvider(provider);
     }
=20
     @Override
     public NavDemoDataProvider getDataProvider() {
-        return (NavDemoDataProvider) dataProvider;
+        return (NavDemoDataProvider) super.getDataProvider();
     }
=20
-    @SuppressWarnings({"unchecked"})
     public DefaultTreeModel createModel() {
=20
         // Create root static node
@@ -65,7 +59,7 @@
         // Create movies category node
         NavDemoTreeNode moviesCategoryNode =3D new NavDemoTreeNode(
                 String.class,
-                n_(MOVIES_CATEGORY_NODE),
+                NavDemoHandler.MOVIES_CATEGORY_NODE,
                 null,
                 getChildLoador(MoviesTreeNodeLoador.class)
         );
@@ -73,7 +67,7 @@
         // Create peoples category node
         NavDemoTreeNode peoplesCategoryNode =3D new NavDemoTreeNode(
                 String.class,
-                n_(ACTORS_CATEGORY_NODE),
+                NavDemoHandler.ACTORS_CATEGORY_NODE,
                 null,
                 getChildLoador(ActorsTreeNodeLoador.class)
         );

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/Actor=
sTreeTableNodeLoador.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/nav/treetable/ActorsTreeT=
ableNodeLoador.java	2010-09-07 10:45:13 UTC (rev 2071)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/ActorsTreeT=
ableNodeLoador.java	2010-09-07 10:46:24 UTC (rev 2072)
@@ -63,7 +63,6 @@
         return provider.getPeoples();
     }
=20
-    @SuppressWarnings({"unchecked"})
     @Override
     public NavDemoTreeTableNode createNode(People data, NavDataProvider data=
Provider) {
=20

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/Movie=
sTreeTableNodeLoador.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/nav/treetable/MoviesTreeT=
ableNodeLoador.java	2010-09-07 10:45:13 UTC (rev 2071)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/MoviesTreeT=
ableNodeLoador.java	2010-09-07 10:46:24 UTC (rev 2072)
@@ -27,6 +27,7 @@
=20
 import jaxx.demo.feature.nav.NavDemoDataProvider;
 import jaxx.demo.entities.Movie;
+import jaxx.demo.feature.nav.NavDemoHandler;
 import jaxx.runtime.swing.nav.NavDataProvider;
 import jaxx.runtime.swing.nav.NavHelper;
 import jaxx.runtime.swing.nav.treetable.NavTreeTableNodeChildLoador;
@@ -65,9 +66,9 @@
         return provider.getMovies();
     }
=20
-    @SuppressWarnings({"unchecked"})
     @Override
-    public NavDemoTreeTableNode createNode(Movie data, NavDataProvider dataP=
rovider) {
+    public NavDemoTreeTableNode createNode(Movie data,
+                                           NavDataProvider dataProvider) {
=20
         NavDemoTreeTableNode moviesNode;
         NavDemoTreeTableNode actorsCategoryNode;
@@ -83,7 +84,7 @@
         // Create clients category node
         actorsCategoryNode =3D new NavDemoTreeTableNode(
                 String.class,
-                n_(NavDemoTreeTableHelper.ACTORS_CATEGORY_NODE),
+                n_(NavDemoHandler.ACTORS_CATEGORY_NODE),
                 null,
                 NavHelper.getChildLoador(ActorsTreeTableNodeLoador.class)
         );

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDe=
moTreeTableHelper.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/nav/treetable/NavDemoTree=
TableHelper.java	2010-09-07 10:45:13 UTC (rev 2071)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTree=
TableHelper.java	2010-09-07 10:46:24 UTC (rev 2072)
@@ -26,32 +26,26 @@
 package jaxx.demo.feature.nav.treetable;
=20
 import jaxx.demo.feature.nav.NavDemoDataProvider;
+import jaxx.demo.feature.nav.NavDemoHandler;
 import jaxx.runtime.swing.nav.treetable.NavTreeTableHelper;
 import jaxx.runtime.swing.nav.treetable.NavTreeTableModel;
=20
-import static org.nuiton.i18n.I18n.n_;
-
 /**
  * @author sletellier <letellier@codelutin.com>
  * @since 2.1
  */
 public class NavDemoTreeTableHelper extends NavTreeTableHelper<NavDemoTreeTa=
bleNode> {
=20
-    public static String MOVIES_CATEGORY_NODE =3D "movies";
-
-    public static String ACTORS_CATEGORY_NODE =3D "actors";
-
     public NavDemoTreeTableHelper(NavDemoDataProvider provider) {
         setDataProvider(provider);
     }
=20
     @Override
     public NavDemoDataProvider getDataProvider() {
-        return (NavDemoDataProvider) dataProvider;
+        return (NavDemoDataProvider) super.getDataProvider();
     }
=20
=20
-    @SuppressWarnings({"unchecked"})
     public NavTreeTableModel createModel() {
=20
         // Create root static node
@@ -65,7 +59,7 @@
         // Create movies category node
         NavDemoTreeTableNode moviesCategoryNode =3D new NavDemoTreeTableNode(
                 String.class,
-                n_(MOVIES_CATEGORY_NODE),
+                NavDemoHandler.MOVIES_CATEGORY_NODE,
                 null,
                 getChildLoador(MoviesTreeTableNodeLoador.class)
         );
@@ -73,7 +67,7 @@
         // Create peoples category node
         NavDemoTreeTableNode peoplesCategoryNode =3D new NavDemoTreeTableNod=
e(
                 String.class,
-                n_(ACTORS_CATEGORY_NODE),
+                NavDemoHandler.ACTORS_CATEGORY_NODE,
                 null,
                 getChildLoador(ActorsTreeTableNodeLoador.class)
         );

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDe=
moTreeTableModel.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/nav/treetable/NavDemoTree=
TableModel.java	2010-09-07 10:45:13 UTC (rev 2071)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTree=
TableModel.java	2010-09-07 10:46:24 UTC (rev 2072)
@@ -107,9 +107,9 @@
=20
     @Override
     public String[] getColumnsNames() {
-        return new String[]{_("jaxxdemo.tree.firstName"),
-            _("jaxxdemo.tree.lastName"),
-            _("jaxxdemo.tree.age")};
+        return new String[]{_("jaxxdemo.common.firstName"),
+            _("jaxxdemo.common.lastName"),
+            _("jaxxdemo.common.age")};
     }
=20
     @Override

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	2010-0=
9-07 10:45:13 UTC (rev 2071)
+++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.properties	2010-0=
9-07 10:46:24 UTC (rev 2072)
@@ -155,9 +155,20 @@
 jaxxdemo.action.show=3Dshow
 jaxxdemo.action.site=3DWeb site
 jaxxdemo.action.site.tip=3DGo to the web site
+jaxxdemo.common.actors=3DActors
+jaxxdemo.common.age=3DAge
+jaxxdemo.common.firstName=3DFirst name
+jaxxdemo.common.id=3DId
+jaxxdemo.common.image=3DImage
+jaxxdemo.common.lastName=3DLast name
+jaxxdemo.common.movie=3DMovie
+jaxxdemo.common.movies=3DMovies
+jaxxdemo.common.people=3DPeople
+jaxxdemo.common.title=3DTitle
+jaxxdemo.common.year=3DYear
 jaxxdemo.component.jaxx=3DJAXX Components
 jaxxdemo.component.jaxx.editor=3DEditors
-jaxxdemo.component.jaxx.tree=3D
+jaxxdemo.component.jaxx.tree=3DTree
 jaxxdemo.component.swing=3DSwing Components
 jaxxdemo.component.swing.buttons=3DButtons
 jaxxdemo.component.swing.form=3DForm elements
@@ -216,8 +227,8 @@
 jaxxdemo.tree.age=3DAge
 jaxxdemo.tree.firstName=3DFirst name
 jaxxdemo.tree.lastName=3DLast name
-jaxxdemo.tree.tabtitle=3D
-jaxxdemo.treeTable.tabtitle=3D
+jaxxdemo.tree.tabtitle=3DTree
+jaxxdemo.treeTable.tabtitle=3DTreeTable
 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

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	2010-0=
9-07 10:45:13 UTC (rev 2071)
+++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-fr_FR.properties	2010-0=
9-07 10:46:24 UTC (rev 2072)
@@ -155,6 +155,17 @@
 jaxxdemo.action.show=3DVoir
 jaxxdemo.action.site=3DSite internet
 jaxxdemo.action.site.tip=3DAcc\u00E9der au site de l'application sur internet
+jaxxdemo.common.actors=3DActeurs
+jaxxdemo.common.age=3DAge
+jaxxdemo.common.firstName=3DPr\u00E9nom
+jaxxdemo.common.id=3DIdentifiant
+jaxxdemo.common.image=3DImage
+jaxxdemo.common.lastName=3DNom
+jaxxdemo.common.movie=3DFilm
+jaxxdemo.common.movies=3DFilms
+jaxxdemo.common.people=3DActeur
+jaxxdemo.common.title=3DTitre
+jaxxdemo.common.year=3DAnn\u00E9e
 jaxxdemo.component.jaxx=3DComposants JAXX
 jaxxdemo.component.jaxx.editor=3DEditeurs
 jaxxdemo.component.jaxx.tree=3D


--===============7150418840639129362==--