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

r2684 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/session
by kmorin＠users.nuiton.org 04 Jun '13

04 Jun '13

Author: kmorin Date: 2013-06-04 12:13:53 +0200 (Tue, 04 Jun 2013) New Revision: 2684 Url: http://nuiton.org/projects/jaxx/repository/revisions/2684 Log: fixes #2716 [SwingSession] enable to replace a component if its path already exists Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/SwingSession.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-30 13:38:34 UTC (rev 2683) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/SwingSession.java 2013-06-04 10:13:53 UTC (rev 2684) @@ -27,6 +27,8 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections.Predicate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; @@ -234,14 +236,43 @@ } public void add(Component c) { - if (registeredComponent.contains(c)) { - log.warn(String.format( - "Component already added %s(%s)", c.getClass(), c.getName())); - } else { - registeredComponent.add(c); - walkThrowComponent("", Collections.singleton(c), - new RestoreStateAction()); + add(c, false); + } + + public void add(final Component c, boolean replace) { + if (c == null) { + return; } + final String cName = getComponentName(c); + Object existingComponent = CollectionUtils.find(registeredComponent, + new Predicate() { + @Override + public boolean evaluate(Object o) { + Component comp = (Component) o; + String compName = getComponentName(comp); + return c.getClass().equals(comp.getClass()) + && cName.equals(compName); + } + }); + + if (existingComponent != null) { + if (replace) { + if (log.isDebugEnabled()) { + log.debug("replacing the component fir path /" + cName); + } + remove((Component) existingComponent); + + } else { + log.warn(String.format( + "Component already added %s(%s)", c.getClass(), c.getName())); + return; + } + } + + registeredComponent.add(c); + walkThrowComponent("", + Collections.singleton(c), + new RestoreStateAction()); } /**

1 0

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