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

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

Feb. 27, 2013

Author: kmorin Date: 2013-02-27 14:57:45 +0100 (Wed, 27 Feb 2013) New Revision: 2582 Url: http://nuiton.org/projects/jaxx/repository/revisions/2582 Log: fixes #2549 BeanComboBox - trigger the item selection only when the user really selects an item Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx 2013-02-27 10:13:52 UTC (rev 2581) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx 2013-02-27 13:57:45 UTC (rev 2582) @@ -132,8 +132,7 @@ <cell weightx='1'>  <JComboBox id='combobox' - onFocusGained='hidePopup()' - onItemStateChanged='setSelectedItem(combobox.getSelectedItem())'/> + onFocusGained='hidePopup()'/> </cell> <cell anchor='east' fill='both' insets='0'>  Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java 2013-02-27 10:13:52 UTC (rev 2581) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java 2013-02-27 13:57:45 UTC (rev 2582) @@ -47,6 +47,8 @@ import java.beans.PropertyChangeListener; import java.lang.reflect.Method; import java.util.List; +import javax.swing.event.PopupMenuEvent; +import javax.swing.event.PopupMenuListener; /** * Le handler d'un {@link BeanComboBox}. @@ -131,11 +133,39 @@ this.decorator = BeanUIUtil.createDecorator(decorator); - JComboBox combobox = ui.getCombobox(); + final JComboBox combobox = ui.getCombobox(); // init combobox renderer base on given decorator combobox.setRenderer(new DecoratorListCellRenderer(this.decorator)); + combobox.addPopupMenuListener(new PopupMenuListener() { + private O selectedItem; + + boolean canceled = false; + + public void popupMenuWillBecomeVisible(PopupMenuEvent e) { + selectedItem = (O) combobox.getSelectedItem(); + } + + public void popupMenuWillBecomeInvisible(PopupMenuEvent e) { + O newSelectedItem = (O) combobox.getSelectedItem(); + if (canceled) { + ui.setSelectedItem(null); + + } else if ((newSelectedItem == null ^ selectedItem == null) + || (newSelectedItem != null + && !selectedItem.equals(newSelectedItem))) { + ui.setSelectedItem(newSelectedItem); + } + selectedItem = null; + canceled = false; + } + + public void popupMenuCanceled(PopupMenuEvent e) { + canceled = true; + } + }); + convertor = BeanUIUtil.newDecoratedObjectToStringConverter(this.decorator); // keep a trace of original document (to make possible reverse autom-complete) @@ -155,7 +185,7 @@ this.decorator); ui.autoComplete = true; - + ui.addPropertyChangeListener(this); // set datas

1 0

r2581 - trunk
by kmorin＠users.nuiton.org Feb. 27, 2013

Feb. 27, 2013

Author: kmorin Date: 2013-02-27 11:13:52 +0100 (Wed, 27 Feb 2013) New Revision: 2581 Url: http://nuiton.org/projects/jaxx/repository/revisions/2581 Log: fixes #2546 Updates to nuiton-utils 2.6.9 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-02-26 17:43:28 UTC (rev 2580) +++ trunk/pom.xml 2013-02-27 10:13:52 UTC (rev 2581) @@ -111,7 +111,7 @@  <projectId>jaxx</projectId> - <nuitonUtilsVersion>2.6.5</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.9</nuitonUtilsVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> <eugeneVersion>2.6</eugeneVersion> <jxLayerVersion>3.0.4</jxLayerVersion>

1 0

r2580 - 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 18:43:28 +0100 (Tue, 26 Feb 2013) New Revision: 2580 Url: http://nuiton.org/projects/jaxx/repository/revisions/2580 Log: sort data on set universe and seleted 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-26 17:07:31 UTC (rev 2579) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java 2013-02-26 17:43:28 UTC (rev 2580) @@ -194,6 +194,16 @@ sortData(); } + public void setUniverse(List<O> selection) { + ui.getModel().setUniverse(selection); + sortData(); + } + + public void setSelected(List<O> selection) { + ui.getModel().setSelected(selection); + sortData(); + } + /** Toggle the popup visible state. */ public void togglePopup() { popupHandler.togglePopup();

1 0

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

Feb. 26, 2013

Author: kmorin Date: 2013-02-26 18:07:31 +0100 (Tue, 26 Feb 2013) New Revision: 2579 Url: http://nuiton.org/projects/jaxx/repository/revisions/2579 Log: add text filter highlightas a parameter 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/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 17:07:22 UTC (rev 2578) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.css 2013-02-26 17:07:31 UTC (rev 2579) @@ -30,6 +30,11 @@ selected: true; } +#highlightFilterTextButton { + text: "jaxxdemo.beandoublelistdemo.highlightFilterText"; + selected: false; +} + #showResetButton { text: "jaxxdemo.beandoublelistdemo.showReset"; selected: true; @@ -50,4 +55,5 @@ filterable: {filterableButton.isSelected()}; showReset: {showResetButton.isSelected()}; showDecorator: {showDecoratorButton.isSelected()}; + highlightFilterText: {highlightFilterTextButton.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-26 17:07:22 UTC (rev 2578) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx 2013-02-26 17:07:31 UTC (rev 2579) @@ -35,6 +35,7 @@ <cell> <JPanel id='configurationPanel' layout='{new GridLayout(0,1)}'> <JCheckBox id='filterableButton'/> + <JCheckBox id='highlightFilterTextButton'/> <JCheckBox id='showResetButton'/> <JCheckBox id='showDecoratorButton'/> <JCheckBox id='filterOnNachoButton'/> 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 17:07:22 UTC (rev 2578) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties 2013-02-26 17:07:31 UTC (rev 2579) @@ -178,6 +178,7 @@ jaxxdemo.beandoublelistdemo.configuration=Configuration jaxxdemo.beandoublelistdemo.filterOnNacho=Show only the actors playing in Nacho Libre jaxxdemo.beandoublelistdemo.filterable=Filterable +jaxxdemo.beandoublelistdemo.highlightFilterText=Highlight the filter text jaxxdemo.beandoublelistdemo.showDecorator=Show decorator button jaxxdemo.beandoublelistdemo.showReset=Show Reset button jaxxdemo.common.actors=Actors 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 17:07:22 UTC (rev 2578) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties 2013-02-26 17:07:31 UTC (rev 2579) @@ -178,6 +178,7 @@ jaxxdemo.beandoublelistdemo.configuration= jaxxdemo.beandoublelistdemo.filterOnNacho= jaxxdemo.beandoublelistdemo.filterable= +jaxxdemo.beandoublelistdemo.highlightFilterText= jaxxdemo.beandoublelistdemo.showDecorator= jaxxdemo.beandoublelistdemo.showReset= jaxxdemo.common.actors=Acteurs 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 17:07:22 UTC (rev 2578) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties 2013-02-26 17:07:31 UTC (rev 2579) @@ -178,6 +178,7 @@ jaxxdemo.beandoublelistdemo.configuration=Configuration jaxxdemo.beandoublelistdemo.filterOnNacho=N'afficher que les acteurs de Nacho Libre jaxxdemo.beandoublelistdemo.filterable=Filtrable +jaxxdemo.beandoublelistdemo.highlightFilterText=Surligner le texte de filtre jaxxdemo.beandoublelistdemo.showDecorator=Changer la décoration jaxxdemo.beandoublelistdemo.showReset=Pouvoir réinitialiser le filtre jaxxdemo.common.actors=Acteurs

1 0

r2578 - 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 18:07:22 +0100 (Tue, 26 Feb 2013) New Revision: 2578 Url: http://nuiton.org/projects/jaxx/repository/revisions/2578 Log: add text filter highlightas a parameter 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/BeanDoubleListHandler.java 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 17:07:11 UTC (rev 2577) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx 2013-02-26 17:07:22 UTC (rev 2578) @@ -41,6 +41,9 @@  <Boolean id='showReset' javaBean='true'/> +  + <Boolean id='highlightFilterText' javaBean='false'/> +  <Class id='beanType' genericType='O' javaBean='null'/> 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 17:07:11 UTC (rev 2577) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java 2013-02-26 17:07:22 UTC (rev 2578) @@ -245,6 +245,13 @@ updateUI(ui.getIndex(), newValue); } + protected void setHighlightFilterText(Boolean newValue) { + FilteredDecoratorListCellRenderer universeListCellRenderer = + (FilteredDecoratorListCellRenderer) ui.getUniverseList().getCellRenderer(); + universeListCellRenderer.setHighlightFilterText(newValue); + ui.getUniverseList().repaint(); + } + protected void updateUI(int index, boolean reversesort) { // change decorator context @@ -359,14 +366,16 @@ // 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)) { + + } else if (BeanDoubleList.PROPERTY_REVERSE_SORT.equals(propertyName)) { // sort order has changed, force reload of data in ui setSortOrder((Boolean) evt.getOldValue(), (Boolean) evt.getNewValue()); + + } else if (BeanDoubleList.PROPERTY_HIGHLIGHT_FILTER_TEXT.equals(propertyName)) { + + setHighlightFilterText((Boolean) evt.getNewValue()); } }

1 0

r2577 - 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 18:07:11 +0100 (Tue, 26 Feb 2013) New Revision: 2577 Url: http://nuiton.org/projects/jaxx/repository/revisions/2577 Log: add text filter highlightas a parameter Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableListModel.java 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 =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableListModel.java 2013-02-26 15:07:50 UTC (rev 2576) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableListModel.java 2013-02-26 17:07:11 UTC (rev 2577) @@ -186,7 +186,8 @@ protected void refilter() { filteredItems.clear(); - if (StringUtils.isBlank(filterText) && filters.isEmpty()) { + if (StringUtils.isEmpty(StringUtils.remove(filterText, '*')) + && filters.isEmpty()) { filteredItems.addAll(delegate); } else { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/FilteredDecoratorListCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/FilteredDecoratorListCellRenderer.java 2013-02-26 15:07:50 UTC (rev 2576) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/FilteredDecoratorListCellRenderer.java 2013-02-26 17:07:11 UTC (rev 2577) @@ -29,6 +29,7 @@ import java.util.regex.Pattern; import javax.swing.JList; import javax.swing.ListCellRenderer; +import org.apache.commons.lang3.StringUtils; import org.nuiton.util.decorator.Decorator; /** @@ -44,6 +45,10 @@ /** text to highlight */ protected String filterText; + protected Pattern pattern; + + protected boolean highlightFilterText = false; + public FilteredDecoratorListCellRenderer(Decorator<?> decorator) { super(decorator); } @@ -52,6 +57,13 @@ Decorator<?> decorator) { super(delegate, decorator); } + + public FilteredDecoratorListCellRenderer(ListCellRenderer delegate, + Decorator<?> decorator, + boolean highlightFilterText) { + super(delegate, decorator); + this.highlightFilterText = highlightFilterText; + } public String getFilterText() { return filterText; @@ -59,8 +71,18 @@ public void setFilterText(String filterText) { this.filterText = filterText; + computePattern(); } + public boolean isHighlightFilterText() { + return highlightFilterText; + } + + public void setHighlightFilterText(boolean highlightFilterText) { + this.highlightFilterText = highlightFilterText; + computePattern(); + } + @Override public Component getListCellRendererComponent(JList list, Object value, @@ -73,25 +95,24 @@ } 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); + if (pattern != null) { 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 = ""; + StringBuilder sb = new StringBuilder(); 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>"; + sb.append(stringValue.substring(i, indexOfMatch)) + .append("<span style='background:#FFFF00'>") + .append(match) + .append("</span>"); i = indexOfMatch + match.length(); } - s += stringValue.substring(i); - stringValue = "<html>" + s + "</html>"; + sb.append(stringValue.substring(i)); + stringValue = "<html>" + sb.toString() + "</html>"; } } return delegate.getListCellRendererComponent(list, @@ -101,4 +122,17 @@ cellHasFocus ); } + + protected void computePattern() { + if (highlightFilterText + && !StringUtils.isEmpty(StringUtils.remove(filterText, '*'))) { + // add the groups in the pattern + String patternText = "(" + filterText.replace("*", ").*(") + ").*"; + patternText = StringUtils.remove(patternText, "()"); + pattern = Pattern.compile(patternText, Pattern.CASE_INSENSITIVE); + + } else { + pattern = null; + } + } }

1 0

r2576 - trunk/jaxx-widgets/src/main/resources/icons
by kmorin＠users.nuiton.org Feb. 26, 2013

Feb. 26, 2013

Author: kmorin Date: 2013-02-26 16:07:50 +0100 (Tue, 26 Feb 2013) New Revision: 2576 Url: http://nuiton.org/projects/jaxx/repository/revisions/2576 Log: add icon Added: trunk/jaxx-widgets/src/main/resources/icons/action-filter.png Added: trunk/jaxx-widgets/src/main/resources/icons/action-filter.png =================================================================== (Binary files differ) Property changes on: trunk/jaxx-widgets/src/main/resources/icons/action-filter.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r2575 - trunk/jaxx-demo/src/main/resources/icons
by kmorin＠users.nuiton.org Feb. 26, 2013

Feb. 26, 2013

Author: kmorin Date: 2013-02-26 16:06:27 +0100 (Tue, 26 Feb 2013) New Revision: 2575 Url: http://nuiton.org/projects/jaxx/repository/revisions/2575 Log: remove unused icon Removed: trunk/jaxx-demo/src/main/resources/icons/action-filter.png Deleted: trunk/jaxx-demo/src/main/resources/icons/action-filter.png =================================================================== (Binary files differ)

1 0

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