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

r2606 - in trunk/jaxx-demo/src/main: java/jaxx/demo/component/jaxx/editor java/jaxx/demo/tree resources/i18n
by kmorin＠users.nuiton.org 09 Mar '13

09 Mar '13

Author: kmorin Date: 2013-03-09 19:12:23 +0100 (Sat, 09 Mar 2013) New Revision: 2606 Url: http://nuiton.org/projects/jaxx/repository/revisions/2606 Log: fixes #2580 Make a combobox whose elements can be filtered Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.css trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java Modified: 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 Copied: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.css (from rev 2591, trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.css) =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.css (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.css 2013-03-09 18:12:23 UTC (rev 2606) @@ -0,0 +1,62 @@ +/* + * #%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.beanfilterablecomboboxdemo.configuration"))}; +} + +#filterableButton { + text: "jaxxdemo.beanfilterablecomboboxdemo.filterable"; + selected: true; +} + +#showResetButton { + text: "jaxxdemo.beanfilterablecomboboxdemo.showReset"; + selected: true; +} + +#showDecoratorButton { + text: "jaxxdemo.beanfilterablecomboboxdemo.showDecorator"; + selected: true; +} + +#colorizeInvalidComboEditorTextButton { + text: "jaxxdemo.beanfilterablecomboboxdemo.colorizeInvalidComboEditorText"; + selected: true; +} + +#comboBox { + i18nPrefix: "jaxxdemo.common."; + filterable: {filterableButton.isSelected()}; + showReset: {showResetButton.isSelected()}; + showDecorator: {showDecoratorButton.isSelected()}; + invalidComboEditorTextColor: {colorizeInvalidComboEditorTextButton.isSelected() ? java.awt.Color.RED : null}; +} + +#resultPanel { + border: {new TitledBorder(_("jaxxdemo.beanfilterablecomboboxdemo.result"))}; +} + +#selectedResult { + text: {handler.getSelectedResult(comboBox.getSelectedItem())}; +} Copied: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jaxx (from rev 2591, trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jaxx) =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jaxx (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jaxx 2013-03-09 18:12:23 UTC (rev 2606) @@ -0,0 +1,76 @@ + +<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> + + <import> + jaxx.demo.entities.People + jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + </import> + + <BeanFilterableComboBoxDemoHandler 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='filterableButton'/> + <JCheckBox id='showResetButton'/> + <JCheckBox id='showDecoratorButton'/> + <JCheckBox id='colorizeInvalidComboEditorTextButton'/> + </JPanel> + </cell> + </row> + <row> + <cell> + <BeanFilterableComboBox 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(), + "BeanFilterableComboBoxDemo.css", + "BeanFilterableComboBoxDemo.java", + "BeanFilterableComboBoxDemoHandler.java" + }; +} + +]]></script> + +</jaxx.demo.DemoPanel> \ No newline at end of file Copied: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java (from rev 2591, trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java) =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java 2013-03-09 18:12:23 UTC (rev 2606) @@ -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 kmorin <kmorin(a)codelutin.com> + * @since 2.5.12 + */ +public class BeanFilterableComboBoxDemoHandler { + + private final BeanFilterableComboBoxDemo ui; + + private final JXPathDecorator<People> decorator; + + public BeanFilterableComboBoxDemoHandler(BeanFilterableComboBoxDemo 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(Object people) { + String result; + + if (people == null || !People.class.isInstance(people)) { + result = _("jaxxdemo.beanfilterablecomboboxdemo.no.people.selected"); + } else { + result = _("jaxxdemo.beanfilterablecomboboxdemo.selected.people", decorator.toString(people)); + } + return result; + } + + static { + n_("jaxxdemo.common.people"); + n_("jaxxdemo.common.firstName"); + n_("jaxxdemo.common.lastName"); + n_("jaxxdemo.common.age"); + } +} Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java 2013-03-09 18:11:38 UTC (rev 2605) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java 2013-03-09 18:12:23 UTC (rev 2606) @@ -73,6 +73,7 @@ import java.util.Map; import jaxx.demo.component.jaxx.editor.BeanDoubleListDemo; +import jaxx.demo.component.jaxx.editor.BeanFilterableComboBoxDemo; import static org.nuiton.i18n.I18n.n_; /** @@ -164,6 +165,7 @@ FileEditorDemo.class, ListSelectorDemo.class, BeanComboBoxDemo.class, + BeanFilterableComboBoxDemo.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 2013-03-09 18:11:38 UTC (rev 2605) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties 2013-03-09 18:12:23 UTC (rev 2606) @@ -181,6 +181,14 @@ jaxxdemo.beandoublelistdemo.highlightFilterText=Highlight the filter text jaxxdemo.beandoublelistdemo.showDecorator=Show decorator button jaxxdemo.beandoublelistdemo.showReset=Show Reset button +jaxxdemo.beanfilterablecomboboxdemo.colorizeInvalidComboEditorText=Colorize the text if it not valid +jaxxdemo.beanfilterablecomboboxdemo.configuration=Configuration +jaxxdemo.beanfilterablecomboboxdemo.filterable=Filterable +jaxxdemo.beanfilterablecomboboxdemo.no.people.selected=No selection +jaxxdemo.beanfilterablecomboboxdemo.result=Result +jaxxdemo.beanfilterablecomboboxdemo.selected.people=Selection\: %s +jaxxdemo.beanfilterablecomboboxdemo.showDecorator=Show decorator button +jaxxdemo.beanfilterablecomboboxdemo.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 2013-03-09 18:11:38 UTC (rev 2605) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties 2013-03-09 18:12:23 UTC (rev 2606) @@ -181,6 +181,14 @@ jaxxdemo.beandoublelistdemo.highlightFilterText= jaxxdemo.beandoublelistdemo.showDecorator= jaxxdemo.beandoublelistdemo.showReset= +jaxxdemo.beanfilterablecomboboxdemo.colorizeInvalidComboEditorText= +jaxxdemo.beanfilterablecomboboxdemo.configuration= +jaxxdemo.beanfilterablecomboboxdemo.filterable= +jaxxdemo.beanfilterablecomboboxdemo.no.people.selected= +jaxxdemo.beanfilterablecomboboxdemo.result= +jaxxdemo.beanfilterablecomboboxdemo.selected.people= +jaxxdemo.beanfilterablecomboboxdemo.showDecorator= +jaxxdemo.beanfilterablecomboboxdemo.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 2013-03-09 18:11:38 UTC (rev 2605) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties 2013-03-09 18:12:23 UTC (rev 2606) @@ -181,6 +181,14 @@ jaxxdemo.beandoublelistdemo.highlightFilterText=Surligner le texte de filtre jaxxdemo.beandoublelistdemo.showDecorator=Changer la décoration jaxxdemo.beandoublelistdemo.showReset=Pouvoir réinitialiser le filtre +jaxxdemo.beanfilterablecomboboxdemo.colorizeInvalidComboEditorText=Colorer le texte s'il n'est pas valide +jaxxdemo.beanfilterablecomboboxdemo.configuration=Configuration +jaxxdemo.beanfilterablecomboboxdemo.filterable=Filtrable +jaxxdemo.beanfilterablecomboboxdemo.no.people.selected=Pas de sélection +jaxxdemo.beanfilterablecomboboxdemo.result=Résultat +jaxxdemo.beanfilterablecomboboxdemo.selected.people=Sélection \: %s +jaxxdemo.beanfilterablecomboboxdemo.showDecorator=Changer la décoration +jaxxdemo.beanfilterablecomboboxdemo.showReset=Pouvoir réinitialiser jaxxdemo.common.actors=Acteurs jaxxdemo.common.age=Age jaxxdemo.common.firstName=Prénom

1 0

r2605 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
by kmorin＠users.nuiton.org 09 Mar '13

09 Mar '13

Author: kmorin Date: 2013-03-09 19:11:38 +0100 (Sat, 09 Mar 2013) New Revision: 2605 Url: http://nuiton.org/projects/jaxx/repository/revisions/2605 Log: refs #2580 Make a combobox whose elements can be filtered Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.css trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java Copied: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.css (from rev 2591, trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.css) =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.css (rev 0) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.css 2013-03-09 18:11:38 UTC (rev 2605) @@ -0,0 +1,95 @@ +/* + * #%L + * JAXX :: Widgets + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin, Tony Chemit + * %% + * 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% + */ +#indexes { + useToolTipText:true; +} + +#sortGroup { + useToolTipText:true; + selectedValue:{isReverseSort()}; +} + +#popup { + border:{new TitledBorder(_("beancombobox.popup.title"))}; +} + +#popupSortLabel { + actionIcon:"bean-sort"; + text:"bean.sort.label"; +} + +#sortUp { + buttonGroup:"sortGroup"; + value:{false}; + actionIcon:"bean-sort-up"; + text:"bean.sort.up"; + selected:{!isReverseSort()}; +} + +#sortDown { + buttonGroup:"sortGroup"; + value:{true}; + actionIcon:"bean-sort-down"; + text:"bean.sort.down"; + selected:{isReverseSort()}; +} + +#toolbarLeft { + floatable:false; + borderPainted:false; + visible:{isShowReset()}; +} + +#resetButton { + actionIcon:"combobox-reset"; + toolTipText:"beancombobox.action.reset.tip"; + focusable:false; + focusPainted:false; + enabled:{isEditable() && isEnabled()}; +} + +#combobox { + model: {new JaxxFilterableComboBoxModel<O>()}; + selectedItem:{getSelectedItem()}; + enabled:{isEnabled()}; + editable:{isEditable()}; + focusable:{isEnabled() && isEditable()}; +} + +#toolbarRight { + floatable:false; + borderPainted:false; + visible:{isShowDecorator()}; +} + +#changeDecorator { + actionIcon:"combobox-sort"; + toolTipText:"beancombobox.action.sort.tip"; + focusable:false; + focusPainted:false; + enabled:{isShowDecorator() && isEnabled()}; +} + + + Copied: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx (from rev 2591, trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx) =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx (rev 0) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx 2013-03-09 18:11:38 UTC (rev 2605) @@ -0,0 +1,146 @@ + + +<Table fill='both' insets='0' genericType='O' + implements='jaxx.runtime.bean.BeanTypeAware<O>' + onFocusGained='combobox.requestFocus()' onFocusLost='hidePopup()'> + + <import> + jaxx.runtime.swing.model.JaxxFilterableComboBoxModel + org.nuiton.util.decorator.JXPathDecorator + javax.swing.border.TitledBorder + </import> + +  + <Class id='beanType' genericType='O' javaBean='null'/> + +  + <Boolean id='filterable' javaBean='false'/> + +  + <Boolean id='reverseSort' javaBean='false'/> + +  + <Boolean id='showReset' javaBean='false'/> + +  + <Boolean id='showDecorator' javaBean='true'/> + +  + <Boolean id='editable' javaBean='true'/> + +  + <String id='property' javaBean='""'/> + +  + <Object id='bean' javaBean='null'/> + +  + <Object id='selectedItem' javaBean='null'/> + +  + <Integer id='index' javaBean='0'/> + + <java.awt.Color id='invalidComboEditorTextColor' javaBean='null'/> + +  + <java.util.List id='data' genericType='O' javaBean='null'/> + +  + <ButtonGroup id='indexes' + onStateChanged='setIndex((Integer)indexes.getSelectedValue())'/> + + <ButtonGroup id='sortGroup' + onStateChanged='setReverseSort((Boolean)sortGroup.getSelectedValue())'/> + +  + <BeanFilterableComboBoxHandler id='handler' genericType='O' constructorParams='this'/> + + <String id='selectedToolTipText' javaBean='null'/> + + <String id='notSelectedToolTipText' javaBean='null'/> + + <String id='popupTitleText' javaBean='null'/> + + <String id='i18nPrefix' javaBean='"entitycombobox.common."'/> + +  + <JPopupMenu id='popup' + onPopupMenuWillBecomeInvisible='getChangeDecorator().setSelected(false)' + onPopupMenuCanceled='getChangeDecorator().setSelected(false)'> + <JLabel id='popupSortLabel'/> + + <JRadioButtonMenuItem id='sortUp'/> + + <JRadioButtonMenuItem id='sortDown'/> + + <JSeparator id='popupSeparator'/> + <JLabel id='popupLabel'/> + <JSeparator/> + </JPopupMenu> + + <script><![CDATA[ + +public static final String PROPERTY_EMPTY = "empty"; + +public void init(JXPathDecorator<O> decorator, List<O> data) { + handler.init(decorator, data); +} + +protected void hidePopup() { + if (popup.isVisible()) { + 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> + <cell anchor='west'> +  + <JToolBar id='toolbarLeft'> + <JButton id='resetButton' onActionPerformed='handler.reset()'/> + </JToolBar> + + </cell> + <cell weightx='1'> +  + <JComboBox id='combobox'/> + </cell> + <cell anchor='east' fill='both' insets='0'> +  + <JToolBar id='toolbarRight'> + <JToggleButton id='changeDecorator' + onActionPerformed='getHandler().togglePopup()'/> + </JToolBar> + </cell> + </row> +</Table> Copied: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java (from rev 2591, trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java) =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java (rev 0) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java 2013-03-09 18:11:38 UTC (rev 2605) @@ -0,0 +1,604 @@ +/* + * #%L + * JAXX :: Widgets + * + * $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.runtime.swing.editor.bean; + +import java.awt.Color; +import java.awt.Component; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import jaxx.runtime.SwingUtil; +import jaxx.runtime.swing.JAXXButtonGroup; +import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; +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; +import javax.swing.text.JTextComponent; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.lang.reflect.Method; +import java.util.List; +import javax.swing.ComboBoxEditor; +import javax.swing.event.DocumentEvent; +import javax.swing.event.DocumentListener; +import javax.swing.event.PopupMenuEvent; +import javax.swing.event.PopupMenuListener; +import javax.swing.plaf.basic.BasicComboBoxEditor; +import jaxx.runtime.swing.model.JaxxFilterableComboBoxModel; +import org.jdesktop.swingx.autocomplete.AbstractAutoCompleteAdaptor; +import org.jdesktop.swingx.autocomplete.AutoCompleteDocument; +import org.jdesktop.swingx.autocomplete.ComboBoxAdaptor; + +/** + * Le handler d'un {@link BeanFilterableComboBox}. + * <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 kmorin <kmorin(a)codelutin.com> + * @since 2.5.12 + * @see BeanFilterableComboBox + */ +public class BeanFilterableComboBoxHandler<O> implements PropertyChangeListener { + + public static final Log log = LogFactory.getLog(BeanFilterableComboBoxHandler.class); + /** + * ui if the handler + */ + protected BeanFilterableComboBox<O> ui; + /** + * the mutator method on the property of boxed bean in the ui + */ + protected Method mutator; + /** + * the decorator of data + */ + protected MultiJXPathDecorator<O> decorator; + + protected boolean init; + + public BeanFilterableComboBoxHandler(BeanFilterableComboBox<O> ui) { + this.ui = ui; + } + + protected final FocusListener EDITOR_TEXT_COMP0NENT_FOCUSLISTENER = new FocusListener() { + @Override + public void focusGained(FocusEvent e) { + if (log.isDebugEnabled()) { + log.debug("close popup from " + e); + } + ui.getPopup().setVisible(false); + } + + @Override + public void focusLost(FocusEvent e) { + } + }; + + protected final DocumentListener EDITOR_TEXT_COMPONENT_DOCUMENTLISTENER = new DocumentListener() { + public void insertUpdate(DocumentEvent e) { + updateFilter(); + } + + public void removeUpdate(DocumentEvent e) { + updateFilter(); + } + + public void changedUpdate(DocumentEvent e) { + updateFilter(); + } + + protected void updateFilter() { + JComboBox comboBox = ui.getCombobox(); + JaxxFilterableComboBoxModel model = (JaxxFilterableComboBoxModel) comboBox.getModel(); + JTextComponent editorComponent = (JTextComponent) comboBox.getEditor().getEditorComponent(); + // hide the popup before setting the filter, otherwise the popup height does not fit + if (comboBox.isShowing()) { + comboBox.hidePopup(); + } + model.setFilterText(editorComponent.getText()); + if (comboBox.isShowing()) { + comboBox.showPopup(); + } + } + + }; + + private final BeanUIUtil.PopupHandler popupHandler = new BeanUIUtil.PopupHandler() { + @Override + public JPopupMenu getPopup() { + return ui.getPopup(); + } + + @Override + public JComponent getInvoker() { + return ui.getChangeDecorator(); + } + }; + + /** + * Initialise le handler de l'ui + * + * @param decorator le decorateur a utiliser + * @param data la liste des données a gérer + */ + public void init(JXPathDecorator<O> decorator, List<O> data) { + + if (init) { + throw new IllegalStateException("can not init the handler twice"); + } + init = true; + + if (decorator == null) { + throw new NullPointerException("decorator can not be null"); + } + + JAXXButtonGroup indexes = ui.getIndexes(); + + this.decorator = BeanUIUtil.createDecorator(decorator); + + final JComboBox combobox = ui.getCombobox(); + ComboBoxEditor editor = new JAXXFilterableComboBoxEditor(ui.getCombobox().getEditor()); + combobox.setEditor(editor); + + editor.getEditorComponent().addMouseListener(new MouseAdapter() { + + @Override + public void mouseClicked(MouseEvent e) { + combobox.showPopup(); + } + + }); + editor.getEditorComponent().addKeyListener(new KeyAdapter() { + + @Override + public void keyPressed(KeyEvent e) { + if (!combobox.isPopupVisible()) { + combobox.showPopup(); + } + } + + }); + + // init combobox renderer base on given decorator + combobox.setRenderer(new DecoratorListCellRenderer(this.decorator)); + ((JaxxFilterableComboBoxModel) combobox.getModel()).setDecorator(this.decorator); + combobox.putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE); + combobox.addItemListener(new ItemListener() { + + public void itemStateChanged(ItemEvent e) { + Object item = e.getItem(); + if (e.getStateChange() == ItemEvent.SELECTED + && item != null && getBeanType().isInstance(item)) { + ui.setSelectedItem(e.getItem()); + } + } + }); + + // build popup + popupHandler.preparePopup(ui.getSelectedToolTipText(), + ui.getNotSelectedToolTipText(), + ui.getI18nPrefix(), + ui.getPopupTitleText(), + indexes, + ui.getPopupSeparator(), + ui.getPopupLabel(), + ui.getSortUp(), + ui.getSortDown(), + this.decorator); + + setFilterable(false, ui.getFilterable()); + + ui.addPropertyChangeListener(this); + + // set datas + ui.setData(data); + + // select sort button + indexes.setSelectedButton(ui.getIndex()); + } + + /** + * Toggle the popup visible state. + */ + public void togglePopup() { + popupHandler.togglePopup(); + } + + /** + * @return {@code true} if there is no data in comboBox, {@code false} + * otherwise. + */ + 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. + */ + 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); + } + + /** + * 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 + */ + 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); + } + } + + /** + * Sort data of the model. + */ + public void sortData() { + + // just update UI should do the math of this + updateUI(ui.getIndex(), ui.isReverseSort()); + } + + public void reset() { + JTextComponent editorComponent = (JTextComponent) ui.getCombobox().getEditor().getEditorComponent(); + editorComponent.setText(""); +// ui.setSelectedItem(null); + } + + /** + * Modifie l'état filterable de l'ui. + * + * @param oldValue l'ancienne valeur + * @param newValue la nouvelle valeur + */ + protected void setFilterable(Boolean oldValue, Boolean newValue) { + oldValue = oldValue != null && oldValue; + newValue = newValue != null && newValue; + if (oldValue.equals(newValue)) { + return; + } + if (log.isDebugEnabled()) { + log.debug("filterable state : <" + oldValue + " to " + newValue + ">"); + } + if (!newValue) { + JTextComponent editorComponent = (JTextComponent) ui.getCombobox().getEditor().getEditorComponent(); + editorComponent.removeFocusListener(EDITOR_TEXT_COMP0NENT_FOCUSLISTENER); + editorComponent.getDocument().removeDocumentListener(EDITOR_TEXT_COMPONENT_DOCUMENTLISTENER); + ((JaxxFilterableComboBoxModel) ui.getCombobox().getModel()).setFilterText(null); + + } else { + JTextComponent editorComponent = (JTextComponent) ui.getCombobox().getEditor().getEditorComponent(); + editorComponent.addFocusListener(EDITOR_TEXT_COMP0NENT_FOCUSLISTENER); + editorComponent.getDocument().addDocumentListener(EDITOR_TEXT_COMPONENT_DOCUMENTLISTENER); + EDITOR_TEXT_COMPONENT_DOCUMENTLISTENER.changedUpdate(null); + } + } + + /** + * Modifie l'index du décorateur + * + * @param oldValue l'ancienne valeur + * @param newValue la nouvelle valeur + */ + protected void setIndex(Integer oldValue, Integer newValue) { + if (newValue == null || newValue.equals(oldValue)) { + return; + } + if (log.isDebugEnabled()) { + log.debug("check state : <" + oldValue + " to " + newValue + ">"); + } + updateUI(newValue, ui.isReverseSort()); + } + + /** + * Modifie l'index du décorateur + * + * @param oldValue l'ancienne valeur + * @param newValue la nouvelle valeur + */ + protected void setSortOrder(Boolean oldValue, Boolean newValue) { + + if (newValue == null || newValue.equals(oldValue)) { + return; + } + if (log.isDebugEnabled()) { + log.debug("check state : <" + oldValue + " to " + newValue + ">"); + } + + updateUI(ui.getIndex(), newValue); + } + + protected void updateUI(int index, boolean reversesort) { + + // change decorator context + decorator.setContextIndex(index); + + // keep selected item + Object previousSelectedItem = ui.getSelectedItem(); + + // remove autocomplete + if (previousSelectedItem != null) { + ui.getCombobox().setSelectedItem(null); + ui.selectedItem = null; + } + + List<O> data = ui.getData(); + try { + // Sort data with the decorator jxpath tokens. + DecoratorUtil.sort(decorator, + data, + index, + reversesort); + + } catch (Exception eee) { + log.warn(eee.getMessage(), eee); + } + + // reload the model + SwingUtil.fillComboBox(ui.getCombobox(), data, null); + + if (previousSelectedItem != null) { + ui.setSelectedItem(previousSelectedItem); + } + + ui.getCombobox().requestFocus(); + } + + /** + * Modifie la valeur sélectionnée dans la liste déroulante. + * + * @param oldValue l'ancienne valeur + * @param newValue la nouvelle valeur + */ + protected void setSelectedItem(O oldValue, O newValue) { + if (ui.getBean() == null) { + return; + } + + if (newValue == null) { + if (ui.getCombobox().getSelectedItem() == null) { + return; + } + ui.getCombobox().setSelectedItem(null); + + if (oldValue == null) { + return; + } + } + if (log.isDebugEnabled()) { + log.debug(ui.getProperty() + " on " + getBeanType() + " :: " + oldValue + " to " + newValue); + } + + try { + Method mut = getMutator(); + if (mut != null) { + mut.invoke(ui.getBean(), newValue); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + public MultiJXPathDecorator<O> getDecorator() { + return decorator; + } + + /** + * @return get the type of objects contained in the comboBox model. + */ + public Class<O> getBeanType() { + Class<O> result = ui.getBeanType(); + if (result == null) { + result = decorator == null ? null : decorator.getType(); + } + return result; + } + + /** + * @return le mutateur a utiliser pour modifier le bean associé. + */ + protected Method getMutator() { + if (mutator == null && ui.getBean() != null && ui.getProperty() != null) { + mutator = BeanUIUtil.getMutator(ui.getBean(), ui.getProperty()); + } + return mutator; + } + + @Override + public void propertyChange(PropertyChangeEvent evt) { + String propertyName = evt.getPropertyName(); + + if (BeanFilterableComboBox.PROPERTY_SELECTED_ITEM.equals(propertyName)) { + setSelectedItem((O) evt.getOldValue(), (O) evt.getNewValue()); + return; + } + + if (BeanFilterableComboBox.PROPERTY_FILTERABLE.equals(propertyName)) { + + setFilterable((Boolean) evt.getOldValue(), + (Boolean) evt.getNewValue()); + return; + } + + if (BeanFilterableComboBox.PROPERTY_INDEX.equals(propertyName)) { + + // decorator index has changed, force reload of data in ui + setIndex((Integer) evt.getOldValue(), + (Integer) evt.getNewValue()); + return; + } + + if (BeanFilterableComboBox.PROPERTY_REVERSE_SORT.equals(propertyName)) { + + // sort order has changed, force reload of data in ui + setSortOrder((Boolean) evt.getOldValue(), + (Boolean) evt.getNewValue()); + return; + } + + if (BeanFilterableComboBox.PROPERTY_DATA.equals(propertyName)) { + + // list has changed, force reload of index + setIndex(null, 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()); + } + + /** + * Editor for the Combobox of the UI - uses the decorator + */ + class JAXXFilterableComboBoxEditor implements ComboBoxEditor { + + Object oldItem; + ComboBoxEditor wrapped; + + public JAXXFilterableComboBoxEditor(ComboBoxEditor wrapped) { + this.wrapped = wrapped; + } + + @Override + public JTextComponent getEditorComponent() { + return (JTextComponent) wrapped.getEditorComponent(); + } + + @Override + public void setItem(Object anObject) { + Object item = anObject; + if (anObject != null && getBeanType().isInstance(anObject)) { + item = decorator.toString(anObject); + } + oldItem = anObject; + try { + wrapped.setItem(item); + getEditorComponent().setForeground(null); + + } catch (IllegalStateException e) { + // fail silently and deselect the currently selected item + ui.setSelectedItem(null); + getEditorComponent().setForeground(ui.getInvalidComboEditorTextColor()); + } + } + + @Override + public Object getItem() { + JTextComponent editor = getEditorComponent(); + Object newValue = editor.getText(); + + if (oldItem != null && getBeanType().isInstance(oldItem)) { + // The original value is not a string. Should return the value in it's + // original type. + if (newValue.equals(decorator.toString(oldItem))) { + newValue = oldItem; + + } else { + // Must take the value from the editor and get the value and cast it to the new type. + Class<?> cls = oldItem.getClass(); + try { + Method method = cls.getMethod("valueOf", new Class[]{String.class}); + newValue = method.invoke(oldItem, new Object[] { editor.getText()}); + } catch (Exception ex) { + // Fail silently and return the newValue (a String object) + } + } + } + wrapped.getItem(); + return newValue; + } + + @Override + public void selectAll() { + wrapped.selectAll(); + } + + @Override + public void addActionListener(ActionListener l) { + wrapped.addActionListener(l); + } + + @Override + public void removeActionListener(ActionListener l) { + wrapped.removeActionListener(l); + } + }; +}

1 0

r2604 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model
by kmorin＠users.nuiton.org 09 Mar '13

09 Mar '13

Author: kmorin Date: 2013-03-09 19:11:29 +0100 (Sat, 09 Mar 2013) New Revision: 2604 Url: http://nuiton.org/projects/jaxx/repository/revisions/2604 Log: refs #2580 Make a combobox whose elements can be filtered Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java Copied: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java (from rev 2587, trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultComboBoxModel.java) =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java (rev 0) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java 2013-03-09 18:11:29 UTC (rev 2604) @@ -0,0 +1,202 @@ +package jaxx.runtime.swing.model; + +/* + * #%L + * JAXX :: Runtime + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2013 CodeLutin, Tony Chemit + * %% + * 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 com.google.common.base.Predicate; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import javax.swing.DefaultComboBoxModel; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Vector; +import java.util.regex.Pattern; +import org.apache.commons.lang3.StringUtils; +import org.nuiton.util.decorator.JXPathDecorator; + +/** + * ComboBoxModel which can filter the elements displayed in the popup. + * + * @author kmorin <kmorin(a)codelutin.com> + * @since 2.5.12 + */ +public class JaxxFilterableComboBoxModel<E> extends JaxxDefaultComboBoxModel<E> { + + private static final long serialVersionUID = 1L; + + protected ArrayList<E> filteredItems = Lists.newArrayList(); + + protected String filterText; + + /** the decorator of data */ + protected JXPathDecorator<E> decorator; + + protected List<Predicate<E>> filters = Lists.newArrayList(); + + public JaxxFilterableComboBoxModel() { + super(); + } + + public JaxxFilterableComboBoxModel(E... items) { + delegate = new ArrayList<E>(items.length); + + int i, c; + for (i = 0, c = items.length; i < c; i++) + delegate.add(items[i]); + + } + + public JaxxFilterableComboBoxModel(Collection<E> v) { + delegate = new ArrayList<E>(v); + } + + @Override + public int getIndexOf(E anObject) { + return filteredItems.indexOf(anObject); + } + + @Override + public void addAllElements(Collection<E> objects) { + super.addAllElements(objects); + refilter(); + } + + /** Empties the list. */ + @Override + public void removeAllElements() { + super.removeAllElements(); + refilter(); + } + + @Override + public int getSize() { + return filteredItems.size(); + } + + @Override + public E getElementAt(int index) { + E result; + + if (index >= 0 && index < filteredItems.size()) { + result = filteredItems.get(index); + } else { + result = null; + } + return result; + } + + @Override + public void addElement(Object anObject) { + super.addElement(anObject); + refilter(); + } + + @Override + public void insertElementAt(Object anObject, int index) { + super.insertElementAt(anObject, index); + refilter(); + } + + @Override + public void removeElementAt(int index) { + super.removeElementAt(index); + refilter(); + } + + @Override + public void removeElement(Object anObject) { + super.removeElement(anObject); + refilter(); + } + + public String getFilterText() { + return filterText; + } + + public void setFilterText(String filterText) { + this.filterText = filterText; + refilter(); + } + + public JXPathDecorator<E> getDecorator() { + return decorator; + } + + public void setDecorator(JXPathDecorator<E> decorator) { + this.decorator = decorator; + } + + public void addFilter(Predicate<E> filter) { + filters.add(filter); + refilter(); + } + + public void removeFilter(Predicate<E> filter) { + filters.remove(filter); + refilter(); + } + + public void clearFilters() { + filters.clear(); + refilter(); + } + + protected void refilter() { + filteredItems.clear(); + + if (StringUtils.isEmpty(StringUtils.remove(filterText, '*')) + && filters.isEmpty()) { + filteredItems.addAll(delegate); + + } else { + int itemNumber = delegate.size(); + Pattern pattern = null; + if (!StringUtils.isBlank(filterText)) { + String patternText = Pattern.quote(filterText).replace("*", "\\E.*\\Q") + ".*"; + pattern = Pattern.compile(patternText, Pattern.CASE_INSENSITIVE); + } + for (int i = 0 ; i < itemNumber ; i++) { + E element = delegate.get(i); + boolean addElement = true; + for (Predicate<E> filter : filters) { + addElement &= filter.apply(element); + } + String decoratedElement; + if (decorator != null) { + decoratedElement = decorator.toString(element); + } else { + decoratedElement = String.valueOf(element); + } + boolean matches = pattern == null + || pattern.matcher(decoratedElement).matches(); + if (matches && addElement) { + filteredItems.add(element); + } + } + } + + fireContentsChanged(this, 0, getSize()); + } +}

1 0

r2603 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help
by tchemit＠users.nuiton.org 09 Mar '13

09 Mar '13

Author: tchemit Date: 2013-03-09 15:02:50 +0100 (Sat, 09 Mar 2013) New Revision: 2603 Url: http://nuiton.org/projects/jaxx/repository/revisions/2603 Log: fixes #2579: Improve JAXXHelpBroker Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpBroker.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpBroker.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpBroker.java 2013-03-09 07:21:41 UTC (rev 2602) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpBroker.java 2013-03-09 14:02:50 UTC (rev 2603) @@ -24,6 +24,7 @@ */ package jaxx.runtime.swing.help; +import com.google.common.base.Preconditions; import jaxx.runtime.JAXXContext; import jaxx.runtime.JAXXObject; import jaxx.runtime.SwingUtil; @@ -33,6 +34,7 @@ import javax.help.CSH; import javax.help.HelpBroker; import javax.help.HelpSet; +import javax.help.plaf.basic.BasicCursorFactory; import javax.swing.AbstractButton; import javax.swing.SwingUtilities; import javax.swing.UIManager; @@ -53,6 +55,7 @@ import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; import java.net.URL; +import java.util.Collections; import java.util.Enumeration; import java.util.HashMap; import java.util.Hashtable; @@ -230,15 +233,20 @@ // prepare cursor onItemCursor = (Cursor) UIManager.get("HelpOnItemCursor"); + + if (onItemCursor == null) { + onItemCursor = BasicCursorFactory.getOnItemCursor(); + UIManager.put("HelpOnItemCursor", onItemCursor); + } + Preconditions.checkNotNull(onItemCursor, "A cursor is missing (add HelpOnItemCursor cursor in UIManager)."); Vector<?> topComponents = null; cursors = null; if (onItemCursor != null) { cursors = new Hashtable<Component, Cursor>(); topComponents = getTopContainers(source); - Enumeration<?> enums = topComponents.elements(); - while (enums.hasMoreElements()) { - setAndStoreCursors((Container) enums.nextElement(), onItemCursor); + for (Object topComponent : topComponents) { + setAndStoreCursors((Container) topComponent, onItemCursor); } } @@ -261,9 +269,8 @@ } finally { // restore the old cursors if (topComponents != null) { - Enumeration<?> containers = topComponents.elements(); - while (containers.hasMoreElements()) { - resetAndRestoreCursors((Container) containers.nextElement()); + for (Object topComponent : topComponents) { + resetAndRestoreCursors((Container) topComponent); } } cursors = null; @@ -356,14 +363,12 @@ } } Frame frames[] = Frame.getFrames(); - for (int i = 0; i < frames.length; i++) { - Window[] windows = frames[i].getOwnedWindows(); - for (int j = 0; j < windows.length; j++) { - containers.add(windows[j]); + for (Frame frame : frames) { + Window[] windows = frame.getOwnedWindows(); + Collections.addAll(containers, windows); + if (!containers.contains(frame)) { + containers.add(frame); } - if (!containers.contains(frames[i])) { - containers.add(frames[i]); - } } return containers; } @@ -401,16 +406,21 @@ if (comp == null) { return; } - Cursor compCursor = comp.getCursor(); - if (compCursor != cursor) { - cursors.put(comp, compCursor); - log.debug("set cursor on " + comp); - comp.setCursor(cursor); + if (cache.containsKey(comp)) { + Cursor compCursor = comp.getCursor(); + if (compCursor != cursor) { + cursors.put(comp, compCursor); + if (log.isDebugEnabled()) { + log.debug("set cursor on " + comp); + } + comp.setCursor(cursor); + } } + if (comp instanceof Container) { Component component[] = ((Container) comp).getComponents(); - for (int i = 0; i < component.length; i++) { - setAndStoreCursors(component[i], cursor); + for (Component aComponent : component) { + setAndStoreCursors(aComponent, cursor); } } } @@ -430,8 +440,8 @@ } if (comp instanceof Container) { Component component[] = ((Container) comp).getComponents(); - for (int i = 0; i < component.length; i++) { - resetAndRestoreCursors(component[i]); + for (Component aComponent : component) { + resetAndRestoreCursors(aComponent); } } }

1 0

r2602 - trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin
by tchemit＠users.nuiton.org 09 Mar '13

09 Mar '13

Author: tchemit Date: 2013-03-09 08:21:41 +0100 (Sat, 09 Mar 2013) New Revision: 2602 Url: http://nuiton.org/projects/jaxx/repository/revisions/2602 Log: refs #2566: Can merge helper ids into inpute files in generate-help-ids mojo (invert test) Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java 2013-03-08 22:43:38 UTC (rev 2601) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java 2013-03-09 07:21:41 UTC (rev 2602) @@ -202,7 +202,7 @@ String filename; - if (StringUtils.isEmpty(locale.getCountry())) { + if (StringUtils.isNotEmpty(locale.getCountry())) { filename = String.format( INPUT_FILENAME_FULL_FORMAT, inputHelpFilenamePrefix,

1 0

r2601 - trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin
by tchemit＠users.nuiton.org 08 Mar '13

08 Mar '13

Author: tchemit Date: 2013-03-08 23:43:38 +0100 (Fri, 08 Mar 2013) New Revision: 2601 Url: http://nuiton.org/projects/jaxx/repository/revisions/2601 Log: refs #2566: Can merge helper ids into inpute files in generate-help-ids mojo (improve inptu file generation) Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java 2013-03-08 19:07:19 UTC (rev 2600) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java 2013-03-08 22:43:38 UTC (rev 2601) @@ -28,6 +28,7 @@ import com.google.common.io.Closeables; import com.google.common.io.Files; import jaxx.compiler.decorators.HelpRootCompiledObjectDecorator; +import org.apache.commons.lang3.StringUtils; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; @@ -54,8 +55,10 @@ defaultPhase = LifecyclePhase.PROCESS_SOURCES, requiresProject = true) public class GenerateHelpIdsMojo extends AbstractGenerateHelpMojo { - public static final String INPUT_FILENAME_FORMAT = "%s-%s_%s.properties"; + public static final String INPUT_FILENAME_FULL_FORMAT = "%s-%s_%s.properties"; + public static final String INPUT_FILENAME_FORMAT = "%s-%s.properties"; + /** * Flag to merge ids into input directory. * @@ -197,12 +200,21 @@ if (mergeIdsToInput) { - String filename = String.format( - INPUT_FILENAME_FORMAT, - inputHelpFilenamePrefix, - locale.getLanguage(), - locale.getCountry()); + String filename; + if (StringUtils.isEmpty(locale.getCountry())) { + filename = String.format( + INPUT_FILENAME_FULL_FORMAT, + inputHelpFilenamePrefix, + locale.getLanguage(), + locale.getCountry()); + } else { + filename = String.format( + INPUT_FILENAME_FORMAT, + inputHelpFilenamePrefix, + locale.getLanguage()); + } + File inputFile = new File(inputHelpDirectory, filename); getLog().info("Use input file: " + inputFile);

1 0

r2600 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor
by tchemit＠users.nuiton.org 08 Mar '13

08 Mar '13

Author: tchemit Date: 2013-03-08 20:07:19 +0100 (Fri, 08 Mar 2013) New Revision: 2600 Url: http://nuiton.org/projects/jaxx/repository/revisions/2600 Log: fixes #2578: When invoking fileEditor from a dialog with alwaysOnTopdoes not display in top Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx 2013-03-08 09:50:19 UTC (rev 2599) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx 2013-03-08 19:07:19 UTC (rev 2600) @@ -23,9 +23,12 @@ --> <BaseActionPanel layout='{new BorderLayout()}'> <import> - java.io.File jaxx.runtime.swing.BaseActionPanel + org.apache.commons.lang3.StringUtils + + javax.swing.JDialog + java.io.File </import> <FileEditorHandler id='handler' constructorParams='this'/> @@ -45,31 +48,35 @@ <String id='extsDescription' javaBean='null'/> <script><![CDATA[ - protected File selectedFile; +protected File selectedFile; - public void setSelectedFile(File selectedFile) { - this.selectedFile = selectedFile; - if (selectedFile != null) { - setStartPath(selectedFile.getAbsolutePath()); - fireActionEvent(); - } - } - - public void setSelectedFile(String startPath) { - this.selectedFile = null; - setStartPath(startPath); +public void setSelectedFile(File selectedFile) { + this.selectedFile = selectedFile; + if (selectedFile != null) { + setStartPath(selectedFile.getAbsolutePath()); fireActionEvent(); } +} - public File getSelectedFile() { - if (selectedFile == null) { - if (StringUtils.isNotEmpty(startPath)) { - selectedFile = new File(startPath); - } +public void setSelectedFile(String startPath) { + this.selectedFile = null; + setStartPath(startPath); + fireActionEvent(); +} + +public File getSelectedFile() { + if (selectedFile == null) { + if (StringUtils.isNotEmpty(startPath)) { + selectedFile = new File(startPath); } - return selectedFile; } + return selectedFile; +} +public void setDialogOwner(JDialog dialogOwner) { + handler.setDialogOwner(dialogOwner); +} + ]]></script> <JTextField id='pathField' Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java 2013-03-08 09:50:19 UTC (rev 2599) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java 2013-03-08 19:07:19 UTC (rev 2600) @@ -24,21 +24,29 @@ package jaxx.runtime.swing.editor; import com.google.common.io.Files; -import java.io.File; +import org.apache.commons.lang3.StringUtils; + +import javax.swing.JDialog; import javax.swing.JFileChooser; import javax.swing.filechooser.FileFilter; -import org.apache.commons.lang3.StringUtils; +import java.io.File; -/** - * @author sletellier <letellier(a)codelutin.com> - */ +/** @author sletellier <letellier(a)codelutin.com> */ public class FileEditorHandler { public static final String SEPARATOR_REGEX = "\\s*,\\s*"; + public static File lastSelectedPath; protected FileEditor view; + /** + * To set the dialog (see http://nuiton.org/issues/2578) + * + * @since 2.5.12 + */ + protected JDialog dialogOwner; + public FileEditorHandler(FileEditor view) { this.view = view; if (lastSelectedPath == null) { @@ -117,7 +125,15 @@ } // show dialog + // see http://nuiton.org/issues/2578 + boolean hackDialog = dialogOwner != null && dialogOwner.isAlwaysOnTop(); + if (hackDialog) { + dialogOwner.setAlwaysOnTop(false); + } int returnVal = fc.showOpenDialog(view); + if (hackDialog) { + dialogOwner.setAlwaysOnTop(true); + } if (returnVal == JFileChooser.APPROVE_OPTION) { // get selected to display in ui @@ -143,6 +159,10 @@ } } + protected void setDialogOwner(JDialog dialogOwner) { + this.dialogOwner = dialogOwner; + } + public static class ExtentionFileFiler extends FileFilter { protected String ext; protected String desciption;

1 0

r2599 - trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin
by tchemit＠users.nuiton.org 08 Mar '13

08 Mar '13

Author: tchemit Date: 2013-03-08 10:50:19 +0100 (Fri, 08 Mar 2013) New Revision: 2599 Url: http://nuiton.org/projects/jaxx/repository/revisions/2599 Log: fixes #2575: Add a strict mode on generate-help-ids mojo Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java 2013-03-08 09:50:09 UTC (rev 2598) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java 2013-03-08 09:50:19 UTC (rev 2599) @@ -54,7 +54,7 @@ defaultPhase = LifecyclePhase.PROCESS_SOURCES, requiresProject = true) public class GenerateHelpIdsMojo extends AbstractGenerateHelpMojo { - public static final String INPUT_FILENAME_FORMAT = "%s_%s_%s.properties"; + public static final String INPUT_FILENAME_FORMAT = "%s-%s_%s.properties"; /** * Flag to merge ids into input directory. @@ -67,6 +67,23 @@ protected boolean mergeIdsToInput; /** + * Flag to remove obsolete ids into input files. + * <p/> + * <strong>Important Note:</strong> Be sure to use this after a clean, or + * using with {@code jaxx.force} property to get all ids of any jaxx files + * detected, otherwise you could loose some data. USE WITH CAUTION. + * <p/> + * <strong>Note:</strong> Only used when {@code mergeIdsToInput} parameter + * is on. + * + * @since 2.5.12 + */ + @Parameter(property = "jaxx.strictMode", + defaultValue = "false", + required = true) + protected boolean strictMode; + + /** * Directory where to merge (create) input files. * <p/> * <strong>Note:</strong> Only used when {@code mergeIdsToInput} parameter @@ -75,15 +92,15 @@ * @since 2.5.12 */ @Parameter(property = "jaxx.inputHelpDirectory", - defaultValue = "src/main/resources/help", + defaultValue = "src/main/help", required = true) - private File inputHelpDirectory; + protected File inputHelpDirectory; /** * Prefix of input files. * <p/> - * <strong>Note:</strong> {@code _locale.properties} will be added to each - * generated file. + * <strong>Note:</strong> {@code -locale.properties} will be added to each + * generated file (example: {@code helpMapping-fr_FR.properties}). * <p/> * <strong>Note:</strong> Only used when {@code mergeIdsToInput} parameter * is on. @@ -93,7 +110,7 @@ @Parameter(property = "jaxx.inputHelpFilenamePrefix", defaultValue = "helpMapping", required = true) - private String inputHelpFilenamePrefix; + protected String inputHelpFilenamePrefix; /** help ids to react. */ protected Set<String> helpIds; @@ -133,12 +150,16 @@ boolean b = super.checkSkip(); if (b) { - if (helpIds.isEmpty()) { -// if (isVerbose()) { + if (strictMode) { + + // always launch goal + getLog().info("Strict mode is on, will use all detected ids."); + + } else if (helpIds.isEmpty()) { + // no ids detected in this compilation round getLog().info("No help ids to treate, will skip goal."); -// } - return false; + b = false; } } return b; @@ -198,29 +219,59 @@ } } Set<String> existingId = p.stringPropertyNames(); + Set<String> newIds = new HashSet<String>(); + + SortedProperties resultProperties = p; + + // get all detected ids for (String helpId : helpIds) { newIds.add(removeQuote(helpId)); } - newIds.removeAll(existingId); - if (!newIds.isEmpty()) { - getLog().info("Add " + newIds.size() + " keys."); + if (strictMode) { + // remove all obsolete ids + for (String s : existingId) { + if (!newIds.contains(s)) { + resultProperties.remove(s); + } + } + + // update existing ids + existingId.retainAll(newIds); + } else { + + // remove all existing ids (no need to treat them again) + newIds.removeAll(existingId); + } + + if (newIds.isEmpty()) { + + getLog().info("No keys to add."); + } else { + + if (strictMode) { + getLog().info("Regenerate files with " + newIds.size() + " keys."); + } else { + getLog().info("Add " + newIds.size() + " keys."); + } + for (String helpId : newIds) { - p.put(helpId, ""); + if (!resultProperties.containsKey(helpId)) { + resultProperties.put(helpId, ""); + } } Writer writer = Files.newWriter(inputFile, Charsets.UTF_8); try { - p.store(writer, "Generated by " + getClass().getName()); + resultProperties.store(writer, "Generated by " + getClass().getName()); writer.close(); } finally { Closeables.closeQuietly(writer); } } - } }

1 0

r2598 - trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin
by tchemit＠users.nuiton.org 08 Mar '13

08 Mar '13

Author: tchemit Date: 2013-03-08 10:50:09 +0100 (Fri, 08 Mar 2013) New Revision: 2598 Url: http://nuiton.org/projects/jaxx/repository/revisions/2598 Log: fixes #2576: Change the default generated help ids filenames Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java 2013-03-07 23:16:14 UTC (rev 2597) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java 2013-03-08 09:50:09 UTC (rev 2598) @@ -73,7 +73,7 @@ * * @since 1.3 */ - @Parameter(property = "jaxx.helpIdsFilename", defaultValue = "helpIds.properties", required = true) + @Parameter(property = "jaxx.helpIdsFilename", defaultValue = "helpIds.txt", required = true) private String helpIdsFilename; /** @@ -82,7 +82,7 @@ * * @since 1.3 */ - @Parameter(property = "jaxx.mergeHelpIdsFilename", defaultValue = "helpIds-all.properties", required = true) + @Parameter(property = "jaxx.mergeHelpIdsFilename", defaultValue = "helpIds-all.txt", required = true) private String mergeHelpIdsFilename; /** @@ -243,7 +243,11 @@ try { String id; while ((id = reader.readLine()) != null) { - result.add(id.trim()); + id = id.trim(); + + if (!id.startsWith("#")) { + result.add(id); + } } if (isVerbose()) { getLog().info("load " + result.size() +

1 0

r2597 - trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin
by tchemit＠users.nuiton.org 07 Mar '13

07 Mar '13

Author: tchemit Date: 2013-03-08 00:16:14 +0100 (Fri, 08 Mar 2013) New Revision: 2597 Url: http://nuiton.org/projects/jaxx/repository/revisions/2597 Log: fixes #2566: Can merge helper ids into inpute files in generate-help-ids mojo + improve other helps mojos Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpMojo.java trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpSearchMojo.java Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java 2013-03-07 17:30:11 UTC (rev 2596) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java 2013-03-07 23:16:14 UTC (rev 2597) @@ -119,6 +119,9 @@ /** Call back after doing all stuff for all locales declared */ protected abstract void postDoAction(); + /** Call back before doing all stuff for all locales declared */ + protected abstract void preDoAction() throws IOException; + @Override protected void init() throws Exception { @@ -163,6 +166,8 @@ @Override protected void doAction() throws Exception { + preDoAction(); + for (Locale locale : localesToTreate) { boolean isDefaultLocale = defaultLocale.equals(locale); @@ -231,7 +236,7 @@ protected Set<String> loadHelpIds(File file) throws IOException { - BufferedReader reader = null; + BufferedReader reader; Set<String> result = new HashSet<String>(); reader = new BufferedReader(new InputStreamReader( new FileInputStream(file), getEncoding())); Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java 2013-03-07 17:30:11 UTC (rev 2596) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java 2013-03-07 23:16:14 UTC (rev 2597) @@ -35,6 +35,7 @@ import org.nuiton.util.SortedProperties; import java.io.File; +import java.io.IOException; import java.net.URL; import java.util.Enumeration; import java.util.Locale; @@ -213,6 +214,10 @@ } @Override + protected void preDoAction() throws IOException { + } + + @Override protected void postDoAction() { getLog().info(touchedFiles + " file(s) treated."); } Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java 2013-03-07 17:30:11 UTC (rev 2596) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java 2013-03-07 23:16:14 UTC (rev 2597) @@ -24,12 +24,21 @@ */ package org.nuiton.jaxx.plugin; +import com.google.common.base.Charsets; +import com.google.common.io.Closeables; +import com.google.common.io.Files; import jaxx.compiler.decorators.HelpRootCompiledObjectDecorator; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.nuiton.util.SortedProperties; import java.io.File; +import java.io.IOException; +import java.io.Reader; +import java.io.Writer; +import java.util.HashSet; import java.util.Locale; import java.util.Set; @@ -45,6 +54,47 @@ defaultPhase = LifecyclePhase.PROCESS_SOURCES, requiresProject = true) public class GenerateHelpIdsMojo extends AbstractGenerateHelpMojo { + public static final String INPUT_FILENAME_FORMAT = "%s_%s_%s.properties"; + + /** + * Flag to merge ids into input directory. + * + * @since 2.5.12 + */ + @Parameter(property = "jaxx.mergeIdsToInput", + defaultValue = "false", + required = true) + protected boolean mergeIdsToInput; + + /** + * Directory where to merge (create) input files. + * <p/> + * <strong>Note:</strong> Only used when {@code mergeIdsToInput} parameter + * is on. + * + * @since 2.5.12 + */ + @Parameter(property = "jaxx.inputHelpDirectory", + defaultValue = "src/main/resources/help", + required = true) + private File inputHelpDirectory; + + /** + * Prefix of input files. + * <p/> + * <strong>Note:</strong> {@code _locale.properties} will be added to each + * generated file. + * <p/> + * <strong>Note:</strong> Only used when {@code mergeIdsToInput} parameter + * is on. + * + * @since 2.5.12 + */ + @Parameter(property = "jaxx.inputHelpFilenamePrefix", + defaultValue = "helpMapping", + required = true) + private String inputHelpFilenamePrefix; + /** help ids to react. */ protected Set<String> helpIds; @@ -72,6 +122,10 @@ // always clean helpIdsStore before all cleanHelpIdsStore(); + if (mergeIdsToInput) { + createDirectoryIfNecessary(inputHelpDirectory); + } + } @Override @@ -91,8 +145,7 @@ } @Override - public void doAction() throws Exception { - + protected void preDoAction() throws IOException { // store current jaxx session detected help ids File idsStore = getHelpIdsStoreFile(); @@ -109,13 +162,9 @@ if (idsStoreAll.exists()) { Set<String> allIds = loadHelpIds(idsStoreAll); helpIds.addAll(allIds); - allIds.clear(); } storeHelpIds(idsStoreAll, helpIds); - - helpIds.clear(); - } @Override @@ -124,10 +173,60 @@ File source, String localePath) throws Exception { // nothing to do specific to locale + + if (mergeIdsToInput) { + + String filename = String.format( + INPUT_FILENAME_FORMAT, + inputHelpFilenamePrefix, + locale.getLanguage(), + locale.getCountry()); + + File inputFile = new File(inputHelpDirectory, filename); + + getLog().info("Use input file: " + inputFile); + + SortedProperties p = new SortedProperties(); + + if (inputFile.exists()) { + Reader reader = Files.newReader(inputFile, Charsets.UTF_8); + try { + p.load(reader); + reader.close(); + } finally { + Closeables.closeQuietly(reader); + } + } + Set<String> existingId = p.stringPropertyNames(); + Set<String> newIds = new HashSet<String>(); + for (String helpId : helpIds) { + newIds.add(removeQuote(helpId)); + } + newIds.removeAll(existingId); + if (!newIds.isEmpty()) { + + getLog().info("Add " + newIds.size() + " keys."); + + for (String helpId : newIds) { + p.put(helpId, ""); + } + + Writer writer = Files.newWriter(inputFile, Charsets.UTF_8); + try { + p.store(writer, "Generated by " + getClass().getName()); + writer.close(); + } finally { + Closeables.closeQuietly(writer); + } + + } + + } } @Override protected void postDoAction() { + helpIds.clear(); } @Override Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpMojo.java 2013-03-07 17:30:11 UTC (rev 2596) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpMojo.java 2013-03-07 23:16:14 UTC (rev 2597) @@ -31,6 +31,7 @@ import org.apache.maven.plugins.annotations.ResolutionScope; import java.io.File; +import java.io.IOException; import java.util.Locale; /** @@ -59,7 +60,10 @@ @Override public void doAction() throws Exception { + } + @Override + protected void preDoAction() throws IOException { } @Override Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpSearchMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpSearchMojo.java 2013-03-07 17:30:11 UTC (rev 2596) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpSearchMojo.java 2013-03-07 23:16:14 UTC (rev 2597) @@ -35,6 +35,7 @@ import org.nuiton.plugin.PluginHelper; import java.io.File; +import java.io.IOException; import java.io.PrintStream; import java.lang.reflect.Method; import java.util.ArrayList; @@ -127,7 +128,7 @@ if (isForce()) { - // always generate if force flag is no + // always generate if force flag is on generate = true; } else if (!target.exists()) { @@ -183,6 +184,10 @@ } @Override + protected void preDoAction() throws IOException { + } + + @Override protected void postDoAction() { // add resources to the project

1 0