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

r2549 - trunk/jaxx-demo
by tchemit＠users.nuiton.org Dec. 30, 2012

Dec. 30, 2012

Author: tchemit Date: 2012-12-30 16:03:11 +0100 (Sun, 30 Dec 2012) New Revision: 2549 Url: http://nuiton.org/projects/jaxx/repository/revisions/2549 Log: optimize dependencies Modified: trunk/jaxx-demo/pom.xml Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2012-12-30 14:54:59 UTC (rev 2548) +++ trunk/jaxx-demo/pom.xml 2012-12-30 15:03:11 UTC (rev 2549) @@ -89,11 +89,6 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency>

1 0

r2548 - trunk/jaxx-demo
by tchemit＠users.nuiton.org Dec. 30, 2012

Dec. 30, 2012

Author: tchemit Date: 2012-12-30 15:54:59 +0100 (Sun, 30 Dec 2012) New Revision: 2548 Url: http://nuiton.org/projects/jaxx/repository/revisions/2548 Log: optimize dependencies Modified: trunk/jaxx-demo/pom.xml Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2012-12-30 14:45:45 UTC (rev 2547) +++ trunk/jaxx-demo/pom.xml 2012-12-30 14:54:59 UTC (rev 2548) @@ -89,6 +89,11 @@ </dependency> <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency>

1 0

r2547 - trunk
by tchemit＠users.nuiton.org Dec. 30, 2012

Dec. 30, 2012

Author: tchemit Date: 2012-12-30 15:45:45 +0100 (Sun, 30 Dec 2012) New Revision: 2547 Url: http://nuiton.org/projects/jaxx/repository/revisions/2547 Log: fixes #2498: Updates rsyntaxtextarea to 2.0.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-30 14:38:14 UTC (rev 2546) +++ trunk/pom.xml 2012-12-30 14:45:45 UTC (rev 2547) @@ -273,7 +273,7 @@ <dependency> <groupId>com.fifesoft</groupId> <artifactId>rsyntaxtextarea</artifactId> - <version>1.5.2</version> + <version>2.0.2</version> </dependency>

1 0

r2546 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
by tchemit＠users.nuiton.org Dec. 30, 2012

Dec. 30, 2012

Author: tchemit Date: 2012-12-30 15:38:14 +0100 (Sun, 30 Dec 2012) New Revision: 2546 Url: http://nuiton.org/projects/jaxx/repository/revisions/2546 Log: reformat code Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java 2012-12-30 14:36:31 UTC (rev 2545) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java 2012-12-30 14:38:14 UTC (rev 2546) @@ -25,15 +25,15 @@ package jaxx.runtime.swing.editor.bean; -import org.nuiton.util.decorator.DecoratorUtil; -import org.nuiton.util.decorator.JXPathDecorator; -import org.nuiton.util.decorator.MultiJXPathDecorator; import jaxx.runtime.swing.JAXXButtonGroup; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import org.apache.commons.collections.primitives.ArrayIntList; import org.apache.commons.collections.primitives.IntList; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.decorator.DecoratorUtil; +import org.nuiton.util.decorator.JXPathDecorator; +import org.nuiton.util.decorator.MultiJXPathDecorator; import javax.swing.DefaultListModel; import javax.swing.JComponent; @@ -50,14 +50,15 @@ * Note: ce handler n'est pas stateless et n'est donc pas partageable entre * plusieurs ui. * + * @param <O> le type des objet contenus dans le modèle du composant. * @author tchemit <chemit(a)codelutin.com> - * @param <O> le type des objet contenus dans le modèle du composant. * @see BeanListHeader * @since 2.2 */ public class BeanListHeaderHandler<O> implements PropertyChangeListener { - public static final Log log = LogFactory.getLog(BeanListHeaderHandler.class); + public static final Log log = + LogFactory.getLog(BeanListHeaderHandler.class); /** ui if the handler */ protected BeanListHeader<O> ui; @@ -203,7 +204,7 @@ // reload the model ListModel listModel = ui.getList().getModel(); - if( listModel instanceof DefaultListModel) { + if (listModel instanceof DefaultListModel) { DefaultListModel model = (DefaultListModel) listModel; model.removeAllElements(); for (O data : datas) { @@ -284,6 +285,6 @@ public O getSelectedValue() { JList list = ui.getList(); - return list==null?null: (O) list.getSelectedValue(); + return list == null ? null : (O) list.getSelectedValue(); } }

1 0

r2545 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
by tchemit＠users.nuiton.org Dec. 30, 2012

Dec. 30, 2012

Author: tchemit Date: 2012-12-30 15:36:31 +0100 (Sun, 30 Dec 2012) New Revision: 2545 Url: http://nuiton.org/projects/jaxx/repository/revisions/2545 Log: fixes #2497: [BeanDoubleList] Use widget with no model Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java 2012-12-30 14:33:33 UTC (rev 2544) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java 2012-12-30 14:36:31 UTC (rev 2545) @@ -77,16 +77,14 @@ public void init(JXPathDecorator<O> decorator, List<O> universe, List<O> selected) { this.decorator = BeanUIUtil.createDecorator(decorator); - mutator = BeanUIUtil.getMutator(ui.getBean(), ui.getProperty()); - ui.getModel().setUniverse(universe); ui.getModel().setSelected(selected); JList universeList = ui.getUniverseList(); JList selectedList = ui.getSelectedList(); - universeList.setCellRenderer(new DecoratorListCellRenderer(this.decorator)); - selectedList.setCellRenderer(new DecoratorListCellRenderer(this.decorator)); + universeList.setCellRenderer(new DecoratorListCellRenderer(decorator)); + selectedList.setCellRenderer(new DecoratorListCellRenderer(decorator)); // When universe list selection model changed, update the add button enabled property universeList.getSelectionModel().addListSelectionListener(new ListSelectionListener() { @@ -166,14 +164,19 @@ } protected void fireSelectionUpdate() { - if (ui.getBean() == null) { - return; + if (ui.getBean() != null && getMutator() != null) { + try { + getMutator().invoke(ui.getBean(), ui.getModel().getSelected()); + } catch (Exception e) { + throw new RuntimeException(e); + } } - try { - mutator.invoke(ui.getBean(), ui.getModel().getSelected()); - } catch (Exception e) { - throw new RuntimeException(e); + } + + public Method getMutator() { + if (mutator == null && ui.getBackground() != null && ui.getProperty() != null) { + mutator = BeanUIUtil.getMutator(ui.getBean(), ui.getProperty()); } + return mutator; } - }

1 0

r2544 - in trunk/jaxx-demo: . src/main/java/jaxx/demo/component/jaxx/editor src/main/java/jaxx/demo/feature/nav/content src/main/java/jaxx/demo/tree src/main/resources/i18n
by tchemit＠users.nuiton.org Dec. 30, 2012

Dec. 30, 2012

Author: tchemit Date: 2012-12-30 15:33:33 +0100 (Sun, 30 Dec 2012) New Revision: 2544 Url: http://nuiton.org/projects/jaxx/repository/revisions/2544 Log: fixes #2495: Add BeanComboBox demo refs #2494: Use the genericType to fill the beanType property on BeanTypeAware widgets (use it in demo!) Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.css trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java Modified: trunk/jaxx-demo/pom.xml trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/AbstractContentUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorContentUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorsContentUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MovieContentUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MoviesContentUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2012-12-30 14:32:25 UTC (rev 2543) +++ trunk/jaxx-demo/pom.xml 2012-12-30 14:33:33 UTC (rev 2544) @@ -132,11 +132,6 @@ <artifactId>rsyntaxtextarea</artifactId> </dependency> -  - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> @@ -165,6 +160,7 @@ <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> <jaxx.autoImportCss>true</jaxx.autoImportCss> + <jaxx.autoRecurseInCss>false</jaxx.autoRecurseInCss>  <license.generateBundle>true</license.generateBundle> Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.css =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.css (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.css 2012-12-30 14:33:33 UTC (rev 2544) @@ -0,0 +1,56 @@ +/* + * #%L + * JAXX :: Demo + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 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% + */ +#configurationPanel { + border: {new TitledBorder(_("jaxxdemo.beancomboboxdemo.configuration"))}; +} + +#autoCompleteButton { + text: "jaxxdemo.beancomboboxdemo.autoComplete"; + selected: true; +} + +#showResetButton { + text: "jaxxdemo.beancomboboxdemo.showReset"; + selected: true; +} + +#showDecoratorButton { + text: "jaxxdemo.beancomboboxdemo.showDecorator"; + selected: true; +} + +#comboBox { + i18nPrefix: "jaxxdemo.common."; + autoComplete: {autoCompleteButton.isSelected()}; + showReset: {showResetButton.isSelected()}; + showDecorator: {showDecoratorButton.isSelected()}; +} + +#resultPanel { + border: {new TitledBorder(_("jaxxdemo.beancomboboxdemo.result"))}; +} + +#selectedResult { + text: {handler.getSelectedResult((People) comboBox.getSelectedItem())}; +} Property changes on: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jaxx (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jaxx 2012-12-30 14:33:33 UTC (rev 2544) @@ -0,0 +1,75 @@ + +<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> + + <import> + jaxx.demo.entities.People + jaxx.runtime.swing.editor.bean.BeanComboBox + </import> + + <BeanComboBoxDemoHandler id='handler' constructorParams='this'/> + + <Table insets='0' fill='both' weightx='1' constraints='BorderLayout.NORTH'> + <row> + <cell> + <JPanel id='configurationPanel' layout='{new GridLayout(0,1)}'> + <JCheckBox id='autoCompleteButton'/> + <JCheckBox id='showResetButton'/> + <JCheckBox id='showDecoratorButton'/> + </JPanel> + </cell> + </row> + <row> + <cell> + <BeanComboBox id='comboBox' genericType='People'/> + </cell> + </row> + <row> + <cell> + <JPanel id='resultPanel' layout='{new BorderLayout()}'> + <JLabel id='selectedResult' constraints='BorderLayout.CENTER'/> + </JPanel> + </cell> + </row> + </Table> + + <script><![CDATA[ + +protected void $afterCompleteSetup() { + handler.init(); +} + +@Override +protected String[] getSources() { + return new String[]{ + getDefaultSource(), + "BeanComboBoxDemo.css", + "BeanComboBoxDemo.java", + "BeanComboBoxDemoHandler.java" + }; +} + +]]></script> + +</jaxx.demo.DemoPanel> \ No newline at end of file Property changes on: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jaxx ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java 2012-12-30 14:33:33 UTC (rev 2544) @@ -0,0 +1,78 @@ +package jaxx.demo.component.jaxx.editor; + +/* + * #%L + * JAXX :: Demo + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 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% + */ + +import jaxx.demo.entities.DemoDataProvider; +import jaxx.demo.entities.DemoDecoratorProvider; +import jaxx.demo.entities.People; +import org.nuiton.util.decorator.JXPathDecorator; + +import java.util.List; + +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; + +/** + * Handlerof {@link BeanComboBoxDemo}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.5.9 + */ +public class BeanComboBoxDemoHandler { + + private final BeanComboBoxDemo ui; + + private final JXPathDecorator<People> decorator; + + public BeanComboBoxDemoHandler(BeanComboBoxDemo ui) { + this.ui = ui; + this.decorator = (JXPathDecorator<People>) + new DemoDecoratorProvider().getDecoratorByType(People.class); + } + + public void init() { + List<People> data = new DemoDataProvider().getPeoples(); + + ui.getComboBox().init(decorator, data); + } + + public String getSelectedResult(People people) { + String result; + + if (people == null) { + result = _("jaxxdemo.beancomboboxdemo.no.people.selected"); + } else { + result = _("jaxxdemo.beancomboboxdemo.selected.people", decorator.toString(people)); + } + return result; + } + + static { + n_("jaxxdemo.common.people"); + n_("jaxxdemo.common.firstName"); + n_("jaxxdemo.common.lastName"); + n_("jaxxdemo.common.age"); + } +} Property changes on: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx 2012-12-30 14:32:25 UTC (rev 2543) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx 2012-12-30 14:33:33 UTC (rev 2544) @@ -1,3 +1,26 @@ + <jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> @@ -10,7 +33,7 @@ <Table fill='both'> <row> <cell weighty='1' weightx='1'> - <BeanDoubleList id='doubleList' beanType='{People.class}'/> + <BeanDoubleList id='doubleList' genericType='People'/> </cell> </row> </Table> @@ -21,6 +44,14 @@ handler.init(); } +@Override +protected String[] getSources() { + return new String[]{ + getDefaultSource(), + "BeanDoubleListDemoHandler.java", + }; +} + ]]></script> </jaxx.demo.DemoPanel> \ No newline at end of file Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java 2012-12-30 14:32:25 UTC (rev 2543) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java 2012-12-30 14:33:33 UTC (rev 2544) @@ -4,30 +4,50 @@ */ package jaxx.demo.component.jaxx.editor; -import java.util.ArrayList; -import java.util.List; +/* + * #%L + * JAXX :: Demo + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 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% + */ + import jaxx.demo.entities.DemoDataProvider; import jaxx.demo.entities.DemoDecoratorProvider; import jaxx.demo.entities.People; -import jaxx.runtime.SwingUtil; import org.nuiton.util.decorator.JXPathDecorator; -/** - * - * @author kmorin - */ +import java.util.List; + +/** @author kmorin */ public class BeanDoubleListDemoHandler { - + private BeanDoubleListDemo ui; public BeanDoubleListDemoHandler(BeanDoubleListDemo ui) { this.ui = ui; } - + public void init() { List<People> data = new DemoDataProvider().getPeoples(); JXPathDecorator<People> decorator = (JXPathDecorator<People>) new DemoDecoratorProvider().getDecoratorByType(People.class); this.ui.getDoubleList().init(decorator, data, data.subList(0, 1)); } - + } Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/AbstractContentUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/AbstractContentUI.jaxx 2012-12-30 14:32:25 UTC (rev 2543) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/AbstractContentUI.jaxx 2012-12-30 14:33:33 UTC (rev 2544) @@ -22,9 +22,7 @@ #L% --> -<JPanel abstract='true' - layout='{new BorderLayout()}' - genericType='B'> +<JPanel abstract='true' layout='{new BorderLayout()}' genericType='B'> <import> jaxx.demo.feature.nav.NavDemoHandler Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorContentUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorContentUI.jaxx 2012-12-30 14:32:25 UTC (rev 2543) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorContentUI.jaxx 2012-12-30 14:33:33 UTC (rev 2544) @@ -31,21 +31,17 @@ <People id='data' javaBean='null'/> - <JSplitPane id='splitPane' - orientation='{JSplitPane.VERTICAL_SPLIT}' - resizeWeight='0.5' - constraints='BorderLayout.CENTER' + <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='{getHandler().getContent(getData())}'/> + <JTextPane editable='false' font-size='11' + border='{new TitledBorder(_("jaxxdemo.navigation.actor.title"))}' + text='{getHandler().getContent(getData())}'/> </JScrollPane> <JScrollPane border='{new TitledBorder("Picture")}' Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorsContentUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorsContentUI.jaxx 2012-12-30 14:32:25 UTC (rev 2543) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorsContentUI.jaxx 2012-12-30 14:33:33 UTC (rev 2544) @@ -71,10 +71,8 @@ </JPanel> <BeanListHeader id='listHeader' constraints='BorderLayout.EAST' - i18nPrefix='jaxxdemo.common.' - data='{getData()}' genericType='People' - list='{list}' showReset='true' - beanType='{People.class}'/> + i18nPrefix='jaxxdemo.common.' genericType='People' + data='{getData()}' list='{list}' showReset='true'/> </JToolBar> </JScrollPane> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MovieContentUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MovieContentUI.jaxx 2012-12-30 14:32:25 UTC (rev 2543) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MovieContentUI.jaxx 2012-12-30 14:33:33 UTC (rev 2544) @@ -31,10 +31,8 @@ <Movie id='data' javaBean='null'/> - <JSplitPane id='splitPane' - orientation='{JSplitPane.VERTICAL_SPLIT}' - resizeWeight='0.5' - constraints='BorderLayout.CENTER' + <JSplitPane id='splitPane' orientation='{JSplitPane.VERTICAL_SPLIT}' + resizeWeight='0.5' constraints='BorderLayout.CENTER' oneTouchExpandable='true'> <JScrollPane border='{null}' @@ -43,8 +41,7 @@ <JTextPane border='{new TitledBorder(_("jaxxdemo.navigation.movie.title"))}' - editable='false' - font-size='11' + editable='false' font-size='11' text='{getHandler().getContent(getData())}'/> </JScrollPane> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MoviesContentUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MoviesContentUI.jaxx 2012-12-30 14:32:25 UTC (rev 2543) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MoviesContentUI.jaxx 2012-12-30 14:33:33 UTC (rev 2544) @@ -73,8 +73,7 @@ <BeanListHeader id='listHeader' constraints='BorderLayout.EAST' i18nPrefix='jaxxdemo.common.' data='{getData()}' genericType='Movie' - list='{list}' showReset='true' - beanType='{Movie.class}'/> + list='{list}' showReset='true'/> </JToolBar> </JScrollPane> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java 2012-12-30 14:32:25 UTC (rev 2543) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java 2012-12-30 14:33:33 UTC (rev 2544) @@ -27,6 +27,8 @@ import jaxx.demo.component.jaxx.BoxedDecoratorDemo; import jaxx.demo.component.jaxx.StatusMessagePanelDemo; +import jaxx.demo.component.jaxx.editor.BeanComboBoxDemo; +import jaxx.demo.component.jaxx.editor.BeanComboBoxDemoHandler; import jaxx.demo.component.jaxx.editor.ComboEditorDemo; import jaxx.demo.component.jaxx.editor.DatePickerDemo; import jaxx.demo.component.jaxx.editor.FileEditorDemo; @@ -161,6 +163,7 @@ DatePickerDemo.class, FileEditorDemo.class, ListSelectorDemo.class, + BeanComboBoxDemo.class, BeanDoubleListDemo.class ); 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 2012-12-30 14:32:25 UTC (rev 2543) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties 2012-12-30 14:33:33 UTC (rev 2544) @@ -135,6 +135,9 @@ isF0()\ &&\ isF1()= isF0()\ ||\ isF1()= isF1()= +jaxx.beancomboboxdemo.firstName= +jaxx.beancomboboxdemo.lastName= +jaxx.beancomboboxdemo.people= jaxx.demo.action.add=Add jaxx.demo.action.ok=Ok jaxx.demo.action.remove=Remove @@ -168,6 +171,14 @@ jaxxdemo.action.show=show jaxxdemo.action.site=Web site jaxxdemo.action.site.tip=Go to the web site +jaxxdemo.beancomboboxdemo.age= +jaxxdemo.beancomboboxdemo.autoComplete=AutoComplete +jaxxdemo.beancomboboxdemo.configuration=Configuration +jaxxdemo.beancomboboxdemo.no.people.selected=No selection +jaxxdemo.beancomboboxdemo.result=Result +jaxxdemo.beancomboboxdemo.selected.people=Selection\: %s +jaxxdemo.beancomboboxdemo.showDecorator=Show decorator button +jaxxdemo.beancomboboxdemo.showReset=Show Reset button jaxxdemo.common.actors=Actors jaxxdemo.common.age=Age jaxxdemo.common.firstName=First name Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties 2012-12-30 14:32:25 UTC (rev 2543) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties 2012-12-30 14:33:33 UTC (rev 2544) @@ -135,6 +135,10 @@ isF0()\ &&\ isF1()= isF0()\ ||\ isF1()= isF1()= +jaxx.beancomboboxdemo.age= +jaxx.beancomboboxdemo.firstName= +jaxx.beancomboboxdemo.lastName= +jaxx.beancomboboxdemo.people= jaxx.demo.action.add= jaxx.demo.action.ok= jaxx.demo.action.remove= @@ -149,6 +153,8 @@ jaxx.demo.label.lasstName.tip= jaxx.demo.label.lastName= jaxx.demo.label.lastName.tip= +jaxx.demo.no.people.selected= +jaxx.demo.selected.people= jaxxdemo.about.message=<h3>JAXX Demo</h3><hr/>Pour plus d'informations, vous pouvez visiter le <a href\="http\://maven-site.nuiton.org/jaxx/jaxx-demo">site du projet</a>. jaxxdemo.action.about=A propos jaxxdemo.action.about.tip=A propos de JAXX Demo... @@ -171,6 +177,13 @@ jaxxdemo.action.show=Voir jaxxdemo.action.site=Site internet jaxxdemo.action.site.tip=Accéder au site de l'application sur internet +jaxxdemo.beancomboboxdemo.autoComplete= +jaxxdemo.beancomboboxdemo.configuration= +jaxxdemo.beancomboboxdemo.no.people.selected= +jaxxdemo.beancomboboxdemo.result= +jaxxdemo.beancomboboxdemo.selected.people= +jaxxdemo.beancomboboxdemo.showDecorator= +jaxxdemo.beancomboboxdemo.showReset= jaxxdemo.common.actors=Acteurs jaxxdemo.common.age=Age jaxxdemo.common.firstName=Prénom 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 2012-12-30 14:32:25 UTC (rev 2543) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties 2012-12-30 14:33:33 UTC (rev 2544) @@ -146,6 +146,7 @@ jaxx.demo.label.id.tip=Identifiant jaxx.demo.label.lastName=Nom jaxx.demo.label.lastName.tip=Nom +jaxx.demo.label.people=Personne jaxxdemo.about.message=<h3>JAXX Demo</h3><hr/>Pour plus d'informations, vous pouvez visiter le <a href\="http\://maven-site.nuiton.org/jaxx/jaxx-demo">site du projet</a>. jaxxdemo.action.about=A propos jaxxdemo.action.about.tip=A propos de JAXX Demo... @@ -168,6 +169,17 @@ jaxxdemo.action.show=Voir jaxxdemo.action.site=Site internet jaxxdemo.action.site.tip=Accéder au site de l'application sur internet +jaxxdemo.beancomboboxdemo.age=Age +jaxxdemo.beancomboboxdemo.autoComplete=Auto complétion +jaxxdemo.beancomboboxdemo.configuration=Configuration +jaxxdemo.beancomboboxdemo.firstName=Prénom +jaxxdemo.beancomboboxdemo.lastName=Nom +jaxxdemo.beancomboboxdemo.no.people.selected=Pas de sélection +jaxxdemo.beancomboboxdemo.people=Personne +jaxxdemo.beancomboboxdemo.result=Résultat +jaxxdemo.beancomboboxdemo.selected.people=Sélection \: %s +jaxxdemo.beancomboboxdemo.showDecorator=Changer la décoration +jaxxdemo.beancomboboxdemo.showReset=Pouvoir réinitialiser jaxxdemo.common.actors=Acteurs jaxxdemo.common.age=Age jaxxdemo.common.firstName=Prénom

1 0

r2543 - trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin
by tchemit＠users.nuiton.org Dec. 30, 2012

Dec. 30, 2012

Author: tchemit Date: 2012-12-30 15:32:25 +0100 (Sun, 30 Dec 2012) New Revision: 2543 Url: http://nuiton.org/projects/jaxx/repository/revisions/2543 Log: fixes #2496: Set encoding to UTF-8 in jaxx-m-p tests Modified: trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java Modified: trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java =================================================================== --- trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java 2012-12-30 13:24:10 UTC (rev 2542) +++ trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java 2012-12-30 14:32:25 UTC (rev 2543) @@ -71,6 +71,7 @@ log.error(e); } } + mojo.setEncoding("UTF-8"); mojo.validatorFactoryFQN= SwingValidator.class.getName(); mojo.jaxxContextFQN = DefaultJAXXContext.class.getName(); mojo.compilerFQN = JAXXCompiler.class.getName();

1 0

r2542 - in trunk: jaxx-compiler/src/main/java/jaxx/compiler/tags jaxx-runtime/src/main/java/jaxx/runtime jaxx-runtime/src/main/java/jaxx/runtime/bean jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
by tchemit＠users.nuiton.org Dec. 30, 2012

Dec. 30, 2012

Author: tchemit Date: 2012-12-30 14:24:10 +0100 (Sun, 30 Dec 2012) New Revision: 2542 Url: http://nuiton.org/projects/jaxx/repository/revisions/2542 Log: fixes #2493: [BeanComboBox] Use widget with no model fixes #2494: Use the genericType to fill the beanType property on BeanTypeAware widgets Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/bean/ trunk/jaxx-runtime/src/main/java/jaxx/runtime/bean/BeanTypeAware.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java 2012-12-29 13:29:17 UTC (rev 2541) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java 2012-12-30 13:24:10 UTC (rev 2542) @@ -45,8 +45,11 @@ import jaxx.runtime.ComponentDescriptor; import jaxx.runtime.JAXXObject; import jaxx.runtime.JAXXObjectDescriptor; +import jaxx.runtime.bean.BeanTypeAware; import jaxx.runtime.css.Stylesheet; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; @@ -81,6 +84,9 @@ */ public class DefaultObjectHandler implements TagHandler { + /** Logger. */ + private static final Log log = LogFactory.getLog(DefaultObjectHandler.class); + public static final String ABSTRACT_ATTRIBUTE = "abstract"; public static final String CONSTRAINTS_ATTRIBUTE = "constraints"; @@ -93,7 +99,7 @@ public static final String DISPLAYED_MNEMONIC_INDEX_ATTRIBUTE = "displayedMnemonicIndex"; - public static final String GENERICTYPE_ATTRIBUTE = "genericType"; + public static final String GENERIC_TYPE_ATTRIBUTE = "genericType"; public static final String ID_ATTRIBUTE = "id"; @@ -611,11 +617,15 @@ JAXXCompiler compiler) { List<Attr> attributes = new ArrayList<Attr>(); NamedNodeMap children = tag.getAttributes(); + for (int i = 0; i < children.getLength(); i++) { attributes.add((Attr) children.item(i)); } Collections.sort(attributes, getAttributeComparator()); + CompiledObject rootObject = compiler.getRootObject(); + + Attr genericTypeAttribute = null; for (Attr attribute : attributes) { String name = attribute.getName(); String value = attribute.getValue().trim(); @@ -643,7 +653,7 @@ } continue; } - CompiledObject rootObject = compiler.getRootObject(); + if (name.equals(IMPLEMENTS_ATTRIBUTE)) { if (object != rootObject) { // can ony be apply to root object @@ -667,18 +677,9 @@ continue; } - if (name.equals(GENERICTYPE_ATTRIBUTE)) { - //TC-20090313 check after all atributes been processed - if (object == rootObject) { - compiler.setGenericType(value); - } else { - object.setGenericTypes(value.split(",")); - if (object.getSimpleType() != null) { - - // reload the simpleType - object.setSimpleType(object.getSimpleType() + "<" + value + ">"); - } - } + if (name.equals(GENERIC_TYPE_ATTRIBUTE)) { + //TC-20090313 check after all attributes been processed + genericTypeAttribute = attribute; continue; } @@ -716,6 +717,29 @@ // simple property setAttribute(object, name, value, true, compiler); } + + if (genericTypeAttribute != null) { + String name = genericTypeAttribute.getName(); + String value = genericTypeAttribute.getValue().trim(); + if (object == rootObject) { + compiler.setGenericType(value); + } else { + object.setGenericTypes(value.split(",")); + if (object.getSimpleType() != null) { + + // reload the simpleType + object.setSimpleType(object.getSimpleType() + "<" + value + ">"); + } + } + if (ClassDescriptorHelper.getClassDescriptor(BeanTypeAware.class).isAssignableFrom(object.getObjectClass())) { + // add beanType from genericType + if (log.isDebugEnabled()) { + log.debug("Add beanType property: " + value + " to " + object); + } + setAttribute(object, BeanTypeAware.PROPERTY_BEAN_TYPE, "{" + value + ".class}", true, compiler); + } + } + } /** Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/bean/BeanTypeAware.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/bean/BeanTypeAware.java (rev 0) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/bean/BeanTypeAware.java 2012-12-30 13:24:10 UTC (rev 2542) @@ -0,0 +1,43 @@ +package jaxx.runtime.bean; + +/* + * #%L + * JAXX :: Runtime + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 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% + */ + +/** + * Contract for ui which contains a {@code beanType} property. + * <p/> + * In a jaxx file, if an object has a genericType and implementsthis contract + * then the {@code beanType} will be automaticly setted. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.5.9 + */ +public interface BeanTypeAware<O> { + + String PROPERTY_BEAN_TYPE= "beanType"; + + Class<O> getBeanType(); + + void setBeanType(Class<O> beanType); +} Property changes on: trunk/jaxx-runtime/src/main/java/jaxx/runtime/bean/BeanTypeAware.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx 2012-12-29 13:29:17 UTC (rev 2541) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx 2012-12-30 13:24:10 UTC (rev 2542) @@ -24,20 +24,23 @@ --> <Table fill='both' insets='0' genericType='O' - onFocusGained='combobox.requestFocus()' - onFocusLost='hidePopup()'> + implements='jaxx.runtime.bean.BeanTypeAware<O>' + onFocusGained='combobox.requestFocus()' onFocusLost='hidePopup()'> <import> org.nuiton.util.decorator.JXPathDecorator javax.swing.border.TitledBorder </import> - + +  + <Class id='beanType' genericType='O' javaBean='null'/> +  <Boolean id='autoComplete' javaBean='false'/>  <Boolean id='reverseSort' javaBean='false'/> - +  <Boolean id='showReset' javaBean='false'/> @@ -50,7 +53,7 @@  <String id='property' javaBean='""'/> -  +  <Object id='bean' javaBean='null'/>  @@ -68,7 +71,7 @@ <ButtonGroup id='sortGroup' onStateChanged='setReverseSort((Boolean)sortGroup.getSelectedValue())'/> - +  <BeanComboBoxHandler id='handler' genericType='O' constructorParams='this'/> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java 2012-12-29 13:29:17 UTC (rev 2541) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java 2012-12-30 13:24:10 UTC (rev 2542) @@ -57,7 +57,7 @@ * @author tchemit <chemit(a)codelutin.com> * @see BeanComboBox */ -public class BeanComboBoxHandler<O> implements PropertyChangeListener {//}, ListDataListener { +public class BeanComboBoxHandler<O> implements PropertyChangeListener { public static final Log log = LogFactory.getLog(BeanComboBoxHandler.class); @@ -123,6 +123,10 @@ } init = true; + if (decorator == null) { + throw new NullPointerException("decorator can not be null"); + } + JAXXButtonGroup indexes = ui.getIndexes(); this.decorator = BeanUIUtil.createDecorator(decorator); @@ -152,8 +156,6 @@ ui.autoComplete = true; -// combobox.getModel().addListDataListener(this); - ui.addPropertyChangeListener(this); // set datas @@ -168,11 +170,25 @@ popupHandler.togglePopup(); } + /** + * @return {@code true} if there is no data in comboBox, + * {@code false} otherwise. + * @since 2.5.9 + */ public boolean isEmpty() { boolean result = CollectionUtils.isEmpty(ui.getData()); return result; } + /** + * Add the given item into the comboBox. + * <p/> + * <strong>Note:</strong> The item will be inserted at his correct following + * the selected ordering. + * + * @param item item to add in comboBox. + * @since 2.5.9 + */ public void addItem(O item) { List<O> data = ui.getData(); @@ -184,6 +200,15 @@ fireEmpty(wasEmpty); } + /** + * Remove the given item from the comboBox model. + * <p/> + * <strong>Note:</strong> If this item was selected, then selection will + * be cleared. + * + * @param item the item to remove from the comboBox model + * @since 2.5.9 + */ public void removeItem(O item) { List<O> data = ui.getData(); @@ -340,7 +365,7 @@ } } if (log.isDebugEnabled()) { - log.debug(ui.getProperty() + " on " + ui.getBean().getClass() + " :: " + oldValue + " to " + newValue); + log.debug(ui.getProperty() + " on " + getBeanType() + " :: " + oldValue + " to " + newValue); } try { @@ -362,6 +387,25 @@ return decorator; } + /** + * @return get the type of objects contained in the comboBox model. + * @since 2.5.9 + */ + public Class<O> getBeanType() { + Class<O> result = ui.getBeanType(); + if (result == null) { + result = decorator == null ? null : decorator.getType(); + } + return result; + } + + /** + * Obtain the type of objects contained in the comboBox using the model mutator. + * + * @return get the type of objects contained in the comboBox model. + * @deprecated since 2.5.9 (use now method {@link #getBeanType()}) + */ + @Deprecated public Class<?> getTargetClass() { Method m = getMutator(); return m == null ? null : m.getParameterTypes()[0]; @@ -369,7 +413,7 @@ /** @return le mutateur a utiliser pour modifier le bean associé. */ protected Method getMutator() { - if (mutator == null) { + if (mutator == null && ui.getBean() != null && ui.getProperty() != null) { mutator = BeanUIUtil.getMutator(ui.getBean(), ui.getProperty()); } return mutator; @@ -386,7 +430,8 @@ if (BeanComboBox.PROPERTY_AUTO_COMPLETE.equals(propertyName)) { - setAutoComplete((Boolean) evt.getOldValue(), (Boolean) evt.getNewValue()); + setAutoComplete((Boolean) evt.getOldValue(), + (Boolean) evt.getNewValue()); return; } @@ -418,7 +463,8 @@ } protected void fireEmpty(boolean wasEmpty) { - ui.firePropertyChange(BeanComboBox.PROPERTY_EMPTY, wasEmpty, isEmpty()); + ui.firePropertyChange(BeanComboBox.PROPERTY_EMPTY, wasEmpty, + isEmpty()); } } Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx 2012-12-29 13:29:17 UTC (rev 2541) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx 2012-12-30 13:24:10 UTC (rev 2542) @@ -21,7 +21,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<Table genericType='O'> +<Table genericType='O' implements='jaxx.runtime.bean.BeanTypeAware<O>'> <import> org.nuiton.util.decorator.JXPathDecorator @@ -29,7 +29,7 @@ </import>  - <Class genericType='O' id='beanType' javaBean='null'/> + <Class id='beanType' genericType='O' javaBean='null'/>  <String id='labelText' javaBean='null'/> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx 2012-12-29 13:29:17 UTC (rev 2541) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx 2012-12-30 13:24:10 UTC (rev 2542) @@ -23,7 +23,8 @@ #L% --> -<JPanel id='top' layout='{new BorderLayout()}' genericType='O'> +<JPanel id='top' layout='{new BorderLayout()}' genericType='O' + implements='jaxx.runtime.bean.BeanTypeAware<O>'> <import> org.nuiton.util.decorator.JXPathDecorator @@ -42,8 +43,8 @@  <Boolean id='editable' javaBean='true'/> -  - <Class genericType='O' id='beanType' javaBean='null'/> +  + <Class id='beanType' genericType='O' javaBean='null'/>  <String id='labelText' javaBean='null'/>

1 0

r2541 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
by tchemit＠users.nuiton.org Dec. 29, 2012

Dec. 29, 2012

Author: tchemit Date: 2012-12-29 14:29:17 +0100 (Sat, 29 Dec 2012) New Revision: 2541 Url: http://nuiton.org/projects/jaxx/repository/revisions/2541 Log: fixes #2491: [BeanComboBox] add method to add and remove items from comboBox fixes #2492: [BeanComboBox] add empty property Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.css trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.css =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.css 2012-12-29 11:28:37 UTC (rev 2540) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.css 2012-12-29 13:29:17 UTC (rev 2541) @@ -87,6 +87,7 @@ toolTipText:"beancombobox.action.sort.tip"; focusable:false; focusPainted:false; + enabled:{isShowDecorator() && isEnabled()}; } Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx 2012-12-29 11:28:37 UTC (rev 2540) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx 2012-12-29 13:29:17 UTC (rev 2541) @@ -96,6 +96,9 @@ </JPopupMenu> <script><![CDATA[ + +public static final String PROPERTY_EMPTY = "empty"; + public void init(JXPathDecorator<O> decorator, List<O> data) { handler.init(decorator, data); } @@ -105,6 +108,13 @@ popup.setVisible(false); } } + +public boolean isEmpty() { return handler.isEmpty(); } + +public void addItem(O item) { handler.addItem(item); } + +public void removeItem(O item) { handler.removeItem(item); } + ]]> </script> <row> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java 2012-12-29 11:28:37 UTC (rev 2540) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java 2012-12-29 13:29:17 UTC (rev 2541) @@ -26,16 +26,17 @@ package jaxx.runtime.swing.editor.bean; import jaxx.runtime.SwingUtil; -import org.nuiton.util.decorator.DecoratorUtil; -import org.nuiton.util.decorator.JXPathDecorator; -import org.nuiton.util.decorator.MultiJXPathDecorator; import jaxx.runtime.swing.JAXXButtonGroup; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; -import org.apache.commons.beanutils.PropertyUtils; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.autocomplete.ObjectToStringConverter; +import org.nuiton.util.decorator.DecoratorUtil; +import org.nuiton.util.decorator.JXPathDecorator; +import org.nuiton.util.decorator.MultiJXPathDecorator; +import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JPopupMenu; import javax.swing.text.Document; @@ -44,7 +45,6 @@ import java.awt.event.FocusListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.beans.PropertyDescriptor; import java.lang.reflect.Method; import java.util.List; @@ -53,11 +53,11 @@ * <p/> * Note: ce handler n'est pas stateless et n'est donc pas partageable entre plusieurs ui. * + * @param <O> le type des objet contenus dans le modèle du composant. * @author tchemit <chemit(a)codelutin.com> - * @param <O> le type des objet contenus dans le modèle du composant. * @see BeanComboBox */ -public class BeanComboBoxHandler<O> implements PropertyChangeListener { +public class BeanComboBoxHandler<O> implements PropertyChangeListener {//}, ListDataListener { public static final Log log = LogFactory.getLog(BeanComboBoxHandler.class); @@ -127,29 +127,33 @@ this.decorator = BeanUIUtil.createDecorator(decorator); + JComboBox combobox = ui.getCombobox(); + // init combobox renderer base on given decorator - ui.getCombobox().setRenderer(new DecoratorListCellRenderer(this.decorator)); + combobox.setRenderer(new DecoratorListCellRenderer(this.decorator)); convertor = BeanUIUtil.newDecoratedObjectToStringConverter(this.decorator); // keep a trace of original document (to make possible reverse autom-complete) - JTextComponent editorComponent = (JTextComponent) ui.getCombobox().getEditor().getEditorComponent(); + JTextComponent editorComponent = (JTextComponent) combobox.getEditor().getEditorComponent(); originalDocument = editorComponent.getDocument(); // build popup popupHandler.preparePopup(ui.getSelectedToolTipText(), - ui.getNotSelectedToolTipText(), - ui.getI18nPrefix(), - ui.getPopupTitleText(), - indexes, - ui.getPopupSeparator(), - ui.getPopupLabel(), - ui.getSortUp(), - ui.getSortDown(), - this.decorator); + ui.getNotSelectedToolTipText(), + ui.getI18nPrefix(), + ui.getPopupTitleText(), + indexes, + ui.getPopupSeparator(), + ui.getPopupLabel(), + ui.getSortUp(), + ui.getSortDown(), + this.decorator); ui.autoComplete = true; +// combobox.getModel().addListDataListener(this); + ui.addPropertyChangeListener(this); // set datas @@ -164,6 +168,44 @@ popupHandler.togglePopup(); } + public boolean isEmpty() { + boolean result = CollectionUtils.isEmpty(ui.getData()); + return result; + } + + public void addItem(O item) { + + List<O> data = ui.getData(); + boolean wasEmpty = CollectionUtils.isEmpty(data); + data.add(item); + + updateUI(ui.getIndex(), ui.isReverseSort()); + + fireEmpty(wasEmpty); + } + + public void removeItem(O item) { + + List<O> data = ui.getData(); + + boolean remove = data.remove(item); + + if (remove) { + + // item was found in data + + Object selectedItem = ui.getSelectedItem(); + if (item == selectedItem) { + + // item was selected item, reset selected item then + ui.setSelectedItem(null); + } + + updateUI(ui.getIndex(), ui.isReverseSort()); + fireEmpty(false); + } + } + /** * Modifie l'état autoComplete de l'ui. * @@ -225,7 +267,6 @@ updateUI(ui.getIndex(), newValue); } - @SuppressWarnings({"unchecked"}) protected void updateUI(int index, boolean reversesort) { // change decorator context @@ -339,7 +380,7 @@ String propertyName = evt.getPropertyName(); if (BeanComboBox.PROPERTY_SELECTED_ITEM.equals(propertyName)) { - setSelectedItem((O)evt.getOldValue(), (O)evt.getNewValue()); + setSelectedItem((O) evt.getOldValue(), (O) evt.getNewValue()); return; } @@ -369,6 +410,15 @@ // list has changed, force reload of index setIndex(-1, ui.getIndex()); + + // list has changed, fire empty property + List list = (List) evt.getOldValue(); + fireEmpty(CollectionUtils.isEmpty(list)); } } + + protected void fireEmpty(boolean wasEmpty) { + ui.firePropertyChange(BeanComboBox.PROPERTY_EMPTY, wasEmpty, isEmpty()); + } + }

1 0

r2540 - trunk
by tchemit＠users.nuiton.org Dec. 29, 2012

Dec. 29, 2012

Author: tchemit Date: 2012-12-29 12:28:37 +0100 (Sat, 29 Dec 2012) New Revision: 2540 Url: http://nuiton.org/projects/jaxx/repository/revisions/2540 Log: Update mavenpom4redmineAndCentral to 3.4.7. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-15 00:13:24 UTC (rev 2539) +++ trunk/pom.xml 2012-12-29 11:28:37 UTC (rev 2540) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.6</version> + <version>3.4.7</version> </parent> <artifactId>jaxx</artifactId>

1 0