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

r2574 - in trunk/jaxx-demo/src/main: java/jaxx/demo/component/jaxx/editor resources/i18n resources/icons
by kmorin＠users.nuiton.org Feb. 26, 2013

Feb. 26, 2013

Author: kmorin Date: 2013-02-26 16:05:16 +0100 (Tue, 26 Feb 2013) New Revision: 2574 Url: http://nuiton.org/projects/jaxx/repository/revisions/2574 Log: fixes #2535 Add filter and sorted on the BeanDoubleList widget Added: trunk/jaxx-demo/src/main/resources/icons/action-filter.png Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.css 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/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/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.css =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.css 2013-02-26 15:04:47 UTC (rev 2573) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.css 2013-02-26 15:05:16 UTC (rev 2574) @@ -40,6 +40,11 @@ selected: true; } +#filterOnNachoButton { + text: "jaxxdemo.beandoublelistdemo.filterOnNacho"; + selected: false; +} + #doubleList { i18nPrefix: "jaxxdemo.common."; filterable: {filterableButton.isSelected()}; 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 2013-02-26 15:04:47 UTC (rev 2573) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx 2013-02-26 15:05:16 UTC (rev 2574) @@ -37,6 +37,7 @@ <JCheckBox id='filterableButton'/> <JCheckBox id='showResetButton'/> <JCheckBox id='showDecoratorButton'/> + <JCheckBox id='filterOnNachoButton'/> </JPanel> </cell> </row> 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 2013-02-26 15:04:47 UTC (rev 2573) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java 2013-02-26 15:05:16 UTC (rev 2574) @@ -28,13 +28,16 @@ * #L% */ +import com.google.common.base.Predicate; +import java.util.List; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; import jaxx.demo.entities.DemoDataProvider; import jaxx.demo.entities.DemoDecoratorProvider; +import jaxx.demo.entities.Movie; import jaxx.demo.entities.People; import org.nuiton.util.decorator.JXPathDecorator; -import java.util.List; - /** @author kmorin */ public class BeanDoubleListDemoHandler { @@ -45,9 +48,30 @@ } public void init() { - List<People> data = new DemoDataProvider().getPeoples(); + DemoDataProvider demoDataProvider = new DemoDataProvider(); + List<People> data = demoDataProvider.getPeoples(); JXPathDecorator<People> decorator = (JXPathDecorator<People>) new DemoDecoratorProvider().getDecoratorByType(People.class); - this.ui.getDoubleList().init(decorator, data, data.subList(0, 1)); + ui.getDoubleList().init(decorator, data, data.subList(0, 1)); + + final Movie nacho = demoDataProvider.getMovie("0"); + final Predicate<People> filter = new Predicate<People>() { + + public boolean apply(People input) { + return nacho.getActors().contains(input); + } + }; + ui.getFilterOnNachoButton().addChangeListener(new ChangeListener() { + + public void stateChanged(ChangeEvent e) { + if (ui.getFilterOnNachoButton().isSelected()) { + ui.getDoubleList().getHandler().addFilter(filter); + + } else { + ui.getDoubleList().getHandler().clearFilters(); + } + } + }); + } } 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-02-26 15:04:47 UTC (rev 2573) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties 2013-02-26 15:05:16 UTC (rev 2574) @@ -176,6 +176,7 @@ jaxxdemo.beancomboboxdemo.showDecorator=Show decorator button jaxxdemo.beancomboboxdemo.showReset=Show Reset button jaxxdemo.beandoublelistdemo.configuration=Configuration +jaxxdemo.beandoublelistdemo.filterOnNacho=Show only the actors playing in Nacho Libre jaxxdemo.beandoublelistdemo.filterable=Filterable jaxxdemo.beandoublelistdemo.showDecorator=Show decorator button jaxxdemo.beandoublelistdemo.showReset=Show Reset button 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-02-26 15:04:47 UTC (rev 2573) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties 2013-02-26 15:05:16 UTC (rev 2574) @@ -176,6 +176,7 @@ jaxxdemo.beancomboboxdemo.showDecorator= jaxxdemo.beancomboboxdemo.showReset= jaxxdemo.beandoublelistdemo.configuration= +jaxxdemo.beandoublelistdemo.filterOnNacho= jaxxdemo.beandoublelistdemo.filterable= jaxxdemo.beandoublelistdemo.showDecorator= jaxxdemo.beandoublelistdemo.showReset= 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-02-26 15:04:47 UTC (rev 2573) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties 2013-02-26 15:05:16 UTC (rev 2574) @@ -176,6 +176,7 @@ jaxxdemo.beancomboboxdemo.showDecorator=Changer la décoration jaxxdemo.beancomboboxdemo.showReset=Pouvoir réinitialiser jaxxdemo.beandoublelistdemo.configuration=Configuration +jaxxdemo.beandoublelistdemo.filterOnNacho=N'afficher que les acteurs de Nacho Libre jaxxdemo.beandoublelistdemo.filterable=Filtrable jaxxdemo.beandoublelistdemo.showDecorator=Changer la décoration jaxxdemo.beandoublelistdemo.showReset=Pouvoir réinitialiser le filtre Added: trunk/jaxx-demo/src/main/resources/icons/action-filter.png =================================================================== (Binary files differ) Property changes on: trunk/jaxx-demo/src/main/resources/icons/action-filter.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r2573 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
by kmorin＠users.nuiton.org Feb. 26, 2013

Feb. 26, 2013

Author: kmorin Date: 2013-02-26 16:04:47 +0100 (Tue, 26 Feb 2013) New Revision: 2573 Url: http://nuiton.org/projects/jaxx/repository/revisions/2573 Log: fixes #2535 Add filter and sorted on the BeanDoubleList widget Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.css trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx 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/BeanDoubleList.css =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.css 2013-02-26 15:04:07 UTC (rev 2572) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.css 2013-02-26 15:04:47 UTC (rev 2573) @@ -26,6 +26,10 @@ visible: {isFilterable()}; } +#filterFieldLabel { + actionIcon: "filter"; +} + #universeList { model:{model.getUniverseModel()}; } @@ -82,7 +86,7 @@ toolTipText:"beandoublelist.action.reset.tip"; focusable:false; focusPainted:false; - enabled:{isEnabled()}; + enabled:{isShowReset() && isEnabled()}; } #toolbarRight { 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 2013-02-26 15:04:07 UTC (rev 2572) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx 2013-02-26 15:04:47 UTC (rev 2573) @@ -86,9 +86,12 @@ <row> <cell columns='3' fill='both'> <JPanel layout='{new BorderLayout()}' id='filterPanel'> - <JToolBar id='toolbarLeft' constraints='BorderLayout.WEST'> - <JButton id='resetButton' onActionPerformed='filterField.setText("")'/> - </JToolBar> + <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.WEST'> + <JLabel id='filterFieldLabel' constraints='BorderLayout.WEST'/> + <JToolBar id='toolbarLeft' constraints='BorderLayout.EAST'> + <JButton id='resetButton' onActionPerformed='filterField.setText("")'/> + </JToolBar> + </JPanel> <JTextField id='filterField' constraints='BorderLayout.CENTER'/> <JToolBar id='toolbarRight' constraints='BorderLayout.EAST'> <JToggleButton id='changeDecorator' 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 2013-02-26 15:04:07 UTC (rev 2572) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java 2013-02-26 15:04:47 UTC (rev 2573) @@ -24,21 +24,7 @@ * #L% */ -import com.google.common.collect.Lists; -import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; -import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.util.decorator.JXPathDecorator; -import org.nuiton.util.decorator.MultiJXPathDecorator; - -import javax.swing.JList; -import javax.swing.ListSelectionModel; -import javax.swing.event.ListDataEvent; -import javax.swing.event.ListDataListener; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; +import com.google.common.base.Predicate; import java.awt.event.MouseEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -46,17 +32,26 @@ import java.util.Arrays; import java.util.List; import javax.swing.JComponent; +import javax.swing.JList; import javax.swing.JPopupMenu; +import javax.swing.ListSelectionModel; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; -import javax.swing.text.Document; -import javax.swing.text.JTextComponent; +import javax.swing.event.ListDataEvent; +import javax.swing.event.ListDataListener; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.JAXXButtonGroup; import jaxx.runtime.swing.model.JaxxDefaultListModel; import jaxx.runtime.swing.model.JaxxFilterableListModel; -import org.apache.commons.collections.CollectionUtils; +import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; +import jaxx.runtime.swing.renderer.FilteredDecoratorListCellRenderer; +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; /** * The handler of a {@link BeanDoubleList}. @@ -79,7 +74,7 @@ /** the decorator of data */ protected MultiJXPathDecorator<O> decorator; - + public BeanDoubleListHandler(BeanDoubleList<O> ui) { this.ui = ui; } @@ -113,7 +108,9 @@ JList universeList = ui.getUniverseList(); JList selectedList = ui.getSelectedList(); - universeList.setCellRenderer(new DecoratorListCellRenderer(this.decorator)); + final FilteredDecoratorListCellRenderer universeListCellRenderer + = new FilteredDecoratorListCellRenderer(this.decorator); + universeList.setCellRenderer(universeListCellRenderer); selectedList.setCellRenderer(new DecoratorListCellRenderer(this.decorator)); // When universe list selection model changed, update the add button enabled property @@ -173,20 +170,28 @@ ui.getFilterField().getDocument().addDocumentListener(new DocumentListener() { public void insertUpdate(DocumentEvent e) { - filterModel.setFilterText(ui.getFilterField().getText()); + String text = ui.getFilterField().getText(); + universeListCellRenderer.setFilterText(text); + filterModel.setFilterText(text); } public void removeUpdate(DocumentEvent e) { - filterModel.setFilterText(ui.getFilterField().getText()); + String text = ui.getFilterField().getText(); + universeListCellRenderer.setFilterText(text); + filterModel.setFilterText(text); } public void changedUpdate(DocumentEvent e) { - filterModel.setFilterText(ui.getFilterField().getText()); + String text = ui.getFilterField().getText(); + universeListCellRenderer.setFilterText(text); + filterModel.setFilterText(text); } }); // select sort button indexes.setSelectedButton(ui.getIndex()); + + sortData(); } /** Toggle the popup visible state. */ @@ -362,8 +367,19 @@ // sort order has changed, force reload of data in ui setSortOrder((Boolean) evt.getOldValue(), (Boolean) evt.getNewValue()); - return; } } + public void addFilter(Predicate<O> filter) { + ((JaxxFilterableListModel) ui.getModel().getUniverseModel()).addFilter(filter); + } + + public void removeFilter(Predicate<O> filter) { + ((JaxxFilterableListModel) ui.getModel().getUniverseModel()).removeFilter(filter); + } + + public void clearFilters() { + ((JaxxFilterableListModel) ui.getModel().getUniverseModel()).clearFilters(); + } + }

1 0

r2572 - in trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing: model renderer
by kmorin＠users.nuiton.org Feb. 26, 2013

Feb. 26, 2013

Author: kmorin Date: 2013-02-26 16:04:07 +0100 (Tue, 26 Feb 2013) New Revision: 2572 Url: http://nuiton.org/projects/jaxx/repository/revisions/2572 Log: fixes #2535 Add filter and sorted on the BeanDoubleList widget Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/FilteredDecoratorListCellRenderer.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableListModel.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableListModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableListModel.java 2013-02-25 14:51:57 UTC (rev 2571) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableListModel.java 2013-02-26 15:04:07 UTC (rev 2572) @@ -1,25 +1,33 @@ package jaxx.runtime.swing.model; +import com.google.common.base.Predicate; +import com.google.common.collect.Lists; import java.util.ArrayList; import java.util.Collection; +import java.util.List; +import java.util.regex.Pattern; import org.apache.commons.lang3.StringUtils; import org.nuiton.util.decorator.JXPathDecorator; /** + * List model for filterable lists. * * @author kmorin <kmorin(a)codelutin.com> + * @since 2.5.11 */ public class JaxxFilterableListModel<E> extends JaxxDefaultListModel<E> { private static final long serialVersionUID = 1L; - private ArrayList<E> filteredItems = new ArrayList<E>(); + protected ArrayList<E> filteredItems = Lists.newArrayList(); protected String filterText; /** the decorator of data */ protected JXPathDecorator<E> decorator; + protected List<Predicate<E>> filters = Lists.newArrayList(); + @Override public E getElementAt(int index) { if (index < filteredItems.size()) { @@ -72,7 +80,7 @@ @Override public void setSize(int newSize) { super.setSize(newSize); - ensureCapacity(newSize); + filteredItems.ensureCapacity(newSize); } @Override @@ -160,17 +168,49 @@ 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.isBlank(filterText)) { + if (StringUtils.isBlank(filterText) && filters.isEmpty()) { filteredItems.addAll(delegate); } else { int itemNumber = delegate.size(); + Pattern pattern = null; + if (!StringUtils.isBlank(filterText)) { + String patternText = filterText.replace("*", ".*") + ".*"; + pattern = Pattern.compile(patternText, Pattern.CASE_INSENSITIVE); + } for (int i = 0 ; i < itemNumber ; i++) { E element = delegate.get(i); - if (StringUtils.startsWithIgnoreCase(decorator.toString(element), filterText)) { + 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); } } Copied: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/FilteredDecoratorListCellRenderer.java (from rev 2567, trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java) =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/FilteredDecoratorListCellRenderer.java (rev 0) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/FilteredDecoratorListCellRenderer.java 2013-02-26 15:04:07 UTC (rev 2572) @@ -0,0 +1,104 @@ +/* + * #%L + * JAXX :: Runtime + * + * $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.renderer; + +import java.awt.Component; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import javax.swing.JList; +import javax.swing.ListCellRenderer; +import org.nuiton.util.decorator.Decorator; + +/** + * A {@link ListCellRenderer} which compute text with the given {@link #decorator}, + * highlights a part of the rendered text, + * and leave the hand to the {@link #delegate} to perform the visual renderer. + * + * @author kmorin <kmorin(a)codelutin.com> + * @since 2.5.11 + */ +public class FilteredDecoratorListCellRenderer extends DecoratorListCellRenderer { + + /** text to highlight */ + protected String filterText; + + public FilteredDecoratorListCellRenderer(Decorator<?> decorator) { + super(decorator); + } + + public FilteredDecoratorListCellRenderer(ListCellRenderer delegate, + Decorator<?> decorator) { + super(delegate, decorator); + } + + public String getFilterText() { + return filterText; + } + + public void setFilterText(String filterText) { + this.filterText = filterText; + } + + @Override + public Component getListCellRendererComponent(JList list, + Object value, + int index, + boolean isSelected, + boolean cellHasFocus) { + + if (!(value instanceof String) && decorator != null) { + value = decorator.toString(value); + } + + String stringValue = String.valueOf(value); + if (filterText != null) { + // add the groups in the pattern + String patternText = "(" + filterText.replace("*", ").*(") + ").*"; + Pattern pattern = Pattern.compile(patternText, Pattern.CASE_INSENSITIVE); + Matcher matcher = pattern.matcher(stringValue); + + if (matcher.find()) { + // for each group caught, add the text between the previous group + // and the current group and surround the group with the highlighter + String s = ""; + int i = 0; + for (int g = 1 ; g <= matcher.groupCount() ; g++) { + String match = matcher.group(g); + int indexOfMatch = stringValue.indexOf(match, i); + s += stringValue.substring(i, indexOfMatch) + "<em style='background:#FFFF00'>" + match + "</em>"; + i = indexOfMatch + match.length(); + } + s += stringValue.substring(i); + stringValue = "<html>" + s + "</html>"; + } + } + return delegate.getListCellRendererComponent(list, + stringValue, + index, + isSelected, + cellHasFocus + ); + } +}

1 0

r2571 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
by kmorin＠users.nuiton.org Feb. 25, 2013

Feb. 25, 2013

Author: kmorin Date: 2013-02-25 15:51:57 +0100 (Mon, 25 Feb 2013) New Revision: 2571 Url: http://nuiton.org/projects/jaxx/repository/revisions/2571 Log: refs #2535 Add filter and sorted on the BeanDoubleList widget 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 2013-02-25 14:49:20 UTC (rev 2570) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java 2013-02-25 14:51:57 UTC (rev 2571) @@ -113,8 +113,8 @@ JList universeList = ui.getUniverseList(); JList selectedList = ui.getSelectedList(); - universeList.setCellRenderer(new DecoratorListCellRenderer(decorator)); - selectedList.setCellRenderer(new DecoratorListCellRenderer(decorator)); + universeList.setCellRenderer(new DecoratorListCellRenderer(this.decorator)); + selectedList.setCellRenderer(new DecoratorListCellRenderer(this.decorator)); // When universe list selection model changed, update the add button enabled property universeList.getSelectionModel().addListSelectionListener(new ListSelectionListener() {

1 0

r2570 - in trunk/jaxx-demo/src/main: java/jaxx/demo/component/jaxx/editor java/jaxx/demo/entities resources/i18n resources/jaxx/demo/images
by kmorin＠users.nuiton.org Feb. 25, 2013

Feb. 25, 2013

Author: kmorin Date: 2013-02-25 15:49:20 +0100 (Mon, 25 Feb 2013) New Revision: 2570 Url: http://nuiton.org/projects/jaxx/repository/revisions/2570 Log: refs #2535 Add filter and sorted on the BeanDoubleList widget Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.css trunk/jaxx-demo/src/main/resources/jaxx/demo/images/jim.jpg trunk/jaxx-demo/src/main/resources/jaxx/demo/images/joker.jpg Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/entities/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/BeanDoubleListDemo.css (from rev 2566, trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.css) =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.css (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.css 2013-02-25 14:49:20 UTC (rev 2570) @@ -0,0 +1,48 @@ +/* + * #%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.beandoublelistdemo.configuration"))}; +} + +#filterableButton { + text: "jaxxdemo.beandoublelistdemo.filterable"; + selected: true; +} + +#showResetButton { + text: "jaxxdemo.beandoublelistdemo.showReset"; + selected: true; +} + +#showDecoratorButton { + text: "jaxxdemo.beandoublelistdemo.showDecorator"; + selected: true; +} + +#doubleList { + i18nPrefix: "jaxxdemo.common."; + filterable: {filterableButton.isSelected()}; + showReset: {showResetButton.isSelected()}; + showDecorator: {showDecoratorButton.isSelected()}; +} \ No newline at end of file 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 2013-02-25 14:49:04 UTC (rev 2569) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx 2013-02-25 14:49:20 UTC (rev 2570) @@ -32,6 +32,15 @@ <Table fill='both'> <row> + <cell> + <JPanel id='configurationPanel' layout='{new GridLayout(0,1)}'> + <JCheckBox id='filterableButton'/> + <JCheckBox id='showResetButton'/> + <JCheckBox id='showDecoratorButton'/> + </JPanel> + </cell> + </row> + <row> <cell weighty='1' weightx='1'> <BeanDoubleList id='doubleList' genericType='People'/> </cell> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/entities/DemoDataProvider.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/entities/DemoDataProvider.java 2013-02-25 14:49:04 UTC (rev 2569) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/entities/DemoDataProvider.java 2013-02-25 14:49:20 UTC (rev 2570) @@ -58,6 +58,8 @@ People a = new People("0", "Jack", "Black", 35, "/jaxx/demo/images/jack.jpg"); People a2 = new People("1", "Héctor", "Jiménez", 28, "/jaxx/demo/images/hector.jpg"); People a3 = new People("2", "Ana", "de la Reguera", 34, "/jaxx/demo/images/ana.jpg"); + People a4 = new People("3", "Jack", "Nicholson", 76, "/jaxx/demo/images/joker.jpg"); + People a5 = new People("4", "Jim", "Parsons", 30, "/jaxx/demo/images/jim.jpg"); Movie m = new Movie("0", "Nacho libre", 1996, "/jaxx/demo/images/nacho.jpg"); m.addActor(a); @@ -74,6 +76,8 @@ peoples.put(a.getId(), a); peoples.put(a2.getId(), a2); peoples.put(a3.getId(), a3); + peoples.put(a4.getId(), a4); + peoples.put(a5.getId(), a5); } @Override 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-02-25 14:49:04 UTC (rev 2569) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties 2013-02-25 14:49:20 UTC (rev 2570) @@ -175,6 +175,10 @@ jaxxdemo.beancomboboxdemo.selected.people=Selection\: %s jaxxdemo.beancomboboxdemo.showDecorator=Show decorator button jaxxdemo.beancomboboxdemo.showReset=Show Reset button +jaxxdemo.beandoublelistdemo.configuration=Configuration +jaxxdemo.beandoublelistdemo.filterable=Filterable +jaxxdemo.beandoublelistdemo.showDecorator=Show decorator button +jaxxdemo.beandoublelistdemo.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-02-25 14:49:04 UTC (rev 2569) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties 2013-02-25 14:49:20 UTC (rev 2570) @@ -175,6 +175,10 @@ jaxxdemo.beancomboboxdemo.selected.people= jaxxdemo.beancomboboxdemo.showDecorator= jaxxdemo.beancomboboxdemo.showReset= +jaxxdemo.beandoublelistdemo.configuration= +jaxxdemo.beandoublelistdemo.filterable= +jaxxdemo.beandoublelistdemo.showDecorator= +jaxxdemo.beandoublelistdemo.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-02-25 14:49:04 UTC (rev 2569) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties 2013-02-25 14:49:20 UTC (rev 2570) @@ -175,6 +175,10 @@ jaxxdemo.beancomboboxdemo.selected.people=Sélection \: %s jaxxdemo.beancomboboxdemo.showDecorator=Changer la décoration jaxxdemo.beancomboboxdemo.showReset=Pouvoir réinitialiser +jaxxdemo.beandoublelistdemo.configuration=Configuration +jaxxdemo.beandoublelistdemo.filterable=Filtrable +jaxxdemo.beandoublelistdemo.showDecorator=Changer la décoration +jaxxdemo.beandoublelistdemo.showReset=Pouvoir réinitialiser le filtre jaxxdemo.common.actors=Acteurs jaxxdemo.common.age=Age jaxxdemo.common.firstName=Prénom Added: trunk/jaxx-demo/src/main/resources/jaxx/demo/images/jim.jpg =================================================================== (Binary files differ) Property changes on: trunk/jaxx-demo/src/main/resources/jaxx/demo/images/jim.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/jaxx-demo/src/main/resources/jaxx/demo/images/joker.jpg =================================================================== (Binary files differ) Property changes on: trunk/jaxx-demo/src/main/resources/jaxx/demo/images/joker.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r2569 - in trunk/jaxx-widgets/src/main: java/jaxx/runtime/swing/editor/bean resources/i18n resources/icons
by kmorin＠users.nuiton.org Feb. 25, 2013

Feb. 25, 2013

Author: kmorin Date: 2013-02-25 15:49:04 +0100 (Mon, 25 Feb 2013) New Revision: 2569 Url: http://nuiton.org/projects/jaxx/repository/revisions/2569 Log: refs #2535 Add filter and sorted on the BeanDoubleList widget Added: trunk/jaxx-widgets/src/main/resources/icons/action-doublelist-reset.png trunk/jaxx-widgets/src/main/resources/icons/action-doublelist-sort.png Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.css trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_en_GB.properties trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.css =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.css 2013-02-25 14:48:45 UTC (rev 2568) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.css 2013-02-25 14:49:04 UTC (rev 2569) @@ -22,6 +22,10 @@ * #L% */ +#filterPanel { + visible: {isFilterable()}; +} + #universeList { model:{model.getUniverseModel()}; } @@ -40,4 +44,57 @@ toolTipText:"beandoublelist.button.remove"; actionIcon:"bean-doublelist-unselect"; enabled:{model.isRemoveEnabled()}; +} + +#popup { + border:{new TitledBorder(_("beandoublelist.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:"doublelist-reset"; + toolTipText:"beandoublelist.action.reset.tip"; + focusable:false; + focusPainted:false; + enabled:{isEnabled()}; +} + +#toolbarRight { + floatable:false; + borderPainted:false; + visible:{isShowDecorator()}; +} + +#changeDecorator { + actionIcon:"doublelist-sort"; + toolTipText:"beandoublelist.action.sort.tip"; + focusable:false; + focusPainted:false; + enabled:{isShowDecorator() && isEnabled()}; } \ No newline at end of file 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 2013-02-25 14:48:45 UTC (rev 2568) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx 2013-02-25 14:49:04 UTC (rev 2569) @@ -28,44 +28,81 @@ org.nuiton.util.decorator.JXPathDecorator javax.swing.DefaultListModel </import> - + +  + <Boolean id='filterable' javaBean='true'/> + +  + <Boolean id='reverseSort' javaBean='false'/> + +  + <Boolean id='showDecorator' javaBean='true'/> + +  + <Boolean id='showReset' javaBean='true'/> +  <Class id='beanType' genericType='O' javaBean='null'/> -  - <String id='labelText' javaBean='null'/> -  <String id='property' javaBean='""'/>  <Object id='bean' javaBean='null'/> -  - <Boolean id='showReset' javaBean='false'/> + <String id='i18nPrefix' javaBean='"beanlist.common."'/> -  -  - -  -  <BeanDoubleListModel id='model' genericType='O'/>  <BeanDoubleListHandler id='handler' genericType='O' constructorParams='this'/> +  + <Integer id='index' javaBean='0'/> + +  + <ButtonGroup id='indexes' + onStateChanged='setIndex((Integer)indexes.getSelectedValue())'/> + + <ButtonGroup id='sortGroup' + onStateChanged='setReverseSort((Boolean)sortGroup.getSelectedValue())'/> + +  + <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> + <row> + <cell columns='3' fill='both'> + <JPanel layout='{new BorderLayout()}' id='filterPanel'> + <JToolBar id='toolbarLeft' constraints='BorderLayout.WEST'> + <JButton id='resetButton' onActionPerformed='filterField.setText("")'/> + </JToolBar> + <JTextField id='filterField' constraints='BorderLayout.CENTER'/> + <JToolBar id='toolbarRight' constraints='BorderLayout.EAST'> + <JToggleButton id='changeDecorator' + onActionPerformed='getHandler().togglePopup()'/> + </JToolBar> + </JPanel> + </cell> + </row> + <row> <cell weightx='0.5' weighty='1' fill='both'> <JScrollPane onFocusGained='universeList.requestFocus()'> -   <JList id='universeList' onMouseClicked='handler.onUniverseListClicked(event)'/> -  </JScrollPane> </cell> @@ -78,14 +115,9 @@ <cell weightx='0.5' weighty='1' fill='both'> <JScrollPane onFocusGained='selectedList.requestFocus()'> -   <JList id='selectedList' onMouseClicked='handler.onSelectedListClicked(event)'/> -  </JScrollPane> </cell> </row> 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 2013-02-25 14:48:45 UTC (rev 2568) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java 2013-02-25 14:49:04 UTC (rev 2569) @@ -24,6 +24,9 @@ * #L% */ +import com.google.common.collect.Lists; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -37,9 +40,23 @@ import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import java.awt.event.MouseEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.lang.reflect.Method; import java.util.Arrays; import java.util.List; +import javax.swing.JComponent; +import javax.swing.JPopupMenu; +import javax.swing.event.DocumentEvent; +import javax.swing.event.DocumentListener; +import javax.swing.text.Document; +import javax.swing.text.JTextComponent; +import jaxx.runtime.SwingUtil; +import jaxx.runtime.swing.JAXXButtonGroup; +import jaxx.runtime.swing.model.JaxxDefaultListModel; +import jaxx.runtime.swing.model.JaxxFilterableListModel; +import org.apache.commons.collections.CollectionUtils; +import org.nuiton.util.decorator.DecoratorUtil; /** * The handler of a {@link BeanDoubleList}. @@ -50,7 +67,7 @@ * @see BeanDoubleList * @since 2.5.8 */ -public class BeanDoubleListHandler<O> { +public class BeanDoubleListHandler<O> implements PropertyChangeListener { private static final Log log = LogFactory.getLog(BeanDoubleListHandler.class); @@ -59,7 +76,7 @@ /** ui of the handler */ protected BeanDoubleList<O> ui; - + /** the decorator of data */ protected MultiJXPathDecorator<O> decorator; @@ -67,6 +84,19 @@ this.ui = ui; } + private final BeanUIUtil.PopupHandler popupHandler = new BeanUIUtil.PopupHandler() { + + @Override + public JPopupMenu getPopup() { + return ui.getPopup(); + } + + @Override + public JComponent getInvoker() { + return ui.getChangeDecorator(); + } + }; + /** * Initializes the handler of the UI * @@ -76,7 +106,7 @@ */ public void init(JXPathDecorator<O> decorator, List<O> universe, List<O> selected) { this.decorator = BeanUIUtil.createDecorator(decorator); - + ui.getModel().setUniverse(universe); ui.getModel().setSelected(selected); @@ -118,9 +148,123 @@ fireSelectionUpdate(); } }); + + JAXXButtonGroup indexes = ui.getIndexes(); + + // build popup + popupHandler.preparePopup(null, + null, + ui.getI18nPrefix(), + null, + indexes, + ui.getPopupSeparator(), + ui.getPopupLabel(), + ui.getSortUp(), + ui.getSortDown(), + this.decorator); + + ui.addPropertyChangeListener(this); + + final JaxxFilterableListModel<O> filterModel = + (JaxxFilterableListModel) ui.getModel().getUniverseModel(); + + filterModel.setDecorator(this.decorator); + + ui.getFilterField().getDocument().addDocumentListener(new DocumentListener() { + + public void insertUpdate(DocumentEvent e) { + filterModel.setFilterText(ui.getFilterField().getText()); + } + + public void removeUpdate(DocumentEvent e) { + filterModel.setFilterText(ui.getFilterField().getText()); + } + + public void changedUpdate(DocumentEvent e) { + filterModel.setFilterText(ui.getFilterField().getText()); + } + }); + + // select sort button + indexes.setSelectedButton(ui.getIndex()); } + /** Toggle the popup visible state. */ + public void togglePopup() { + popupHandler.togglePopup(); + } + /** + * Sort data of the model. + * + * @since 2.5.10 + */ + public void sortData() { + + // just update UI should do the math of this + updateUI(ui.getIndex(), ui.isReverseSort()); + } + + /** + * 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); + + List<O> data = (List<O>) Arrays.asList(((JaxxDefaultListModel<O>)ui.getModel().getUniverseModel()).toArray()); + 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.fillList(ui.getUniverseList(), data, null); + + ui.getUniverseList().requestFocus(); + } + + /** * When universe list was double clicked, move selected items to selected list. * * @param event mouse event @@ -131,10 +275,11 @@ int index = universeList.locationToIndex(event.getPoint()); O item = (O) universeList.getModel().getElementAt(index); ui.getModel().addToSelected(item); + + updateUI(ui.getIndex(), ui.isReverseSort()); } } - /** * When selected list was double clicked, move selected items to universe list. * @@ -148,6 +293,8 @@ int index = selectedList.locationToIndex(event.getPoint()); O item = (O) selectedList.getModel().getElementAt(index); ui.getModel().removeFromSelected(item); + + updateUI(ui.getIndex(), ui.isReverseSort()); } } @@ -155,12 +302,14 @@ public void select() { List<O> selection = (List<O>) Arrays.asList(ui.getUniverseList().getSelectedValues()); ui.getModel().addToSelected(selection); + updateUI(ui.getIndex(), ui.isReverseSort()); } /** When remove button was hit, move selected items (from selected list) to universe list. */ public void unselect() { List<O> selection = (List<O>) Arrays.asList(ui.getSelectedList().getSelectedValues()); ui.getModel().removeFromSelected(selection); + updateUI(ui.getIndex(), ui.isReverseSort()); } protected void fireSelectionUpdate() { @@ -179,4 +328,42 @@ } return mutator; } + + public MultiJXPathDecorator<O> getDecorator() { + 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; + } + + @Override + public void propertyChange(PropertyChangeEvent evt) { + String propertyName = evt.getPropertyName(); + + if (BeanListHeader.PROPERTY_INDEX.equals(propertyName)) { + + // decorator index has changed, force reload of data in ui + setIndex((Integer) evt.getOldValue(), + (Integer) evt.getNewValue()); + return; + } + + if (BeanDoubleList.PROPERTY_REVERSE_SORT.equals(propertyName)) { + + // sort order has changed, force reload of data in ui + setSortOrder((Boolean) evt.getOldValue(), + (Boolean) evt.getNewValue()); + return; + } + } + } Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java 2013-02-25 14:48:45 UTC (rev 2568) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java 2013-02-25 14:49:04 UTC (rev 2569) @@ -33,6 +33,7 @@ import javax.swing.ListModel; import java.util.ArrayList; import java.util.List; +import jaxx.runtime.swing.model.JaxxFilterableListModel; /** * The model of the {@link BeanDoubleList} widget @@ -57,7 +58,7 @@ protected List<O> universe = new ArrayList<O>(); /** Model containing the remaining available items */ - protected JaxxDefaultListModel<O> universeModel = new JaxxDefaultListModel<O>(); + protected JaxxFilterableListModel<O> universeModel = new JaxxFilterableListModel<O>(); /** List of the selected items */ protected List<O> selected = new ArrayList<O>(); @@ -65,7 +66,6 @@ /** Model containing the selected items */ protected JaxxDefaultListModel<O> selectedModel = new JaxxDefaultListModel<O>(); - protected boolean addEnabled; protected boolean removeEnabled; Modified: trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_en_GB.properties =================================================================== --- trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_en_GB.properties 2013-02-25 14:48:45 UTC (rev 2568) +++ trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_en_GB.properties 2013-02-25 14:49:04 UTC (rev 2569) @@ -16,8 +16,11 @@ beancombobox.action.reset.tip=Reset the selected value beancombobox.action.sort.tip=Change the sorted property beancombobox.popup.title=Change the sorted property +beandoublelist.action.reset.tip=Reset the value of the filter +beandoublelist.action.sort.tip=Change the sorted property beandoublelist.button.add=Add beandoublelist.button.remove=Remove +beandoublelist.popup.title=Change the sorted property beanlist.action.reset.tip=Reset the selected selection beanlist.action.sort.tip=Change the sorted property beanlist.popup.title=Change the sorted property Modified: trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties =================================================================== --- trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties 2013-02-25 14:48:45 UTC (rev 2568) +++ trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties 2013-02-25 14:49:04 UTC (rev 2569) @@ -16,8 +16,11 @@ beancombobox.action.reset.tip=Reiniciar el valor de la lista desplegable beancombobox.action.sort.tip=Modificar la clasificación de la lista desplegable beancombobox.popup.title=Modificar la clasificación +beandoublelist.action.reset.tip=Reiniciar el valor de la lista desplegable +beandoublelist.action.sort.tip=Modificar la clasificación de la lista beandoublelist.button.add=Add beandoublelist.button.remove=Remove +beandoublelist.popup.title=Modificar la clasificación beanlist.action.reset.tip=Eliminar la selección beanlist.action.sort.tip=Modificar la clasificación de la lista despleglable beanlist.popup.title=Modificar la clasificación Modified: trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties =================================================================== --- trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties 2013-02-25 14:48:45 UTC (rev 2568) +++ trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties 2013-02-25 14:49:04 UTC (rev 2569) @@ -16,8 +16,11 @@ beancombobox.action.reset.tip=Réinitialiser la valeur de la liste déroulante beancombobox.action.sort.tip=Modifier le tri de la liste déroulante beancombobox.popup.title=Modifier le tri -beandoublelist.button.add=Add -beandoublelist.button.remove=Remove +beandoublelist.action.reset.tip=Réinitialiser la valeur du filtre +beandoublelist.action.sort.tip=Modifier le tri de la liste +beandoublelist.button.add=Ajouter +beandoublelist.button.remove=Enlever +beandoublelist.popup.title=Modifier le tri beanlist.action.reset.tip=Supprimer la sélection beanlist.action.sort.tip=Modifier le tri de la liste déroulante beanlist.popup.title=Modifier le tri Copied: trunk/jaxx-widgets/src/main/resources/icons/action-doublelist-reset.png (from rev 2566, trunk/jaxx-widgets/src/main/resources/icons/action-combobox-reset.png) =================================================================== (Binary files differ) Copied: trunk/jaxx-widgets/src/main/resources/icons/action-doublelist-sort.png (from rev 2566, trunk/jaxx-widgets/src/main/resources/icons/action-combobox-sort.png) =================================================================== (Binary files differ)

1 0

r2568 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model
by kmorin＠users.nuiton.org Feb. 25, 2013

Feb. 25, 2013

Author: kmorin Date: 2013-02-25 15:48:45 +0100 (Mon, 25 Feb 2013) New Revision: 2568 Url: http://nuiton.org/projects/jaxx/repository/revisions/2568 Log: refs #2535 Add filter and sorted on the BeanDoubleList widget Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableListModel.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultListModel.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultListModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultListModel.java 2013-02-21 09:03:32 UTC (rev 2567) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultListModel.java 2013-02-25 14:48:45 UTC (rev 2568) @@ -43,7 +43,7 @@ private static final long serialVersionUID = 1L; - private ArrayList<E> delegate = new ArrayList<E>(); + protected ArrayList<E> delegate = new ArrayList<E>(); /** * Returns the number of components in this list. Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableListModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableListModel.java (rev 0) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableListModel.java 2013-02-25 14:48:45 UTC (rev 2568) @@ -0,0 +1,181 @@ +package jaxx.runtime.swing.model; + +import java.util.ArrayList; +import java.util.Collection; +import org.apache.commons.lang3.StringUtils; +import org.nuiton.util.decorator.JXPathDecorator; + +/** + * + * @author kmorin <kmorin(a)codelutin.com> + */ +public class JaxxFilterableListModel<E> extends JaxxDefaultListModel<E> { + + private static final long serialVersionUID = 1L; + + private ArrayList<E> filteredItems = new ArrayList<E>(); + + protected String filterText; + + /** the decorator of data */ + protected JXPathDecorator<E> decorator; + + @Override + public E getElementAt(int index) { + if (index < filteredItems.size()) { + return filteredItems.get(index); + } else { + return null; + } + } + + @Override + public E elementAt(int index) { + return getElementAt(index); + } + + @Override + public void addElement(E o) { + super.addElement(o); + refilter(); + } + + @Override + public boolean removeElement(E o) { + boolean result = super.removeElement(o); + refilter(); + return result; + } + + @Override + public int getSize() { + return filteredItems.size(); + } + + @Override + public int size() { + return filteredItems.size(); + } + + @Override + public void trimToSize() { + super.trimToSize(); + filteredItems.trimToSize(); + } + + @Override + public void ensureCapacity(int minCapacity) { + super.ensureCapacity(minCapacity); + filteredItems.ensureCapacity(minCapacity); + } + + @Override + public void setSize(int newSize) { + super.setSize(newSize); + ensureCapacity(newSize); + } + + @Override + public void setElementAt(E element, int index) { + super.setElementAt(element, index); + refilter(); + } + + @Override + public void removeElementAt(int index) { + super.removeElementAt(index); + refilter(); + } + + @Override + public void insertElementAt(E element, int index) { + super.insertElementAt(element, index); + refilter(); + } + + @Override + public void removeAllElements() { + super.removeAllElements(); + refilter(); + } + + @Override + public E set(int index, E element) { + E rv = super.set(index, element); + refilter(); + return rv; + } + + @Override + public void add(int index, E element) { + super.add(index, element); + refilter(); + } + + @Override + public void setAllElements(Collection<E> objects) { + super.setAllElements(objects); + refilter(); + } + + @Override + public void addAllElements(Collection<E> elements) { + super.addAllElements(elements); + refilter(); + } + + @Override + public E remove(int index) { + E rv = super.remove(index); + refilter(); + return rv; + } + + @Override + public void clear() { + super.clear(); + refilter(); + } + + @Override + public void removeRange(int fromIndex, int toIndex) { + super.removeRange(fromIndex, toIndex); + 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; + } + + protected void refilter() { + filteredItems.clear(); + + if (StringUtils.isBlank(filterText)) { + filteredItems.addAll(delegate); + + } else { + int itemNumber = delegate.size(); + for (int i = 0 ; i < itemNumber ; i++) { + E element = delegate.get(i); + if (StringUtils.startsWithIgnoreCase(decorator.toString(element), filterText)) { + filteredItems.add(element); + } + } + } + + fireContentsChanged(this, 0, getSize()); + } +}

1 0

r2567 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor
by kmorin＠users.nuiton.org Feb. 21, 2013

Feb. 21, 2013

Author: kmorin Date: 2013-02-21 10:03:32 +0100 (Thu, 21 Feb 2013) New Revision: 2567 Url: http://nuiton.org/projects/jaxx/repository/revisions/2567 Log: fixes #2534 Enable to set a tooltip on the NumberEditor Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx 2013-02-15 12:45:53 UTC (rev 2566) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx 2013-02-21 09:03:32 UTC (rev 2567) @@ -160,6 +160,12 @@ } } +@Override +public void setToolTipText(String toolTipText) { + super.setToolTipText(toolTipText); + textField.setToolTipText(toolTipText); +} + ]]> </script>

1 0

r2566 - in trunk: . jaxx-compiler jaxx-demo jaxx-maven-plugin jaxx-runtime jaxx-validator jaxx-widgets
by maven-release＠users.nuiton.org Feb. 15, 2013

Feb. 15, 2013

Author: maven-release Date: 2013-02-15 13:45:53 +0100 (Fri, 15 Feb 2013) New Revision: 2566 Url: http://nuiton.org/projects/jaxx/repository/revisions/2566 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-maven-plugin/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-validator/pom.xml trunk/jaxx-widgets/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2013-02-15 12:45:51 UTC (rev 2565) +++ trunk/jaxx-compiler/pom.xml 2013-02-15 12:45:53 UTC (rev 2566) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.10</version> + <version>2.5.11-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2013-02-15 12:45:51 UTC (rev 2565) +++ trunk/jaxx-demo/pom.xml 2013-02-15 12:45:53 UTC (rev 2566) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.10</version> + <version>2.5.11-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2013-02-15 12:45:51 UTC (rev 2565) +++ trunk/jaxx-maven-plugin/pom.xml 2013-02-15 12:45:53 UTC (rev 2566) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.10</version> + <version>2.5.11-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2013-02-15 12:45:51 UTC (rev 2565) +++ trunk/jaxx-runtime/pom.xml 2013-02-15 12:45:53 UTC (rev 2566) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.10</version> + <version>2.5.11-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2013-02-15 12:45:51 UTC (rev 2565) +++ trunk/jaxx-validator/pom.xml 2013-02-15 12:45:53 UTC (rev 2566) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.10</version> + <version>2.5.11-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2013-02-15 12:45:51 UTC (rev 2565) +++ trunk/jaxx-widgets/pom.xml 2013-02-15 12:45:53 UTC (rev 2566) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.10</version> + <version>2.5.11-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-02-15 12:45:51 UTC (rev 2565) +++ trunk/pom.xml 2013-02-15 12:45:53 UTC (rev 2566) @@ -34,7 +34,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.10</version> + <version>2.5.11-SNAPSHOT</version> <modules> <module>jaxx-runtime</module> @@ -130,11 +130,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.10</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.10 + scm:svn:http://svn.nuiton.org/svn/jaxx/trunk </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/tags/jaxx-2.5.10</url> + <url>http://nuiton.org/projects/jaxx/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r2565 - tags
by maven-release＠users.nuiton.org Feb. 15, 2013

Feb. 15, 2013

Author: maven-release Date: 2013-02-15 13:45:51 +0100 (Fri, 15 Feb 2013) New Revision: 2565 Url: http://nuiton.org/projects/jaxx/repository/revisions/2565 Log: [maven-release-plugin] copy for tag jaxx-2.5.10 Added: tags/jaxx-2.5.10/

1 0