Author: tchemit Date: 2010-06-14 18:15:35 +0200 (Mon, 14 Jun 2010) New Revision: 1971 Url: http://nuiton.org/repositories/revision/jaxx/1971 Log: improve demo (use import tag :)) Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/AbstractContentUI.jaxx Removed: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/ContentUI.jaxx Modified: trunk/jaxx-demo/pom.xml trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemo.jaxx 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 Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2010-06-14 15:47:37 UTC (rev 1970) +++ trunk/jaxx-demo/pom.xml 2010-06-14 16:15:35 UTC (rev 1971) @@ -101,7 +101,7 @@ <properties> - <main.class>jaxx.demo.RunDemo</main.class> + <maven.jar.main.class>jaxx.demo.RunDemo</maven.jar.main.class> <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> @@ -144,7 +144,7 @@ <configuration> <archive> <manifest> - <mainClass>${main.class}</mainClass> + <!--<mainClass>${maven.jar.main.class}</mainClass>--> <useUniqueVersions>false</useUniqueVersions> <addClasspath>true</addClasspath> <classpathPrefix>./lib/</classpathPrefix> 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-14 15:47:37 UTC (rev 1970) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemo.jaxx 2010-06-14 16:15:35 UTC (rev 1971) @@ -24,21 +24,22 @@ <jaxx.demo.DemoPanel> - <CardLayout2 id='contentLayout'/> + <import> + jaxx.runtime.decorator.DecoratorProvider + jaxx.demo.component.jaxx.tree.content.ActorContentUI + jaxx.demo.component.jaxx.tree.content.ActorsContentUI + jaxx.demo.component.jaxx.tree.content.MovieContentUI + jaxx.demo.component.jaxx.tree.content.MoviesContentUI + jaxx.demo.entities.Movie + jaxx.demo.entities.People + javax.swing.tree.TreePath + java.lang.reflect.Constructor + jaxx.demo.component.jaxx.tree.content.AbstractContentUI + </import> + + <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; -import java.lang.reflect.Constructor; -import jaxx.demo.component.jaxx.tree.content.ContentUI; - + <script><![CDATA[ private JaxxTreeDemoDataProvider dataProvider = new JaxxTreeDemoDataProvider(); private JaxxTreeDemoHelper helper = new JaxxTreeDemoHelper(dataProvider); @@ -135,10 +136,10 @@ } // Create by introspection content ui -protected <B> void showUI(B bean, Class<? extends ContentUI> uiClass) { +protected <B> void showUI(B bean, Class<? extends AbstractContentUI> uiClass) { // Verify if instance is existing - ContentUI ui = getContentIfExist(uiClass); + AbstractContentUI ui = getContentIfExist(uiClass); // Get layout identifier String contentName = uiClass.getName(); @@ -146,7 +147,7 @@ if (ui == null) { try { // Get constructor - Constructor<? extends ContentUI> constructor = + Constructor<? extends AbstractContentUI> constructor = uiClass.getConstructor(JAXXContext.class); // Invoke instance creation @@ -176,33 +177,33 @@ if (!contentLayout.contains(contentName)) { return null; } - return (E)contentLayout.getComponent(content, contentName); + return (E) contentLayout.getComponent(content, contentName); } ]]> - </script> + </script> - <JPanel id='demoPanel' layout='{new BorderLayout()}'> + <JPanel id='demoPanel' layout='{new BorderLayout()}'> - <JSplitPane id='splitPane' - constraints='BorderLayout.CENTER' - oneTouchExpandable='true'> + <JSplitPane id='splitPane' + constraints='BorderLayout.CENTER' + oneTouchExpandable='true'> - <JScrollPane border='{null}' - horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}' - verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_NEVER}'> + <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> + <JTree id="navigation" + font-size='11' + rootVisible='false' + showsRootHandles='false' + model='{helper.createTreeModel()}'/> - <JPanel id="content" layout="{contentLayout}" /> + </JScrollPane> - </JSplitPane> + <JPanel id="content" layout="{contentLayout}"/> - </JPanel> + </JSplitPane> + </JPanel> + </jaxx.demo.DemoPanel> Copied: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/AbstractContentUI.jaxx (from rev 1970, 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/AbstractContentUI.jaxx (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/AbstractContentUI.jaxx 2010-06-14 16:15:35 UTC (rev 1971) @@ -0,0 +1,42 @@ +<!-- + #%L + JAXX :: Demo + $Id: AbstractContentUI.jaxx 1861 2010-04-29 14:16:39Z tchemit $ + $HeadURL: http://svn.nuiton.org/svn/jaxx/trunk/jaxx-demo/src/main/java/jaxx/demo/compo... $ + %% + 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% + --> + +<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/ActorContentUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/ActorContentUI.jaxx 2010-06-14 15:47:37 UTC (rev 1970) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/ActorContentUI.jaxx 2010-06-14 16:15:35 UTC (rev 1971) @@ -22,8 +22,11 @@ #L% --> -<ContentUI superGenericType='People'> +<AbstractContentUI superGenericType='People'> + <import> + jaxx.demo.entities.* + </import> <script><![CDATA[ import jaxx.demo.entities.*; @@ -71,4 +74,4 @@ </JScrollPane> </JSplitPane> -</ContentUI> \ No newline at end of file +</AbstractContentUI> \ 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-14 15:47:37 UTC (rev 1970) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/ActorsContentUI.jaxx 2010-06-14 16:15:35 UTC (rev 1971) @@ -22,7 +22,7 @@ #L% --> -<ContentUI superGenericType='java.util.List<People>'> +<AbstractContentUI superGenericType='java.util.List<People>'> <script><![CDATA[ import jaxx.demo.entities.*; @@ -82,4 +82,4 @@ </JToolBar> </JPanel> -</ContentUI> \ No newline at end of file +</AbstractContentUI> \ No newline at end of file Deleted: 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 2010-06-14 15:47:37 UTC (rev 1970) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/ContentUI.jaxx 2010-06-14 16:15:35 UTC (rev 1971) @@ -1,42 +0,0 @@ -<!-- - #%L - JAXX :: Demo - $Id: ContentUI.jaxx 1861 2010-04-29 14:16:39Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/jaxx/trunk/jaxx-demo/src/main/java/jaxx/demo/compo... $ - %% - 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% - --> - -<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-14 15:47:37 UTC (rev 1970) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/MovieContentUI.jaxx 2010-06-14 16:15:35 UTC (rev 1971) @@ -22,7 +22,7 @@ #L% --> -<ContentUI superGenericType='Movie'> +<AbstractContentUI superGenericType='Movie'> <script><![CDATA[ import jaxx.demo.entities.*; @@ -70,4 +70,4 @@ </JScrollPane> </JSplitPane> -</ContentUI> \ No newline at end of file +</AbstractContentUI> \ 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-14 15:47:37 UTC (rev 1970) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/content/MoviesContentUI.jaxx 2010-06-14 16:15:35 UTC (rev 1971) @@ -22,15 +22,18 @@ #L% --> -<ContentUI superGenericType='java.util.List<Movie>'> +<AbstractContentUI + superGenericType='java.util.List<Movie>'> - <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; + <import> + jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer + jaxx.demo.entities.* + jaxx.runtime.binding.SimpleJAXXObjectBinding + java.beans.PropertyChangeEvent + java.beans.PropertyChangeListener + jaxx.demo.component.jaxx.tree.JaxxTreeDemoHelper + </import> + <script><![CDATA[ private void $afterCompleteSetup() { @@ -59,31 +62,34 @@ } ]]></script> - <java.util.List id='data' genericType='Movie' javaBean='null'/> + <java.util.List id='data' genericType='Movie' javaBean='null'/> - <JPanel layout='{new BorderLayout()}'> + <JPanel layout='{new BorderLayout()}'> - <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 + 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)}'/> + <JList id='list' model='{new DefaultListModel()}' + cellRenderer='{getContextValue(DecoratorProviderListCellRenderer.class)}'/> - </JScrollPane> + </JScrollPane> - <JToolBar id='toolbar' opaque='false' constraints='BorderLayout.SOUTH' - floatable='false'> + <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 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 + </JPanel> +</AbstractContentUI> \ No newline at end of file