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

r2616 - in trunk: . jaxx-compiler jaxx-config jaxx-demo jaxx-maven-plugin jaxx-runtime jaxx-validator jaxx-widgets
by maven-release＠users.nuiton.org March 12, 2013

March 12, 2013

Author: maven-release Date: 2013-03-12 14:33:38 +0100 (Tue, 12 Mar 2013) New Revision: 2616 Url: http://nuiton.org/projects/jaxx/repository/revisions/2616 Log: [maven-release-plugin] prepare release jaxx-2.5.13 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-12 09:09:46 UTC (rev 2615) +++ trunk/jaxx-compiler/pom.xml 2013-03-12 13:33:38 UTC (rev 2616) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.13-SNAPSHOT</version> + <version>2.5.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-config/pom.xml =================================================================== --- trunk/jaxx-config/pom.xml 2013-03-12 09:09:46 UTC (rev 2615) +++ trunk/jaxx-config/pom.xml 2013-03-12 13:33:38 UTC (rev 2616) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.13-SNAPSHOT</version> + <version>2.5.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2013-03-12 09:09:46 UTC (rev 2615) +++ trunk/jaxx-demo/pom.xml 2013-03-12 13:33:38 UTC (rev 2616) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.13-SNAPSHOT</version> + <version>2.5.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2013-03-12 09:09:46 UTC (rev 2615) +++ trunk/jaxx-maven-plugin/pom.xml 2013-03-12 13:33:38 UTC (rev 2616) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.13-SNAPSHOT</version> + <version>2.5.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2013-03-12 09:09:46 UTC (rev 2615) +++ trunk/jaxx-runtime/pom.xml 2013-03-12 13:33:38 UTC (rev 2616) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.13-SNAPSHOT</version> + <version>2.5.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2013-03-12 09:09:46 UTC (rev 2615) +++ trunk/jaxx-validator/pom.xml 2013-03-12 13:33:38 UTC (rev 2616) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.13-SNAPSHOT</version> + <version>2.5.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2013-03-12 09:09:46 UTC (rev 2615) +++ trunk/jaxx-widgets/pom.xml 2013-03-12 13:33:38 UTC (rev 2616) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.13-SNAPSHOT</version> + <version>2.5.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-12 09:09:46 UTC (rev 2615) +++ trunk/pom.xml 2013-03-12 13:33:38 UTC (rev 2616) @@ -34,7 +34,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.13-SNAPSHOT</version> + <version>2.5.13</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.13</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/trunk + scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.13 </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/trunk</url> + <url>http://nuiton.org/projects/jaxx/repository/show/tags/jaxx-2.5.13</url> </scm> <distributionManagement>

1 0

r2615 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
by kmorin＠users.nuiton.org March 12, 2013

March 12, 2013

Author: kmorin Date: 2013-03-12 10:09:46 +0100 (Tue, 12 Mar 2013) New Revision: 2615 Url: http://nuiton.org/projects/jaxx/repository/revisions/2615 Log: fixes #2585 Bug in the BeanFilterableComboBoxHandler when the selected item is a String (not the same type as the bean type) 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-12 09:08:07 UTC (rev 2614) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java 2013-03-12 09:09:46 UTC (rev 2615) @@ -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% @@ -54,6 +54,7 @@ import javax.swing.ComboBoxEditor; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; +import jaxx.runtime.JAXXUtil; import jaxx.runtime.swing.model.JaxxFilterableComboBoxModel; /** @@ -197,8 +198,13 @@ // 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)) { + String selectedItemString; + if (getBeanType().isInstance(selectedItem)) { + selectedItemString = BeanFilterableComboBoxHandler.this.decorator.toString(selectedItem); + } else { + selectedItemString = JAXXUtil.getStringValue(selectedItem); + } + if (selectedItem == null || !selectedItemString.equals(text)) { ui.setSelectedItem(null); } }

1 0

r2614 - in trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config: . model
by kmorin＠users.nuiton.org March 12, 2013

March 12, 2013

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 March 11, 2013

March 11, 2013

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 March 11, 2013

March 11, 2013

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 March 11, 2013

March 11, 2013

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 March 11, 2013

March 11, 2013

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 March 11, 2013

March 11, 2013

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 March 11, 2013

March 11, 2013

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 March 11, 2013

March 11, 2013

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