From tchemit@users.nuiton.org Sat Oct 24 13:32:32 2009
From: tchemit@users.nuiton.org
To: jaxx-commits@list.nuiton.org
Subject: [Jaxx-commits] r1590 - in branches/jaxx-2.X/jaxx-demo/src/main:
	java/jaxx/demo/component/jaxx/navigation
	java/jaxx/demo/component/jaxx/navigation/content resources/i18n
Date: Sat, 24 Oct 2009 13:32:31 +0200
Message-ID: <20091024113231.F1D87168A4@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3924012082567759289=="

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

Author: tchemit
Date: 2009-10-24 13:32:31 +0200 (Sat, 24 Oct 2009)
New Revision: 1590

Added:
   branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigat=
ion/content/ContentUI.jaxx
   branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigat=
ion/content/ContentUIHandler.java
Modified:
   branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigat=
ion/FullNavigationTreeDemo.jaxx
   branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigat=
ion/content/ActorContentUI.jaxx
   branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigat=
ion/content/ActorsContentUI.jaxx
   branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigat=
ion/content/MovieContentUI.jaxx
   branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigat=
ion/content/MoviesContentUI.jaxx
   branches/jaxx-2.X/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.proper=
ties
   branches/jaxx-2.X/jaxx-demo/src/main/resources/i18n/jaxx-demo-fr_FR.proper=
ties
Log:
amelioration demo du NavigationTreeHandler

Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/=
navigation/FullNavigationTreeDemo.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
--- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/naviga=
tion/FullNavigationTreeDemo.jaxx	2009-10-24 11:31:57 UTC (rev 1589)
+++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/naviga=
tion/FullNavigationTreeDemo.jaxx	2009-10-24 11:32:31 UTC (rev 1590)
@@ -26,9 +26,13 @@
    =20
     <script><![CDATA[
 import jaxx.runtime.SwingUtil;
+import jaxx.demo.component.jaxx.navigation.content.*;
=20
 private final FullNavigationTreeHelper helper =3D new FullNavigationTreeHelp=
er();
+private final ContentUIHandler contentUIHandler =3D new ContentUIHandler();
 setContextValue(helper);
+setContextValue(contentUIHandler);
+helper.setTree(this, navigation);
 helper.createModel(this);
=20
 @Override

Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/=
navigation/content/ActorContentUI.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
--- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/naviga=
tion/content/ActorContentUI.jaxx	2009-10-24 11:31:57 UTC (rev 1589)
+++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/naviga=
tion/content/ActorContentUI.jaxx	2009-10-24 11:32:31 UTC (rev 1590)
@@ -18,7 +18,7 @@
   <http://www.gnu.org/licenses/lgpl-3.0.html>.
   ##%*
 -->
-<JPanel layout=3D'{new BorderLayout()}' implements=3D'jaxx.runtime.swing.nav=
igation.NavigationContentUI'>
+<ContentUI superGenericType=3D'People'>
    =20
     <script><![CDATA[
 import jaxx.runtime.SwingUtil;
@@ -27,61 +27,27 @@
=20
 @Override
 public void openUI(NavigationTreeNode node) throws Exception {
-    People p =3D (People) getContextValue(FullNavigationTreeHelper.class).ge=
tSelectedBean(this);
+    People p =3D (People) getHelper().getSelectedBean(this);
     log.info("selected people =3D "+p);
     setData(p);
 }
=20
-@Override
-public void closeUI(NavigationTreeNode node) throws Exception {
-// nothing to do
-}
-
-String getType(Object data) {
+String getContent(People data) {
    if (data =3D=3D null) {
-       return "no type";
-   }
-   if (data instanceof java.util.List<?>) {
-        java.util.List<?> l =3D (java.util.List<?>) data;
-        if (l.isEmpty()) {
-            return "Empty collection";
-        }
-        return "Collection of " + l.size() + " " + l.get(0).getClass().getSi=
mpleName() + "(s)";
-    }
-   return data.getClass().getSimpleName();
-}
-
-String getContent(Object data) {
-   if (data =3D=3D null) {
        return "no content";
    }
    StringBuilder buffer =3D new StringBuilder();
-   if (data instanceof java.util.List<?>) {
-       for (Object o : ((java.util.List<?>)data)) {
-             buffer.append(o).append("\n");
-       }
-   } else {
-       buffer.append(data);
-   }
+   buffer.append(data);
    return buffer.toString();
 }
=20
-ImageIcon getImage(Object data) {
-  if (data =3D=3D null) {
-       return null;
-   }
-   if (data instanceof Movie) {
-       return SwingUtil.createIcon(((Movie)data).getImage());
-   }
-   if (data instanceof People) {
-       return SwingUtil.createIcon(((People)data).getImage());
-   }
-   return null;
+ImageIcon getImage(People data) {
+    return data =3D=3D null? null :SwingUtil.createIcon(data.getImage());
 }
- ]]>
+]]>
     </script>
=20
-    <People id=3D'data' javaBean=3D'(People) getContextValue(FullNavigationT=
reeHelper.class).getSelectedBean(this)'/>
+    <People id=3D'data' javaBean=3D'null'/>
=20
     <JSplitPane id=3D'splitPane'
                 orientation=3D'{JSplitPane.VERTICAL_SPLIT}'
@@ -92,7 +58,7 @@
         <JScrollPane border=3D'{null}'
                      horizontalScrollBarPolicy=3D'{JScrollPane.HORIZONTAL_SC=
ROLLBAR_NEVER}'
                      verticalScrollBarPolicy=3D'{JScrollPane.VERTICAL_SCROLL=
BAR_AS_NEEDED}'>
-            <JTextPane border=3D'{new TitledBorder("Content Type : " + getTy=
pe(getData()))}'
+            <JTextPane border=3D'{new TitledBorder(_("jaxxdemo.navigation.ac=
tor.title"))}'
                        editable=3D'false'
                        font-size=3D'11'
                        text=3D'{getContent(getData())}'/>
@@ -108,4 +74,4 @@
         </JScrollPane>
        =20
     </JSplitPane>
-</JPanel>
\ No newline at end of file
+</ContentUI>
\ No newline at end of file

Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/=
navigation/content/ActorsContentUI.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
--- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/naviga=
tion/content/ActorsContentUI.jaxx	2009-10-24 11:31:57 UTC (rev 1589)
+++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/naviga=
tion/content/ActorsContentUI.jaxx	2009-10-24 11:32:31 UTC (rev 1590)
@@ -18,7 +18,7 @@
   <http://www.gnu.org/licenses/lgpl-3.0.html>.
   ##%*
 -->
-<JPanel layout=3D'{new BorderLayout()}' implements=3D'jaxx.runtime.swing.nav=
igation.NavigationContentUI'>
+<ContentUI superGenericType=3D'java.util.List&lt;People&gt;'>
    =20
     <script><![CDATA[
 import jaxx.runtime.SwingUtil;
@@ -29,60 +29,42 @@
=20
 @Override
 public void openUI(NavigationTreeNode node) throws Exception {
-    java.util.List<People> ps =3D (java.util.List<People>)getContextValue(Fu=
llNavigationTreeHelper.class).getSelectedBean(this);
+    java.util.List<People> ps =3D (java.util.List<People>)getHelper().getSel=
ectedBean(this);
     log.info("selected peoples =3D "+ps.size());
     setData(ps);
+    if (ps!=3Dnull) {
+        DefaultListModel model =3D (DefaultListModel) list.getModel();
+        for (People p : ps) {
+            model.addElement(p);
+        }
+    }
 }
=20
 @Override
 public void closeUI(NavigationTreeNode node) throws Exception {
-// nothing to do
+    // clean list model
+    DefaultListModel model =3D (DefaultListModel) list.getModel();
+    model.removeAllElements();
 }
-
-String getType(Object data) {
-   if (data =3D=3D null) {
-       return "no type";
-   }
-   if (data instanceof java.util.List<?>) {
-        java.util.List<?> l =3D (java.util.List<?>) data;
-        if (l.isEmpty()) {
-            return "Empty collection";
-        }
-        return "Collection of " + l.size() + " " + l.get(0).getClass().getSi=
mpleName() + "(s)";
-    }
-   return data.getClass().getSimpleName();
-}
-
-ListModel getModel(java.util.List<People> data) {
-
-    DefaultListModel model =3D new DefaultListModel();
-    for (People m : data) {
-        model.addElement(m);
-    }
-    return model;
-}
-
  ]]>
     </script>
=20
-    <java.util.List id=3D'data'
-                    genericType=3D'People'
-                    javaBean=3D'(java.util.List&lt;People&gt;)getContextValu=
e(FullNavigationTreeHelper.class).getSelectedBean(this)'/>
+    <java.util.List id=3D'data' genericType=3D'People' javaBean=3D'null'/>
=20
-    <JScrollPane border=3D'{new TitledBorder("Content Type : " + getType(get=
Data()))}'
+    <JScrollPane border=3D'{new TitledBorder(_("jaxxdemo.navigation.actors.t=
itle"))}'
                  constraints=3D'BorderLayout.CENTER'
                  columnHeaderView=3D'{toolbar}'
                  horizontalScrollBarPolicy=3D'{JScrollPane.HORIZONTAL_SCROLL=
BAR_NEVER}'
                  verticalScrollBarPolicy=3D'{JScrollPane.VERTICAL_SCROLLBAR_=
AS_NEEDED}'>
-        <JList id=3D'list' model=3D'{getModel(getData())}' cellRenderer=3D'{=
new DecoratorListCellRenderer(DecoratorUtils.get(People.class.getSimpleName()=
))}'/>
+        <JList id=3D'list' model=3D'{new DefaultListModel()}' cellRenderer=
=3D'{new DecoratorListCellRenderer(DecoratorUtils.get(People.class.getSimpleN=
ame()))}'/>
     </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.getSelec=
tedIndex()!=3D-1}'/>
+            <JButton text=3D'jaxxdemo.action.show' enabled=3D'{list.getSelec=
tedIndex()!=3D-1}' onActionPerformed=3D'getHandler().selectChild(this, list.g=
etSelectedIndex())'/>
             <JButton text=3D'jaxxdemo.action.add'/>
             <JButton text=3D'jaxxdemo.action.remove' enabled=3D'{list.getSel=
ectedIndex()!=3D-1}'/>
         </JPanel>
     </JToolBar>
=20
-</JPanel>
\ No newline at end of file
+</ContentUI>
\ No newline at end of file

Added: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/nav=
igation/content/ContentUI.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
--- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/naviga=
tion/content/ContentUI.jaxx	                        (rev 0)
+++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/naviga=
tion/content/ContentUI.jaxx	2009-10-24 11:32:31 UTC (rev 1590)
@@ -0,0 +1,52 @@
+<!--
+  *##%=20
+  jaxx-demo
+  Copyright (C) 2008 - 2009 CodeLutin
+=20
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as
+  published by the Free Software Foundation, either version 3 of the
+  License, or (at your option) any later version.
+=20
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Lesser Public License for more details.
+=20
+  You should have received a copy of the GNU General Lesser Public
+  License along with this program.  If not, see
+  <http://www.gnu.org/licenses/lgpl-3.0.html>.
+  ##%*
+-->
+<JPanel abstract=3D'true'
+        layout=3D'{new BorderLayout()}'
+        genericType=3D'B extends Object'
+        implements=3D'NavigationContentUI'>
+   =20
+    <script><![CDATA[
+import jaxx.runtime.SwingUtil;
+import jaxx.demo.component.jaxx.navigation.*;
+import jaxx.runtime.decorator.DecoratorUtils;
+import jaxx.runtime.decorator.swing.DecoratorListCellRenderer;
+import jaxx.runtime.swing.navigation.NavigationTreeNode;
+import jaxx.runtime.swing.navigation.NavigationContentUI;
+
+ContentUIHandler getHandler() {
+    return getContextValue(ContentUIHandler.class);
+}
+
+FullNavigationTreeHelper getHelper() {
+    return getContextValue(FullNavigationTreeHelper.class);
+}
+
+public abstract B getData();
+
+public abstract void setData(B data);
+
+@Override
+public void closeUI(NavigationTreeNode node) throws Exception {
+    // nothing to do
+}
+ ]]>
+    </script>
+</JPanel>
\ No newline at end of file

Added: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/nav=
igation/content/ContentUIHandler.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
--- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/naviga=
tion/content/ContentUIHandler.java	                        (rev 0)
+++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/naviga=
tion/content/ContentUIHandler.java	2009-10-24 11:32:31 UTC (rev 1590)
@@ -0,0 +1,28 @@
+package jaxx.demo.component.jaxx.navigation.content;
+
+import java.util.List;
+import jaxx.demo.component.jaxx.navigation.FullNavigationTreeHelper;
+import jaxx.demo.component.jaxx.navigation.Movie;
+import jaxx.demo.component.jaxx.navigation.People;
+import jaxx.runtime.JAXXContext;
+
+/**
+ *
+ * @author chemit
+ */
+public class ContentUIHandler {
+
+    public void selectChild(JAXXContext context, int movieIndex) {
+        FullNavigationTreeHelper helper =3D context.getContextValue(FullNavi=
gationTreeHelper.class);
+        helper.gotoChildNode(context, movieIndex);
+    }
+
+    public void addMovie(JAXXContext context, Movie movie) {
+        List<Movie> movies =3D FullNavigationTreeHelper.MOVIES.getContextVal=
ue(context);
+        List<People> actors =3D FullNavigationTreeHelper.ACTORS.getContextVa=
lue(context);
+    }
+
+    public void addActor(JAXXContext context, People a, Movie... movies) {
+        List<People> actors =3D FullNavigationTreeHelper.ACTORS.getContextVa=
lue(context);
+    }
+}


Property changes on: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/comp=
onent/jaxx/navigation/content/ContentUIHandler.java
___________________________________________________________________
Added: svn:keywords
   + "Author Date Id Revision HeadURL

Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/=
navigation/content/MovieContentUI.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
--- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/naviga=
tion/content/MovieContentUI.jaxx	2009-10-24 11:31:57 UTC (rev 1589)
+++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/naviga=
tion/content/MovieContentUI.jaxx	2009-10-24 11:32:31 UTC (rev 1590)
@@ -18,7 +18,7 @@
   <http://www.gnu.org/licenses/lgpl-3.0.html>.
   ##%*
 -->
-<JPanel layout=3D'{new BorderLayout()}' implements=3D'jaxx.runtime.swing.nav=
igation.NavigationContentUI'>
+<ContentUI superGenericType=3D'Movie'>
    =20
     <script><![CDATA[
 import jaxx.runtime.SwingUtil;
@@ -27,61 +27,27 @@
=20
 @Override
 public void openUI(NavigationTreeNode node) throws Exception {
-    Movie m =3D (Movie) getContextValue(FullNavigationTreeHelper.class).getS=
electedBean(this);
-    log.info("selected movie =3D "+m);
+    Movie m =3D (Movie) getHelper().getSelectedBean(this);
+    log.info("selected movie =3D " + m);
     setData(m);
 }
=20
-@Override
-public void closeUI(NavigationTreeNode node) throws Exception {
-// nothing to do
-}
-
-String getType(Object data) {
+String getContent(Movie data) {
    if (data =3D=3D null) {
-       return "no type";
-   }
-   if (data instanceof java.util.List<?>) {
-        java.util.List<?> l =3D (java.util.List<?>) data;
-        if (l.isEmpty()) {
-            return "Empty collection";
-        }
-        return "Collection of " + l.size() + " " + l.get(0).getClass().getSi=
mpleName() + "(s)";
-    }
-   return data.getClass().getSimpleName();
-}
-
-String getContent(Object data) {
-   if (data =3D=3D null) {
        return "no content";
    }
    StringBuilder buffer =3D new StringBuilder();
-   if (data instanceof java.util.List<?>) {
-       for (Object o : ((java.util.List<?>)data)) {
-             buffer.append(o).append("\n");
-       }
-   } else {
-       buffer.append(data);
-   }
+   buffer.append(data);
    return buffer.toString();
 }
=20
-ImageIcon getImage(Object data) {
-  if (data =3D=3D null) {
-       return null;
-   }
-   if (data instanceof Movie) {
-       return SwingUtil.createIcon(((Movie)data).getImage());
-   }
-   if (data instanceof People) {
-       return SwingUtil.createIcon(((People)data).getImage());
-   }
-   return null;
+ImageIcon getImage(Movie data) {
+    return data =3D=3D null? null :SwingUtil.createIcon(data.getImage());
 }
- ]]>
+]]>
     </script>
=20
-    <Movie id=3D'data' javaBean=3D'(Movie) getContextValue(FullNavigationTre=
eHelper.class).getSelectedBean(this)'/>
+    <Movie id=3D'data' javaBean=3D'null'/>
=20
     <JSplitPane id=3D'splitPane'
                 orientation=3D'{JSplitPane.VERTICAL_SPLIT}'
@@ -92,7 +58,7 @@
         <JScrollPane border=3D'{null}'
                      horizontalScrollBarPolicy=3D'{JScrollPane.HORIZONTAL_SC=
ROLLBAR_NEVER}'
                      verticalScrollBarPolicy=3D'{JScrollPane.VERTICAL_SCROLL=
BAR_AS_NEEDED}'>
-            <JTextPane border=3D'{new TitledBorder("Content Type : " + getTy=
pe(getData()))}'
+            <JTextPane border=3D'{new TitledBorder(_("jaxxdemo.navigation.mo=
vie.title"))}'
                        editable=3D'false'
                        font-size=3D'11'
                        text=3D'{getContent(getData())}'/>
@@ -108,4 +74,4 @@
         </JScrollPane>
        =20
     </JSplitPane>
-</JPanel>
\ No newline at end of file
+</ContentUI>
\ No newline at end of file

Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/=
navigation/content/MoviesContentUI.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
--- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/naviga=
tion/content/MoviesContentUI.jaxx	2009-10-24 11:31:57 UTC (rev 1589)
+++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/naviga=
tion/content/MoviesContentUI.jaxx	2009-10-24 11:32:31 UTC (rev 1590)
@@ -18,7 +18,7 @@
   <http://www.gnu.org/licenses/lgpl-3.0.html>.
   ##%*
 -->
-<JPanel layout=3D'{new BorderLayout()}' implements=3D'jaxx.runtime.swing.nav=
igation.NavigationContentUI'>
+<ContentUI superGenericType=3D'java.util.List&lt;Movie&gt;'>
    =20
     <script><![CDATA[
 import jaxx.runtime.SwingUtil;
@@ -29,58 +29,42 @@
=20
 @Override
 public void openUI(NavigationTreeNode node) throws Exception {
-    java.util.List<Movie> ms =3D (java.util.List<Movie>)getContextValue(Full=
NavigationTreeHelper.class).getSelectedBean(this);
+    java.util.List<Movie> ms =3D (java.util.List<Movie>)getHelper().getSelec=
tedBean(this);
     log.info("selected movies =3D "+ms.size());
     setData(ms);
+    if (ms !=3D null) {
+        DefaultListModel model =3D (DefaultListModel) list.getModel();      =
 =20
+        for (Movie m : ms) {
+            model.addElement(m);
+        }
+    }
 }
=20
 @Override
 public void closeUI(NavigationTreeNode node) throws Exception {
-// nothing to do
+    // clean list model
+    DefaultListModel model =3D (DefaultListModel) list.getModel();
+    model.removeAllElements();
 }
-String getType(Object data) {
-   if (data =3D=3D null) {
-       return "no type";
-   }
-   if (data instanceof java.util.List<?>) {
-        java.util.List<?> l =3D (java.util.List<?>) data;
-        if (l.isEmpty()) {
-            return "Empty collection";
-        }
-        return "Collection of " + l.size() + " " + l.get(0).getClass().getSi=
mpleName() + "(s)";
-    }
-   return data.getClass().getSimpleName();
-}
-
-ListModel getModel(java.util.List<Movie> data) {
-    DefaultListModel model =3D new DefaultListModel();
-    for (Movie m : data) {
-        model.addElement(m);
-    }
-    return model;
-}
-
  ]]>
     </script>
=20
-    <java.util.List id=3D'data'
-                    genericType=3D'Movie'
-                    javaBean=3D'(java.util.List&lt;Movie&gt;)getContextValue=
(FullNavigationTreeHelper.class).getSelectedBean(this)'/>
+    <java.util.List id=3D'data' genericType=3D'Movie' javaBean=3D'null'/>
=20
-    <JScrollPane border=3D'{new TitledBorder("Content Type : " + getType(get=
Data()))}'
+    <JScrollPane border=3D'{new TitledBorder(_("jaxxdemo.navigation.movies.t=
itle"))}'
                  constraints=3D'BorderLayout.CENTER'
                  columnHeaderView=3D'{toolbar}'
                  horizontalScrollBarPolicy=3D'{JScrollPane.HORIZONTAL_SCROLL=
BAR_NEVER}'
                  verticalScrollBarPolicy=3D'{JScrollPane.VERTICAL_SCROLLBAR_=
AS_NEEDED}'>
-        <JList id=3D'list' model=3D'{getModel(getData())}' cellRenderer=3D'{=
new DecoratorListCellRenderer(DecoratorUtils.get(Movie.class.getSimpleName())=
)}'/>
+        <JList id=3D'list' model=3D'{new DefaultListModel()}' cellRenderer=
=3D'{new DecoratorListCellRenderer(DecoratorUtils.get(Movie.class.getSimpleNa=
me()))}'/>
     </JScrollPane>
     <JToolBar id=3D'toolbar' opaque=3D'false' constraints=3D'BorderLayout.SO=
UTH'
               floatable=3D'false'>
         <JPanel layout=3D'{new GridLayout(1,0)}'>
-            <JButton text=3D'jaxxdemo.action.show' enabled=3D'{list.getSelec=
tedIndex()!=3D-1}'/>
+            <JButton text=3D'jaxxdemo.action.show' enabled=3D'{list.getSelec=
tedIndex()!=3D-1}' onActionPerformed=3D'getHandler().selectChild(this, list.g=
etSelectedIndex())'/>
             <JButton text=3D'jaxxdemo.action.add'/>
             <JButton text=3D'jaxxdemo.action.remove' enabled=3D'{list.getSel=
ectedIndex()!=3D-1}'/>
         </JPanel>
     </JToolBar>
=20
-</JPanel>
\ No newline at end of file
+</ContentUI>
\ No newline at end of file

Modified: branches/jaxx-2.X/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
--- branches/jaxx-2.X/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.prope=
rties	2009-10-24 11:31:57 UTC (rev 1589)
+++ branches/jaxx-2.X/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.prope=
rties	2009-10-24 11:32:31 UTC (rev 1590)
@@ -159,6 +159,10 @@
 jaxxdemo.menu.help=3D
 jaxxdemo.message.config.loaded=3DConfiguration of JAXXDemo v. %1$s loaded.
 jaxxdemo.message.goto.site=3DGo to JAXXDemo Web site
+jaxxdemo.navigation.actor.title=3D
+jaxxdemo.navigation.actors.title=3D
+jaxxdemo.navigation.movie.title=3D
+jaxxdemo.navigation.movies.title=3D
 jaxxdemo.numbereditor.autoPopup=3D
 jaxxdemo.numbereditor.configuration=3D
 jaxxdemo.numbereditor.model=3D

Modified: branches/jaxx-2.X/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
--- branches/jaxx-2.X/jaxx-demo/src/main/resources/i18n/jaxx-demo-fr_FR.prope=
rties	2009-10-24 11:31:57 UTC (rev 1589)
+++ branches/jaxx-2.X/jaxx-demo/src/main/resources/i18n/jaxx-demo-fr_FR.prope=
rties	2009-10-24 11:32:31 UTC (rev 1590)
@@ -159,6 +159,10 @@
 jaxxdemo.menu.help=3DAide
 jaxxdemo.message.config.loaded=3DConfiguration de JAXX Demo v. %1$s charg\u0=
0E9e.
 jaxxdemo.message.goto.site=3DAcc\u00E9der au site de JAXX Demo (%1$s)
+jaxxdemo.navigation.actor.title=3D
+jaxxdemo.navigation.actors.title=3D
+jaxxdemo.navigation.movie.title=3D
+jaxxdemo.navigation.movies.title=3D
 jaxxdemo.numbereditor.autoPopup=3DAffichage automatique popup
 jaxxdemo.numbereditor.configuration=3DConfiguration
 jaxxdemo.numbereditor.model=3DR\u00E9sultat


--===============3924012082567759289==--