- Jaxx-commits - mailman.cloud.codelutin.com

r1963 - in trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree: . loadors
by sletellier＠users.nuiton.org 10 Jun '10

10 Jun '10

Author: sletellier Date: 2010-06-10 12:34:17 +0200 (Thu, 10 Jun 2010) New Revision: 1963 Url: http://nuiton.org/repositories/revision/jaxx/1963 Log: Add override method to renderer component Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoCellRenderer.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/MoviesNodeLoadors.java Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoCellRenderer.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoCellRenderer.java 2010-06-10 10:32:59 UTC (rev 1962) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoCellRenderer.java 2010-06-10 10:34:17 UTC (rev 1963) @@ -33,6 +33,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.*; +import java.awt.*; + /** * @author sletellier <letellier(a)codelutin.com> * @since 2.1 @@ -47,7 +50,7 @@ public JaxxTreeDemoCellRenderer(DecoratorProvider decoratorProvider, JaxxTreeDemoDataProvider provider) { super.setDataProvider(provider); - this.decoratorProvider = decoratorProvider;; + this.decoratorProvider = decoratorProvider; } @Override @@ -87,4 +90,24 @@ return decorated; } + + @Override + public Component getTreeCellRendererComponent(JTree tree, + Object value, + boolean sel, + boolean expanded, + boolean leaf, int row, + boolean hasFocus) { + + // get node + JaxxTreeDemoNode node = (JaxxTreeDemoNode)value; + + // get text for node + String text = getNodeText(node); + + // Render node + return super.getTreeCellRendererComponent(tree, text, sel, + expanded, leaf, + row, hasFocus); + } } Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/MoviesNodeLoadors.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/MoviesNodeLoadors.java 2010-06-10 10:32:59 UTC (rev 1962) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/MoviesNodeLoadors.java 2010-06-10 10:34:17 UTC (rev 1963) @@ -69,7 +69,7 @@ ); // Create clients category node - JaxxTreeDemoNode ActorsCategoryNode = new JaxxTreeDemoNode( + JaxxTreeDemoNode actorsCategoryNode = new JaxxTreeDemoNode( String.class, n_(JaxxTreeDemoHelper.ACTORS_CATEGORY_NODE), null, @@ -77,7 +77,7 @@ ); // Add actors nodes to movies node - moviesNode.add(ActorsCategoryNode); + moviesNode.add(actorsCategoryNode); return moviesNode; }

1 0

r1962 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree
by sletellier＠users.nuiton.org 10 Jun '10

10 Jun '10

Author: sletellier Date: 2010-06-10 12:32:59 +0200 (Thu, 10 Jun 2010) New Revision: 1962 Url: http://nuiton.org/repositories/revision/jaxx/1962 Log: Remove comment Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/AbstractJaxxTreeCellRenderer.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/AbstractJaxxTreeCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/AbstractJaxxTreeCellRenderer.java 2010-06-10 10:09:43 UTC (rev 1961) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/AbstractJaxxTreeCellRenderer.java 2010-06-10 10:32:59 UTC (rev 1962) @@ -119,24 +119,4 @@ return text; } - -// @Override -// public Component getTreeCellRendererComponent(JTree tree, -// Object value, -// boolean sel, -// boolean expanded, -// boolean leaf, int row, -// boolean hasFocus) { -// -// // get node -// N node = (N)value; -// -// // get text for node -// String text = getNodeText(node); -// -// // Render node -// return super.getTreeCellRendererComponent(tree, text, sel, -// expanded, leaf, -// row, hasFocus); -// } }

1 0

r1961 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree
by tchemit＠users.nuiton.org 10 Jun '10

10 Jun '10

Author: tchemit Date: 2010-06-10 12:09:43 +0200 (Thu, 10 Jun 2010) New Revision: 1961 Url: http://nuiton.org/repositories/revision/jaxx/1961 Log: revert renderer default method Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/AbstractJaxxTreeCellRenderer.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/AbstractJaxxTreeCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/AbstractJaxxTreeCellRenderer.java 2010-06-09 13:08:53 UTC (rev 1960) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/AbstractJaxxTreeCellRenderer.java 2010-06-10 10:09:43 UTC (rev 1961) @@ -27,9 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.*; import javax.swing.tree.DefaultTreeCellRenderer; -import java.awt.*; import java.util.HashMap; import java.util.Map; @@ -122,23 +120,23 @@ return text; } - @Override - public Component getTreeCellRendererComponent(JTree tree, - Object value, - boolean sel, - boolean expanded, - boolean leaf, int row, - boolean hasFocus) { - - // get node - N node = (N)value; - - // get text for node - String text = getNodeText(node); - - // Render node - return super.getTreeCellRendererComponent(tree, text, sel, - expanded, leaf, - row, hasFocus); - } +// @Override +// public Component getTreeCellRendererComponent(JTree tree, +// Object value, +// boolean sel, +// boolean expanded, +// boolean leaf, int row, +// boolean hasFocus) { +// +// // get node +// N node = (N)value; +// +// // get text for node +// String text = getNodeText(node); +// +// // Render node +// return super.getTreeCellRendererComponent(tree, text, sel, +// expanded, leaf, +// row, hasFocus); +// } }

1 0

r1960 - in trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree: . content loadors
by sletellier＠users.nuiton.org 09 Jun '10

09 Jun '10

Author: sletellier Date: 2010-06-09 15:08:53 +0200 (Wed, 09 Jun 2010) New Revision: 1960 Url: http://nuiton.org/repositories/revision/jaxx/1960 Log: - Update headers - Add comments - Refactor ui comportement Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/ContentUI.jaxx Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoCellRenderer.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoDataProvider.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoHelper.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoNode.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/ActorContentUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/ActorsContentUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/MovieContentUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/MoviesContentUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/ActorsNodeLoadors.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/MoviesNodeLoadors.java Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemo.jaxx 2010-06-09 10:15:46 UTC (rev 1959) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemo.jaxx 2010-06-09 13:08:53 UTC (rev 1960) @@ -1,29 +1,27 @@  - <jaxx.demo.DemoPanel> <CardLayout2 id='contentLayout'/> @@ -38,6 +36,8 @@ import jaxx.demo.entities.Movie; import jaxx.demo.entities.People; import javax.swing.tree.TreePath; +import java.lang.reflect.Constructor; +import jaxx.demo.component.jaxx.tree.content.ContentUI; private JaxxTreeDemoDataProvider dataProvider = new JaxxTreeDemoDataProvider(); private JaxxTreeDemoHelper helper = new JaxxTreeDemoHelper(dataProvider); @@ -56,6 +56,7 @@ private void $afterCompleteSetup() { setContextValue(helper); + // Creation of selection listener to open ui when tree selection change TreeSelectionListener selectionListener = new TreeSelectionListener() { @Override public void valueChanged(TreeSelectionEvent event) { @@ -76,8 +77,11 @@ // Register decorator DecoratorProvider decoratorProvider = getContextValue(DecoratorProvider.class); + + // Attach renderer navigation.setCellRenderer(new JaxxTreeDemoCellRenderer(decoratorProvider, dataProvider)); + // Register tree helper.setTree(navigation, true, selectionListener); SwingUtilities.invokeLater(new Runnable() { @@ -108,56 +112,59 @@ // Actors categorie node if (JaxxTreeDemoHelper.ACTORS_CATEGORY_NODE.equals(id)) { - java.util.List<People> peopleList = dataProvider.getPeoples(); - ActorsContentUI ui = getContentIfExist(ActorsContentUI.class); - String contentName = ActorsContentUI.class.getName(); - if (ui == null) { - ui = new ActorsContentUI(this); - content.add(ui, contentName); - } - ui.setData(peopleList); - contentLayout.show(content, contentName); + java.util.List<People> peoples = dataProvider.getPeoples(); + showUI(peoples, ActorsContentUI.class); // Movies categorie node } else if (JaxxTreeDemoHelper.MOVIES_CATEGORY_NODE.equals(id)) { - java.util.List<Movie> movieList = dataProvider.getMovies(); - MoviesContentUI ui = getContentIfExist(MoviesContentUI.class); - String contentName = MoviesContentUI.class.getName(); - if (ui == null) { - ui = new MoviesContentUI(this); - content.add(ui, contentName); - } - ui.setData(movieList); - contentLayout.show(content, contentName); + java.util.List<Movie> movies = dataProvider.getMovies(); + showUI(movies, MoviesContentUI.class); } // People node } else if (editType.equals(People.class)) { People people = dataProvider.getPeople(id); + showUI(people, ActorContentUI.class); - ActorContentUI ui = getContentIfExist(ActorContentUI.class); - String contentName = ActorContentUI.class.getName(); - if (ui == null) { - ui = new ActorContentUI(this); - content.add(ui, contentName); - } - ui.setData(people); - contentLayout.show(content, contentName); - // Movie node } else if (editType.equals(Movie.class)) { Movie movie = dataProvider.getMovie(id); + showUI(movie, MovieContentUI.class); + } +} - MovieContentUI ui = getContentIfExist(MovieContentUI.class); - String contentName = MovieContentUI.class.getName(); - if (ui == null) { - ui = new MovieContentUI(this); - content.add(ui, contentName); +// Create by introspection content ui +protected <B> void showUI(B bean, Class<? extends ContentUI> uiClass) { + + // Verify if instance is existing + ContentUI ui = getContentIfExist(uiClass); + + // Get layout identifier + String contentName = uiClass.getName(); + + if (ui == null) { + try { + // Get constructor + Constructor<? extends ContentUI> constructor = + uiClass.getConstructor(JAXXContext.class); + + // Invoke instance creation + ui = constructor.newInstance(this); + } catch (Exception eee) { + log.error(eee); + ErrorDialogUI.showError(eee); } - ui.setData(movie); - contentLayout.show(content, contentName); + + // 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 Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoCellRenderer.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoCellRenderer.java 2010-06-09 10:15:46 UTC (rev 1959) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoCellRenderer.java 2010-06-09 13:08:53 UTC (rev 1960) @@ -1,3 +1,28 @@ +/* + * #%L + * JAXX :: Demo + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2010 CodeLutin + * %% + * 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. + * + * 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. + * + * 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>. + * #L% + */ + package jaxx.demo.component.jaxx.tree; import jaxx.demo.entities.Movie; @@ -42,6 +67,7 @@ Object toDecorate = null; + // People node if (editType.equals(People.class)) { toDecorate = getDataProvider().getPeople(id); Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoDataProvider.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoDataProvider.java 2010-06-09 10:15:46 UTC (rev 1959) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoDataProvider.java 2010-06-09 13:08:53 UTC (rev 1960) @@ -1,3 +1,28 @@ +/* + * #%L + * JAXX :: Demo + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2010 CodeLutin + * %% + * 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. + * + * 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. + * + * 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>. + * #L% + */ + package jaxx.demo.component.jaxx.tree; import jaxx.demo.entities.Movie; @@ -80,7 +105,9 @@ public List<People> getPeoples(String moviesId){ - log.info("Get people for movie " + moviesId); + if (log.isDebugEnabled()) { + log.debug("Get people for movie " + moviesId); + } return movies.get(moviesId).getActors(); } Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoHelper.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoHelper.java 2010-06-09 10:15:46 UTC (rev 1959) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoHelper.java 2010-06-09 13:08:53 UTC (rev 1960) @@ -1,3 +1,27 @@ +/* + * #%L + * JAXX :: Demo + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2010 CodeLutin + * %% + * 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. + * + * 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. + * + * 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>. + * #L% + */ package jaxx.demo.component.jaxx.tree; @@ -26,6 +50,7 @@ public TreeModel createTreeModel() { + // Create root static node JaxxTreeDemoNode root = new JaxxTreeDemoNode( String.class, "Root node", @@ -33,6 +58,7 @@ null ); + // Create movies category node JaxxTreeDemoNode moviesCategoryNode = new JaxxTreeDemoNode( String.class, n_(MOVIES_CATEGORY_NODE), @@ -40,6 +66,7 @@ new MoviesNodeLoadors() ); + // Create peoples category node JaxxTreeDemoNode peoplesCategoryNode = new JaxxTreeDemoNode( String.class, n_(ACTORS_CATEGORY_NODE), @@ -47,16 +74,21 @@ new ActorsNodeLoadors() ); + // Add to root root.add(moviesCategoryNode); root.add(peoplesCategoryNode); + // Create model DefaultTreeModel model = getModel(); if (model == null) { model = createModel(root); } else { model.setRoot(root); } + + // Populate childs nodes root.populateChilds(model, getDataProvider()); + return model; } } Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoNode.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoNode.java 2010-06-09 10:15:46 UTC (rev 1959) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoNode.java 2010-06-09 13:08:53 UTC (rev 1960) @@ -1,3 +1,28 @@ +/* + * #%L + * JAXX :: Demo + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2010 CodeLutin + * %% + * 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. + * + * 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. + * + * 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>. + * #L% + */ + package jaxx.demo.component.jaxx.tree; import jaxx.runtime.swing.tree.JaxxNode; Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/ActorContentUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/ActorContentUI.jaxx 2010-06-09 10:15:46 UTC (rev 1959) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/ActorContentUI.jaxx 2010-06-09 13:08:53 UTC (rev 1960) @@ -1,35 +1,29 @@  +<ContentUI superGenericType='People'> -<JSplitPane id='splitPane' - orientation='{JSplitPane.VERTICAL_SPLIT}' - resizeWeight='0.5' - constraints='BorderLayout.CENTER' - oneTouchExpandable='true'> - <script><![CDATA[ import jaxx.demo.entities.*; @@ -48,25 +42,33 @@ ]]></script> - <People id='data' javaBean='null'/> + <JSplitPane id='splitPane' + orientation='{JSplitPane.VERTICAL_SPLIT}' + resizeWeight='0.5' + constraints='BorderLayout.CENTER' + oneTouchExpandable='true'> - <JScrollPane border='{null}' - horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}' - verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}'> - <JTextPane border='{new TitledBorder(_("jaxxdemo.navigation.actor.title"))}' - editable='false' - font-size='11' - text='{getContent(getData())}'/> - </JScrollPane> + <People id='data' javaBean='null'/> - <JScrollPane border='{new TitledBorder("Picture")}' - horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED}' - verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}' - minimumSize='{SwingUtil.newMinDimension()}'> + <JScrollPane border='{null}' + horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}' + verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}'> - <JLabel horizontalAlignment='center' - icon='{getImage(getData())}'/> + <JTextPane border='{new TitledBorder(_("jaxxdemo.navigation.actor.title"))}' + editable='false' + font-size='11' + text='{getContent(getData())}'/> + </JScrollPane> - </JScrollPane> + <JScrollPane border='{new TitledBorder("Picture")}' + horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED}' + verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}' + minimumSize='{SwingUtil.newMinDimension()}'> -</JSplitPane> + <JLabel horizontalAlignment='center' + icon='{getImage(getData())}'/> + + </JScrollPane> + + </JSplitPane> +</ContentUI> \ No newline at end of file Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/ActorsContentUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/ActorsContentUI.jaxx 2010-06-09 10:15:46 UTC (rev 1959) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/ActorsContentUI.jaxx 2010-06-09 13:08:53 UTC (rev 1960) @@ -1,29 +1,28 @@  -<JPanel layout='{new BorderLayout()}'> +<ContentUI superGenericType='java.util.List<People>'> <script><![CDATA[ import jaxx.demo.entities.*; @@ -56,28 +55,31 @@ protected void selectChild() { People selected = (People)list.getSelectedValue(); - getContextValue(JaxxTreeDemoHelper.class).selectNode(selected.getId()); + getHelper().selectNode(selected.getId()); } ]]></script> <java.util.List id='data' genericType='People' javaBean='null'/> - <JScrollPane border='{new TitledBorder(_("jaxxdemo.navigation.actors.title"))}' - constraints='BorderLayout.CENTER' - columnHeaderView='{toolbar}' - horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}' - verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}'> - <JList id='list' model='{new DefaultListModel()}' - cellRenderer='{getContextValue(DecoratorProviderListCellRenderer.class)}'/> - </JScrollPane> - <JToolBar id='toolbar' constraints='BorderLayout.SOUTH' - floatable='false'> - <JPanel layout='{new GridLayout(1,0)}'> - <JButton text='jaxxdemo.action.show' enabled='{list.getSelectedIndex()!=-1}' - onActionPerformed='selectChild()'/> - <JButton text='jaxxdemo.action.add'/> - <JButton text='jaxxdemo.action.remove' enabled='{list.getSelectedIndex()!=-1}'/> - </JPanel> - </JToolBar> + <JPanel layout='{new BorderLayout()}'> -</JPanel> + <JScrollPane border='{new TitledBorder(_("jaxxdemo.navigation.actors.title"))}' + constraints='BorderLayout.CENTER' + columnHeaderView='{toolbar}' + horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}' + verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}'> + <JList id='list' model='{new DefaultListModel()}' + cellRenderer='{getContextValue(DecoratorProviderListCellRenderer.class)}'/> + </JScrollPane> + <JToolBar id='toolbar' constraints='BorderLayout.SOUTH' + floatable='false'> + <JPanel layout='{new GridLayout(1,0)}'> + <JButton text='jaxxdemo.action.show' enabled='{list.getSelectedIndex()!=-1}' + onActionPerformed='selectChild()'/> + <JButton text='jaxxdemo.action.add'/> + <JButton text='jaxxdemo.action.remove' enabled='{list.getSelectedIndex()!=-1}'/> + </JPanel> + </JToolBar> + + </JPanel> +</ContentUI> \ No newline at end of file Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/ContentUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/ContentUI.jaxx (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/ContentUI.jaxx 2010-06-09 13:08:53 UTC (rev 1960) @@ -0,0 +1,42 @@ + + +<JPanel abstract='true' + layout='{new BorderLayout()}' + genericType='B extends Object'> + + <script><![CDATA[ +import jaxx.demo.component.jaxx.tree.JaxxTreeDemoHelper; + +// Get helper in context +JaxxTreeDemoHelper getHelper() { + return getContextValue(JaxxTreeDemoHelper.class); +} + +public abstract B getData(); + +public abstract void setData(B data); + ]]> + </script> +</JPanel> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/MovieContentUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/MovieContentUI.jaxx 2010-06-09 10:15:46 UTC (rev 1959) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/MovieContentUI.jaxx 2010-06-09 13:08:53 UTC (rev 1960) @@ -1,34 +1,28 @@  - -<JSplitPane id='splitPane' - orientation='{JSplitPane.VERTICAL_SPLIT}' - resizeWeight='0.5' - constraints='BorderLayout.CENTER' - oneTouchExpandable='true'> +<ContentUI superGenericType='Movie'> <script><![CDATA[ import jaxx.demo.entities.*; @@ -47,26 +41,33 @@ } ]]></script> - <Movie id='data' javaBean='null'/> + <JSplitPane id='splitPane' + orientation='{JSplitPane.VERTICAL_SPLIT}' + resizeWeight='0.5' + constraints='BorderLayout.CENTER' + oneTouchExpandable='true'> - <JScrollPane border='{null}' - horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}' - verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}'> - - <JTextPane border='{new TitledBorder(_("jaxxdemo.navigation.movie.title"))}' - editable='false' - font-size='11' - text='{getContent(getData())}'/> - </JScrollPane> + <Movie id='data' javaBean='null'/> - <JScrollPane border='{new TitledBorder("Picture")}' - horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED}' - verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}' - minimumSize='{SwingUtil.newMinDimension()}'> + <JScrollPane border='{null}' + horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}' + verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}'> - <JLabel horizontalAlignment='center' - icon='{getImage(getData())}'/> + <JTextPane border='{new TitledBorder(_("jaxxdemo.navigation.movie.title"))}' + editable='false' + font-size='11' + text='{getContent(getData())}'/> + </JScrollPane> - </JScrollPane> + <JScrollPane border='{new TitledBorder("Picture")}' + horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED}' + verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}' + minimumSize='{SwingUtil.newMinDimension()}'> -</JSplitPane> \ No newline at end of file + <JLabel horizontalAlignment='center' + icon='{getImage(getData())}'/> + + </JScrollPane> + + </JSplitPane> +</ContentUI> \ No newline at end of file Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/MoviesContentUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/MoviesContentUI.jaxx 2010-06-09 10:15:46 UTC (rev 1959) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/MoviesContentUI.jaxx 2010-06-09 13:08:53 UTC (rev 1960) @@ -1,29 +1,28 @@  -<JPanel layout='{new BorderLayout()}'> +<ContentUI superGenericType='java.util.List<Movie>'> <script><![CDATA[ import jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer; @@ -56,32 +55,35 @@ protected void selectChild() { Movie selected = (Movie)list.getSelectedValue(); - getContextValue(JaxxTreeDemoHelper.class).selectNode(selected.getId()); + getHelper().selectNode(selected.getId()); } ]]></script> <java.util.List id='data' genericType='Movie' javaBean='null'/> - <JScrollPane border='{new TitledBorder(_("jaxxdemo.navigation.movies.title"))}' - constraints='BorderLayout.CENTER' - columnHeaderView='{toolbar}' - horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}' - verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}'> + <JPanel layout='{new BorderLayout()}'> - <JList id='list' model='{new DefaultListModel()}' - cellRenderer='{getContextValue(DecoratorProviderListCellRenderer.class)}'/> + <JScrollPane border='{new TitledBorder(_("jaxxdemo.navigation.movies.title"))}' + constraints='BorderLayout.CENTER' + columnHeaderView='{toolbar}' + horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}' + verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}'> - </JScrollPane> + <JList id='list' model='{new DefaultListModel()}' + cellRenderer='{getContextValue(DecoratorProviderListCellRenderer.class)}'/> - <JToolBar id='toolbar' opaque='false' constraints='BorderLayout.SOUTH' - floatable='false'> + </JScrollPane> - <JPanel layout='{new GridLayout(1,0)}'> - <JButton text='jaxxdemo.action.show' enabled='{list.getSelectedIndex()!=-1}' - onActionPerformed='selectChild()'/> - <JButton text='jaxxdemo.action.add'/> - <JButton text='jaxxdemo.action.remove' enabled='{list.getSelectedIndex()!=-1}'/> - </JPanel> - </JToolBar> + <JToolBar id='toolbar' opaque='false' constraints='BorderLayout.SOUTH' + floatable='false'> -</JPanel> + <JPanel layout='{new GridLayout(1,0)}'> + <JButton text='jaxxdemo.action.show' enabled='{list.getSelectedIndex()!=-1}' + onActionPerformed='selectChild()'/> + <JButton text='jaxxdemo.action.add'/> + <JButton text='jaxxdemo.action.remove' enabled='{list.getSelectedIndex()!=-1}'/> + </JPanel> + </JToolBar> + + </JPanel> +</ContentUI> \ No newline at end of file Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/ActorsNodeLoadors.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/ActorsNodeLoadors.java 2010-06-09 10:15:46 UTC (rev 1959) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/ActorsNodeLoadors.java 2010-06-09 13:08:53 UTC (rev 1960) @@ -1,3 +1,28 @@ +/* + * #%L + * JAXX :: Demo + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2010 CodeLutin + * %% + * 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. + * + * 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. + * + * 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>. + * #L% + */ + package jaxx.demo.component.jaxx.tree.loadors; import jaxx.demo.component.jaxx.tree.JaxxTreeDemoNode; @@ -20,24 +45,27 @@ @Override public List<People> getData(Class<?> parentClass, - String parentId, + String moviesId, DataProvider dataProvider) throws Exception { // Get people for parentId JaxxTreeDemoDataProvider provider = (JaxxTreeDemoDataProvider) dataProvider; // If its not root - if (parentId != null) { - return provider.getPeoples(parentId); + if (moviesId != null) { + + // Return peoples for movies id + return provider.getPeoples(moviesId); } + // Return all peoples return provider.getPeoples(); } @Override public JaxxTreeDemoNode createNode(JaxxTreeDemoNode parentNode, People data) { - // Create actor nodes + // Create actor static nodes JaxxTreeDemoNode actorsNode = new JaxxTreeDemoNode( getBeanType(), data.getId(), Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/MoviesNodeLoadors.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/MoviesNodeLoadors.java 2010-06-09 10:15:46 UTC (rev 1959) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/MoviesNodeLoadors.java 2010-06-09 13:08:53 UTC (rev 1960) @@ -1,3 +1,28 @@ +/* + * #%L + * JAXX :: Demo + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2010 CodeLutin + * %% + * 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. + * + * 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. + * + * 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>. + * #L% + */ + package jaxx.demo.component.jaxx.tree.loadors; import jaxx.demo.component.jaxx.tree.JaxxTreeDemoHelper; @@ -27,13 +52,15 @@ DataProvider dataProvider) throws Exception { JaxxTreeDemoDataProvider provider = (JaxxTreeDemoDataProvider) dataProvider; + + // Return all movies return provider.getMovies(); } @Override public JaxxTreeDemoNode createNode(JaxxTreeDemoNode parentNode, Movie data) { - // Create movies nodes + // Create movies static nodes JaxxTreeDemoNode moviesNode = new JaxxTreeDemoNode( getBeanType(), data.getId(), @@ -49,7 +76,7 @@ new ActorsNodeLoadors() ); - // Add to movies node + // Add actors nodes to movies node moviesNode.add(ActorsCategoryNode); return moviesNode;

1 0

r1959 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/application
by tchemit＠users.nuiton.org 09 Jun '10

09 Jun '10

Author: tchemit Date: 2010-06-09 12:15:46 +0200 (Wed, 09 Jun 2010) New Revision: 1959 Url: http://nuiton.org/repositories/revision/jaxx/1959 Log: use ReflectionUtil api to obtain method Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ActionExecutor.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ActionExecutor.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ActionExecutor.java 2010-06-08 17:36:46 UTC (rev 1958) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ActionExecutor.java 2010-06-09 10:15:46 UTC (rev 1959) @@ -26,6 +26,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.ReflectUtil; import javax.swing.SwingWorker; import java.beans.PropertyChangeEvent; @@ -232,31 +233,11 @@ // find method Class<?> klass = methodContainer.getClass(); - Method mFound = null; - for (Method m : klass.getDeclaredMethods()) { - if (!methodName.equals(m.getName())) { - continue; - } - //same method name - - Class<?>[] types = m.getParameterTypes(); - if (arguments.length != types.length) { - continue; - } - - // same number arguments - mFound = m; - break; - } - if (mFound == null) { - throw new IllegalArgumentException( - "could not find method " + methodName + " on type " + - klass.getName()); - } - - //TODO Test arguments are on good type... - - final Method targetMethod = mFound; + final Method targetMethod= ReflectUtil.getDeclaredMethod(klass, + methodName, + true, + arguments + ); targetMethod.setAccessible(true); Runnable result;

1 0

r1958 - in trunk/jaxx-demo/src: main/java/jaxx/demo main/java/jaxx/demo/component/jaxx main/java/jaxx/demo/component/jaxx/navigation main/java/jaxx/demo/component/jaxx/navigation/content main/java/jaxx/demo/component/jaxx/tree main/java/jaxx/demo/component/jaxx/tree/content main/java/jaxx/demo/component/jaxx/tree/loadors main/java/jaxx/demo/entities main/java/jaxx/demo/feature/validation main/resources main/resources/i18n main/resources/jaxx/demo main/resources/jaxx/demo/entities test/java/ja
by sletellier＠users.nuiton.org 08 Jun '10

08 Jun '10

Author: sletellier Date: 2010-06-08 19:36:46 +0200 (Tue, 08 Jun 2010) New Revision: 1958 Url: http://nuiton.org/repositories/revision/jaxx/1958 Log: - Refactors entities - Add new tree API demo Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoCellRenderer.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoDataProvider.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoHelper.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoNode.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/ActorContentUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/ActorsContentUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/MovieContentUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/MoviesContentUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/ActorsNodeLoadors.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/MoviesNodeLoadors.java trunk/jaxx-demo/src/main/java/jaxx/demo/entities/ trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Identity.java trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Model.java trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Movie.java trunk/jaxx-demo/src/main/java/jaxx/demo/entities/People.java trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/ trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/Identity-error-validation.xml trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/Identity-info-validation.xml trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/Identity-warning-validation.xml trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/Model-error-validation.xml trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/Model-info-validation.xml trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/Model-warning-validation.xml Removed: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/Movie.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/People.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/Identity.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/Model.java trunk/jaxx-demo/src/main/resources/jaxx/demo/feature/ Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoTreeHelper.java trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/FullNavigationTreeHelper.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/FullNavigationTreeModelBuilder.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ActorContentUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ActorsContentUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ContentUIHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/MovieContentUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/MoviesContentUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationListDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationTableDemo.jaxx trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.properties trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-fr_FR.properties trunk/jaxx-demo/src/main/resources/log4j.properties trunk/jaxx-demo/src/test/java/jaxx/demo/BeanValidatorDetectorTest.java Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoTreeHelper.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoTreeHelper.java 2010-06-08 17:35:19 UTC (rev 1957) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoTreeHelper.java 2010-06-08 17:36:46 UTC (rev 1958) @@ -31,6 +31,7 @@ import jaxx.demo.component.jaxx.editor.I18nEditorDemo; import jaxx.demo.component.jaxx.editor.NumberEditorDemo; import jaxx.demo.component.jaxx.navigation.FullNavigationTreeDemo; +import jaxx.demo.component.jaxx.tree.JaxxTreeDemo; import jaxx.demo.component.swing.*; import jaxx.demo.feature.databinding.BeanDataBindingDemo; import jaxx.demo.feature.databinding.BindingExtremeDemo; @@ -45,7 +46,6 @@ import jaxx.runtime.context.JAXXContextEntryDef; import jaxx.runtime.swing.CardLayout2; import jaxx.runtime.swing.ErrorDialogUI; -import jaxx.runtime.swing.navigation.handler.AbstractNavigationHandler; import jaxx.runtime.swing.navigation.handler.NavigationHandler; import jaxx.runtime.swing.navigation.handler.NavigationTreeHandlerWithCardLayout; import jaxx.runtime.swing.navigation.tree.NavigationTreeHelper; @@ -119,6 +119,9 @@ addText(n_("jaxxdemo.tree.component.jaxx.tree.navigation")). addDemo(FullNavigationTreeDemo.class). goUp(). + addText(n_("jaxxdemo.tree.component.jaxx.tree")). + addDemo(JaxxTreeDemo.class). + goUp(). addDemo(BoxedDecoratorDemo.class). addDemo(StatusMessagePanelDemo.class). goUp(). Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java 2010-06-08 17:35:19 UTC (rev 1957) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java 2010-06-08 17:36:46 UTC (rev 1958) @@ -25,8 +25,8 @@ package jaxx.demo; -import jaxx.demo.component.jaxx.navigation.Movie; -import jaxx.demo.component.jaxx.navigation.People; +import jaxx.demo.entities.Movie; +import jaxx.demo.entities.People; import jaxx.runtime.SwingUtil; import jaxx.runtime.context.DefaultApplicationContext; import jaxx.runtime.decorator.DecoratorProvider; Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/FullNavigationTreeHelper.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/FullNavigationTreeHelper.java 2010-06-08 17:35:19 UTC (rev 1957) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/FullNavigationTreeHelper.java 2010-06-08 17:36:46 UTC (rev 1958) @@ -25,6 +25,8 @@ package jaxx.demo.component.jaxx.navigation; +import jaxx.demo.entities.Movie; +import jaxx.demo.entities.People; import jaxx.runtime.JAXXContext; import jaxx.runtime.JAXXObject; import jaxx.runtime.JAXXUtil; Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/FullNavigationTreeModelBuilder.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/FullNavigationTreeModelBuilder.java 2010-06-08 17:35:19 UTC (rev 1957) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/FullNavigationTreeModelBuilder.java 2010-06-08 17:36:46 UTC (rev 1958) @@ -25,6 +25,8 @@ package jaxx.demo.component.jaxx.navigation; +import jaxx.demo.entities.Movie; +import jaxx.demo.entities.People; import jaxx.demo.component.jaxx.navigation.content.ActorContentUI; import jaxx.demo.component.jaxx.navigation.content.ActorsContentUI; import jaxx.demo.component.jaxx.navigation.content.MovieContentUI; Deleted: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/Movie.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/Movie.java 2010-06-08 17:35:19 UTC (rev 1957) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/Movie.java 2010-06-08 17:36:46 UTC (rev 1958) @@ -1,133 +0,0 @@ -/* - * #%L - * JAXX :: Demo - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2010 CodeLutin - * %% - * 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. - * - * 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. - * - * 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>. - * #L% - */ - -package jaxx.demo.component.jaxx.navigation; - -import java.util.ArrayList; -import java.util.List; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; - -/** - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.7.2 - */ -public class Movie { - - protected String id; - protected String title; - protected String image; - protected int year; - protected List<People> actors; - - public Movie(String id, String title, int year,String image) { - this(); - this.id = id; - this.title = title; - this.year = year; - this.image=image; - } - - public Movie() { - actors = new ArrayList<People>(); - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public List<People> getActors() { - return actors; - } - - public void setActors(List<People> actors) { - this.actors = actors; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public int getYear() { - return year; - } - - public void setYear(int year) { - this.year = year; - } - - public String getImage() { - return image; - } - - public void setImage(String image) { - this.image = image; - } - - public void addActor(People actor) { - actors.add(actor); - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final Movie other = (Movie) obj; - if ((this.id == null) ? (other.id != null) : !this.id.equals(other.id)) { - return false; - } - return true; - } - - @Override - public int hashCode() { - int hash = 5; - hash = 41 * hash + (this.id != null ? this.id.hashCode() : 0); - return hash; - } - - @Override - public String toString() { - ToStringBuilder b = new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE); - b.append("id", id); - b.append("title", title); - b.append("year", year); - b.append("actors", actors); - return b.toString(); - } -} Deleted: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/People.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/People.java 2010-06-08 17:35:19 UTC (rev 1957) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/People.java 2010-06-08 17:36:46 UTC (rev 1958) @@ -1,123 +0,0 @@ -/* - * #%L - * JAXX :: Demo - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2010 CodeLutin - * %% - * 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. - * - * 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. - * - * 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>. - * #L% - */ - -package jaxx.demo.component.jaxx.navigation; - -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; - -/** - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.7.2 - */ -public class People { - - protected String id; - protected String image; - protected String firstName; - protected String lastName; - protected int age; - - public People(String id, String firstName, String lastName, int age, String image) { - this.id = id; - this.firstName = firstName; - this.lastName = lastName; - this.age = age; - this.image = image; - } - - public int getAge() { - return age; - } - - public void setAge(int age) { - this.age = age; - } - - public String getFirstName() { - return firstName; - } - - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLastName() { - return lastName; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - } - - public String getImage() { - return image; - } - - public void setImage(String image) { - this.image = image; - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final People other = (People) obj; - if ((this.id == null) ? (other.id != null) : !this.id.equals(other.id)) { - return false; - } - return true; - } - - @Override - public int hashCode() { - int hash = 7; - hash = 97 * hash + (this.id != null ? this.id.hashCode() : 0); - return hash; - } - - @Override - public String toString() { - ToStringBuilder b = new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE); - b.append("id", id); - b.append("firstName", firstName); - b.append("lastName", lastName); - b.append("age", age); - return b.toString(); - } -} Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ActorContentUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ActorContentUI.jaxx 2010-06-08 17:35:19 UTC (rev 1957) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ActorContentUI.jaxx 2010-06-08 17:36:46 UTC (rev 1958) @@ -28,6 +28,7 @@ <script><![CDATA[ import jaxx.runtime.swing.navigation.tree.NavigationTreeNode; import jaxx.demo.component.jaxx.navigation.*; +import jaxx.demo.entities.*; @Override public void openUI(NavigationTreeNode node) throws Exception { @@ -48,8 +49,7 @@ ImageIcon getImage(People data) { return data == null? null :SwingUtil.createIcon(data.getImage()); } -]]> - </script> +]]></script> <People id='data' javaBean='null'/> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ActorsContentUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ActorsContentUI.jaxx 2010-06-08 17:35:19 UTC (rev 1957) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ActorsContentUI.jaxx 2010-06-08 17:36:46 UTC (rev 1958) @@ -27,6 +27,7 @@ <script><![CDATA[ import jaxx.demo.component.jaxx.navigation.*; +import jaxx.demo.entities.*; import jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer; import jaxx.runtime.swing.navigation.tree.NavigationTreeNode; @@ -49,8 +50,7 @@ DefaultListModel model = (DefaultListModel) list.getModel(); model.removeAllElements(); } - ]]> - </script> + ]]></script> <java.util.List id='data' genericType='People' javaBean='null'/> @@ -59,12 +59,14 @@ columnHeaderView='{toolbar}' horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}' verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}'> - <JList id='list' model='{new DefaultListModel()}' cellRenderer='{getContextValue(DecoratorProviderListCellRenderer.class)}'/> + <JList id='list' model='{new DefaultListModel()}' + cellRenderer='{getContextValue(DecoratorProviderListCellRenderer.class)}'/> </JScrollPane> <JToolBar id='toolbar' constraints='BorderLayout.SOUTH' floatable='false'> <JPanel layout='{new GridLayout(1,0)}'> - <JButton text='jaxxdemo.action.show' enabled='{list.getSelectedIndex()!=-1}' onActionPerformed='getHandler().selectChild(this, list.getSelectedIndex())'/> + <JButton text='jaxxdemo.action.show' enabled='{list.getSelectedIndex()!=-1}' + onActionPerformed='getHandler().selectChild(this, list.getSelectedIndex())'/> <JButton text='jaxxdemo.action.add'/> <JButton text='jaxxdemo.action.remove' enabled='{list.getSelectedIndex()!=-1}'/> </JPanel> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ContentUIHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ContentUIHandler.java 2010-06-08 17:35:19 UTC (rev 1957) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ContentUIHandler.java 2010-06-08 17:36:46 UTC (rev 1958) @@ -26,9 +26,10 @@ package jaxx.demo.component.jaxx.navigation.content; import java.util.List; + +import jaxx.demo.entities.Movie; +import jaxx.demo.entities.People; 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; /** Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/MovieContentUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/MovieContentUI.jaxx 2010-06-08 17:35:19 UTC (rev 1957) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/MovieContentUI.jaxx 2010-06-08 17:36:46 UTC (rev 1958) @@ -28,6 +28,7 @@ <script><![CDATA[ import jaxx.runtime.swing.navigation.tree.NavigationTreeNode; import jaxx.demo.component.jaxx.navigation.*; +import jaxx.demo.entities.*; @Override public void openUI(NavigationTreeNode node) throws Exception { @@ -48,8 +49,7 @@ ImageIcon getImage(Movie data) { return data == null? null :SwingUtil.createIcon(data.getImage()); } -]]> - </script> +]]></script> <Movie id='data' javaBean='null'/> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/MoviesContentUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/MoviesContentUI.jaxx 2010-06-08 17:35:19 UTC (rev 1957) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/MoviesContentUI.jaxx 2010-06-08 17:36:46 UTC (rev 1958) @@ -29,6 +29,7 @@ import jaxx.demo.component.jaxx.navigation.*; import jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer; import jaxx.runtime.swing.navigation.tree.NavigationTreeNode; +import jaxx.demo.entities.*; @Override public void openUI(NavigationTreeNode node) throws Exception { @@ -36,7 +37,7 @@ log.info("selected movies = "+ms.size()); setData(ms); if (ms != null) { - DefaultListModel model = (DefaultListModel) list.getModel(); + DefaultListModel model = (DefaultListModel) list.getModel(); for (Movie m : ms) { model.addElement(m); } @@ -49,8 +50,7 @@ DefaultListModel model = (DefaultListModel) list.getModel(); model.removeAllElements(); } - ]]> - </script> + ]]></script> <java.util.List id='data' genericType='Movie' javaBean='null'/> @@ -59,12 +59,14 @@ columnHeaderView='{toolbar}' horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}' verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}'> - <JList id='list' model='{new DefaultListModel()}' cellRenderer='{getContextValue(DecoratorProviderListCellRenderer.class)}'/> + <JList id='list' model='{new DefaultListModel()}' + cellRenderer='{getContextValue(DecoratorProviderListCellRenderer.class)}'/> </JScrollPane> <JToolBar id='toolbar' opaque='false' constraints='BorderLayout.SOUTH' floatable='false'> <JPanel layout='{new GridLayout(1,0)}'> - <JButton text='jaxxdemo.action.show' enabled='{list.getSelectedIndex()!=-1}' onActionPerformed='getHandler().selectChild(this, list.getSelectedIndex())'/> + <JButton text='jaxxdemo.action.show' enabled='{list.getSelectedIndex()!=-1}' + onActionPerformed='getHandler().selectChild(this, list.getSelectedIndex())'/> <JButton text='jaxxdemo.action.add'/> <JButton text='jaxxdemo.action.remove' enabled='{list.getSelectedIndex()!=-1}'/> </JPanel> Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemo.jaxx (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemo.jaxx 2010-06-08 17:36:46 UTC (rev 1958) @@ -0,0 +1,201 @@ + + + +<jaxx.demo.DemoPanel> + + <CardLayout2 id='contentLayout'/> + + <script><![CDATA[ + +import jaxx.runtime.decorator.DecoratorProvider; +import jaxx.demo.component.jaxx.tree.content.ActorContentUI; +import jaxx.demo.component.jaxx.tree.content.ActorsContentUI; +import jaxx.demo.component.jaxx.tree.content.MovieContentUI; +import jaxx.demo.component.jaxx.tree.content.MoviesContentUI; +import jaxx.demo.entities.Movie; +import jaxx.demo.entities.People; +import javax.swing.tree.TreePath; + +private JaxxTreeDemoDataProvider dataProvider = new JaxxTreeDemoDataProvider(); +private JaxxTreeDemoHelper helper = new JaxxTreeDemoHelper(dataProvider); + +@Override +protected String[] getSources() { + return new String[]{ getDefaultSource(), + "JaxxTreeDemoHelper.java", + "JaxxTreeDemoNode.java", + "JaxxTreeDemoCellRenderer.java", + "JaxxTreeDemoDataProvider.java", + "loadors/ActorsNodeLoadors.java", + "loadors/MoviesNodeLoadors.java"}; +} + +private void $afterCompleteSetup() { + setContextValue(helper); + + TreeSelectionListener selectionListener = new TreeSelectionListener() { + @Override + public void valueChanged(TreeSelectionEvent event) { + TreePath path = event.getPath(); + JaxxTreeDemoNode node = (JaxxTreeDemoNode) path.getLastPathComponent(); + + if (log.isDebugEnabled()) { + log.debug("Select node " + node); + } + + // Do nothing for root + if (node.isRoot()) { + return; + } + openUI(node); + } + }; + + // Register decorator + DecoratorProvider decoratorProvider = getContextValue(DecoratorProvider.class); + navigation.setCellRenderer(new JaxxTreeDemoCellRenderer(decoratorProvider, dataProvider)); + + helper.setTree(navigation, true, selectionListener); + + SwingUtilities.invokeLater(new Runnable() { + + @Override + public void run() { + navigation.setSelectionInterval(0, 0); + splitPane.resetToPreferredSizes(); + } + }); + + // expand the tree + SwingUtil.expandTree(navigation); + + // auto-expand node when selected + SwingUtil.addExpandOnClickListener(navigation); +} + +protected void openUI(JaxxTreeDemoNode node) { + + // Get node type + Class<?> editType = node.getInternalClass(); + String id = node.getId(); + + // If it's category node + if (editType.equals(String.class)) { + + // Actors categorie node + if (JaxxTreeDemoHelper.ACTORS_CATEGORY_NODE.equals(id)) { + + java.util.List<People> peopleList = dataProvider.getPeoples(); + ActorsContentUI ui = getContentIfExist(ActorsContentUI.class); + String contentName = ActorsContentUI.class.getName(); + if (ui == null) { + ui = new ActorsContentUI(this); + content.add(ui, contentName); + } + ui.setData(peopleList); + contentLayout.show(content, contentName); + + // Movies categorie node + } else if (JaxxTreeDemoHelper.MOVIES_CATEGORY_NODE.equals(id)) { + + java.util.List<Movie> movieList = dataProvider.getMovies(); + MoviesContentUI ui = getContentIfExist(MoviesContentUI.class); + String contentName = MoviesContentUI.class.getName(); + if (ui == null) { + ui = new MoviesContentUI(this); + content.add(ui, contentName); + } + ui.setData(movieList); + contentLayout.show(content, contentName); + } + + // People node + } else if (editType.equals(People.class)) { + People people = dataProvider.getPeople(id); + + ActorContentUI ui = getContentIfExist(ActorContentUI.class); + String contentName = ActorContentUI.class.getName(); + if (ui == null) { + ui = new ActorContentUI(this); + content.add(ui, contentName); + } + ui.setData(people); + contentLayout.show(content, contentName); + + // Movie node + } else if (editType.equals(Movie.class)) { + Movie movie = dataProvider.getMovie(id); + + MovieContentUI ui = getContentIfExist(MovieContentUI.class); + String contentName = MovieContentUI.class.getName(); + if (ui == null) { + ui = new MovieContentUI(this); + content.add(ui, contentName); + } + ui.setData(movie); + contentLayout.show(content, contentName); + } +} + +// Get content if exist in content, else return null +protected <E extends Component> E getContentIfExist(Class<E> uiClass) { + String contentName = 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> + + <JPanel id='demoPanel' layout='{new BorderLayout()}'> + + <JSplitPane id='splitPane' + constraints='BorderLayout.CENTER' + oneTouchExpandable='true'> + + <JScrollPane border='{null}' + horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}' + verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_NEVER}'> + + <JTree id="navigation" + font-size='11' + rootVisible='false' + showsRootHandles='false' + model='{helper.createTreeModel()}'/> + + </JScrollPane> + + <JPanel id="content" layout="{contentLayout}" /> + + </JSplitPane> + + </JPanel> + +</jaxx.demo.DemoPanel> Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoCellRenderer.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoCellRenderer.java (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoCellRenderer.java 2010-06-08 17:36:46 UTC (rev 1958) @@ -0,0 +1,64 @@ +package jaxx.demo.component.jaxx.tree; + +import jaxx.demo.entities.Movie; +import jaxx.demo.entities.People; +import jaxx.runtime.decorator.Decorator; +import jaxx.runtime.decorator.DecoratorProvider; +import jaxx.runtime.swing.tree.AbstractJaxxTreeCellRenderer; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * @author sletellier <letellier(a)codelutin.com> + * @since 2.1 + */ +public class JaxxTreeDemoCellRenderer extends AbstractJaxxTreeCellRenderer<JaxxTreeDemoNode> { + + /** Logger */ + protected static final Log log = + LogFactory.getLog(JaxxTreeDemoCellRenderer.class); + + protected DecoratorProvider decoratorProvider; + + public JaxxTreeDemoCellRenderer(DecoratorProvider decoratorProvider, JaxxTreeDemoDataProvider provider) { + super.setDataProvider(provider); + this.decoratorProvider = decoratorProvider;; + } + + @Override + public JaxxTreeDemoDataProvider getDataProvider() { + return (JaxxTreeDemoDataProvider)super.getDataProvider(); + } + + @Override + protected String computeNodeText(JaxxTreeDemoNode node) { + + // Get node type + Class<?> editType = node.getInternalClass(); + String id = node.getId(); + + // get decorator + Decorator<?> decorator = decoratorProvider.getDecorator(editType); + + Object toDecorate = null; + + if (editType.equals(People.class)) { + toDecorate = getDataProvider().getPeople(id); + + // Movie node + } else if (editType.equals(Movie.class)) { + toDecorate = getDataProvider().getMovie(id); + } + + // Get decorated value + String decorated = decorator.toString(toDecorate); + + if (log.isDebugEnabled()) { + log.debug("Compute text for node " + + node + " return " + + decorated); + } + + return decorated; + } +} Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoDataProvider.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoDataProvider.java (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoDataProvider.java 2010-06-08 17:36:46 UTC (rev 1958) @@ -0,0 +1,87 @@ +package jaxx.demo.component.jaxx.tree; + +import jaxx.demo.entities.Movie; +import jaxx.demo.entities.People; +import jaxx.runtime.swing.tree.DataProvider; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author sletellier <letellier(a)codelutin.com> + * @since 2.1 + */ +public class JaxxTreeDemoDataProvider implements DataProvider { + + /** + * Logger + */ + static private final Log log = LogFactory.getLog(JaxxTreeDemoDataProvider.class); + + protected Map<String, Movie> movies; + + protected Map<String, People> peoples; + + public JaxxTreeDemoDataProvider() { + + movies = new HashMap<String, Movie>(); + peoples = new HashMap<String, People>(); + + log.info("for " + this); + People a = new People("0", "Jack", "Black", 0, "/jaxx/demo/images/jack.jpg"); + People a2 = new People("1", "Héctor", "Jiménez", 0, "/jaxx/demo/images/hector.jpg"); + People a3 = new People("2", "Ana", "de la Reguera", 0, "/jaxx/demo/images/ana.jpg"); + + Movie m = new Movie("0", "Nacho libre", 1996, "/jaxx/demo/images/nacho.jpg"); + m.addActor(a); + m.addActor(a2); + m.addActor(a3); + + Movie m2 = new Movie("1", "Nacho 2", 2009, "/jaxx/demo/images/nacho2.png"); + m2.addActor(a); + m2.addActor(a2); + + movies.put(m.getId(), m); + movies.put(m2.getId(), m2); + + peoples.put(a.getId(), a); + peoples.put(a2.getId(), a2); + peoples.put(a3.getId(), a3); + } + + @Override + public boolean isEnabled() { + return true; + } + + public Movie getMovie(String id){ + return movies.get(id); + } + + public People getPeople(String id){ + return peoples.get(id); + } + + public List<Movie> getMovies(){ + return new ArrayList<Movie>(movies.values()); + } + + public List<People> getPeoples() { + return new ArrayList<People>(peoples.values()); + } + + public List<People> getPeoples(Movie m){ + return m.getActors(); + } + + public List<People> getPeoples(String moviesId){ + + log.info("Get people for movie " + moviesId); + + return movies.get(moviesId).getActors(); + } +} Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoHelper.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoHelper.java (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoHelper.java 2010-06-08 17:36:46 UTC (rev 1958) @@ -0,0 +1,62 @@ + +package jaxx.demo.component.jaxx.tree; + +import jaxx.demo.component.jaxx.tree.loadors.ActorsNodeLoadors; +import jaxx.demo.component.jaxx.tree.loadors.MoviesNodeLoadors; +import jaxx.runtime.swing.tree.JaxxTreeHelper; + +import javax.swing.tree.DefaultTreeModel; +import javax.swing.tree.TreeModel; + +import static org.nuiton.i18n.I18n.n_; + +/** + * @author sletellier <letellier(a)codelutin.com> + * @since 2.1 + */ +public class JaxxTreeDemoHelper extends JaxxTreeHelper<JaxxTreeDemoNode> { + + public static String MOVIES_CATEGORY_NODE = "movies"; + public static String ACTORS_CATEGORY_NODE = "actors"; + + public JaxxTreeDemoHelper(JaxxTreeDemoDataProvider provider) { + super(); + setDataProvider(provider); + } + + public TreeModel createTreeModel() { + + JaxxTreeDemoNode root = new JaxxTreeDemoNode( + String.class, + "Root node", + null, + null + ); + + JaxxTreeDemoNode moviesCategoryNode = new JaxxTreeDemoNode( + String.class, + n_(MOVIES_CATEGORY_NODE), + null, + new MoviesNodeLoadors() + ); + + JaxxTreeDemoNode peoplesCategoryNode = new JaxxTreeDemoNode( + String.class, + n_(ACTORS_CATEGORY_NODE), + null, + new ActorsNodeLoadors() + ); + + root.add(moviesCategoryNode); + root.add(peoplesCategoryNode); + + DefaultTreeModel model = getModel(); + if (model == null) { + model = createModel(root); + } else { + model.setRoot(root); + } + root.populateChilds(model, getDataProvider()); + return model; + } +} Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoNode.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoNode.java (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoNode.java 2010-06-08 17:36:46 UTC (rev 1958) @@ -0,0 +1,20 @@ +package jaxx.demo.component.jaxx.tree; + +import jaxx.runtime.swing.tree.JaxxNode; +import jaxx.runtime.swing.tree.JaxxNodeChildLoador; + +/** + * + * @author sletellier <letellier(a)codelutin.com> + * @since 2.1 + */ +public class JaxxTreeDemoNode extends JaxxNode<JaxxTreeDemoNode> { + + public JaxxTreeDemoNode(String id) { + super(id); + } + + public JaxxTreeDemoNode(Class<?> internalClass, String id, String context, JaxxNodeChildLoador<?, JaxxTreeDemoNode> jaxxDemoNodeJaxxNodeChildLoador) { + super(internalClass, id, context, jaxxDemoNodeJaxxNodeChildLoador); + } +} Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/ActorContentUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/ActorContentUI.jaxx (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/ActorContentUI.jaxx 2010-06-08 17:36:46 UTC (rev 1958) @@ -0,0 +1,72 @@ + + + +<JSplitPane id='splitPane' + orientation='{JSplitPane.VERTICAL_SPLIT}' + resizeWeight='0.5' + constraints='BorderLayout.CENTER' + oneTouchExpandable='true'> + + <script><![CDATA[ +import jaxx.demo.entities.*; + +String getContent(People data) { + if (data == null) { + return "no content"; + } + StringBuilder buffer = new StringBuilder(); + buffer.append(data); + return buffer.toString(); +} + +ImageIcon getImage(People data) { + return data == null? null :SwingUtil.createIcon(data.getImage()); +} + +]]></script> + + <People id='data' javaBean='null'/> + + <JScrollPane border='{null}' + horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}' + verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}'> + <JTextPane border='{new TitledBorder(_("jaxxdemo.navigation.actor.title"))}' + editable='false' + font-size='11' + text='{getContent(getData())}'/> + </JScrollPane> + + <JScrollPane border='{new TitledBorder("Picture")}' + horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED}' + verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}' + minimumSize='{SwingUtil.newMinDimension()}'> + + <JLabel horizontalAlignment='center' + icon='{getImage(getData())}'/> + + </JScrollPane> + +</JSplitPane> Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/ActorsContentUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/ActorsContentUI.jaxx (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/ActorsContentUI.jaxx 2010-06-08 17:36:46 UTC (rev 1958) @@ -0,0 +1,83 @@ + + +<JPanel layout='{new BorderLayout()}'> + + <script><![CDATA[ +import jaxx.demo.entities.*; +import jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer; +import jaxx.runtime.binding.SimpleJAXXObjectBinding; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import jaxx.demo.component.jaxx.tree.JaxxTreeDemoHelper; + +private void $afterCompleteSetup() { + + addPropertyChangeListener(PROPERTY_DATA, new PropertyChangeListener(){ + @Override + public void propertyChange(PropertyChangeEvent evt) { + java.util.List<People> ps = getData(); + + if (ps != null) { + DefaultListModel model = (DefaultListModel) list.getModel(); + for (People p : ps) { + model.addElement(p); + } + } else { + // clean list model + DefaultListModel model = (DefaultListModel) list.getModel(); + model.removeAllElements(); + } + } + }); +} + +protected void selectChild() { + People selected = (People)list.getSelectedValue(); + getContextValue(JaxxTreeDemoHelper.class).selectNode(selected.getId()); +} + ]]></script> + + <java.util.List id='data' genericType='People' javaBean='null'/> + + <JScrollPane border='{new TitledBorder(_("jaxxdemo.navigation.actors.title"))}' + constraints='BorderLayout.CENTER' + columnHeaderView='{toolbar}' + horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}' + verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}'> + <JList id='list' model='{new DefaultListModel()}' + cellRenderer='{getContextValue(DecoratorProviderListCellRenderer.class)}'/> + </JScrollPane> + <JToolBar id='toolbar' constraints='BorderLayout.SOUTH' + floatable='false'> + <JPanel layout='{new GridLayout(1,0)}'> + <JButton text='jaxxdemo.action.show' enabled='{list.getSelectedIndex()!=-1}' + onActionPerformed='selectChild()'/> + <JButton text='jaxxdemo.action.add'/> + <JButton text='jaxxdemo.action.remove' enabled='{list.getSelectedIndex()!=-1}'/> + </JPanel> + </JToolBar> + +</JPanel> Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/MovieContentUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/MovieContentUI.jaxx (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/MovieContentUI.jaxx 2010-06-08 17:36:46 UTC (rev 1958) @@ -0,0 +1,72 @@ + + + +<JSplitPane id='splitPane' + orientation='{JSplitPane.VERTICAL_SPLIT}' + resizeWeight='0.5' + constraints='BorderLayout.CENTER' + oneTouchExpandable='true'> + + <script><![CDATA[ +import jaxx.demo.entities.*; + +String getContent(Movie data) { + if (data == null) { + return "no content"; + } + StringBuilder buffer = new StringBuilder(); + buffer.append(data); + return buffer.toString(); +} + +ImageIcon getImage(Movie data) { + return data == null? null :SwingUtil.createIcon(data.getImage()); +} +]]></script> + + <Movie id='data' javaBean='null'/> + + <JScrollPane border='{null}' + horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}' + verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}'> + + <JTextPane border='{new TitledBorder(_("jaxxdemo.navigation.movie.title"))}' + editable='false' + font-size='11' + text='{getContent(getData())}'/> + </JScrollPane> + + <JScrollPane border='{new TitledBorder("Picture")}' + horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED}' + verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}' + minimumSize='{SwingUtil.newMinDimension()}'> + + <JLabel horizontalAlignment='center' + icon='{getImage(getData())}'/> + + </JScrollPane> + +</JSplitPane> \ No newline at end of file Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/MoviesContentUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/MoviesContentUI.jaxx (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/MoviesContentUI.jaxx 2010-06-08 17:36:46 UTC (rev 1958) @@ -0,0 +1,87 @@ + + +<JPanel layout='{new BorderLayout()}'> + + <script><![CDATA[ +import jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer; +import jaxx.demo.entities.*; +import jaxx.runtime.binding.SimpleJAXXObjectBinding; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import jaxx.demo.component.jaxx.tree.JaxxTreeDemoHelper; + +private void $afterCompleteSetup() { + + addPropertyChangeListener(PROPERTY_DATA, new PropertyChangeListener(){ + @Override + public void propertyChange(PropertyChangeEvent evt) { + java.util.List<Movie> ms = getData(); + + if (ms != null) { + DefaultListModel model = (DefaultListModel) list.getModel(); + for (Movie m : ms) { + model.addElement(m); + } + } else { + // clean list model + DefaultListModel model = (DefaultListModel) list.getModel(); + model.removeAllElements(); + } + } + }); +} + +protected void selectChild() { + Movie selected = (Movie)list.getSelectedValue(); + getContextValue(JaxxTreeDemoHelper.class).selectNode(selected.getId()); +} + ]]></script> + + <java.util.List id='data' genericType='Movie' javaBean='null'/> + + <JScrollPane border='{new TitledBorder(_("jaxxdemo.navigation.movies.title"))}' + constraints='BorderLayout.CENTER' + columnHeaderView='{toolbar}' + horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}' + verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}'> + + <JList id='list' model='{new DefaultListModel()}' + cellRenderer='{getContextValue(DecoratorProviderListCellRenderer.class)}'/> + + </JScrollPane> + + <JToolBar id='toolbar' opaque='false' constraints='BorderLayout.SOUTH' + floatable='false'> + + <JPanel layout='{new GridLayout(1,0)}'> + <JButton text='jaxxdemo.action.show' enabled='{list.getSelectedIndex()!=-1}' + onActionPerformed='selectChild()'/> + <JButton text='jaxxdemo.action.add'/> + <JButton text='jaxxdemo.action.remove' enabled='{list.getSelectedIndex()!=-1}'/> + </JPanel> + </JToolBar> + +</JPanel> Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/ActorsNodeLoadors.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/ActorsNodeLoadors.java (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/ActorsNodeLoadors.java 2010-06-08 17:36:46 UTC (rev 1958) @@ -0,0 +1,50 @@ +package jaxx.demo.component.jaxx.tree.loadors; + +import jaxx.demo.component.jaxx.tree.JaxxTreeDemoNode; +import jaxx.demo.component.jaxx.tree.JaxxTreeDemoDataProvider; +import jaxx.demo.entities.People; +import jaxx.runtime.swing.tree.DataProvider; +import jaxx.runtime.swing.tree.JaxxNodeChildLoador; + +import java.util.List; + +/** + * @author sletellier <letellier(a)codelutin.com> + * @since 2.1 + */ +public class ActorsNodeLoadors extends JaxxNodeChildLoador<People, JaxxTreeDemoNode> { + + public ActorsNodeLoadors() { + super(People.class); + } + + @Override + public List<People> getData(Class<?> parentClass, + String parentId, + DataProvider dataProvider) throws Exception { + + // Get people for parentId + JaxxTreeDemoDataProvider provider = (JaxxTreeDemoDataProvider) dataProvider; + + // If its not root + if (parentId != null) { + return provider.getPeoples(parentId); + } + + return provider.getPeoples(); + } + + @Override + public JaxxTreeDemoNode createNode(JaxxTreeDemoNode parentNode, People data) { + + // Create actor nodes + JaxxTreeDemoNode actorsNode = new JaxxTreeDemoNode( + getBeanType(), + data.getId(), + null, + null + ); + + return actorsNode; + } +} Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/MoviesNodeLoadors.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/MoviesNodeLoadors.java (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/MoviesNodeLoadors.java 2010-06-08 17:36:46 UTC (rev 1958) @@ -0,0 +1,57 @@ +package jaxx.demo.component.jaxx.tree.loadors; + +import jaxx.demo.component.jaxx.tree.JaxxTreeDemoHelper; +import jaxx.demo.component.jaxx.tree.JaxxTreeDemoNode; +import jaxx.demo.component.jaxx.tree.JaxxTreeDemoDataProvider; +import jaxx.demo.entities.Movie; +import jaxx.runtime.swing.tree.DataProvider; +import jaxx.runtime.swing.tree.JaxxNodeChildLoador; + +import java.util.List; + +import static org.nuiton.i18n.I18n.n_; + +/** + * @author sletellier <letellier(a)codelutin.com> + * @since 2.1 + */ +public class MoviesNodeLoadors extends JaxxNodeChildLoador<Movie, JaxxTreeDemoNode> { + + public MoviesNodeLoadors() { + super(Movie.class); + } + + @Override + public List<Movie> getData(Class<?> parentClass, + String parentId, + DataProvider dataProvider) throws Exception { + + JaxxTreeDemoDataProvider provider = (JaxxTreeDemoDataProvider) dataProvider; + return provider.getMovies(); + } + + @Override + public JaxxTreeDemoNode createNode(JaxxTreeDemoNode parentNode, Movie data) { + + // Create movies nodes + JaxxTreeDemoNode moviesNode = new JaxxTreeDemoNode( + getBeanType(), + data.getId(), + null, + null + ); + + // Create clients category node + JaxxTreeDemoNode ActorsCategoryNode = new JaxxTreeDemoNode( + String.class, + n_(JaxxTreeDemoHelper.ACTORS_CATEGORY_NODE), + null, + new ActorsNodeLoadors() + ); + + // Add to movies node + moviesNode.add(ActorsCategoryNode); + + return moviesNode; + } +} Added: trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Identity.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Identity.java (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Identity.java 2010-06-08 17:36:46 UTC (rev 1958) @@ -0,0 +1,128 @@ +/* + * #%L + * JAXX :: Demo + * + * $Id: Identity.java 1847 2010-04-16 12:27:48Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/jaxx/trunk/jaxx-demo/src/main/java/jaxx/demo/feat… $ + * %% + * Copyright (C) 2008 - 2010 CodeLutin + * %% + * 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. + * + * 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. + * + * 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>. + * #L% + */ + +package jaxx.demo.entities; + +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.io.File; + +public class Identity { + + protected String firstName = ""; + + protected String lastName = ""; + + protected String email = "dummy(a)codelutin.com"; + + protected int age = 51; + + protected File config = new File("/tmp"); + + protected File dir = new File("/tmp"); + + PropertyChangeSupport p; + + public Identity() { + p = new PropertyChangeSupport(this); + } + + public void addPropertyChangeListener(PropertyChangeListener listener) { + p.addPropertyChangeListener(listener); + } + + public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { + p.addPropertyChangeListener(propertyName, listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + p.removePropertyChangeListener(listener); + } + + public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { + p.removePropertyChangeListener(propertyName, listener); + } + + + public String getFirstName() { + return firstName; + } + + public String getLastName() { + return lastName; + } + + public String getEmail() { + return email; + } + + public int getAge() { + return age; + } + + public File getConfig() { + return config; + } + + public File getDir() { + return dir; + } + + public void setFirstName(String firstName) { + String oldFirstName = this.firstName; + this.firstName = firstName; + p.firePropertyChange("firstName", oldFirstName, firstName); + } + + public void setLastName(String lastName) { + String oldLastName = this.lastName; + this.lastName = lastName; + p.firePropertyChange("lastName", oldLastName, lastName); + } + + public void setEmail(String email) { + String oldEmail = this.email; + this.email = email; + p.firePropertyChange("email", oldEmail, email); + } + + public void setAge(int age) { + int oldAge = this.age; + this.age = age; + p.firePropertyChange("age", oldAge, age); + } + + public void setConfig(File config) { + File oldConfig = this.config; + this.config = config; + p.firePropertyChange("config", oldConfig, config); + } + + public void setDir(File dir) { + File oldDir = this.dir; + this.dir = dir; + p.firePropertyChange("dir", oldDir, dir); + } +} Added: trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Model.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Model.java (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Model.java 2010-06-08 17:36:46 UTC (rev 1958) @@ -0,0 +1,91 @@ +/* + * #%L + * JAXX :: Demo + * + * $Id: Model.java 1847 2010-04-16 12:27:48Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/jaxx/trunk/jaxx-demo/src/main/java/jaxx/demo/enti… $ + * %% + * Copyright (C) 2008 - 2010 CodeLutin + * %% + * 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. + * + * 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. + * + * 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>. + * #L% + */ + +package jaxx.demo.entities; + +import java.beans.*; + +public class Model { + + protected String text = "text"; + + protected String text2 = "text2"; + + protected int ratio = 51; + + + PropertyChangeSupport p; + + public Model() { + p = new PropertyChangeSupport(this); + } + + public void addPropertyChangeListener(PropertyChangeListener listener) { + p.addPropertyChangeListener(listener); + } + + public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { + p.addPropertyChangeListener(propertyName, listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + p.removePropertyChangeListener(listener); + } + + public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { + p.removePropertyChangeListener(propertyName, listener); + } + + + public String getText() { + return text; + } + + public String getText2() { + return text2; + } + + public int getRatio() { + return ratio; + } + + public void setText(String text) { + String oldText = this.text; + this.text = text; + p.firePropertyChange("text", oldText, text); + } + + public void setText2(String text2) { + String oldText2 = this.text2; + this.text2 = text2; + p.firePropertyChange("text2", oldText2, text2); + } + + public void setRatio(int ratio) { + int oldRatio = this.ratio; + this.ratio = ratio; + p.firePropertyChange("ratio", oldRatio, ratio); + } +} Added: trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Movie.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Movie.java (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Movie.java 2010-06-08 17:36:46 UTC (rev 1958) @@ -0,0 +1,133 @@ +/* + * #%L + * JAXX :: Demo + * + * $Id: Movie.java 1847 2010-04-16 12:27:48Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/jaxx/trunk/jaxx-demo/src/main/java/jaxx/demo/enti… $ + * %% + * Copyright (C) 2008 - 2010 CodeLutin + * %% + * 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. + * + * 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. + * + * 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>. + * #L% + */ + +package jaxx.demo.entities; + +import java.util.ArrayList; +import java.util.List; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang.builder.ToStringStyle; + +/** + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.7.2 + */ +public class Movie { + + protected String id; + protected String title; + protected String image; + protected int year; + protected List<People> actors; + + public Movie(String id, String title, int year,String image) { + this(); + this.id = id; + this.title = title; + this.year = year; + this.image=image; + } + + public Movie() { + actors = new ArrayList<People>(); + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public List<People> getActors() { + return actors; + } + + public void setActors(List<People> actors) { + this.actors = actors; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public int getYear() { + return year; + } + + public void setYear(int year) { + this.year = year; + } + + public String getImage() { + return image; + } + + public void setImage(String image) { + this.image = image; + } + + public void addActor(People actor) { + actors.add(actor); + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final Movie other = (Movie) obj; + if ((this.id == null) ? (other.id != null) : !this.id.equals(other.id)) { + return false; + } + return true; + } + + @Override + public int hashCode() { + int hash = 5; + hash = 41 * hash + (this.id != null ? this.id.hashCode() : 0); + return hash; + } + + @Override + public String toString() { + ToStringBuilder b = new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE); + b.append("id", id); + b.append("title", title); + b.append("year", year); + b.append("actors", actors); + return b.toString(); + } +} Added: trunk/jaxx-demo/src/main/java/jaxx/demo/entities/People.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/entities/People.java (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/entities/People.java 2010-06-08 17:36:46 UTC (rev 1958) @@ -0,0 +1,123 @@ +/* + * #%L + * JAXX :: Demo + * + * $Id: People.java 1847 2010-04-16 12:27:48Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/jaxx/trunk/jaxx-demo/src/main/java/jaxx/demo/comp… $ + * %% + * Copyright (C) 2008 - 2010 CodeLutin + * %% + * 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. + * + * 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. + * + * 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>. + * #L% + */ + +package jaxx.demo.entities; + +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang.builder.ToStringStyle; + +/** + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.7.2 + */ +public class People { + + protected String id; + protected String image; + protected String firstName; + protected String lastName; + protected int age; + + public People(String id, String firstName, String lastName, int age, String image) { + this.id = id; + this.firstName = firstName; + this.lastName = lastName; + this.age = age; + this.image = image; + } + + public int getAge() { + return age; + } + + public void setAge(int age) { + this.age = age; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getImage() { + return image; + } + + public void setImage(String image) { + this.image = image; + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final People other = (People) obj; + if ((this.id == null) ? (other.id != null) : !this.id.equals(other.id)) { + return false; + } + return true; + } + + @Override + public int hashCode() { + int hash = 7; + hash = 97 * hash + (this.id != null ? this.id.hashCode() : 0); + return hash; + } + + @Override + public String toString() { + ToStringBuilder b = new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE); + b.append("id", id); + b.append("firstName", firstName); + b.append("lastName", lastName); + b.append("age", age); + return b.toString(); + } +} Deleted: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/Identity.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/Identity.java 2010-06-08 17:35:19 UTC (rev 1957) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/Identity.java 2010-06-08 17:36:46 UTC (rev 1958) @@ -1,128 +0,0 @@ -/* - * #%L - * JAXX :: Demo - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2010 CodeLutin - * %% - * 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. - * - * 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. - * - * 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>. - * #L% - */ - -package jaxx.demo.feature.validation; - -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; -import java.io.File; - -public class Identity { - - protected String firstName = ""; - - protected String lastName = ""; - - protected String email = "dummy(a)codelutin.com"; - - protected int age = 51; - - protected File config = new File("/tmp"); - - protected File dir = new File("/tmp"); - - PropertyChangeSupport p; - - public Identity() { - p = new PropertyChangeSupport(this); - } - - public void addPropertyChangeListener(PropertyChangeListener listener) { - p.addPropertyChangeListener(listener); - } - - public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { - p.addPropertyChangeListener(propertyName, listener); - } - - public void removePropertyChangeListener(PropertyChangeListener listener) { - p.removePropertyChangeListener(listener); - } - - public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { - p.removePropertyChangeListener(propertyName, listener); - } - - - public String getFirstName() { - return firstName; - } - - public String getLastName() { - return lastName; - } - - public String getEmail() { - return email; - } - - public int getAge() { - return age; - } - - public File getConfig() { - return config; - } - - public File getDir() { - return dir; - } - - public void setFirstName(String firstName) { - String oldFirstName = this.firstName; - this.firstName = firstName; - p.firePropertyChange("firstName", oldFirstName, firstName); - } - - public void setLastName(String lastName) { - String oldLastName = this.lastName; - this.lastName = lastName; - p.firePropertyChange("lastName", oldLastName, lastName); - } - - public void setEmail(String email) { - String oldEmail = this.email; - this.email = email; - p.firePropertyChange("email", oldEmail, email); - } - - public void setAge(int age) { - int oldAge = this.age; - this.age = age; - p.firePropertyChange("age", oldAge, age); - } - - public void setConfig(File config) { - File oldConfig = this.config; - this.config = config; - p.firePropertyChange("config", oldConfig, config); - } - - public void setDir(File dir) { - File oldDir = this.dir; - this.dir = dir; - p.firePropertyChange("dir", oldDir, dir); - } -} Deleted: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/Model.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/Model.java 2010-06-08 17:35:19 UTC (rev 1957) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/Model.java 2010-06-08 17:36:46 UTC (rev 1958) @@ -1,91 +0,0 @@ -/* - * #%L - * JAXX :: Demo - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2010 CodeLutin - * %% - * 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. - * - * 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. - * - * 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>. - * #L% - */ - -package jaxx.demo.feature.validation; - -import java.beans.*; - -public class Model { - - protected String text = "text"; - - protected String text2 = "text2"; - - protected int ratio = 51; - - - PropertyChangeSupport p; - - public Model() { - p = new PropertyChangeSupport(this); - } - - public void addPropertyChangeListener(PropertyChangeListener listener) { - p.addPropertyChangeListener(listener); - } - - public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { - p.addPropertyChangeListener(propertyName, listener); - } - - public void removePropertyChangeListener(PropertyChangeListener listener) { - p.removePropertyChangeListener(listener); - } - - public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { - p.removePropertyChangeListener(propertyName, listener); - } - - - public String getText() { - return text; - } - - public String getText2() { - return text2; - } - - public int getRatio() { - return ratio; - } - - public void setText(String text) { - String oldText = this.text; - this.text = text; - p.firePropertyChange("text", oldText, text); - } - - public void setText2(String text2) { - String oldText2 = this.text2; - this.text2 = text2; - p.firePropertyChange("text2", oldText2, text2); - } - - public void setRatio(int ratio) { - int oldRatio = this.ratio; - this.ratio = ratio; - p.firePropertyChange("ratio", oldRatio, ratio); - } -} Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationListDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationListDemo.jaxx 2010-06-08 17:35:19 UTC (rev 1957) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationListDemo.jaxx 2010-06-08 17:36:46 UTC (rev 1958) @@ -28,6 +28,7 @@ <script><![CDATA[ import static org.nuiton.i18n.I18n.n_; +import jaxx.demo.entities.*; import jaxx.runtime.validator.swing.SwingValidatorMessageListRenderer; import jaxx.runtime.validator.swing.SwingValidatorMessageListModel; Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationTableDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationTableDemo.jaxx 2010-06-08 17:35:19 UTC (rev 1957) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationTableDemo.jaxx 2010-06-08 17:36:46 UTC (rev 1958) @@ -28,6 +28,7 @@ <script><![CDATA[ import static org.nuiton.i18n.I18n.n_; +import jaxx.demo.entities.*; import jaxx.runtime.validator.swing.SwingValidatorUtil; import jaxx.runtime.validator.swing.SwingValidatorMessageTableRenderer; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.properties 2010-06-08 17:35:19 UTC (rev 1957) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.properties 2010-06-08 17:36:46 UTC (rev 1958) @@ -197,6 +197,7 @@ jaxxdemo.title.about=About JAXXDemo... jaxxdemo.tree.component.jaxx=JAXX Components jaxxdemo.tree.component.jaxx.editor=Editors +jaxxdemo.tree.component.jaxx.tree=Jaxx tree API jaxxdemo.tree.component.jaxx.tree.navigation=Navigation trees jaxxdemo.tree.component.swing=Swing Components jaxxdemo.tree.component.swing.buttons=Buttons Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-fr_FR.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-fr_FR.properties 2010-06-08 17:35:19 UTC (rev 1957) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-fr_FR.properties 2010-06-08 17:36:46 UTC (rev 1958) @@ -197,6 +197,7 @@ jaxxdemo.title.about=A propos de JAXX Demo... jaxxdemo.tree.component.jaxx=Composants JAXX jaxxdemo.tree.component.jaxx.editor=Editeurs +jaxxdemo.tree.component.jaxx.tree=API JAXX pour les arbres jaxxdemo.tree.component.jaxx.tree.navigation=Arbre de navigation jaxxdemo.tree.component.swing=Composants Swing jaxxdemo.tree.component.swing.buttons=Boutons Added: trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/Identity-error-validation.xml =================================================================== --- trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/Identity-error-validation.xml (rev 0) +++ trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/Identity-error-validation.xml 2010-06-08 17:36:46 UTC (rev 1958) @@ -0,0 +1,49 @@ +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + <field name="firstName"> + <field-validator type="requiredstring" short-circuit="true"> + <message>You must enter a firstName.</message> + </field-validator> + </field> + <field name="lastName"> + <field-validator type="requiredstring" short-circuit="true"> + <message>You must enter a lastName.</message> + </field-validator> + </field> + + <field name="email"> + <field-validator type="requiredstring" short-circuit="true"> + <message>You must enter a value for email.</message> + </field-validator> + <field-validator type="email" short-circuit="true"> + <message>Not a valid e-mail.</message> + </field-validator> + </field> + + <field name="config"> + <field-validator type="requiredFile" short-circuit="true"> + <message>You must enter a value for config.</message> + </field-validator> + <field-validator type="existingFile" short-circuit="true"> + <message>The configuration file ${config} does not exist.</message> + </field-validator> + </field> + + <field name="dir"> + <field-validator type="requiredFile" short-circuit="true"> + <message>You must enter a value for dir.</message> + </field-validator> + <field-validator type="existingDirectory" short-circuit="true"> + <message>The directory ${dir} does not exist.</message> + </field-validator> + </field> + + <field name="age"> + <field-validator type="int"> + <param name="min">18</param> + <message>Your are too young (min ${min} )</message> + </field-validator> + </field> +</validators> \ No newline at end of file Added: trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/Identity-info-validation.xml =================================================================== --- trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/Identity-info-validation.xml (rev 0) +++ trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/Identity-info-validation.xml 2010-06-08 17:36:46 UTC (rev 1958) @@ -0,0 +1,49 @@ +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> +  + + <field name="age"> + <field-validator type="int"> + <param name="min">25</param> + <message>You are still young ( old ${min} ) </message> + </field-validator> + </field> +</validators> \ No newline at end of file Added: trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/Identity-warning-validation.xml =================================================================== --- trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/Identity-warning-validation.xml (rev 0) +++ trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/Identity-warning-validation.xml 2010-06-08 17:36:46 UTC (rev 1958) @@ -0,0 +1,49 @@ +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> +  + + <field name="age"> + <field-validator type="int"> + <param name="max">88</param> + <message>Info : Your are older than ${max} !</message> + </field-validator> + </field> +</validators> \ No newline at end of file Added: trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/Model-error-validation.xml =================================================================== --- trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/Model-error-validation.xml (rev 0) +++ trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/Model-error-validation.xml 2010-06-08 17:36:46 UTC (rev 1958) @@ -0,0 +1,35 @@ +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> +  + <field name="text"> + <field-validator type="requiredstring" short-circuit="true"> + <message>You must enter a value for text.</message> + </field-validator> + </field> + + <field name="text2"> + <field-validator type="requiredstring" short-circuit="true"> + <message>You must enter a value for text2.</message> + </field-validator> + </field> + + <field name="ratio"> + <field-validator type="int"> + <param name="min">20</param> + <param name="max">50</param> + <message>Ratio needs to be between ${min} and ${max}</message> + </field-validator> + </field> + +  + <validator type="expression"> + <param name="expression">text.startsWith("poussin")</param> + <message>Email not starts with poussin</message> + </validator> + <validator type="expression"> + <param name="expression">text2.startsWith("chemit")</param> + <message>Email not starts with chemit</message> + </validator> +</validators> \ No newline at end of file Added: trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/Model-info-validation.xml =================================================================== --- trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/Model-info-validation.xml (rev 0) +++ trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/Model-info-validation.xml 2010-06-08 17:36:46 UTC (rev 1958) @@ -0,0 +1,13 @@ +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> +  + <field name="text"> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ text != null && text.length() > 10]]></param> + <message>Text should have more than 10 caracters</message> + </field-validator> + </field> + +</validators> \ No newline at end of file Added: trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/Model-warning-validation.xml =================================================================== --- trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/Model-warning-validation.xml (rev 0) +++ trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/Model-warning-validation.xml 2010-06-08 17:36:46 UTC (rev 1958) @@ -0,0 +1,18 @@ +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> +  + <field name="text"> + <field-validator type="email" short-circuit="true"> + <message>Not a valid e-mail for text.</message> + </field-validator> + </field> + + <field name="text2"> + <field-validator type="requiredstring" short-circuit="true"> + <message>You must enter a value for text2.</message> + </field-validator> + </field> + +</validators> \ No newline at end of file Modified: trunk/jaxx-demo/src/main/resources/log4j.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/log4j.properties 2010-06-08 17:35:19 UTC (rev 1957) +++ trunk/jaxx-demo/src/main/resources/log4j.properties 2010-06-08 17:36:46 UTC (rev 1958) @@ -6,6 +6,7 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n log4j.logger.jaxx.demo=INFO +#log4j.logger.jaxx.demo.component.jaxx.tree=DEBUG #log4j.logger.jaxx.demo.config.DemoConfig=DEBUG log4j.logger.jaxx.runtime.swing.editor.config=INFO #log4j.logger.jaxx.runtime.swing.editor.config.model.ConfigUIModelBuilder=DEBUG Modified: trunk/jaxx-demo/src/test/java/jaxx/demo/BeanValidatorDetectorTest.java =================================================================== --- trunk/jaxx-demo/src/test/java/jaxx/demo/BeanValidatorDetectorTest.java 2010-06-08 17:35:19 UTC (rev 1957) +++ trunk/jaxx-demo/src/test/java/jaxx/demo/BeanValidatorDetectorTest.java 2010-06-08 17:36:46 UTC (rev 1958) @@ -25,8 +25,9 @@ package jaxx.demo; -import jaxx.demo.feature.validation.Model; -import jaxx.demo.feature.validation.Identity; +import jaxx.demo.entities.Identity; +import jaxx.demo.entities.Model; + import java.io.File; import java.util.Iterator; import java.util.SortedSet;

1 0

r1957 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree
by sletellier＠users.nuiton.org 08 Jun '10

08 Jun '10

Author: sletellier Date: 2010-06-08 19:35:19 +0200 (Tue, 08 Jun 2010) New Revision: 1957 Url: http://nuiton.org/repositories/revision/jaxx/1957 Log: Add default usage of AbstractJaxxTreeCellRenderer Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/AbstractJaxxTreeCellRenderer.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/AbstractJaxxTreeCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/AbstractJaxxTreeCellRenderer.java 2010-06-08 13:35:14 UTC (rev 1956) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/AbstractJaxxTreeCellRenderer.java 2010-06-08 17:35:19 UTC (rev 1957) @@ -27,7 +27,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.*; import javax.swing.tree.DefaultTreeCellRenderer; +import java.awt.*; import java.util.HashMap; import java.util.Map; @@ -120,4 +122,23 @@ return text; } + @Override + public Component getTreeCellRendererComponent(JTree tree, + Object value, + boolean sel, + boolean expanded, + boolean leaf, int row, + boolean hasFocus) { + + // get node + N node = (N)value; + + // get text for node + String text = getNodeText(node); + + // Render node + return super.getTreeCellRendererComponent(tree, text, sel, + expanded, leaf, + row, hasFocus); + } }

1 0

r1956 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree
by tchemit＠users.nuiton.org 08 Jun '10

08 Jun '10

Author: tchemit Date: 2010-06-08 15:35:14 +0200 (Tue, 08 Jun 2010) New Revision: 1956 Url: http://nuiton.org/repositories/revision/jaxx/1956 Log: authorize to create childs when no parent is known Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxNodeChildLoador.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxNodeChildLoador.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxNodeChildLoador.java 2010-06-08 13:01:04 UTC (rev 1955) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxNodeChildLoador.java 2010-06-08 13:35:14 UTC (rev 1956) @@ -89,21 +89,31 @@ N containerNode = parentNode.getContainerNode(); + List<O> datas; if (containerNode == null) { + // pas d'ancetre, il doit s'agir d'un premier neoud de données depuis le noeud root + + // recuperation des objets fils (sans connaitre de parent) + datas = getData(null, + null, + source); + // on considere que le container est le parent - containerNode = parentNode; - } +// containerNode = parentNode; + } else { + if (log.isDebugEnabled()) { + log.debug("search data for " + containerNode.getInternalClass() + + " : " + containerNode.getId()); + } - if (log.isDebugEnabled()) { - log.debug("search data for " + containerNode.getInternalClass() + - " : " + containerNode.getId()); + // recuperation des objets fils + datas = getData(containerNode.getInternalClass(), + containerNode.getId(), + source); + } - // recuperation des objets fils - List<O> datas = getData(containerNode.getInternalClass(), - containerNode.getId(), - source); if (datas != null && !datas.isEmpty()) {

1 0

r1955 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree
by tchemit＠users.nuiton.org 08 Jun '10

08 Jun '10

Author: tchemit Date: 2010-06-08 15:01:04 +0200 (Tue, 08 Jun 2010) New Revision: 1955 Url: http://nuiton.org/repositories/revision/jaxx/1955 Log: fix NPE when tree still not in help reformat Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxNode.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxTreeHelper.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxNode.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxNode.java 2010-06-08 10:00:28 UTC (rev 1954) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxNode.java 2010-06-08 13:01:04 UTC (rev 1955) @@ -65,7 +65,7 @@ /** l'objet (optionnel) pour créer les noeuds fils */ protected final JaxxNodeChildLoador<?, N> childLoador; - public JaxxNode(String id) { + protected JaxxNode(String id) { this(String.class, id, null, null); } @@ -294,7 +294,7 @@ @Override public String toString() { - return System.identityHashCode(this) + " :" + id; + return System.identityHashCode(this) + " : " + id; } } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxTreeHelper.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxTreeHelper.java 2010-06-08 10:00:28 UTC (rev 1954) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxTreeHelper.java 2010-06-08 13:01:04 UTC (rev 1955) @@ -226,9 +226,13 @@ return dataProvider; } - public void setTree(JTree tree, TreeSelectionListener listener) { + public void setTree(JTree tree, + boolean addExpandTreeListener, + TreeSelectionListener listener) { this.tree = tree; - this.tree.addTreeWillExpandListener(expandListener); + if (addExpandTreeListener) { + this.tree.addTreeWillExpandListener(expandListener); + } if (listener != null) { this.tree.getSelectionModel().addTreeSelectionListener(listener); } @@ -237,6 +241,9 @@ public AbstractJaxxTreeCellRenderer<N> getTreeCellRenderer() { JTree t = getTree(); + if (t == null) { + return null; + } TreeCellRenderer r = t.getCellRenderer(); return (AbstractJaxxTreeCellRenderer<N>) (r instanceof AbstractJaxxTreeCellRenderer ? r : null); @@ -395,5 +402,11 @@ public void setDataProvider(DataProvider dataProvider) { this.dataProvider = dataProvider; + AbstractJaxxTreeCellRenderer<N> renderer = getTreeCellRenderer(); + if (renderer != null) { + + // dispatch provider to renderer + renderer.setDataProvider(dataProvider); + } } }

1 0

r1954 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree
by tchemit＠users.nuiton.org 08 Jun '10

08 Jun '10

Author: tchemit Date: 2010-06-08 12:00:28 +0200 (Tue, 08 Jun 2010) New Revision: 1954 Url: http://nuiton.org/repositories/revision/jaxx/1954 Log: finalize tree api Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/AbstractJaxxTreeCellRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/DataProvider.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxNode.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxNodeChildLoador.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxTreeHelper.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/AbstractJaxxTreeCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/AbstractJaxxTreeCellRenderer.java 2010-06-07 14:50:20 UTC (rev 1953) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/AbstractJaxxTreeCellRenderer.java 2010-06-08 10:00:28 UTC (rev 1954) @@ -24,7 +24,6 @@ */ package jaxx.runtime.swing.tree; -import jaxx.runtime.swing.navigation.tree.NavigationTreeNode; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -41,42 +40,38 @@ * @author chemit <chemit(a)codelutin.com> * @since 1.2 */ -public abstract class AbstractJaxxTreeCellRenderer extends DefaultTreeCellRenderer { +public abstract class AbstractJaxxTreeCellRenderer<N extends JaxxNode<N>> extends DefaultTreeCellRenderer { /** Logger */ protected static final Log log = LogFactory.getLog(AbstractJaxxTreeCellRenderer.class); /** source de donnée */ - protected DataProvider dataSource; + protected DataProvider dataProvider; /** le cache de rendu */ - protected final Map<JaxxNode, String> renderCache = new HashMap<JaxxNode, String>(); + protected final Map<N, String> renderCache = new HashMap<N, String>(); /** - * Determines the text render of a node using the {@link #dataSource}. + * Determines the text render of a node using the {@link #dataProvider}. * - * @param node - * @return + * @param node the node to render + * @return the text render of the node */ - protected abstract String computeNodeRender(JaxxNode node); + protected abstract String computeNodeText(N node); protected AbstractJaxxTreeCellRenderer() { } - public DataProvider getDataSource() { - - return dataSource; + public DataProvider getDataProvider() { + return dataProvider; } + public void setDataProvider(DataProvider dataProvider) { + this.dataProvider = dataProvider; - public void setDataSource(DataProvider dataSource) { - this.dataSource = dataSource; - if (dataSource != null) { - - // une nouvelle source utilisée, on vide le cache - clearCache(); - } + // une nouvelle source utilisée, on vide le cache + clearCache(); } public void clearCache() { @@ -89,7 +84,7 @@ clearCache(); } - public String getNodeText(JaxxNode node) { + public String getNodeText(N node) { if (node == null) { return null; } @@ -97,55 +92,32 @@ if (node.isDirty() || !renderCache.containsKey(node)) { - // il calculer le rendu du noeud - text = computeRender(node); + // calculer le rendu du noeud + if (node.isStringNode()) { + text = _(node.getId()); + } else { + + text = computeNodeText(node); + } + if (log.isDebugEnabled()) { - log.debug("render for node [" + node + "] = " + text); + log.debug("text for node [" + node + "] = <" + text + ">"); } // sauvegarde dans le cache renderCache.put(node, text); + // le noeud est de nouveau propre node.setDirty(false); } else { + + // recupération directement du rendu dans le cache text = renderCache.get(node); } return text; } - protected String computeRender(JaxxNode node) { - - if (log.isDebugEnabled()) { - log.debug("for node : " + node.getId()); - } - - String text; - - if (node.isStringNode()) { - text = _(node.getId()); - return text; - } - - // not a static node - text = computeNodeRender(node); - - return text; - } - - /** - * @param value the value which should be a node - * @return the cast {@link NavigationTreeNode}, or <code>null</code> if - * value is null. - */ - public static JaxxNode getNode(Object value) { - JaxxNode node = null; - if (value instanceof JaxxNode) { - node = (JaxxNode) value; - } - return node; - } - } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/DataProvider.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/DataProvider.java 2010-06-07 14:50:20 UTC (rev 1953) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/DataProvider.java 2010-06-08 10:00:28 UTC (rev 1954) @@ -25,13 +25,17 @@ package jaxx.runtime.swing.tree; /** - * Contract of provider of data from theire ids. + * Contract of provider of data from their ids. * * @author tchemit <chemit(a)codelutin.com> * @since 2.1 */ public interface DataProvider { - Object getData(String id) throws Exception; + /** + * @return {@code true} is provider is enabled and can provide datas, + * {@code false} otherwise. + */ + boolean isEnabled(); } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxNode.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxNode.java 2010-06-07 14:50:20 UTC (rev 1953) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxNode.java 2010-06-08 10:00:28 UTC (rev 1954) @@ -37,7 +37,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 2.1 */ -public class JaxxNode extends DefaultMutableTreeNode { +public class JaxxNode<N extends JaxxNode<N>> extends DefaultMutableTreeNode { /** Logger */ static private final Log log = LogFactory.getLog(JaxxNode.class); @@ -47,33 +47,39 @@ /** le type de l'objet encapsule dans le noeud */ protected final Class<?> internalClass; + /** + * un nom de context optionnel de context pour pouvoir gérer plusieurs + * types de noeud ayant la même {@link #internalClass}. + */ protected final String context; /** l'id de l'objet encapsule dans le noeud */ protected final String id; - /** un drapeau pour savoir quand il faut recalculer le rendu du noeud */ + /** un drapeau pour savoir quand il faut recalculer les données du noeud */ protected boolean dirty = true; - /** un drapeau a faux tant que les fils n'ont pas ete chargés */ protected boolean loaded; - /** l'objet pour créer les noeuds fils */ - protected final JaxxNodeChildLoador<?> childLoador; + /** l'objet (optionnel) pour créer les noeuds fils */ + protected final JaxxNodeChildLoador<?, N> childLoador; - public JaxxNode(String id) { this(String.class, id, null, null); } - public JaxxNode(Class<?> internalClass, String id, String context, JaxxNodeChildLoador<?> childLoador) { + public JaxxNode(Class<?> internalClass, + String id, + String context, + JaxxNodeChildLoador<?, N> childLoador) { this.internalClass = internalClass; this.id = id; this.context = context; this.childLoador = childLoador; - if (childLoador == null) { - // no child loador, this is a static node + if (isStaticNode()) { + + // A static node is always full loaded loaded = true; } if (log.isDebugEnabled()) { @@ -81,16 +87,6 @@ } } - @Override - public Object getUserObject() { - return id; - } - - @Override - public JaxxNode getParent() { - return (JaxxNode) super.getParent(); - } - public String getId() { return id; } @@ -111,12 +107,70 @@ return dirty; } + @Override + public Object getUserObject() { + return id; + } + + @Override + public N getParent() { + return (N) super.getParent(); + } + + @Override + public N getRoot() { + return (N) super.getRoot(); + } + + @Override + public N getChildAt(int index) { + return (N) super.getChildAt(index); + } + + @Override + public Enumeration<N> children() { + return (Enumeration<N>) super.children(); + } + + @Override + public boolean isLeaf() { + // there is two behaviours for the test : + // 1 - when the node is static, then can directly use his number of child + // to determine if node is a leaf (no child) + // 2 - when the node is dynamic, then ALWAYS says the node is NOT a leaf until + // it is loaded, otherwise the WillExpand listener will not load the childs... + // Once the node is loaded, use back the normal behaviour (count number of childs) + return isStaticNode() ? getChildCount() == 0 : isLoaded() && getChildCount() == 0; + } + + /** + * Convinient method to known if we are on a String typed node. + * + * @return {@code true} if the type of node if + */ public boolean isStringNode() { return String.class.equals(internalClass); } + /** + * To know if the node is static. + * <p/> + * A {@code static} node has no {@link #childLoador}. + * + * @return {@code true} when the node is static : says, the node has + * no {@link #childLoador}. + */ + public boolean isStaticNode() { + return childLoador == null; + } - public JaxxNode getContainerNode() { + /** + * Get the first node form this one to the root which has a none + * {@code String} type. + * + * @return the first concrete node type + */ + public N getContainerNode() { if (isRoot()) { // si on arrive sur le root, quelque chose ne va pas, // on bloque par null, a defaut de declancher une exception @@ -129,85 +183,118 @@ } // cas final : sur un noeud de donnee + classe interne de donnee - return this; + return (N) this; } - @Override - public boolean isLeaf() { - return !loaded || getChildCount() == 0; - } - + /** + * Changes the {@link #dirty} state. + * <p/> + * As a side effect, when a render will use this node, it will force to reload + * the datas from the {@link DataProvider}. + * + * @param dirty the new dirty value + */ public void setDirty(boolean dirty) { this.dirty = dirty; } - @Override - public String toString() { - return System.identityHashCode(this) + " :" + id; - } + public N findNodeById(String id, + DefaultTreeModel model, + DataProvider source) { + if (id == null) { - public JaxxNode findNodeById(String id, - DefaultTreeModel model, - DataProvider source) { - if (id == null) { + // id null ? donc rien a faire return null; } if (id.equals(getId())) { - return this; + + // on a trouve le bon noeud + return (N) this; } + if (!isLoaded()) { - // il faut ouvrir le noeud pour effectuer la recherche + // il faut charger les fils du noeud pour effectuer la recherche populateChilds(model, source); } - if (getChildCount() == 0) { + + if (isLeaf()) { + + // au final le noeud est une feuille, donc ne convient pas return null; } - Enumeration<?> enumeration = children(); + + // on recherche dans les fils + Enumeration<N> enumeration = children(); while (enumeration.hasMoreElements()) { - JaxxNode node = (JaxxNode) enumeration.nextElement(); - JaxxNode nodeById = node.findNodeById(id, model, source); + N node = enumeration.nextElement(); + N nodeById = node.findNodeById(id, model, source); if (nodeById != null) { return nodeById; } } + + // aucun des noeud fils ne convient return null; } - public void populateChilds(DefaultTreeModel model, DataProvider source) { - if (childLoador == null) { - // pas de fils constructible - return; - } - try { - if (log.isDebugEnabled()) { - log.debug("Will load childs for " + this); - } - childLoador.loadChilds(model, this, source); - } catch (Exception e) { - throw new RuntimeException(e); - } finally { - loaded = true; - } - } - + /** + * Pour charger un noeud et optionnellement ces fils. + * <p/> + * Tous les noeuds modifiés (ou chargés) passent à l'état {@code dirty}, et + * donc les rendus seront recalculés. + * + * @param model le modèles content le noeud + * @param provider le provider de données + * @param populateChilds un drapeau pour charger aussi les fils du noeud courant + */ public void populateNode(DefaultTreeModel model, - DataProvider source, + DataProvider provider, boolean populateChilds) { + // on indique que le noeud n'est plus propre setDirty(true); if (populateChilds) { // chargement des fils - populateChilds(model, source); + populateChilds(model, provider); } + } - if (isStringNode()) { + /** + * Pour charger les fils d'un noeud en utilisant le {@link #childLoador}. + * <p/> + * Si le noeud est static (i.e n'a pas de childLoador), on ne fait rien. + * + * @param model le modèle contenant le noeud + * @param provider le provider de données + */ + public void populateChilds(DefaultTreeModel model, DataProvider provider) { + if (isStaticNode()) { + + // noeud static, rien a faire return; } - throw new IllegalStateException("Cano not populate node [" + internalClass + ":" + id + "]"); + // chargement des noeuds fils du noeud courant + try { + if (log.isDebugEnabled()) { + log.debug("Will load childs for " + this); + } + childLoador.loadChilds(model, (N) this, provider); + } catch (Exception e) { + throw new RuntimeException(e.getMessage(), e); + } finally { + + // au final, on passe le noeud a l'état chargé + loaded = true; + } } + @Override + public String toString() { + return System.identityHashCode(this) + " :" + id; + } + } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxNodeChildLoador.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxNodeChildLoador.java 2010-06-07 14:50:20 UTC (rev 1953) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxNodeChildLoador.java 2010-06-08 10:00:28 UTC (rev 1954) @@ -37,34 +37,44 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.4 */ -public abstract class JaxxNodeChildLoador<O> implements Serializable { +public abstract class JaxxNodeChildLoador<O, N extends JaxxNode<N>> implements Serializable { /** Logger */ - static private final Log log = - LogFactory.getLog(JaxxNodeChildLoador.class); + static private final Log log = LogFactory.getLog(JaxxNodeChildLoador.class); + /** Type of data of the node */ protected final Class<O> beanType; - protected transient DataProvider dataService; - - public JaxxNodeChildLoador(Class<O> beanType) { + protected JaxxNodeChildLoador(Class<O> beanType) { this.beanType = beanType; } + /** + * Obtain the list of data to put in childs. + * + * @param parentClass type of parent + * @param parentId id of parent + * @param dataProvider the data provider + * @return the list of data + * @throws Exception if any problem + */ public abstract List<O> getData(Class<?> parentClass, String parentId, - DataProvider dataService); + DataProvider dataProvider) throws Exception; - public abstract JaxxNode createNode(JaxxNode parentNode, O data); + /** + * Hook to create a child node given his {@code data}. + * + * @param parentNode the parent node + * @param data the data of the node to create + * @return the created node + */ + public abstract N createNode(N parentNode, O data); public Class<O> getBeanType() { return beanType; } - public DataProvider getDataService() { - return dataService; - } - /** * Charge les fils du noeud parent donne. * @@ -74,10 +84,10 @@ * @throws Exception pour tout probleme de recuperation de donnees */ public void loadChilds(DefaultTreeModel model, - JaxxNode parentNode, + N parentNode, DataProvider source) throws Exception { - JaxxNode containerNode = parentNode.getContainerNode(); + N containerNode = parentNode.getContainerNode(); if (containerNode == null) { @@ -109,19 +119,21 @@ model.nodesWereInserted(parentNode, indices); } - protected void addChildNodes(JaxxNode parentNode, List<O> datas) { + protected void addChildNodes(N parentNode, List<O> datas) { // creation des noeuds fils for (O o : datas) { - log.info("[" + parentNode + "] Will add child node for " + o); - JaxxNode node = createNode(parentNode, o); + if (log.isInfoEnabled()) { + log.info("[" + parentNode + "] Will add child node for " + o); + } + N node = createNode(parentNode, o); parentNode.add(node); } } - protected void notifyChildChildAdded(DefaultTreeModel model, JaxxNode parentNode) { + protected void notifyChildChildAdded(DefaultTreeModel model, N parentNode) { // notifie le modele d'un ajout de noeuds for (int i = 0; i < parentNode.getChildCount(); i++) { - JaxxNode at = (JaxxNode) parentNode.getChildAt(i); + N at = parentNode.getChildAt(i); model.nodesWereInserted(at, new int[]{0}); } } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxTreeHelper.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxTreeHelper.java 2010-06-07 14:50:20 UTC (rev 1953) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxTreeHelper.java 2010-06-08 10:00:28 UTC (rev 1954) @@ -50,7 +50,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 2.1 */ -public class JaxxTreeHelper { +public class JaxxTreeHelper<N extends JaxxNode<N>> { /** Logger */ static private final Log log = LogFactory.getLog(JaxxTreeHelper.class); @@ -61,7 +61,8 @@ /** l'arbre utilisation le model */ protected JTree tree; - protected DataProvider dataSource; + /** data provider */ + protected DataProvider dataProvider; /** * pour charger les fils d'un noeud lorsqu'on l'ouvre. Cela permet de @@ -90,8 +91,8 @@ if (e.getPath() == null) { return; } - JaxxNode node = - (JaxxNode) e.getPath().getLastPathComponent(); + JaxxNode<?> node = + (JaxxNode<?>) e.getPath().getLastPathComponent(); if (log.isDebugEnabled()) { log.debug("for node " + node); @@ -123,7 +124,7 @@ DefaultTreeModel model = (DefaultTreeModel) ((JTree) event.getSource()).getModel(); - JaxxNode source = (JaxxNode) + JaxxNode<?> source = (JaxxNode<?>) event.getPath().getLastPathComponent(); if (log.isDebugEnabled()) { log.debug("will expand node " + source); @@ -147,9 +148,10 @@ treeModelListener = new TreeModelListener() { @Override public void treeNodesChanged(TreeModelEvent e) { - JaxxNode source = (JaxxNode) e.getTreePath().getLastPathComponent(); + JaxxNode<?> source = (JaxxNode<?>) e.getTreePath().getLastPathComponent(); DefaultTreeModel model = (DefaultTreeModel) e.getSource(); - source.populateNode(model, getDataProvider(), false); + DataProvider dataProvider = getDataProvider(); + source.populateNode(model, dataProvider, false); if (log.isDebugEnabled()) { String message = getLogMessage(e, source); log.debug(message); @@ -157,17 +159,18 @@ Object[] children = e.getChildren(); if (children != null) { for (Object o : children) { - JaxxNode child = (JaxxNode) o; - child.populateNode(model, getDataProvider(), false); + JaxxNode<?> child = (JaxxNode<?>) o; + child.populateNode(model, dataProvider, false); } } } @Override public void treeNodesInserted(TreeModelEvent e) { - JaxxNode source = (JaxxNode) e.getTreePath().getLastPathComponent(); + JaxxNode<?> source = (JaxxNode<?>) e.getTreePath().getLastPathComponent(); DefaultTreeModel model = (DefaultTreeModel) e.getSource(); - source.populateNode(model, getDataProvider(), false); + DataProvider dataProvider = getDataProvider(); + source.populateNode(model, dataProvider, false); if (log.isDebugEnabled()) { String message = getLogMessage(e, source); log.debug(message); @@ -175,15 +178,15 @@ Object[] children = e.getChildren(); if (children != null) { for (Object o : children) { - JaxxNode child = (JaxxNode) o; - child.populateNode(model, getDataProvider(), false); + JaxxNode<?> child = (JaxxNode<?>) o; + child.populateNode(model, dataProvider, false); } } } @Override public void treeNodesRemoved(TreeModelEvent e) { - JaxxNode source = (JaxxNode) e.getTreePath().getLastPathComponent(); + JaxxNode<?> source = (JaxxNode<?>) e.getTreePath().getLastPathComponent(); if (log.isDebugEnabled()) { String message = getLogMessage(e, source); log.debug(message); @@ -192,9 +195,10 @@ @Override public void treeStructureChanged(TreeModelEvent e) { - JaxxNode source = (JaxxNode) e.getTreePath().getLastPathComponent(); + JaxxNode<?> source = (JaxxNode<?>) e.getTreePath().getLastPathComponent(); DefaultTreeModel model = (DefaultTreeModel) e.getSource(); - source.populateNode(model, getDataProvider(), false); + DataProvider dataProvider = getDataProvider(); + source.populateNode(model, dataProvider, false); if (log.isDebugEnabled()) { String message = getLogMessage(e, source); log.debug(message); @@ -202,13 +206,13 @@ Object[] children = e.getChildren(); if (children != null) { for (Object o : children) { - JaxxNode child = (JaxxNode) o; - child.populateNode(model, getDataProvider(), true); + JaxxNode<?> child = (JaxxNode<?>) o; + child.populateNode(model, dataProvider, true); } } } - protected String getLogMessage(TreeModelEvent e, JaxxNode source) { + protected String getLogMessage(TreeModelEvent e, JaxxNode<?> source) { String message = source.getInternalClass() + " - " + source.getId() + " : " + source.getUserObject() + "\n" + "children indices : " + @@ -219,7 +223,7 @@ } protected DataProvider getDataProvider() { - return dataSource; + return dataProvider; } public void setTree(JTree tree, TreeSelectionListener listener) { @@ -231,10 +235,10 @@ this.tree.getSelectionModel().addTreeSelectionListener(selectionListener); } - public AbstractJaxxTreeCellRenderer getTreeCellRenderer() { + public AbstractJaxxTreeCellRenderer<N> getTreeCellRenderer() { JTree t = getTree(); TreeCellRenderer r = t.getCellRenderer(); - return (AbstractJaxxTreeCellRenderer) + return (AbstractJaxxTreeCellRenderer<N>) (r instanceof AbstractJaxxTreeCellRenderer ? r : null); } @@ -252,27 +256,25 @@ * @param deep un flag pour activer la repainte de la descendance du * noeud */ - public void refreshNode(JaxxNode node, boolean deep) { + public void refreshNode(N node, boolean deep) { if (log.isDebugEnabled()) { log.debug(node); } model.nodeChanged(node); if (deep) { // repaint childs nodes - //todo we should only repaint necessary nodes ? - Enumeration<?> e = node.children(); + Enumeration<N> e = node.children(); while (e.hasMoreElements()) { - JaxxNode child = (JaxxNode) e.nextElement(); + N child = e.nextElement(); refreshNode(child, true); } } } - /** Sélection du parent du noeud selectionne dans l'arbre de navigation. */ public void selectParentNode() { - JaxxNode node = getSelectedNode(); + N node = getSelectedNode(); if (node == null) { // pas de noeud selectionne @@ -283,19 +285,19 @@ selectNode(node); } - public JaxxNode getSelectedNode() { + public N getSelectedNode() { JTree tree = getTree(); TreePath path = tree.getSelectionPath(); - JaxxNode node = null; + N node = null; if (path != null) { - node = (JaxxNode) path.getLastPathComponent(); + node = (N) path.getLastPathComponent(); } return node; } public String[] getSelectedIds() { List<String> result = new ArrayList<String>(); - JaxxNode selectedNode = getSelectedNode(); + JaxxNode<?> selectedNode = getSelectedNode(); while (selectedNode != null && !selectedNode.isRoot()) { result.add(selectedNode.getId()); @@ -311,8 +313,8 @@ * @param path le path absolue du noeud dans l'arbre */ public void selectNode(String... path) { - JaxxNode root = (JaxxNode) model.getRoot(); - JaxxNode node = findNode(root, path); + N root = (N) model.getRoot(); + N node = findNode(root, path); if (log.isDebugEnabled()) { log.debug(Arrays.toString(path) + " :: " + node); } @@ -326,7 +328,7 @@ * * @param node le noeud à sélectionner dans l'arbre */ - public void selectNode(JaxxNode node) { + public void selectNode(N node) { if (log.isDebugEnabled()) { log.debug(node); @@ -337,8 +339,8 @@ tree.scrollPathToVisible(path); } - public JaxxNode findNode(JaxxNode node, String... ids) { - JaxxNode result = null; + public N findNode(N node, String... ids) { + N result = null; for (String id : ids) { result = node.findNodeById(id, model, getDataProvider()); @@ -353,135 +355,35 @@ return result; } - public JaxxNode removeChildNode(JaxxNode node) { - JaxxNode parentNode = node.getParent(); + public N removeChildNode(N node) { + N parentNode = node.getParent(); model.removeNodeFromParent(node); return parentNode; } - public void moveNode(JaxxNode parentNode, JaxxNode node, int position) { + public void moveNode(N parentNode, N node, int position) { parentNode.remove(node); parentNode.insert(node, position); model.nodeStructureChanged(parentNode); } -// public JaxxNode addUnsavedNode(JaxxNode parentNode, Class<?> type) { -// -// // noeud en mode creation -// String label = decoratorService.getEntityLabel(type) + ".unsaved"; -// JaxxNode result = new JaxxNode(type, null, label, false, null); -// parentNode.add(result); -// model.nodesWereInserted(parentNode, new int[]{parentNode.getIndex(result)}); -// return result; -// } -// -// public JaxxNode addMaree(JaxxNode parentNode, Maree bean) { -// JaxxNode result; -// if (bean == null) { -// throw new NullPointerException("Ne peut pas ajouter un objet null"); -// } -// -// result = new JaxxNode(Maree.class, bean.getTopiaId(), false, null); -// -// // Creation d'un node routes -// JaxxNode child = new JaxxNode( -// String.class, -// n_("observe.common.routes"), -// Maree.PROPERTY_ROUTE, -// false, -// new RoutesNodeChildLoador() -// ); -// result.add(child); -// parentNode.add(result); -// -// model.nodesWereInserted(parentNode, new int[]{parentNode.getIndex(result)}); -// model.nodesWereInserted(result, new int[]{result.getIndex(child)}); -// return result; -// } -// -// public JaxxNode addRoute(JaxxNode parentNode, Route bean) { -// JaxxNode result; -// if (bean == null) { -// throw new NullPointerException("Ne peut pas ajouter un objet null"); -// } -// result = new JaxxNode(Route.class, bean.getTopiaId(), false, null); -// -// // Creation d'un node activites -// JaxxNode child = new JaxxNode( -// String.class, -// n_("observe.common.activites"), -// Route.PROPERTY_ACTIVITE, -// false, -// new ActivitesNodeChildLoador() -// ); -// result.add(child); -// parentNode.add(result); -// -// model.nodesWereInserted(parentNode, new int[]{parentNode.getIndex(result)}); -// model.nodesWereInserted(result, new int[]{result.getIndex(child)}); -// return result; -// } -// -// public JaxxNode addActivite(JaxxNode parentNode, Activite bean) { -// JaxxNode result; -// if (bean == null) { -// throw new NullPointerException("Ne peut pas ajouter un objet null"); -// } -// result = new JaxxNode(Activite.class, -// bean.getTopiaId(), -// false, -// new ActiviteNodeChildLoador()); -// parentNode.add(result); -// -// model.nodesWereInserted(parentNode, new int[]{parentNode.getIndex(result)}); -// return result; -// } -// -// public JaxxNode addObjetFlottant(JaxxNode parentNode, ObjetFlottant bean) { -// JaxxNode result; -// if (bean == null) { -// throw new NullPointerException("Ne peut pas ajouter un objet null"); -// } -// result = new JaxxNode(ObjetFlottant.class, bean.getTopiaId(), false, new ObjetFlottantNodeChildLoador()); -// parentNode.add(result); -// -// model.nodesWereInserted(parentNode, new int[]{parentNode.getIndex(result)}); -// return result; -// } -// -// public JaxxNode addCalee(JaxxNode parentNode, Calee bean) { -// JaxxNode result; -// if (bean == null) { -// throw new NullPointerException("Ne peut pas ajouter un objet null"); -// } -// result = new JaxxNode(Calee.class, bean.getTopiaId(), false, new CaleeNodeChildLoador()); -// parentNode.add(result); -// -// model.nodesWereInserted(parentNode, new int[]{parentNode.getIndex(result)}); -// return result; -// } - protected JTree getTree() { return tree; } - protected DefaultTreeModel createModel(JaxxNode node) { + protected DefaultTreeModel createModel(N node) { model = new DefaultTreeModel(node); model.addTreeModelListener(treeModelListener); return model; } public void reloadModel(JTree tree) { - -// DataSelectionTreeCellRenderer r = (DataSelectionTreeCellRenderer) tree.getCellRenderer(); -// r.clearCache(); -// tree.clearSelection(); DefaultTreeModel model = (DefaultTreeModel) tree.getModel(); TreeNode node = (TreeNode) model.getRoot(); reload(model, node); } - private void reload(DefaultTreeModel model, TreeNode node) { + protected void reload(DefaultTreeModel model, TreeNode node) { model.nodeChanged(node); Enumeration<?> enumeration = node.children(); while (enumeration.hasMoreElements()) { @@ -491,7 +393,7 @@ } } - public void setDataProvider(DataProvider dataSource) { - this.dataSource = dataSource; + public void setDataProvider(DataProvider dataProvider) { + this.dataProvider = dataProvider; } }

1 0