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

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

04 Jun '13

Author: maven-release Date: 2013-06-04 15:09:25 +0200 (Tue, 04 Jun 2013) New Revision: 2688 Url: http://nuiton.org/projects/jaxx/repository/revisions/2688 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-06-04 13:09:23 UTC (rev 2687) +++ trunk/jaxx-compiler/pom.xml 2013-06-04 13:09:25 UTC (rev 2688) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.22</version> + <version>2.5.23-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-config/pom.xml =================================================================== --- trunk/jaxx-config/pom.xml 2013-06-04 13:09:23 UTC (rev 2687) +++ trunk/jaxx-config/pom.xml 2013-06-04 13:09:25 UTC (rev 2688) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.22</version> + <version>2.5.23-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2013-06-04 13:09:23 UTC (rev 2687) +++ trunk/jaxx-demo/pom.xml 2013-06-04 13:09:25 UTC (rev 2688) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.22</version> + <version>2.5.23-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2013-06-04 13:09:23 UTC (rev 2687) +++ trunk/jaxx-maven-plugin/pom.xml 2013-06-04 13:09:25 UTC (rev 2688) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.22</version> + <version>2.5.23-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2013-06-04 13:09:23 UTC (rev 2687) +++ trunk/jaxx-runtime/pom.xml 2013-06-04 13:09:25 UTC (rev 2688) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.22</version> + <version>2.5.23-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2013-06-04 13:09:23 UTC (rev 2687) +++ trunk/jaxx-validator/pom.xml 2013-06-04 13:09:25 UTC (rev 2688) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.22</version> + <version>2.5.23-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2013-06-04 13:09:23 UTC (rev 2687) +++ trunk/jaxx-widgets/pom.xml 2013-06-04 13:09:25 UTC (rev 2688) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.22</version> + <version>2.5.23-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.22/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.22/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-06-04 13:09:23 UTC (rev 2687) +++ trunk/pom.xml 2013-06-04 13:09:25 UTC (rev 2688) @@ -34,7 +34,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.22</version> + <version>2.5.23-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.22</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.22 + scm:svn:http://svn.nuiton.org/svn/jaxx/trunk </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/tags/jaxx-2.5.22</url> + <url>http://nuiton.org/projects/jaxx/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r2687 - tags
by maven-release＠users.nuiton.org 04 Jun '13

04 Jun '13

Author: maven-release Date: 2013-06-04 15:09:23 +0200 (Tue, 04 Jun 2013) New Revision: 2687 Url: http://nuiton.org/projects/jaxx/repository/revisions/2687 Log: [maven-release-plugin] copy for tag jaxx-2.5.22 Added: tags/jaxx-2.5.22/

1 0

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

04 Jun '13

Author: maven-release Date: 2013-06-04 15:09:21 +0200 (Tue, 04 Jun 2013) New Revision: 2686 Url: http://nuiton.org/projects/jaxx/repository/revisions/2686 Log: [maven-release-plugin] prepare release jaxx-2.5.22 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-06-04 13:07:49 UTC (rev 2685) +++ trunk/jaxx-compiler/pom.xml 2013-06-04 13:09:21 UTC (rev 2686) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.22-SNAPSHOT</version> + <version>2.5.22</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-config/pom.xml =================================================================== --- trunk/jaxx-config/pom.xml 2013-06-04 13:07:49 UTC (rev 2685) +++ trunk/jaxx-config/pom.xml 2013-06-04 13:09:21 UTC (rev 2686) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.22-SNAPSHOT</version> + <version>2.5.22</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2013-06-04 13:07:49 UTC (rev 2685) +++ trunk/jaxx-demo/pom.xml 2013-06-04 13:09:21 UTC (rev 2686) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.22-SNAPSHOT</version> + <version>2.5.22</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2013-06-04 13:07:49 UTC (rev 2685) +++ trunk/jaxx-maven-plugin/pom.xml 2013-06-04 13:09:21 UTC (rev 2686) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.22-SNAPSHOT</version> + <version>2.5.22</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2013-06-04 13:07:49 UTC (rev 2685) +++ trunk/jaxx-runtime/pom.xml 2013-06-04 13:09:21 UTC (rev 2686) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.22-SNAPSHOT</version> + <version>2.5.22</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2013-06-04 13:07:49 UTC (rev 2685) +++ trunk/jaxx-validator/pom.xml 2013-06-04 13:09:21 UTC (rev 2686) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.22-SNAPSHOT</version> + <version>2.5.22</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2013-06-04 13:07:49 UTC (rev 2685) +++ trunk/jaxx-widgets/pom.xml 2013-06-04 13:09:21 UTC (rev 2686) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.22-SNAPSHOT</version> + <version>2.5.22</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.22/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.22/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-06-04 13:07:49 UTC (rev 2685) +++ trunk/pom.xml 2013-06-04 13:09:21 UTC (rev 2686) @@ -34,7 +34,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.22-SNAPSHOT</version> + <version>2.5.22</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.22</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/trunk + scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.22 </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/trunk</url> + <url>http://nuiton.org/projects/jaxx/repository/show/tags/jaxx-2.5.22</url> </scm> <distributionManagement>

1 0

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

04 Jun '13

Author: tchemit Date: 2013-06-04 15:07:49 +0200 (Tue, 04 Jun 2013) New Revision: 2685 Url: http://nuiton.org/projects/jaxx/repository/revisions/2685 Log: fixes #2717: Synchronize data access in filterableComboBox model Modified: trunk/jaxx-config/src/main/resources/i18n/jaxx-config_es_ES.properties trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java 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-06-04 10:13:53 UTC (rev 2684) +++ trunk/jaxx-config/src/main/resources/i18n/jaxx-config_es_ES.properties 2013-06-04 13:07:49 UTC (rev 2685) @@ -12,6 +12,7 @@ config.defaultValue.tip=Valor por defecto de la opción config.description=Descripción config.detected.callBack=Acciones detectadas para las opciones modificadas +config.error.applicationconfig.save= config.error.category.already.exists=la categoría '%1$s' ya existe\! config.error.category.not.found=La categoria '%1$s' no existe\! config.key=Clave Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java 2013-06-04 10:13:53 UTC (rev 2684) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java 2013-06-04 13:07:49 UTC (rev 2685) @@ -96,11 +96,14 @@ public E getElementAt(int index) { E result; - if (index >= 0 && index < filteredItems.size()) { - result = filteredItems.get(index); - } else { - result = null; + synchronized (this) { + if (index >= 0 && index < filteredItems.size()) { + result = filteredItems.get(index); + } else { + result = null; + } } + return result; }

1 0

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