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

r2614 - in trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config: . model
by kmorin＠users.nuiton.org 12 Mar '13

12 Mar '13

Author: kmorin Date: 2013-03-12 10:08:07 +0100 (Tue, 12 Mar 2013) New Revision: 2614 Url: http://nuiton.org/projects/jaxx/repository/revisions/2614 Log: fixes #2583 The table cell editor in the config options is never used fixes #2584 Enable to use a particular table cell renderer for a config option Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableEditor.java trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableRenderer.java trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHelper.java trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModelBuilder.java trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/OptionModel.java Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableEditor.java =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableEditor.java 2013-03-11 11:11:11 UTC (rev 2613) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableEditor.java 2013-03-12 09:08:07 UTC (rev 2614) @@ -112,8 +112,12 @@ Class<?> type = option.getType(); TableCellEditor editor = table.getDefaultEditor(type); TableCellEditor defaultEditor = table.getDefaultEditor(Object.class); - //TODO always Search from option.getEditor() and store editor as cache - if (editor.equals(defaultEditor)) { + // always Search from option.getEditor() and store editor as cache + if (option.getEditor() != null) { + editor = option.getEditor(); + table.setDefaultEditor(type, editor); + + } else if (editor.equals(defaultEditor)) { // find not a specialized editor for the type if (type.isEnum()) { // add a EnumEditor to table Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableRenderer.java =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableRenderer.java 2013-03-11 11:11:11 UTC (rev 2613) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableRenderer.java 2013-03-12 09:08:07 UTC (rev 2614) @@ -112,10 +112,14 @@ } protected Component getValueCellRenderer(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column, OptionModel key, boolean isValid, boolean isModified) { - TableCellRenderer defaultRenderer = table.getDefaultRenderer(key.getType()); + Component result; + if (key.getRenderer() != null) { + result = key.getRenderer().getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); - Component result; - result = defaultRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); + } else { + TableCellRenderer defaultRenderer = table.getDefaultRenderer(key.getType()); + result = defaultRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); + } return result; } } Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHelper.java =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHelper.java 2013-03-11 11:11:11 UTC (rev 2613) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHelper.java 2013-03-12 09:08:07 UTC (rev 2614) @@ -41,6 +41,7 @@ import javax.swing.Icon; import javax.swing.table.TableCellEditor; import java.awt.Frame; +import javax.swing.table.TableCellRenderer; /** * A helper to build a config ui. @@ -115,6 +116,12 @@ return modelBuilder; } + public ConfigUIModelBuilder setOptionRenderer(TableCellRenderer renderer) + throws IllegalStateException, NullPointerException { + modelBuilder.setOptionRenderer(renderer); + return modelBuilder; + } + public ConfigUIModelBuilder registerCallBack(String name, String description, Icon icon, Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModelBuilder.java =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModelBuilder.java 2013-03-11 11:11:11 UTC (rev 2613) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModelBuilder.java 2013-03-12 09:08:07 UTC (rev 2614) @@ -33,6 +33,7 @@ import javax.swing.Icon; import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; /** * A builder of {@link ConfigUIModel} @@ -246,6 +247,23 @@ } /** + * Set the renderer on the current option. + * + * @param renderer the renderer to set in the current option. + * @return the builder + * @throws IllegalStateException if there is not a current option set. + * @throws NullPointerException if any of parameter is {@code null} + * @see OptionModel#setRenderer(TableCellRenderer) + */ + public ConfigUIModelBuilder setOptionRenderer(TableCellRenderer renderer) + throws IllegalStateException, NullPointerException { + checkCurrent(option, "option"); + checkNotNull(renderer, "setOptionRenderer", "renderer"); + option.setRenderer(renderer); + return this; + } + + /** * Registers a new callback. * <p/> * <b>Note:</b> the order of registred callback is used to determine Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/OptionModel.java =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/OptionModel.java 2013-03-11 11:11:11 UTC (rev 2613) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/OptionModel.java 2013-03-12 09:08:07 UTC (rev 2614) @@ -28,6 +28,7 @@ import org.nuiton.util.config.ConfigOptionDef; import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; /** * le modele d'une option de la configuration a editer. @@ -60,6 +61,9 @@ /** l'editeur utilise pour modifier graphiquement l'option */ protected TableCellEditor editor; + /** le renderer utilise pour afficher graphiquement l'option */ + protected TableCellRenderer renderer; + protected OptionModel(ConfigOptionDef def, Object value) { this.def = def; initValue(value); @@ -159,6 +163,14 @@ this.editor = editor; } + public TableCellRenderer getRenderer() { + return renderer; + } + + public void setRenderer(TableCellRenderer renderer) { + this.renderer = renderer; + } + protected void setPropertyName(String propertyName) { this.propertyName = propertyName; }

1 0

r2613 - in trunk: . jaxx-compiler jaxx-config jaxx-demo jaxx-maven-plugin jaxx-runtime jaxx-validator jaxx-widgets
by maven-release＠users.nuiton.org 11 Mar '13

11 Mar '13

Author: maven-release Date: 2013-03-11 12:11:11 +0100 (Mon, 11 Mar 2013) New Revision: 2613 Url: http://nuiton.org/projects/jaxx/repository/revisions/2613 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-config/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-03-11 11:11:09 UTC (rev 2612) +++ trunk/jaxx-compiler/pom.xml 2013-03-11 11:11:11 UTC (rev 2613) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.12</version> + <version>2.5.13-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-config/pom.xml =================================================================== --- trunk/jaxx-config/pom.xml 2013-03-11 11:11:09 UTC (rev 2612) +++ trunk/jaxx-config/pom.xml 2013-03-11 11:11:11 UTC (rev 2613) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.12</version> + <version>2.5.13-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2013-03-11 11:11:09 UTC (rev 2612) +++ trunk/jaxx-demo/pom.xml 2013-03-11 11:11:11 UTC (rev 2613) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.12</version> + <version>2.5.13-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2013-03-11 11:11:09 UTC (rev 2612) +++ trunk/jaxx-maven-plugin/pom.xml 2013-03-11 11:11:11 UTC (rev 2613) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.12</version> + <version>2.5.13-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2013-03-11 11:11:09 UTC (rev 2612) +++ trunk/jaxx-runtime/pom.xml 2013-03-11 11:11:11 UTC (rev 2613) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.12</version> + <version>2.5.13-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2013-03-11 11:11:09 UTC (rev 2612) +++ trunk/jaxx-validator/pom.xml 2013-03-11 11:11:11 UTC (rev 2613) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.12</version> + <version>2.5.13-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2013-03-11 11:11:09 UTC (rev 2612) +++ trunk/jaxx-widgets/pom.xml 2013-03-11 11:11:11 UTC (rev 2613) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.12</version> + <version>2.5.13-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-11 11:11:09 UTC (rev 2612) +++ trunk/pom.xml 2013-03-11 11:11:11 UTC (rev 2613) @@ -34,7 +34,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.12</version> + <version>2.5.13-SNAPSHOT</version> <modules> <module>jaxx-runtime</module> @@ -131,11 +131,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.12</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.12 + scm:svn:http://svn.nuiton.org/svn/jaxx/trunk </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/tags/jaxx-2.5.12</url> + <url>http://nuiton.org/projects/jaxx/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r2612 - tags
by maven-release＠users.nuiton.org 11 Mar '13

11 Mar '13

Author: maven-release Date: 2013-03-11 12:11:09 +0100 (Mon, 11 Mar 2013) New Revision: 2612 Url: http://nuiton.org/projects/jaxx/repository/revisions/2612 Log: [maven-release-plugin] copy for tag jaxx-2.5.12 Added: tags/jaxx-2.5.12/

1 0

r2611 - in trunk: . jaxx-compiler jaxx-config jaxx-demo jaxx-maven-plugin jaxx-runtime jaxx-validator jaxx-widgets
by maven-release＠users.nuiton.org 11 Mar '13

11 Mar '13

Author: maven-release Date: 2013-03-11 12:11:07 +0100 (Mon, 11 Mar 2013) New Revision: 2611 Url: http://nuiton.org/projects/jaxx/repository/revisions/2611 Log: [maven-release-plugin] prepare release jaxx-2.5.12 Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-config/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-03-11 11:09:12 UTC (rev 2610) +++ trunk/jaxx-compiler/pom.xml 2013-03-11 11:11:07 UTC (rev 2611) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.12-SNAPSHOT</version> + <version>2.5.12</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-config/pom.xml =================================================================== --- trunk/jaxx-config/pom.xml 2013-03-11 11:09:12 UTC (rev 2610) +++ trunk/jaxx-config/pom.xml 2013-03-11 11:11:07 UTC (rev 2611) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.12-SNAPSHOT</version> + <version>2.5.12</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2013-03-11 11:09:12 UTC (rev 2610) +++ trunk/jaxx-demo/pom.xml 2013-03-11 11:11:07 UTC (rev 2611) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.12-SNAPSHOT</version> + <version>2.5.12</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2013-03-11 11:09:12 UTC (rev 2610) +++ trunk/jaxx-maven-plugin/pom.xml 2013-03-11 11:11:07 UTC (rev 2611) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.12-SNAPSHOT</version> + <version>2.5.12</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2013-03-11 11:09:12 UTC (rev 2610) +++ trunk/jaxx-runtime/pom.xml 2013-03-11 11:11:07 UTC (rev 2611) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.12-SNAPSHOT</version> + <version>2.5.12</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2013-03-11 11:09:12 UTC (rev 2610) +++ trunk/jaxx-validator/pom.xml 2013-03-11 11:11:07 UTC (rev 2611) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.12-SNAPSHOT</version> + <version>2.5.12</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2013-03-11 11:09:12 UTC (rev 2610) +++ trunk/jaxx-widgets/pom.xml 2013-03-11 11:11:07 UTC (rev 2611) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.12-SNAPSHOT</version> + <version>2.5.12</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-11 11:09:12 UTC (rev 2610) +++ trunk/pom.xml 2013-03-11 11:11:07 UTC (rev 2611) @@ -34,7 +34,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.12-SNAPSHOT</version> + <version>2.5.12</version> <modules> <module>jaxx-runtime</module> @@ -131,11 +131,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.12</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/trunk + scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.12 </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/trunk</url> + <url>http://nuiton.org/projects/jaxx/repository/show/tags/jaxx-2.5.12</url> </scm> <distributionManagement>

1 0

r2610 - in trunk: . jaxx-demo/src/main/java/jaxx/demo jaxx-maven-plugin
by tchemit＠users.nuiton.org 11 Mar '13

11 Mar '13

Author: tchemit Date: 2013-03-11 12:09:12 +0100 (Mon, 11 Mar 2013) New Revision: 2610 Url: http://nuiton.org/projects/jaxx/repository/revisions/2610 Log: refs #2581: Updates mavenpom to 3.4.8 prepare release Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java trunk/jaxx-maven-plugin/pom.xml trunk/pom.xml Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java 2013-03-11 10:50:07 UTC (rev 2609) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java 2013-03-11 11:09:12 UTC (rev 2610) @@ -3,23 +3,23 @@ /* * #%L * JAXX :: Demo - * + * * * $Id$ * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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% Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2013-03-11 10:50:07 UTC (rev 2609) +++ trunk/jaxx-maven-plugin/pom.xml 2013-03-11 11:09:12 UTC (rev 2610) @@ -111,6 +111,11 @@ </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> <groupId>javax.help</groupId> <artifactId>javahelp</artifactId> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-11 10:50:07 UTC (rev 2609) +++ trunk/pom.xml 2013-03-11 11:09:12 UTC (rev 2610) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.7</version> + <version>3.4.8</version> </parent> <artifactId>jaxx</artifactId>

1 0

r2609 - in trunk: jaxx-runtime/src/main/java/jaxx/runtime/swing/model jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
by tchemit＠users.nuiton.org 11 Mar '13

11 Mar '13

Author: tchemit Date: 2013-03-11 11:50:07 +0100 (Mon, 11 Mar 2013) New Revision: 2609 Url: http://nuiton.org/projects/jaxx/repository/revisions/2609 Log: fixes #2581: Updates mavenpom to 3.4.8 + add license header Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.css trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java 2013-03-11 10:30:59 UTC (rev 2608) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java 2013-03-11 10:50:07 UTC (rev 2609) @@ -9,16 +9,16 @@ * Copyright (C) 2008 - 2013 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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% Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.css =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.css 2013-03-11 10:30:59 UTC (rev 2608) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.css 2013-03-11 10:50:07 UTC (rev 2609) @@ -7,16 +7,16 @@ * Copyright (C) 2008 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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% Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java 2013-03-11 10:30:59 UTC (rev 2608) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java 2013-03-11 10:50:07 UTC (rev 2609) @@ -1,23 +1,23 @@ /* * #%L * JAXX :: Widgets - * + * * * $Id$ * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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%

1 0

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

11 Mar '13

Author: kmorin Date: 2013-03-11 11:30:59 +0100 (Mon, 11 Mar 2013) New Revision: 2608 Url: http://nuiton.org/projects/jaxx/repository/revisions/2608 Log: fixes #2580 Make a combobox whose elements can be filtered Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java 2013-03-11 09:44:14 UTC (rev 2607) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java 2013-03-11 10:30:59 UTC (rev 2608) @@ -327,6 +327,10 @@ JTextComponent editorComponent = (JTextComponent) ui.getCombobox().getEditor().getEditorComponent(); editorComponent.setText(""); ui.setSelectedItem(null); + JComboBox comboBox = ui.getCombobox(); + if (comboBox.isShowing()) { + comboBox.hidePopup(); + } } /**

1 0

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

11 Mar '13

Author: kmorin Date: 2013-03-11 10:44:14 +0100 (Mon, 11 Mar 2013) New Revision: 2607 Url: http://nuiton.org/projects/jaxx/repository/revisions/2607 Log: fixes #2580 Make a combobox whose elements can be filtered Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx 2013-03-09 18:12:23 UTC (rev 2606) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx 2013-03-11 09:44:14 UTC (rev 2607) @@ -37,7 +37,7 @@ <Class id='beanType' genericType='O' javaBean='null'/>  - <Boolean id='filterable' javaBean='false'/> + <Boolean id='filterable' javaBean='true'/>  <Boolean id='reverseSort' javaBean='false'/> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java 2013-03-09 18:12:23 UTC (rev 2606) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java 2013-03-11 09:44:14 UTC (rev 2607) @@ -24,9 +24,6 @@ */ package jaxx.runtime.swing.editor.bean; -import java.awt.Color; -import java.awt.Component; -import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.JAXXButtonGroup; @@ -34,7 +31,6 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.autocomplete.ObjectToStringConverter; import org.nuiton.util.decorator.DecoratorUtil; import org.nuiton.util.decorator.JXPathDecorator; import org.nuiton.util.decorator.MultiJXPathDecorator; @@ -42,7 +38,6 @@ import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JPopupMenu; -import javax.swing.text.Document; import javax.swing.text.JTextComponent; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; @@ -52,7 +47,6 @@ import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.lang.reflect.Method; @@ -60,13 +54,7 @@ import javax.swing.ComboBoxEditor; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; -import javax.swing.event.PopupMenuEvent; -import javax.swing.event.PopupMenuListener; -import javax.swing.plaf.basic.BasicComboBoxEditor; import jaxx.runtime.swing.model.JaxxFilterableComboBoxModel; -import org.jdesktop.swingx.autocomplete.AbstractAutoCompleteAdaptor; -import org.jdesktop.swingx.autocomplete.AutoCompleteDocument; -import org.jdesktop.swingx.autocomplete.ComboBoxAdaptor; /** * Le handler d'un {@link BeanFilterableComboBox}. @@ -136,7 +124,11 @@ if (comboBox.isShowing()) { comboBox.hidePopup(); } - model.setFilterText(editorComponent.getText()); + String text = editorComponent.getText(); + if (log.isDebugEnabled()) { + log.debug("updateFilter " + text); + } + model.setFilterText(text); if (comboBox.isShowing()) { comboBox.showPopup(); } @@ -178,7 +170,8 @@ this.decorator = BeanUIUtil.createDecorator(decorator); final JComboBox combobox = ui.getCombobox(); - ComboBoxEditor editor = new JAXXFilterableComboBoxEditor(ui.getCombobox().getEditor()); + final JAXXFilterableComboBoxEditor editor = + new JAXXFilterableComboBoxEditor(ui.getCombobox().getEditor()); combobox.setEditor(editor); editor.getEditorComponent().addMouseListener(new MouseAdapter() { @@ -197,6 +190,18 @@ combobox.showPopup(); } } + + @Override + public void keyReleased(KeyEvent e) { + // if the typed text does not match the selected item, + // set the selected item to null + Object selectedItem = ui.getSelectedItem(); + String text = editor.getEditorComponent().getText(); + if (selectedItem == null || + !BeanFilterableComboBoxHandler.this.decorator.toString(selectedItem).equals(text)) { + ui.setSelectedItem(null); + } + } }); @@ -208,9 +213,15 @@ public void itemStateChanged(ItemEvent e) { Object item = e.getItem(); - if (e.getStateChange() == ItemEvent.SELECTED - && item != null && getBeanType().isInstance(item)) { + if (e.getStateChange() == ItemEvent.SELECTED) { + if (log.isDebugEnabled()) { + log.debug("itemStateChanged selected " + item + " - " + (item != null ? item.getClass() : null)); + } ui.setSelectedItem(e.getItem()); + } else { + if (log.isDebugEnabled()) { + log.debug("itemStateChanged deselected " + item + " - " + (item != null ? item.getClass() : null)); + } } } }); @@ -315,7 +326,7 @@ public void reset() { JTextComponent editorComponent = (JTextComponent) ui.getCombobox().getEditor().getEditorComponent(); editorComponent.setText(""); -// ui.setSelectedItem(null); + ui.setSelectedItem(null); } /** @@ -544,19 +555,26 @@ @Override public void setItem(Object anObject) { + if (log.isDebugEnabled()) { + log.debug("setItem " + anObject + " - " + (anObject != null ? anObject.getClass() : null)); + } Object item = anObject; - if (anObject != null && getBeanType().isInstance(anObject)) { - item = decorator.toString(anObject); - } - oldItem = anObject; - try { - wrapped.setItem(item); - getEditorComponent().setForeground(null); + if (anObject != null) { + if (getBeanType().isInstance(anObject)) { + item = decorator.toString(anObject); + oldItem = anObject; + } + try { + wrapped.setItem(item); + getEditorComponent().setForeground(null); - } catch (IllegalStateException e) { - // fail silently and deselect the currently selected item - ui.setSelectedItem(null); - getEditorComponent().setForeground(ui.getInvalidComboEditorTextColor()); + } catch (IllegalStateException e) { + // fail silently + if (log.isDebugEnabled()) { + log.debug("setItem IllegalStateException "); + } + getEditorComponent().setForeground(ui.getInvalidComboEditorTextColor()); + } } } @@ -564,25 +582,20 @@ public Object getItem() { JTextComponent editor = getEditorComponent(); Object newValue = editor.getText(); + if (log.isDebugEnabled()) { + log.debug("getItem " + newValue + " - " + (newValue != null ? newValue.getClass() : null)); + } if (oldItem != null && getBeanType().isInstance(oldItem)) { // The original value is not a string. Should return the value in it's // original type. if (newValue.equals(decorator.toString(oldItem))) { newValue = oldItem; - - } else { - // Must take the value from the editor and get the value and cast it to the new type. - Class<?> cls = oldItem.getClass(); - try { - Method method = cls.getMethod("valueOf", new Class[]{String.class}); - newValue = method.invoke(oldItem, new Object[] { editor.getText()}); - } catch (Exception ex) { - // Fail silently and return the newValue (a String object) - } } } - wrapped.getItem(); + if (log.isDebugEnabled()) { + log.debug("getItem 2 " + newValue + " - " + (newValue != null ? newValue.getClass() : null)); + } return newValue; }

1 0

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

09 Mar '13

Author: kmorin Date: 2013-03-09 19:12:23 +0100 (Sat, 09 Mar 2013) New Revision: 2606 Url: http://nuiton.org/projects/jaxx/repository/revisions/2606 Log: fixes #2580 Make a combobox whose elements can be filtered Added: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.css trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties Copied: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.css (from rev 2591, trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.css) =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.css (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.css 2013-03-09 18:12:23 UTC (rev 2606) @@ -0,0 +1,62 @@ +/* + * #%L + * JAXX :: Demo + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +#configurationPanel { + border: {new TitledBorder(_("jaxxdemo.beanfilterablecomboboxdemo.configuration"))}; +} + +#filterableButton { + text: "jaxxdemo.beanfilterablecomboboxdemo.filterable"; + selected: true; +} + +#showResetButton { + text: "jaxxdemo.beanfilterablecomboboxdemo.showReset"; + selected: true; +} + +#showDecoratorButton { + text: "jaxxdemo.beanfilterablecomboboxdemo.showDecorator"; + selected: true; +} + +#colorizeInvalidComboEditorTextButton { + text: "jaxxdemo.beanfilterablecomboboxdemo.colorizeInvalidComboEditorText"; + selected: true; +} + +#comboBox { + i18nPrefix: "jaxxdemo.common."; + filterable: {filterableButton.isSelected()}; + showReset: {showResetButton.isSelected()}; + showDecorator: {showDecoratorButton.isSelected()}; + invalidComboEditorTextColor: {colorizeInvalidComboEditorTextButton.isSelected() ? java.awt.Color.RED : null}; +} + +#resultPanel { + border: {new TitledBorder(_("jaxxdemo.beanfilterablecomboboxdemo.result"))}; +} + +#selectedResult { + text: {handler.getSelectedResult(comboBox.getSelectedItem())}; +} Copied: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jaxx (from rev 2591, trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jaxx) =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jaxx (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jaxx 2013-03-09 18:12:23 UTC (rev 2606) @@ -0,0 +1,76 @@ + +<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> + + <import> + jaxx.demo.entities.People + jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + </import> + + <BeanFilterableComboBoxDemoHandler id='handler' constructorParams='this'/> + + <Table insets='0' fill='both' weightx='1' constraints='BorderLayout.NORTH'> + <row> + <cell> + <JPanel id='configurationPanel' layout='{new GridLayout(0,1)}'> + <JCheckBox id='filterableButton'/> + <JCheckBox id='showResetButton'/> + <JCheckBox id='showDecoratorButton'/> + <JCheckBox id='colorizeInvalidComboEditorTextButton'/> + </JPanel> + </cell> + </row> + <row> + <cell> + <BeanFilterableComboBox id='comboBox' genericType='People'/> + </cell> + </row> + <row> + <cell> + <JPanel id='resultPanel' layout='{new BorderLayout()}'> + <JLabel id='selectedResult' constraints='BorderLayout.CENTER'/> + </JPanel> + </cell> + </row> + </Table> + + <script><![CDATA[ + +protected void $afterCompleteSetup() { + handler.init(); +} + +@Override +protected String[] getSources() { + return new String[]{ + getDefaultSource(), + "BeanFilterableComboBoxDemo.css", + "BeanFilterableComboBoxDemo.java", + "BeanFilterableComboBoxDemoHandler.java" + }; +} + +]]></script> + +</jaxx.demo.DemoPanel> \ No newline at end of file Copied: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java (from rev 2591, trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java) =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java 2013-03-09 18:12:23 UTC (rev 2606) @@ -0,0 +1,78 @@ +package jaxx.demo.component.jaxx.editor; + +/* + * #%L + * JAXX :: Demo + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +import jaxx.demo.entities.DemoDataProvider; +import jaxx.demo.entities.DemoDecoratorProvider; +import jaxx.demo.entities.People; +import org.nuiton.util.decorator.JXPathDecorator; + +import java.util.List; + +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; + +/** + * Handlerof {@link BeanComboBoxDemo}. + * + * @author kmorin <kmorin(a)codelutin.com> + * @since 2.5.12 + */ +public class BeanFilterableComboBoxDemoHandler { + + private final BeanFilterableComboBoxDemo ui; + + private final JXPathDecorator<People> decorator; + + public BeanFilterableComboBoxDemoHandler(BeanFilterableComboBoxDemo ui) { + this.ui = ui; + this.decorator = (JXPathDecorator<People>) + new DemoDecoratorProvider().getDecoratorByType(People.class); + } + + public void init() { + List<People> data = new DemoDataProvider().getPeoples(); + + ui.getComboBox().init(decorator, data); + } + + public String getSelectedResult(Object people) { + String result; + + if (people == null || !People.class.isInstance(people)) { + result = _("jaxxdemo.beanfilterablecomboboxdemo.no.people.selected"); + } else { + result = _("jaxxdemo.beanfilterablecomboboxdemo.selected.people", decorator.toString(people)); + } + return result; + } + + static { + n_("jaxxdemo.common.people"); + n_("jaxxdemo.common.firstName"); + n_("jaxxdemo.common.lastName"); + n_("jaxxdemo.common.age"); + } +} Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java 2013-03-09 18:11:38 UTC (rev 2605) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java 2013-03-09 18:12:23 UTC (rev 2606) @@ -73,6 +73,7 @@ import java.util.Map; import jaxx.demo.component.jaxx.editor.BeanDoubleListDemo; +import jaxx.demo.component.jaxx.editor.BeanFilterableComboBoxDemo; import static org.nuiton.i18n.I18n.n_; /** @@ -164,6 +165,7 @@ FileEditorDemo.class, ListSelectorDemo.class, BeanComboBoxDemo.class, + BeanFilterableComboBoxDemo.class, BeanDoubleListDemo.class ); Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties 2013-03-09 18:11:38 UTC (rev 2605) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties 2013-03-09 18:12:23 UTC (rev 2606) @@ -181,6 +181,14 @@ jaxxdemo.beandoublelistdemo.highlightFilterText=Highlight the filter text jaxxdemo.beandoublelistdemo.showDecorator=Show decorator button jaxxdemo.beandoublelistdemo.showReset=Show Reset button +jaxxdemo.beanfilterablecomboboxdemo.colorizeInvalidComboEditorText=Colorize the text if it not valid +jaxxdemo.beanfilterablecomboboxdemo.configuration=Configuration +jaxxdemo.beanfilterablecomboboxdemo.filterable=Filterable +jaxxdemo.beanfilterablecomboboxdemo.no.people.selected=No selection +jaxxdemo.beanfilterablecomboboxdemo.result=Result +jaxxdemo.beanfilterablecomboboxdemo.selected.people=Selection\: %s +jaxxdemo.beanfilterablecomboboxdemo.showDecorator=Show decorator button +jaxxdemo.beanfilterablecomboboxdemo.showReset=Show Reset button jaxxdemo.common.actors=Actors jaxxdemo.common.age=Age jaxxdemo.common.firstName=First name Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties 2013-03-09 18:11:38 UTC (rev 2605) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties 2013-03-09 18:12:23 UTC (rev 2606) @@ -181,6 +181,14 @@ jaxxdemo.beandoublelistdemo.highlightFilterText= jaxxdemo.beandoublelistdemo.showDecorator= jaxxdemo.beandoublelistdemo.showReset= +jaxxdemo.beanfilterablecomboboxdemo.colorizeInvalidComboEditorText= +jaxxdemo.beanfilterablecomboboxdemo.configuration= +jaxxdemo.beanfilterablecomboboxdemo.filterable= +jaxxdemo.beanfilterablecomboboxdemo.no.people.selected= +jaxxdemo.beanfilterablecomboboxdemo.result= +jaxxdemo.beanfilterablecomboboxdemo.selected.people= +jaxxdemo.beanfilterablecomboboxdemo.showDecorator= +jaxxdemo.beanfilterablecomboboxdemo.showReset= jaxxdemo.common.actors=Acteurs jaxxdemo.common.age=Age jaxxdemo.common.firstName=Prénom Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties 2013-03-09 18:11:38 UTC (rev 2605) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties 2013-03-09 18:12:23 UTC (rev 2606) @@ -181,6 +181,14 @@ jaxxdemo.beandoublelistdemo.highlightFilterText=Surligner le texte de filtre jaxxdemo.beandoublelistdemo.showDecorator=Changer la décoration jaxxdemo.beandoublelistdemo.showReset=Pouvoir réinitialiser le filtre +jaxxdemo.beanfilterablecomboboxdemo.colorizeInvalidComboEditorText=Colorer le texte s'il n'est pas valide +jaxxdemo.beanfilterablecomboboxdemo.configuration=Configuration +jaxxdemo.beanfilterablecomboboxdemo.filterable=Filtrable +jaxxdemo.beanfilterablecomboboxdemo.no.people.selected=Pas de sélection +jaxxdemo.beanfilterablecomboboxdemo.result=Résultat +jaxxdemo.beanfilterablecomboboxdemo.selected.people=Sélection \: %s +jaxxdemo.beanfilterablecomboboxdemo.showDecorator=Changer la décoration +jaxxdemo.beanfilterablecomboboxdemo.showReset=Pouvoir réinitialiser jaxxdemo.common.actors=Acteurs jaxxdemo.common.age=Age jaxxdemo.common.firstName=Prénom

1 0

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

09 Mar '13

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

1 0