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

r2584 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell
by kmorin＠users.nuiton.org March 1, 2013

March 1, 2013

Author: kmorin Date: 2013-03-01 16:55:12 +0100 (Fri, 01 Mar 2013) New Revision: 2584 Url: http://nuiton.org/projects/jaxx/repository/revisions/2584 Log: fixes #2551 NumberCellEditor - the textfield is not emptied when we change to an empty cell Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java 2013-03-01 11:19:52 UTC (rev 2583) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java 2013-03-01 15:55:12 UTC (rev 2584) @@ -7,16 +7,16 @@ * 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 + * 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 + * + * 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% @@ -34,6 +34,7 @@ import javax.swing.event.AncestorEvent; import javax.swing.event.AncestorListener; import javax.swing.table.TableCellEditor; +import jaxx.runtime.JAXXUtil; import jaxx.runtime.swing.editor.NumberEditor; /** @@ -66,11 +67,7 @@ E number = (E) value; numberEditor.setModel(number); - - // Check nullity and set the text that will be selected with the current value - if (number != null) { - numberEditor.setModelText(String.valueOf(number)); - } + numberEditor.setModelText(JAXXUtil.getStringValue(number)); return numberEditor; } @@ -123,7 +120,11 @@ numberEditor.setModel(null); // Use empty string, otherwise there is a NPE in NumberEditorHandler numberEditor.setModelText(""); + // force binding, I do not know why the textfield text is not emptied + // if we do not force it + numberEditor.applyDataBinding(NumberEditor.BINDING_TEXT_FIELD_TEXT); } return result; } + }

1 0

r2583 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model
by kmorin＠users.nuiton.org March 1, 2013

March 1, 2013

Author: kmorin Date: 2013-03-01 12:19:52 +0100 (Fri, 01 Mar 2013) New Revision: 2583 Url: http://nuiton.org/projects/jaxx/repository/revisions/2583 Log: escape the special characters 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-27 13:57:45 UTC (rev 2582) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableListModel.java 2013-03-01 11:19:52 UTC (rev 2583) @@ -7,6 +7,7 @@ import java.util.List; import java.util.regex.Pattern; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.LogFactory; import org.nuiton.util.decorator.JXPathDecorator; /** @@ -18,16 +19,16 @@ public class JaxxFilterableListModel<E> extends JaxxDefaultListModel<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(); - + @Override public E getElementAt(int index) { if (index < filteredItems.size()) { @@ -36,7 +37,7 @@ return null; } } - + @Override public E elementAt(int index) { return getElementAt(index); @@ -54,17 +55,17 @@ refilter(); return result; } - + @Override public int getSize() { return filteredItems.size(); } - + @Override public int size() { return filteredItems.size(); } - + @Override public void trimToSize() { super.trimToSize(); @@ -82,19 +83,19 @@ super.setSize(newSize); filteredItems.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); @@ -106,14 +107,14 @@ 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); @@ -150,7 +151,7 @@ super.removeRange(fromIndex, toIndex); refilter(); } - + public String getFilterText() { return filterText; } @@ -167,34 +168,34 @@ 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, '*')) + + 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 = filterText.replace("*", ".*") + ".*"; + String patternText = Pattern.quote(filterText).replace("*", "\\E.*\\Q") + ".*"; pattern = Pattern.compile(patternText, Pattern.CASE_INSENSITIVE); } for (int i = 0 ; i < itemNumber ; i++) { @@ -209,14 +210,14 @@ } else { decoratedElement = String.valueOf(element); } - boolean matches = pattern == null + boolean matches = pattern == null || pattern.matcher(decoratedElement).matches(); if (matches && addElement) { filteredItems.add(element); } } } - + fireContentsChanged(this, 0, getSize()); } }

1 0

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