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

r2683 - in trunk: . jaxx-compiler jaxx-config jaxx-demo jaxx-maven-plugin jaxx-runtime jaxx-validator jaxx-widgets
by maven-release＠users.nuiton.org 30 May '13

30 May '13

Author: maven-release Date: 2013-05-30 15:38:34 +0200 (Thu, 30 May 2013) New Revision: 2683 Url: http://nuiton.org/projects/jaxx/repository/revisions/2683 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-05-30 13:38:32 UTC (rev 2682) +++ trunk/jaxx-compiler/pom.xml 2013-05-30 13:38:34 UTC (rev 2683) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.21</version> + <version>2.5.22-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-config/pom.xml =================================================================== --- trunk/jaxx-config/pom.xml 2013-05-30 13:38:32 UTC (rev 2682) +++ trunk/jaxx-config/pom.xml 2013-05-30 13:38:34 UTC (rev 2683) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.21</version> + <version>2.5.22-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2013-05-30 13:38:32 UTC (rev 2682) +++ trunk/jaxx-demo/pom.xml 2013-05-30 13:38:34 UTC (rev 2683) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.21</version> + <version>2.5.22-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2013-05-30 13:38:32 UTC (rev 2682) +++ trunk/jaxx-maven-plugin/pom.xml 2013-05-30 13:38:34 UTC (rev 2683) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.21</version> + <version>2.5.22-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2013-05-30 13:38:32 UTC (rev 2682) +++ trunk/jaxx-runtime/pom.xml 2013-05-30 13:38:34 UTC (rev 2683) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.21</version> + <version>2.5.22-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2013-05-30 13:38:32 UTC (rev 2682) +++ trunk/jaxx-validator/pom.xml 2013-05-30 13:38:34 UTC (rev 2683) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.21</version> + <version>2.5.22-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2013-05-30 13:38:32 UTC (rev 2682) +++ trunk/jaxx-widgets/pom.xml 2013-05-30 13:38:34 UTC (rev 2683) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.21</version> + <version>2.5.22-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> @@ -49,11 +49,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.21/jaxx-widgets</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk/jaxx-widgets</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.21/jaxx-widgets + scm:svn:http://svn.nuiton.org/svn/jaxx/trunk/jaxx-widgets </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/trunkjaxx-widgets/tags/jaxx…</url> + <url>http://nuiton.org/projects/jaxx/repository/show/trunkjaxx-widgets</url> </scm> <dependencies> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-30 13:38:32 UTC (rev 2682) +++ trunk/pom.xml 2013-05-30 13:38:34 UTC (rev 2683) @@ -34,7 +34,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.21</version> + <version>2.5.22-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.21</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.21 + scm:svn:http://svn.nuiton.org/svn/jaxx/trunk </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/tags/jaxx-2.5.21</url> + <url>http://nuiton.org/projects/jaxx/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r2682 - tags
by maven-release＠users.nuiton.org 30 May '13

30 May '13

Author: maven-release Date: 2013-05-30 15:38:32 +0200 (Thu, 30 May 2013) New Revision: 2682 Url: http://nuiton.org/projects/jaxx/repository/revisions/2682 Log: [maven-release-plugin] copy for tag jaxx-2.5.21 Added: tags/jaxx-2.5.21/

1 0

r2681 - in trunk: . jaxx-compiler jaxx-config jaxx-demo jaxx-maven-plugin jaxx-runtime jaxx-validator jaxx-widgets
by maven-release＠users.nuiton.org 30 May '13

30 May '13

Author: maven-release Date: 2013-05-30 15:38:30 +0200 (Thu, 30 May 2013) New Revision: 2681 Url: http://nuiton.org/projects/jaxx/repository/revisions/2681 Log: [maven-release-plugin] prepare release jaxx-2.5.21 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-05-30 13:07:44 UTC (rev 2680) +++ trunk/jaxx-compiler/pom.xml 2013-05-30 13:38:30 UTC (rev 2681) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.21-SNAPSHOT</version> + <version>2.5.21</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-config/pom.xml =================================================================== --- trunk/jaxx-config/pom.xml 2013-05-30 13:07:44 UTC (rev 2680) +++ trunk/jaxx-config/pom.xml 2013-05-30 13:38:30 UTC (rev 2681) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.21-SNAPSHOT</version> + <version>2.5.21</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2013-05-30 13:07:44 UTC (rev 2680) +++ trunk/jaxx-demo/pom.xml 2013-05-30 13:38:30 UTC (rev 2681) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.21-SNAPSHOT</version> + <version>2.5.21</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2013-05-30 13:07:44 UTC (rev 2680) +++ trunk/jaxx-maven-plugin/pom.xml 2013-05-30 13:38:30 UTC (rev 2681) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.21-SNAPSHOT</version> + <version>2.5.21</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2013-05-30 13:07:44 UTC (rev 2680) +++ trunk/jaxx-runtime/pom.xml 2013-05-30 13:38:30 UTC (rev 2681) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.21-SNAPSHOT</version> + <version>2.5.21</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2013-05-30 13:07:44 UTC (rev 2680) +++ trunk/jaxx-validator/pom.xml 2013-05-30 13:38:30 UTC (rev 2681) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.21-SNAPSHOT</version> + <version>2.5.21</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2013-05-30 13:07:44 UTC (rev 2680) +++ trunk/jaxx-widgets/pom.xml 2013-05-30 13:38:30 UTC (rev 2681) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.21-SNAPSHOT</version> + <version>2.5.21</version> </parent> <groupId>org.nuiton.jaxx</groupId> @@ -49,11 +49,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk/jaxx-widgets</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.21/jaxx-widgets</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/trunk/jaxx-widgets + scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.21/jaxx-widgets </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/trunkjaxx-widgets</url> + <url>http://nuiton.org/projects/jaxx/repository/show/trunkjaxx-widgets/tags/jaxx…</url> </scm> <dependencies> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-30 13:07:44 UTC (rev 2680) +++ trunk/pom.xml 2013-05-30 13:38:30 UTC (rev 2681) @@ -34,7 +34,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.21-SNAPSHOT</version> + <version>2.5.21</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.21</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/trunk + scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.21 </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/trunk</url> + <url>http://nuiton.org/projects/jaxx/repository/show/tags/jaxx-2.5.21</url> </scm> <distributionManagement>

1 0

r2680 - in trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing: editor/bean session
by kmorin＠users.nuiton.org 30 May '13

30 May '13

Author: kmorin Date: 2013-05-30 15:07:44 +0200 (Thu, 30 May 2013) New Revision: 2680 Url: http://nuiton.org/projects/jaxx/repository/revisions/2680 Log: fixes #2711 [Swing session] create a state for the BeanDoubleList Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/session/BeanDoubleListState.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java 2013-05-30 12:36:46 UTC (rev 2679) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java 2013-05-30 13:07:44 UTC (rev 2680) @@ -37,10 +37,7 @@ import org.nuiton.util.decorator.JXPathDecorator; import org.nuiton.util.decorator.MultiJXPathDecorator; -import javax.swing.JComponent; -import javax.swing.JList; -import javax.swing.JPopupMenu; -import javax.swing.ListSelectionModel; +import javax.swing.*; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.event.ListDataEvent; @@ -237,6 +234,10 @@ if (log.isDebugEnabled()) { log.debug("check state : <" + oldValue + " to " + newValue + ">"); } + AbstractButton button = ui.getIndexes().getButton(newValue); + if (button != null) { + button.setSelected(true); + } updateUI(newValue, ui.isReverseSort()); } Copied: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/session/BeanDoubleListState.java (from rev 2678, trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/session/BeanFilterableComboBoxState.java) =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/session/BeanDoubleListState.java (rev 0) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/session/BeanDoubleListState.java 2013-05-30 13:07:44 UTC (rev 2680) @@ -0,0 +1,68 @@ +package jaxx.runtime.swing.session; + +import jaxx.runtime.swing.editor.bean.BeanDoubleList; +import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; + +/** + * @author kmorin <kmorin(a)codelutin.com> + * @since 2.5.21 + */ +public class BeanDoubleListState implements State { + + protected int index = 0; + + protected boolean reverseSort = false; + + public BeanDoubleListState() { + } + + public BeanDoubleListState(int index, boolean reverseSort) { + this.index = index; + this.reverseSort = reverseSort; + } + + public int getIndex() { + return index; + } + + public void setIndex(int index) { + this.index = index; + } + + public boolean isReverseSort() { + return reverseSort; + } + + public void setReverseSort(boolean reverseSort) { + this.reverseSort = reverseSort; + } + + protected BeanDoubleList checkComponent(Object o) { + if (o == null) { + throw new IllegalArgumentException("null component"); + } + if (!(o instanceof BeanDoubleList)) { + throw new IllegalArgumentException("invalid component"); + } + return (BeanDoubleList) o; + } + + @Override + public State getState(Object o) { + BeanDoubleList list = checkComponent(o); + return new BeanDoubleListState(list.getIndex(), list.isReverseSort()); + } + + @Override + public void setState(Object o, State state) { + if (!(state instanceof BeanDoubleListState)) { + throw new IllegalArgumentException("invalid state"); + } + BeanDoubleList list = checkComponent(o); + BeanDoubleListState beanDoubleListState = (BeanDoubleListState) state; + list.setIndex(beanDoubleListState.getIndex()); + list.setReverseSort(beanDoubleListState.isReverseSort()); + } + + +}

1 0

r2679 - in trunk/jaxx-config/src/main: java/jaxx/runtime/swing/config java/jaxx/runtime/swing/config/model resources/i18n
by tchemit＠users.nuiton.org 30 May '13

30 May '13

Author: tchemit Date: 2013-05-30 14:36:46 +0200 (Thu, 30 May 2013) New Revision: 2679 Url: http://nuiton.org/projects/jaxx/repository/revisions/2679 Log: fixes #2710: Should be able to specify the file where to save Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHelper.java trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModel.java trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModelBuilder.java trunk/jaxx-config/src/main/resources/i18n/jaxx-config_en_GB.properties trunk/jaxx-config/src/main/resources/i18n/jaxx-config_es_ES.properties trunk/jaxx-config/src/main/resources/i18n/jaxx-config_fr_FR.properties 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-05-27 17:55:19 UTC (rev 2678) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHelper.java 2013-05-30 12:36:46 UTC (rev 2679) @@ -41,6 +41,7 @@ import javax.swing.Icon; import javax.swing.table.TableCellEditor; import java.awt.Frame; +import java.io.File; import javax.swing.table.TableCellRenderer; /** @@ -68,6 +69,16 @@ modelBuilder.createModel(config); } + public ConfigUIHelper(Supplier<ApplicationConfig> config, File configFile) { + modelBuilder = new ConfigUIModelBuilder(); + modelBuilder.createModel(config, configFile); + } + + public ConfigUIHelper(ApplicationConfig config, File configFile) { + modelBuilder = new ConfigUIModelBuilder(); + modelBuilder.createModel(config, configFile); + } + public ConfigUIHelper(ApplicationConfig config) { modelBuilder = new ConfigUIModelBuilder(); modelBuilder.createModel(config); Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModel.java =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModel.java 2013-05-27 17:55:19 UTC (rev 2678) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModel.java 2013-05-30 12:36:46 UTC (rev 2679) @@ -29,11 +29,15 @@ import com.google.common.collect.Lists; import jaxx.runtime.JAXXUtil; import org.apache.commons.beanutils.PropertyUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.util.config.ApplicationConfig; import javax.swing.Icon; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; +import java.io.File; +import java.io.IOException; import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Iterator; @@ -53,11 +57,20 @@ */ public class ConfigUIModel implements Iterable<CategoryModel> { + /** Logger. */ + private static final Log log = LogFactory.getLog(ConfigUIModel.class); + public static final String CATEGORY_MODEL_PROPERTY_NAME = "categoryModel"; /** le dictionnaire des options disponibles par categorie */ protected final Map<String, CategoryModel> categories; + /** + * Le fichier où sauvegarder la configuration. + * @since 2.5.21 + */ + protected final File configFile; + /** La configuration de l'application */ protected final Object configBean; @@ -102,13 +115,26 @@ this(config, config.get()); } + public ConfigUIModel(Supplier<ApplicationConfig> config, File configFile) { + this(config, config.get(), configFile); + } + public ConfigUIModel(ApplicationConfig applicationConfig) { this(applicationConfig, applicationConfig); } + public ConfigUIModel(ApplicationConfig applicationConfig, File configFile) { + this(applicationConfig, applicationConfig, configFile); + } + public ConfigUIModel(Object configBean, ApplicationConfig applicationConfig) { + this(configBean, applicationConfig, applicationConfig.getUserConfigFile()); + } + + public ConfigUIModel(Object configBean, ApplicationConfig applicationConfig, File configFile) { this.configBean = configBean; this.applicationConfig = applicationConfig; + this.configFile = configFile; categories = new LinkedHashMap<String, CategoryModel>(); callBacksManager = new CallBacksManager(); pcs = new PropertyChangeSupport(this); @@ -289,7 +315,17 @@ setSaved(true); // save config - applicationConfig.saveForUser(transients.toArray(new String[transients.size()])); + // Ano +// applicationConfig.saveForUser(transients.toArray(new String[transients.size()])); + try { + applicationConfig.save(configFile, false, transients.toArray(new String[transients.size()])); + } catch (IOException eee) { + if (log.isWarnEnabled()) { + log.warn(_("config.error.applicationconfig.save", configFile), + eee); + } + } + // notify data has changed categoryModel.firePropertyChange( CategoryModel.MODIFIED_PROPERTY_NAME, 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-05-27 17:55:19 UTC (rev 2678) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModelBuilder.java 2013-05-30 12:36:46 UTC (rev 2679) @@ -34,6 +34,7 @@ import javax.swing.Icon; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; +import java.io.File; /** * A builder of {@link ConfigUIModel} @@ -82,6 +83,29 @@ /** * Create a new model and set it as current model. * + * @param config the configuration used in model + * @param configFile configuration file where to save (can not be null) + * @return the builder + * @throws IllegalStateException if there is already a current model + * @throws NullPointerException if config or configFile is {@code null} + * @since 2.5.21 + */ + public ConfigUIModelBuilder createModel(Supplier<ApplicationConfig> config, + File configFile) + throws IllegalStateException, NullPointerException { + checkNoCurrent(model, "model"); + checkNotNull(config, "createModel", "config"); + checkNotNull(configFile, "createModel", "configFile"); + model = new ConfigUIModel(config, configFile); + if (log.isDebugEnabled()) { + log.debug("model created : " + model); + } + return this; + } + + /** + * Create a new model and set it as current model. + * * @param config the configuration used in model * @return the builder * @throws IllegalStateException if there is already a current model @@ -92,6 +116,7 @@ checkNoCurrent(model, "model"); checkNotNull(config, "createModel", "config"); model = new ConfigUIModel(config); + if (log.isDebugEnabled()) { log.debug("model created : " + model); } @@ -99,6 +124,30 @@ } /** + * Create a new model and set it as current model. + * + * @param config the configuration used in model + * @param configFile configuration file where to save (can not be null) + * @return the builder + * @throws IllegalStateException if there is already a current model + * @throws NullPointerException if config or configFile is {@code null} + * @since 2.5.21 + */ + public ConfigUIModelBuilder createModel(ApplicationConfig config, + File configFile) + throws IllegalStateException, NullPointerException { + checkNoCurrent(model, "model"); + checkNotNull(config, "createModel", "config"); + checkNotNull(configFile, "createModel", "configFile"); + model = new ConfigUIModel(config, configFile); + + if (log.isDebugEnabled()) { + log.debug("model created : " + model); + } + return this; + } + + /** * Add a new category, and set it as current. * <p/> * <b>Note:</b> As side effets, if a previous category, then store it to Modified: trunk/jaxx-config/src/main/resources/i18n/jaxx-config_en_GB.properties =================================================================== --- trunk/jaxx-config/src/main/resources/i18n/jaxx-config_en_GB.properties 2013-05-27 17:55:19 UTC (rev 2678) +++ trunk/jaxx-config/src/main/resources/i18n/jaxx-config_en_GB.properties 2013-05-30 12:36:46 UTC (rev 2679) @@ -12,6 +12,7 @@ config.defaultValue.tip=Default value of the option config.description=Description config.detected.callBack=Detected actions +config.error.applicationconfig.save=Can't save config in file %s config.error.category.already.exists=category with name '%1$s' does already exist\! config.error.category.not.found=category with name '%1$s' does not exist\! config.key=Key Modified: trunk/jaxx-config/src/main/resources/i18n/jaxx-config_es_ES.properties =================================================================== --- trunk/jaxx-config/src/main/resources/i18n/jaxx-config_es_ES.properties 2013-05-27 17:55:19 UTC (rev 2678) +++ trunk/jaxx-config/src/main/resources/i18n/jaxx-config_es_ES.properties 2013-05-30 12:36:46 UTC (rev 2679) @@ -31,3 +31,4 @@ config.unvalid=Opción no valida (valor original \: %1$s, tipo requerido \: %2$s) config.value=Valor config.value.tip=Valor de la opción +nuitonutil.error.applicationconfig.save= Modified: trunk/jaxx-config/src/main/resources/i18n/jaxx-config_fr_FR.properties =================================================================== --- trunk/jaxx-config/src/main/resources/i18n/jaxx-config_fr_FR.properties 2013-05-27 17:55:19 UTC (rev 2678) +++ trunk/jaxx-config/src/main/resources/i18n/jaxx-config_fr_FR.properties 2013-05-30 12:36:46 UTC (rev 2679) @@ -12,6 +12,7 @@ config.defaultValue.tip=Valeur par défaut de l'option config.description=Description config.detected.callBack=Actions détectées pour les options modifiées +config.error.applicationconfig.save=Impossible de sauvegarder le fichier de configuration dans %s config.error.category.already.exists=La catégorie de nom '%1$s' existe déjà\! config.error.category.not.found=La catégorie de nom '%1$s' n'existe pas\! config.key=Clef

1 0

r2678 - in trunk: . jaxx-compiler jaxx-config jaxx-demo jaxx-maven-plugin jaxx-runtime jaxx-validator jaxx-widgets
by maven-release＠users.nuiton.org 27 May '13

27 May '13

Author: maven-release Date: 2013-05-27 19:55:19 +0200 (Mon, 27 May 2013) New Revision: 2678 Url: http://nuiton.org/projects/jaxx/repository/revisions/2678 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-05-27 17:55:17 UTC (rev 2677) +++ trunk/jaxx-compiler/pom.xml 2013-05-27 17:55:19 UTC (rev 2678) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.20</version> + <version>2.5.21-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-config/pom.xml =================================================================== --- trunk/jaxx-config/pom.xml 2013-05-27 17:55:17 UTC (rev 2677) +++ trunk/jaxx-config/pom.xml 2013-05-27 17:55:19 UTC (rev 2678) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.20</version> + <version>2.5.21-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2013-05-27 17:55:17 UTC (rev 2677) +++ trunk/jaxx-demo/pom.xml 2013-05-27 17:55:19 UTC (rev 2678) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.20</version> + <version>2.5.21-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2013-05-27 17:55:17 UTC (rev 2677) +++ trunk/jaxx-maven-plugin/pom.xml 2013-05-27 17:55:19 UTC (rev 2678) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.20</version> + <version>2.5.21-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2013-05-27 17:55:17 UTC (rev 2677) +++ trunk/jaxx-runtime/pom.xml 2013-05-27 17:55:19 UTC (rev 2678) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.20</version> + <version>2.5.21-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2013-05-27 17:55:17 UTC (rev 2677) +++ trunk/jaxx-validator/pom.xml 2013-05-27 17:55:19 UTC (rev 2678) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.20</version> + <version>2.5.21-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2013-05-27 17:55:17 UTC (rev 2677) +++ trunk/jaxx-widgets/pom.xml 2013-05-27 17:55:19 UTC (rev 2678) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.20</version> + <version>2.5.21-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> @@ -49,11 +49,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.20/jaxx-widgets</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk/jaxx-widgets</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.20/jaxx-widgets + scm:svn:http://svn.nuiton.org/svn/jaxx/trunk/jaxx-widgets </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/trunkjaxx-widgets/tags/jaxx…</url> + <url>http://nuiton.org/projects/jaxx/repository/show/trunkjaxx-widgets</url> </scm> <dependencies> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-27 17:55:17 UTC (rev 2677) +++ trunk/pom.xml 2013-05-27 17:55:19 UTC (rev 2678) @@ -34,7 +34,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.20</version> + <version>2.5.21-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.20</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.20 + scm:svn:http://svn.nuiton.org/svn/jaxx/trunk </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/tags/jaxx-2.5.20</url> + <url>http://nuiton.org/projects/jaxx/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r2677 - tags
by maven-release＠users.nuiton.org 27 May '13

27 May '13

Author: maven-release Date: 2013-05-27 19:55:17 +0200 (Mon, 27 May 2013) New Revision: 2677 Url: http://nuiton.org/projects/jaxx/repository/revisions/2677 Log: [maven-release-plugin] copy for tag jaxx-2.5.20 Added: tags/jaxx-2.5.20/

1 0

r2676 - in trunk: . jaxx-compiler jaxx-config jaxx-demo jaxx-maven-plugin jaxx-runtime jaxx-validator jaxx-widgets
by maven-release＠users.nuiton.org 27 May '13

27 May '13

Author: maven-release Date: 2013-05-27 19:55:15 +0200 (Mon, 27 May 2013) New Revision: 2676 Url: http://nuiton.org/projects/jaxx/repository/revisions/2676 Log: [maven-release-plugin] prepare release jaxx-2.5.20 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-05-27 12:49:26 UTC (rev 2675) +++ trunk/jaxx-compiler/pom.xml 2013-05-27 17:55:15 UTC (rev 2676) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.20-SNAPSHOT</version> + <version>2.5.20</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-config/pom.xml =================================================================== --- trunk/jaxx-config/pom.xml 2013-05-27 12:49:26 UTC (rev 2675) +++ trunk/jaxx-config/pom.xml 2013-05-27 17:55:15 UTC (rev 2676) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.20-SNAPSHOT</version> + <version>2.5.20</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2013-05-27 12:49:26 UTC (rev 2675) +++ trunk/jaxx-demo/pom.xml 2013-05-27 17:55:15 UTC (rev 2676) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.20-SNAPSHOT</version> + <version>2.5.20</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2013-05-27 12:49:26 UTC (rev 2675) +++ trunk/jaxx-maven-plugin/pom.xml 2013-05-27 17:55:15 UTC (rev 2676) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.20-SNAPSHOT</version> + <version>2.5.20</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2013-05-27 12:49:26 UTC (rev 2675) +++ trunk/jaxx-runtime/pom.xml 2013-05-27 17:55:15 UTC (rev 2676) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.20-SNAPSHOT</version> + <version>2.5.20</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2013-05-27 12:49:26 UTC (rev 2675) +++ trunk/jaxx-validator/pom.xml 2013-05-27 17:55:15 UTC (rev 2676) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.20-SNAPSHOT</version> + <version>2.5.20</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2013-05-27 12:49:26 UTC (rev 2675) +++ trunk/jaxx-widgets/pom.xml 2013-05-27 17:55:15 UTC (rev 2676) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.20-SNAPSHOT</version> + <version>2.5.20</version> </parent> <groupId>org.nuiton.jaxx</groupId> @@ -49,11 +49,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk/jaxx-widgets</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.20/jaxx-widgets</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/trunk/jaxx-widgets + scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.20/jaxx-widgets </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/trunkjaxx-widgets</url> + <url>http://nuiton.org/projects/jaxx/repository/show/trunkjaxx-widgets/tags/jaxx…</url> </scm> <dependencies> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-27 12:49:26 UTC (rev 2675) +++ trunk/pom.xml 2013-05-27 17:55:15 UTC (rev 2676) @@ -34,7 +34,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.20-SNAPSHOT</version> + <version>2.5.20</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.20</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/trunk + scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.20 </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/trunk</url> + <url>http://nuiton.org/projects/jaxx/repository/show/tags/jaxx-2.5.20</url> </scm> <distributionManagement>

1 0

r2675 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor
by kmorin＠users.nuiton.org 27 May '13

27 May '13

Author: kmorin Date: 2013-05-27 14:49:26 +0200 (Mon, 27 May 2013) New Revision: 2675 Url: http://nuiton.org/projects/jaxx/repository/revisions/2675 Log: fixes #2706 [NumberEditor] When the new model does not match the pattern, the last text set is not correct Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java 2013-05-26 06:50:51 UTC (rev 2674) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java 2013-05-27 12:49:26 UTC (rev 2675) @@ -476,14 +476,31 @@ } protected void setModel(Number oldValue, Number newValue) { - if (editor.getBean() == null) { - return; - } if (log.isDebugEnabled()) { log.debug(editor.getProperty() + " on " + editor.getBean().getClass() + " :: " + oldValue + " to " + newValue); } + String strValue; + if (newValue == null) { + strValue = ""; + } else { + strValue = newValue + ""; + if (editor.isUseFloat()) { + Float n = Float.parseFloat(strValue); + if ((float) n.intValue() == n) { + strValue = n.intValue() + ""; + } + } + } + + lastValidText = strValue; + editor.setModelText(strValue); + + if (editor.getBean() == null) { + return; + } + try { Method mutator = getMutator(); if (newValue == null && !getAcceptNull()) { @@ -509,21 +526,7 @@ // mutator.invoke(editor.getBean(), newValue); // } mutator.invoke(editor.getBean(), newValue); - String strValue; - if (newValue == null) { - strValue = ""; - } else { - strValue = newValue + ""; - if (editor.isUseFloat()) { - Float n = Float.parseFloat(strValue); - if ((float) n.intValue() == n) { - strValue = n.intValue() + ""; - } - } - } - - lastValidText = strValue; - editor.setModelText(strValue); + } catch (Exception e) { throw new RuntimeException(e); }

1 0

r2674 - trunk
by tchemit＠users.nuiton.org 26 May '13

26 May '13

Author: tchemit Date: 2013-05-26 08:50:51 +0200 (Sun, 26 May 2013) New Revision: 2674 Url: http://nuiton.org/projects/jaxx/repository/revisions/2674 Log: updates mavenpom to 3.4.11 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-22 12:10:28 UTC (rev 2673) +++ trunk/pom.xml 2013-05-26 06:50:51 UTC (rev 2674) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.11-SNAPSHOT</version> + <version>3.4.11</version> </parent> <artifactId>jaxx</artifactId>

1 0

r2673 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing
by tchemit＠users.nuiton.org 22 May '13

22 May '13

Author: tchemit Date: 2013-05-22 14:10:28 +0200 (Wed, 22 May 2013) New Revision: 2673 Url: http://nuiton.org/projects/jaxx/repository/revisions/2673 Log: fix jdk 1.7 API Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXRuntimeException.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXRuntimeException.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXRuntimeException.java 2013-05-22 09:44:39 UTC (rev 2672) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXRuntimeException.java 2013-05-22 12:10:28 UTC (rev 2673) @@ -47,8 +47,4 @@ public JAXXRuntimeException(Throwable cause) { super(cause); } - - public JAXXRuntimeException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { - super(message, cause, enableSuppression, writableStackTrace); - } }

1 0

r2672 - trunk
by tchemit＠users.nuiton.org 22 May '13

22 May '13

Author: tchemit Date: 2013-05-22 11:44:39 +0200 (Wed, 22 May 2013) New Revision: 2672 Url: http://nuiton.org/projects/jaxx/repository/revisions/2672 Log: fixes #2697: Updates i18n to 2.5.1 refs #2696: Updates mavenpom to 3.4.11 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-16 17:09:40 UTC (rev 2671) +++ trunk/pom.xml 2013-05-22 09:44:39 UTC (rev 2672) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.10</version> + <version>3.4.11-SNAPSHOT</version> </parent> <artifactId>jaxx</artifactId> @@ -113,7 +113,7 @@  <projectId>jaxx</projectId> <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> - <nuitonI18nVersion>2.5</nuitonI18nVersion> + <nuitonI18nVersion>2.5.1</nuitonI18nVersion> <eugeneVersion>2.6.2</eugeneVersion> <jxLayerVersion>3.0.4</jxLayerVersion> <javaHelpVersion>2.0.05</javaHelpVersion>

1 0

r2671 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
by kmorin＠users.nuiton.org 16 May '13

16 May '13

Author: kmorin Date: 2013-05-16 19:09:40 +0200 (Thu, 16 May 2013) New Revision: 2671 Url: http://nuiton.org/projects/jaxx/repository/revisions/2671 Log: fixes #2690 [BeanDoubleList] Add a shortcut to add the selected items and to remove them from the selected Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx 2013-05-15 16:48:20 UTC (rev 2670) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx 2013-05-16 17:09:40 UTC (rev 2671) @@ -108,7 +108,9 @@ <JScrollPane onFocusGained='universeList.requestFocus()'>  <JList id='universeList' - onMouseClicked='handler.onUniverseListClicked(event)'/> + onFocusGained='handler.selectFirstRowIfNoSelection(event)' + onMouseClicked='handler.onUniverseListClicked(event)' + onKeyPressed='handler.onKeyPressedOnUniverseList(event)'/> </JScrollPane> </cell> @@ -123,7 +125,9 @@ <JScrollPane onFocusGained='selectedList.requestFocus()'>  <JList id='selectedList' - onMouseClicked='handler.onSelectedListClicked(event)'/> + onFocusGained='handler.selectFirstRowIfNoSelection(event)' + onMouseClicked='handler.onSelectedListClicked(event)' + onKeyPressed='handler.onKeyPressedOnSelectedList(event)'/> </JScrollPane> </cell> </row> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java 2013-05-15 16:48:20 UTC (rev 2670) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java 2013-05-16 17:09:40 UTC (rev 2671) @@ -47,6 +47,9 @@ import javax.swing.event.ListDataListener; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; +import java.awt.event.FocusEvent; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -404,4 +407,35 @@ ((JaxxFilterableListModel) ui.getModel().getUniverseModel()).refreshFilteredElements(); } + public void onKeyPressedOnUniverseList(KeyEvent e) { + if (e.getKeyCode() == KeyEvent.VK_ENTER) { + int lastIndice = ui.getUniverseList().getSelectionModel().getLeadSelectionIndex(); + select(); + JList source = (JList) e.getSource(); + if (source.getModel().getSize() > 0) { + source.setSelectedIndex(Math.min(lastIndice, source.getModel().getSize() - 1)); + } else { + ui.getSelectedList().requestFocus(); + } + } + } + + public void onKeyPressedOnSelectedList(KeyEvent e) { + if (e.getKeyCode() == KeyEvent.VK_DELETE) { + int lastIndice = ui.getSelectedList().getSelectionModel().getLeadSelectionIndex(); + unselect(); + JList source = (JList) e.getSource(); + if (source.getModel().getSize() > 0) { + source.setSelectedIndex(Math.min(lastIndice, source.getModel().getSize() - 1)); + ui.getSelectedList().requestFocus(); + } + } + } + + public void selectFirstRowIfNoSelection(FocusEvent event) { + JList list = (JList) event.getSource(); + if (list.isSelectionEmpty()) { + list.setSelectedIndex(0); + } + } }

1 0

r2670 - in trunk: jaxx-runtime/src/main/java/jaxx/runtime/swing/session jaxx-widgets/src/main/java/jaxx/runtime/swing jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean jaxx-widgets/src/main/java/jaxx/runtime/swing/session
by kmorin＠users.nuiton.org 15 May '13

15 May '13

Author: kmorin Date: 2013-05-15 18:48:20 +0200 (Wed, 15 May 2013) New Revision: 2670 Url: http://nuiton.org/projects/jaxx/repository/revisions/2670 Log: fixes #2689 [Swing session] create a state for the BeanFilterableComboBox Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/session/ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/session/BeanFilterableComboBoxState.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/SwingSession.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/session/SwingSession.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/SwingSession.java 2013-05-13 09:11:13 UTC (rev 2669) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/SwingSession.java 2013-05-15 16:48:20 UTC (rev 2670) @@ -92,7 +92,12 @@ * key: path of compoenent; value: State */ protected Map<String, State> states; + public SwingSession(File file, boolean autoSave) { + this(file, autoSave, Maps.<Class, State>newHashMap()); + } + + public SwingSession(File file, boolean autoSave, Map<Class, State> additionalStates) { this.file = file; this.autoSave = autoSave; stateManager.put(Window.class, new WindowState()); @@ -100,6 +105,7 @@ stateManager.put(JTabbedPane.class, new JTabbedPaneState()); stateManager.put(JSplitPane.class, new JSplitPaneState()); stateManager.put(JXTable.class, new JXTableSwingSessionState()); + stateManager.putAll(additionalStates); states = loadStates(file); if (states == null) { 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-05-13 09:11:13 UTC (rev 2669) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.css 2013-05-15 16:48:20 UTC (rev 2670) @@ -31,7 +31,7 @@ } #popup { - border:{new TitledBorder(_("beancombobox.popup.title"))}; + border:{ new TitledBorder(_("beancombobox.popup.title")) }; } #popupSortLabel { 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-05-13 09:11:13 UTC (rev 2669) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java 2013-05-15 16:48:20 UTC (rev 2670) @@ -37,10 +37,7 @@ import org.nuiton.util.decorator.JXPathDecorator; import org.nuiton.util.decorator.MultiJXPathDecorator; -import javax.swing.ComboBoxEditor; -import javax.swing.JComboBox; -import javax.swing.JComponent; -import javax.swing.JPopupMenu; +import javax.swing.*; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.text.JTextComponent; @@ -386,6 +383,10 @@ if (log.isDebugEnabled()) { log.debug("check state : <" + oldValue + " to " + newValue + ">"); } + AbstractButton button = ui.getIndexes().getButton(newValue); + if (button != null) { + button.setSelected(true); + } updateUI(newValue, ui.isReverseSort()); } Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/session/BeanFilterableComboBoxState.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/session/BeanFilterableComboBoxState.java (rev 0) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/session/BeanFilterableComboBoxState.java 2013-05-15 16:48:20 UTC (rev 2670) @@ -0,0 +1,67 @@ +package jaxx.runtime.swing.session; + +import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; + +/** + * @author kmorin <kmorin(a)codelutin.com> + * @since 2.5.20 + */ +public class BeanFilterableComboBoxState implements State { + + protected int index = 0; + + protected boolean reverseSort = false; + + public BeanFilterableComboBoxState() { + } + + public BeanFilterableComboBoxState(int index, boolean reverseSort) { + this.index = index; + this.reverseSort = reverseSort; + } + + public int getIndex() { + return index; + } + + public void setIndex(int index) { + this.index = index; + } + + public boolean isReverseSort() { + return reverseSort; + } + + public void setReverseSort(boolean reverseSort) { + this.reverseSort = reverseSort; + } + + protected BeanFilterableComboBox checkComponent(Object o) { + if (o == null) { + throw new IllegalArgumentException("null component"); + } + if (!(o instanceof BeanFilterableComboBox)) { + throw new IllegalArgumentException("invalid component"); + } + return (BeanFilterableComboBox) o; + } + + @Override + public State getState(Object o) { + BeanFilterableComboBox combo = checkComponent(o); + return new BeanFilterableComboBoxState(combo.getIndex(), combo.isReverseSort()); + } + + @Override + public void setState(Object o, State state) { + if (!(state instanceof BeanFilterableComboBoxState)) { + throw new IllegalArgumentException("invalid state"); + } + BeanFilterableComboBox combo = checkComponent(o); + BeanFilterableComboBoxState bfcbState = (BeanFilterableComboBoxState) state; + combo.setIndex(bfcbState.getIndex()); + combo.setReverseSort(bfcbState.isReverseSort()); + } + + +}

1 0

r2669 - tags/jaxx-2.5.19/jaxx-widgets/src/main/java/jaxx/runtime/swing
by maven-release＠users.nuiton.org 13 May '13

13 May '13

Author: maven-release Date: 2013-05-13 11:11:13 +0200 (Mon, 13 May 2013) New Revision: 2669 Url: http://nuiton.org/projects/jaxx/repository/revisions/2669 Log: fix jdk 6 requirement Modified: tags/jaxx-2.5.19/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXRuntimeException.java Modified: tags/jaxx-2.5.19/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXRuntimeException.java =================================================================== --- tags/jaxx-2.5.19/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXRuntimeException.java 2013-05-13 09:02:42 UTC (rev 2668) +++ tags/jaxx-2.5.19/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXRuntimeException.java 2013-05-13 09:11:13 UTC (rev 2669) @@ -47,8 +47,4 @@ public JAXXRuntimeException(Throwable cause) { super(cause); } - - public JAXXRuntimeException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { - super(message, cause, enableSuppression, writableStackTrace); - } }

1 0

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

13 May '13

Author: maven-release Date: 2013-05-13 11:02:42 +0200 (Mon, 13 May 2013) New Revision: 2668 Url: http://nuiton.org/projects/jaxx/repository/revisions/2668 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-05-13 09:02:40 UTC (rev 2667) +++ trunk/jaxx-compiler/pom.xml 2013-05-13 09:02:42 UTC (rev 2668) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.19</version> + <version>2.5.20-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-config/pom.xml =================================================================== --- trunk/jaxx-config/pom.xml 2013-05-13 09:02:40 UTC (rev 2667) +++ trunk/jaxx-config/pom.xml 2013-05-13 09:02:42 UTC (rev 2668) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.19</version> + <version>2.5.20-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2013-05-13 09:02:40 UTC (rev 2667) +++ trunk/jaxx-demo/pom.xml 2013-05-13 09:02:42 UTC (rev 2668) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.19</version> + <version>2.5.20-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2013-05-13 09:02:40 UTC (rev 2667) +++ trunk/jaxx-maven-plugin/pom.xml 2013-05-13 09:02:42 UTC (rev 2668) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.19</version> + <version>2.5.20-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2013-05-13 09:02:40 UTC (rev 2667) +++ trunk/jaxx-runtime/pom.xml 2013-05-13 09:02:42 UTC (rev 2668) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.19</version> + <version>2.5.20-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2013-05-13 09:02:40 UTC (rev 2667) +++ trunk/jaxx-validator/pom.xml 2013-05-13 09:02:42 UTC (rev 2668) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.19</version> + <version>2.5.20-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2013-05-13 09:02:40 UTC (rev 2667) +++ trunk/jaxx-widgets/pom.xml 2013-05-13 09:02:42 UTC (rev 2668) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.19</version> + <version>2.5.20-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> @@ -49,11 +49,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.19/jaxx-widgets</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk/jaxx-widgets</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.19/jaxx-widgets + scm:svn:http://svn.nuiton.org/svn/jaxx/trunk/jaxx-widgets </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/trunkjaxx-widgets/tags/jaxx…</url> + <url>http://nuiton.org/projects/jaxx/repository/show/trunkjaxx-widgets</url> </scm> <dependencies> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-13 09:02:40 UTC (rev 2667) +++ trunk/pom.xml 2013-05-13 09:02:42 UTC (rev 2668) @@ -34,7 +34,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.19</version> + <version>2.5.20-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.19</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.19 + scm:svn:http://svn.nuiton.org/svn/jaxx/trunk </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/tags/jaxx-2.5.19</url> + <url>http://nuiton.org/projects/jaxx/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r2667 - tags
by maven-release＠users.nuiton.org 13 May '13

13 May '13

Author: maven-release Date: 2013-05-13 11:02:40 +0200 (Mon, 13 May 2013) New Revision: 2667 Url: http://nuiton.org/projects/jaxx/repository/revisions/2667 Log: [maven-release-plugin] copy for tag jaxx-2.5.19 Added: tags/jaxx-2.5.19/

1 0

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

13 May '13

Author: maven-release Date: 2013-05-13 11:02:38 +0200 (Mon, 13 May 2013) New Revision: 2666 Url: http://nuiton.org/projects/jaxx/repository/revisions/2666 Log: [maven-release-plugin] prepare release jaxx-2.5.19 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-05-08 10:52:36 UTC (rev 2665) +++ trunk/jaxx-compiler/pom.xml 2013-05-13 09:02:38 UTC (rev 2666) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.19-SNAPSHOT</version> + <version>2.5.19</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-config/pom.xml =================================================================== --- trunk/jaxx-config/pom.xml 2013-05-08 10:52:36 UTC (rev 2665) +++ trunk/jaxx-config/pom.xml 2013-05-13 09:02:38 UTC (rev 2666) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.19-SNAPSHOT</version> + <version>2.5.19</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2013-05-08 10:52:36 UTC (rev 2665) +++ trunk/jaxx-demo/pom.xml 2013-05-13 09:02:38 UTC (rev 2666) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.19-SNAPSHOT</version> + <version>2.5.19</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2013-05-08 10:52:36 UTC (rev 2665) +++ trunk/jaxx-maven-plugin/pom.xml 2013-05-13 09:02:38 UTC (rev 2666) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.19-SNAPSHOT</version> + <version>2.5.19</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2013-05-08 10:52:36 UTC (rev 2665) +++ trunk/jaxx-runtime/pom.xml 2013-05-13 09:02:38 UTC (rev 2666) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.19-SNAPSHOT</version> + <version>2.5.19</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2013-05-08 10:52:36 UTC (rev 2665) +++ trunk/jaxx-validator/pom.xml 2013-05-13 09:02:38 UTC (rev 2666) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.19-SNAPSHOT</version> + <version>2.5.19</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2013-05-08 10:52:36 UTC (rev 2665) +++ trunk/jaxx-widgets/pom.xml 2013-05-13 09:02:38 UTC (rev 2666) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.19-SNAPSHOT</version> + <version>2.5.19</version> </parent> <groupId>org.nuiton.jaxx</groupId> @@ -49,11 +49,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk/jaxx-widgets</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.19/jaxx-widgets</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/trunk/jaxx-widgets + scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.19/jaxx-widgets </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/trunkjaxx-widgets</url> + <url>http://nuiton.org/projects/jaxx/repository/show/trunkjaxx-widgets/tags/jaxx…</url> </scm> <dependencies> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-08 10:52:36 UTC (rev 2665) +++ trunk/pom.xml 2013-05-13 09:02:38 UTC (rev 2666) @@ -34,7 +34,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.19-SNAPSHOT</version> + <version>2.5.19</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.19</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/trunk + scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.19 </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/trunk</url> + <url>http://nuiton.org/projects/jaxx/repository/show/tags/jaxx-2.5.19</url> </scm> <distributionManagement>

1 0

r2665 - in trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing: . editor/bean
by tchemit＠users.nuiton.org 08 May '13

08 May '13

Author: tchemit Date: 2013-05-08 12:52:36 +0200 (Wed, 08 May 2013) New Revision: 2665 Url: http://nuiton.org/projects/jaxx/repository/revisions/2665 Log: fixes #2688: Add a JaxxRuntimeException to catch some special errors Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXRuntimeException.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXRuntimeException.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXRuntimeException.java (rev 0) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXRuntimeException.java 2013-05-08 10:52:36 UTC (rev 2665) @@ -0,0 +1,54 @@ +package jaxx.runtime.swing; + +/* + * #%L + * JAXX :: Widgets + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2013 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% + */ + +/** + * A special runtime exception to catch special errors fro + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.5.19 + */ +public class JAXXRuntimeException extends RuntimeException { + private static final long serialVersionUID = -2963740979386945340L; + + public JAXXRuntimeException() { + } + + public JAXXRuntimeException(String message) { + super(message); + } + + public JAXXRuntimeException(String message, Throwable cause) { + super(message, cause); + } + + public JAXXRuntimeException(Throwable cause) { + super(cause); + } + + public JAXXRuntimeException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { + super(message, cause, enableSuppression, writableStackTrace); + } +} Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXRuntimeException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java 2013-04-28 21:13:44 UTC (rev 2664) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java 2013-05-08 10:52:36 UTC (rev 2665) @@ -39,6 +39,8 @@ import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JPopupMenu; +import javax.swing.event.PopupMenuEvent; +import javax.swing.event.PopupMenuListener; import javax.swing.text.Document; import javax.swing.text.JTextComponent; import java.awt.event.FocusEvent; @@ -47,8 +49,6 @@ import java.beans.PropertyChangeListener; import java.lang.reflect.Method; import java.util.List; -import javax.swing.event.PopupMenuEvent; -import javax.swing.event.PopupMenuListener; /** * Le handler d'un {@link BeanComboBox}. @@ -140,9 +140,9 @@ combobox.addPopupMenuListener(new PopupMenuListener() { private O selectedItem; - + boolean canceled = false; - + public void popupMenuWillBecomeVisible(PopupMenuEvent e) { selectedItem = (O) combobox.getSelectedItem(); } @@ -151,10 +151,10 @@ O newSelectedItem = (O) combobox.getSelectedItem(); if (canceled) { ui.setSelectedItem(null); - - } else if ((newSelectedItem == null ^ selectedItem == null) - || (newSelectedItem != null - && !selectedItem.equals(newSelectedItem))) { + + } else if ((newSelectedItem == null ^ selectedItem == null) + || (newSelectedItem != null + && !selectedItem.equals(newSelectedItem))) { ui.setSelectedItem(newSelectedItem); } selectedItem = null; @@ -185,7 +185,7 @@ this.decorator); ui.autoComplete = true; - + ui.addPropertyChangeListener(this); // set datas @@ -409,14 +409,7 @@ 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); - } + BeanUIUtil.invokeMethod(getMutator(), ui.getBean(), (O) newValue); } /** @return le document de l'éditeur avant complétion. */ Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java 2013-04-28 21:13:44 UTC (rev 2664) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java 2013-05-08 10:52:36 UTC (rev 2665) @@ -25,22 +25,6 @@ */ import com.google.common.base.Predicate; -import java.awt.event.MouseEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.lang.reflect.Method; -import java.util.Arrays; -import java.util.List; -import javax.swing.JComponent; -import javax.swing.JList; -import javax.swing.JPopupMenu; -import javax.swing.ListSelectionModel; -import javax.swing.event.DocumentEvent; -import javax.swing.event.DocumentListener; -import javax.swing.event.ListDataEvent; -import javax.swing.event.ListDataListener; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.JAXXButtonGroup; import jaxx.runtime.swing.model.JaxxDefaultListModel; @@ -53,6 +37,23 @@ import org.nuiton.util.decorator.JXPathDecorator; import org.nuiton.util.decorator.MultiJXPathDecorator; +import javax.swing.JComponent; +import javax.swing.JList; +import javax.swing.JPopupMenu; +import javax.swing.ListSelectionModel; +import javax.swing.event.DocumentEvent; +import javax.swing.event.DocumentListener; +import javax.swing.event.ListDataEvent; +import javax.swing.event.ListDataListener; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import java.awt.event.MouseEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.List; + /** * The handler of a {@link BeanDoubleList}. * <p/> @@ -267,7 +268,7 @@ // change decorator context decorator.setContextIndex(index); - List<O> data = (List<O>) Arrays.asList(((JaxxDefaultListModel<O>)ui.getModel().getUniverseModel()).toArray()); + List<O> data = (List<O>) Arrays.asList(((JaxxDefaultListModel<O>) ui.getModel().getUniverseModel()).toArray()); try { // Sort data with the decorator jxpath tokens. DecoratorUtil.sort(decorator, @@ -335,12 +336,10 @@ } protected void fireSelectionUpdate() { - if (ui.getBean() != null && getMutator() != null) { - try { - getMutator().invoke(ui.getBean(), ui.getModel().getSelected()); - } catch (Exception e) { - throw new RuntimeException(e); - } + if (ui.getBean() != null) { + BeanUIUtil.invokeMethod(getMutator(), + ui.getBean(), + ui.getModel().getSelected()); } } 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-04-28 21:13:44 UTC (rev 2664) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java 2013-05-08 10:52:36 UTC (rev 2665) @@ -25,9 +25,10 @@ package jaxx.runtime.swing.editor.bean; import com.google.common.base.Predicate; -import java.awt.event.ActionListener; +import jaxx.runtime.JAXXUtil; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.JAXXButtonGroup; +import jaxx.runtime.swing.model.JaxxFilterableComboBoxModel; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; @@ -36,10 +37,14 @@ import org.nuiton.util.decorator.JXPathDecorator; import org.nuiton.util.decorator.MultiJXPathDecorator; +import javax.swing.ComboBoxEditor; import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JPopupMenu; +import javax.swing.event.DocumentEvent; +import javax.swing.event.DocumentListener; import javax.swing.text.JTextComponent; +import java.awt.event.ActionListener; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; import java.awt.event.ItemEvent; @@ -52,12 +57,6 @@ 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 jaxx.runtime.JAXXUtil; -import jaxx.runtime.swing.model.JaxxFilterableComboBoxModel; -import jaxx.runtime.swing.model.JaxxFilterableListModel; /** * Le handler d'un {@link BeanFilterableComboBox}. @@ -67,25 +66,22 @@ * * @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 + * @since 2.5.12 */ public class BeanFilterableComboBoxHandler<O> implements PropertyChangeListener { public static final Log log = LogFactory.getLog(BeanFilterableComboBoxHandler.class); - /** - * ui if the handler - */ + + /** ui if the handler */ protected BeanFilterableComboBox<O> ui; - /** - * the mutator method on the property of boxed bean in the ui - */ + + /** the mutator method on the property of boxed bean in the ui */ protected Method mutator; - /** - * the decorator of data - */ + + /** the decorator of data */ protected MultiJXPathDecorator<O> decorator; - + protected boolean init; public BeanFilterableComboBoxHandler(BeanFilterableComboBox<O> ui) { @@ -142,7 +138,7 @@ } }; - + private final BeanUIUtil.PopupHandler popupHandler = new BeanUIUtil.PopupHandler() { @Override public JPopupMenu getPopup() { @@ -159,7 +155,7 @@ * Initialise le handler de l'ui * * @param decorator le decorateur a utiliser - * @param data la liste des données a gérer + * @param data la liste des données a gérer */ public void init(JXPathDecorator<O> decorator, List<O> data) { @@ -197,7 +193,7 @@ combobox.showPopup(); } } - + @Override public void keyReleased(KeyEvent e) { // if the typed text does not match the selected item, @@ -229,29 +225,29 @@ if (log.isDebugEnabled()) { log.debug("itemStateChanged selected " + item + " - " + (item != null ? item.getClass() : null)); } - ((JTextComponent) combobox.getEditor().getEditorComponent()).setForeground(null); + combobox.getEditor().getEditorComponent().setForeground(null); ui.setSelectedItem(item); - + } else { if (log.isDebugEnabled()) { log.debug("itemStateChanged deselected " + item + " - " + (item != null ? item.getClass() : null)); } - ((JTextComponent) combobox.getEditor().getEditorComponent()).setForeground(ui.getInvalidComboEditorTextColor()); + combobox.getEditor().getEditorComponent().setForeground(ui.getInvalidComboEditorTextColor()); } } }); // build popup popupHandler.preparePopup(ui.getSelectedToolTipText(), - ui.getNotSelectedToolTipText(), - ui.getI18nPrefix(), - ui.getPopupTitleText(), - indexes, - ui.getPopupSeparator(), - ui.getPopupLabel(), - ui.getSortUp(), - ui.getSortDown(), - this.decorator); + ui.getNotSelectedToolTipText(), + ui.getI18nPrefix(), + ui.getPopupTitleText(), + indexes, + ui.getPopupSeparator(), + ui.getPopupLabel(), + ui.getSortUp(), + ui.getSortDown(), + this.decorator); setFilterable(false, ui.getFilterable()); @@ -264,16 +260,14 @@ indexes.setSelectedButton(ui.getIndex()); } - /** - * Toggle the popup visible state. - */ + /** Toggle the popup visible state. */ public void togglePopup() { popupHandler.togglePopup(); } /** * @return {@code true} if there is no data in comboBox, {@code false} - * otherwise. + * otherwise. */ public boolean isEmpty() { boolean result = CollectionUtils.isEmpty(ui.getData()); @@ -329,9 +323,7 @@ } } - /** - * Sort data of the model. - */ + /** Sort data of the model. */ public void sortData() { // just update UI should do the math of this @@ -433,9 +425,9 @@ try { // Sort data with the decorator jxpath tokens. DecoratorUtil.sort(decorator, - data, - index, - reversesort); + data, + index, + reversesort); } catch (Exception eee) { log.warn(eee.getMessage(), eee); @@ -455,16 +447,11 @@ if (ui.selectedItem == null) { return; } - + ui.selectedItem = null; - try { - Method mut = getMutator(); - if (mut != null) { - mut.invoke(ui.getBean(), (O)null); - } - } catch (Exception e) { - throw new RuntimeException(e); - } + BeanUIUtil.invokeMethod(getMutator(), + ui.getBean(), + (O) null); } /** @@ -477,35 +464,28 @@ if (oldValue == null && newValue == null) { return; } - + if (!getBeanType().isInstance(newValue)) { newValue = null; } JTextComponent editorComponent = (JTextComponent) ui.getCombobox().getEditor().getEditorComponent(); editorComponent.setText(""); - + 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); - } + BeanUIUtil.invokeMethod(getMutator(), + ui.getBean(), + newValue); } public MultiJXPathDecorator<O> getDecorator() { return decorator; } - /** - * @return get the type of objects contained in the comboBox model. - */ + /** @return get the type of objects contained in the comboBox model. */ public Class<O> getBeanType() { Class<O> result = ui.getBeanType(); if (result == null) { @@ -514,9 +494,7 @@ return result; } - /** - * @return le mutateur a utiliser pour modifier le bean associé. - */ + /** @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()); @@ -536,7 +514,7 @@ if (BeanFilterableComboBox.PROPERTY_FILTERABLE.equals(propertyName)) { setFilterable((Boolean) evt.getOldValue(), - (Boolean) evt.getNewValue()); + (Boolean) evt.getNewValue()); return; } @@ -544,7 +522,7 @@ // decorator index has changed, force reload of data in ui setIndex((Integer) evt.getOldValue(), - (Integer) evt.getNewValue()); + (Integer) evt.getNewValue()); return; } @@ -552,7 +530,7 @@ // sort order has changed, force reload of data in ui setSortOrder((Boolean) evt.getOldValue(), - (Boolean) evt.getNewValue()); + (Boolean) evt.getNewValue()); return; } @@ -569,15 +547,14 @@ protected void fireEmpty(boolean wasEmpty) { ui.firePropertyChange(BeanComboBox.PROPERTY_EMPTY, wasEmpty, - isEmpty()); + isEmpty()); } - /** - * Editor for the Combobox of the UI - uses the decorator - */ + /** Editor for the Combobox of the UI - uses the decorator */ class JAXXFilterableComboBoxEditor implements ComboBoxEditor { Object oldItem; + ComboBoxEditor wrapped; public JAXXFilterableComboBoxEditor(ComboBoxEditor wrapped) { @@ -617,10 +594,10 @@ log.debug("getItem " + newValue + " - " + (newValue != null ? newValue.getClass() : null)); } - if (oldItem != null && getBeanType().isInstance(oldItem)) { + 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))) { + if (newValue.equals(decorator.toString(oldItem))) { newValue = oldItem; } } @@ -644,7 +621,7 @@ public void removeActionListener(ActionListener l) { wrapped.removeActionListener(l); } - }; + } public void addFilter(Predicate<O> filter) { ((JaxxFilterableComboBoxModel) ui.getCombobox().getModel()).addFilter(filter); Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java 2013-04-28 21:13:44 UTC (rev 2664) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java 2013-05-08 10:52:36 UTC (rev 2665) @@ -24,15 +24,10 @@ */ package jaxx.runtime.swing.editor.bean; -import org.apache.commons.beanutils.PropertyUtils; -import java.beans.PropertyDescriptor; -import java.lang.reflect.Method; -import org.nuiton.util.decorator.Decorator; -import org.nuiton.util.decorator.DecoratorUtil; -import org.nuiton.util.decorator.JXPathDecorator; -import org.nuiton.util.decorator.MultiJXPathDecorator; import jaxx.runtime.swing.JAXXButtonGroup; +import jaxx.runtime.swing.JAXXRuntimeException; import org.apache.commons.beanutils.MethodUtils; +import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.autocomplete.AutoCompleteComboBoxEditor; @@ -40,6 +35,10 @@ import org.jdesktop.swingx.autocomplete.AutoCompleteDocument; import org.jdesktop.swingx.autocomplete.ComboBoxAdaptor; import org.jdesktop.swingx.autocomplete.ObjectToStringConverter; +import org.nuiton.util.decorator.Decorator; +import org.nuiton.util.decorator.DecoratorUtil; +import org.nuiton.util.decorator.JXPathDecorator; +import org.nuiton.util.decorator.MultiJXPathDecorator; import javax.swing.AbstractButton; import javax.swing.ActionMap; @@ -62,6 +61,9 @@ import java.awt.event.KeyListener; import java.beans.Introspector; import java.beans.PropertyChangeListener; +import java.beans.PropertyDescriptor; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.util.Date; import java.util.List; @@ -86,6 +88,19 @@ public static final Object[] EMPTY_CLASS_ARRAY = new Object[0]; + public static void invokeMethod(Method mut, Object source, Object... params) { + + if (mut != null) { + try { + mut.invoke(source, params); + } catch (IllegalAccessException e) { + throw new JAXXRuntimeException(e); + } catch (InvocationTargetException e) { + throw new JAXXRuntimeException(e.getCause()); + } + } + } + /** * Encapsule un {@link Decorator} dans un {@link ObjectToStringConverter}. * @@ -255,7 +270,8 @@ ); return (MultiJXPathDecorator<O>) clone; } catch (Exception e) { - throw new IllegalStateException("Could not clone decorator "+decorator, e); } + throw new IllegalStateException("Could not clone decorator " + decorator, e); + } } if (decorator instanceof MultiJXPathDecorator<?>) { @@ -276,7 +292,7 @@ separatorReplacement ); } - + public static Method getMutator(Object bean, String property) { Method mutator = null; if (bean == null) { @@ -294,7 +310,7 @@ } catch (Exception e) { throw new RuntimeException(e); } - + return mutator; } @@ -378,7 +394,7 @@ //Container container = ui.getIndexesContainer(); int nbContext = decorator.getNbContext(); - if (nbContext>1) { + if (nbContext > 1) { for (int i = 0; i < nbContext; i++) { String property = i18nPrefix + decorator.getProperty(i); String propertyI18n = _(property);

1 0