[jaxx] branch develop updated (b8e7d5a -> e3b9324)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git from b8e7d5a [jgitflow-maven-plugin]updating poms for 2.12-SNAPSHOT development new 3d9003d [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new cb9bafd [jgitflow-maven-plugin]updating poms for branch'release/2.11' with non-snapshot versions new d73743e Merge branch 'release/2.11' new 605737d Merge branch 'master' into develop new e3b9324 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit e3b932480d089a2d23293760661cd2d2bf361626 Author: Maven Release <maven-release@codelutin.com> Date: Mon Aug 25 14:53:12 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 605737d608bfc31d2416f3128e5003c964513cb1 Merge: 3d9003d d73743e Author: Maven Release <maven-release@codelutin.com> Date: Mon Aug 25 14:53:12 2014 +0200 Merge branch 'master' into develop commit 3d9003d389f88dbbcd05f520c776f2379a51c09a Author: Maven Release <maven-release@codelutin.com> Date: Mon Aug 25 14:53:11 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit d73743e817fa9198083fbe14a1739f78f8d68ff3 Merge: f0cd746 cb9bafd Author: Maven Release <maven-release@codelutin.com> Date: Mon Aug 25 14:53:09 2014 +0200 Merge branch 'release/2.11' commit cb9bafd56fddff74a72971bfc9ef86a6005b39bc Author: Maven Release <maven-release@codelutin.com> Date: Mon Aug 25 14:49:17 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.11' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit cb9bafd56fddff74a72971bfc9ef86a6005b39bc Author: Maven Release <maven-release@codelutin.com> Date: Mon Aug 25 14:49:17 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.11' with non-snapshot versions --- jaxx-application-api/pom.xml | 2 +- jaxx-application-swing/pom.xml | 2 +- jaxx-compiler/pom.xml | 2 +- jaxx-config/pom.xml | 2 +- jaxx-demo/pom.xml | 2 +- jaxx-maven-plugin/pom.xml | 2 +- jaxx-runtime/pom.xml | 2 +- jaxx-validator/pom.xml | 2 +- jaxx-widgets-extra/pom.xml | 2 +- jaxx-widgets/pom.xml | 2 +- pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/jaxx-application-api/pom.xml b/jaxx-application-api/pom.xml index a8a01b4..1d9e1ba 100644 --- a/jaxx-application-api/pom.xml +++ b/jaxx-application-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.11-SNAPSHOT</version> + <version>2.11</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-application-swing/pom.xml b/jaxx-application-swing/pom.xml index 22508ce..03c0ec1 100644 --- a/jaxx-application-swing/pom.xml +++ b/jaxx-application-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.11-SNAPSHOT</version> + <version>2.11</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-compiler/pom.xml b/jaxx-compiler/pom.xml index a4cb078..353ecdd 100644 --- a/jaxx-compiler/pom.xml +++ b/jaxx-compiler/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.11-SNAPSHOT</version> + <version>2.11</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-config/pom.xml b/jaxx-config/pom.xml index 6a3eb01..b71757e 100644 --- a/jaxx-config/pom.xml +++ b/jaxx-config/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.11-SNAPSHOT</version> + <version>2.11</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index 9d48d92..b5e8be0 100644 --- a/jaxx-demo/pom.xml +++ b/jaxx-demo/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.11-SNAPSHOT</version> + <version>2.11</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-maven-plugin/pom.xml b/jaxx-maven-plugin/pom.xml index f1539e2..1f09cd6 100644 --- a/jaxx-maven-plugin/pom.xml +++ b/jaxx-maven-plugin/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.11-SNAPSHOT</version> + <version>2.11</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-runtime/pom.xml b/jaxx-runtime/pom.xml index c659421..021fe7a 100644 --- a/jaxx-runtime/pom.xml +++ b/jaxx-runtime/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.11-SNAPSHOT</version> + <version>2.11</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-validator/pom.xml b/jaxx-validator/pom.xml index b012c7d..5a262f9 100644 --- a/jaxx-validator/pom.xml +++ b/jaxx-validator/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.11-SNAPSHOT</version> + <version>2.11</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-extra/pom.xml b/jaxx-widgets-extra/pom.xml index 49e514c..9da011f 100644 --- a/jaxx-widgets-extra/pom.xml +++ b/jaxx-widgets-extra/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.11-SNAPSHOT</version> + <version>2.11</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets/pom.xml b/jaxx-widgets/pom.xml index 531f7a6..36bf82d 100644 --- a/jaxx-widgets/pom.xml +++ b/jaxx-widgets/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.11-SNAPSHOT</version> + <version>2.11</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/pom.xml b/pom.xml index f61eda7..3a4e041 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.11-SNAPSHOT</version> + <version>2.11</version> <modules> <module>jaxx-runtime</module> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit d73743e817fa9198083fbe14a1739f78f8d68ff3 Merge: f0cd746 cb9bafd Author: Maven Release <maven-release@codelutin.com> Date: Mon Aug 25 14:53:09 2014 +0200 Merge branch 'release/2.11' jaxx-application-api/pom.xml | 2 +- jaxx-application-swing/pom.xml | 2 +- .../swing/AbstractApplicationFormUIModel.java | 8 +- .../swing/AbstractApplicationUIHandler.java | 87 +++++++------ .../swing/table/AbstractApplicationTableModel.java | 42 +++++- jaxx-compiler/pom.xml | 2 +- .../java/jaxx/compiler/CompilerConfiguration.java | 11 +- .../compiler/DefaultCompilerConfiguration.java | 7 - .../src/main/java/jaxx/compiler/I18nHelper.java | 23 +++- .../src/main/java/jaxx/compiler/JAXXCompiler.java | 46 ++++--- .../main/java/jaxx/compiler/tags/StyleHandler.java | 33 ++--- .../jaxx/compiler/tasks/CompileFirstPassTask.java | 15 +-- jaxx-config/pom.xml | 4 +- .../swing/config/ConfigCategoryUIHandler.java | 1 - .../swing/config/model/ConfigTableModel.java | 6 +- .../swing/config/model/MyDelegateConfigTest.java | 142 +++++++++++---------- .../swing/config/model/MyInheritedConfigTest.java | 136 +++++++++++--------- jaxx-demo/pom.xml | 2 +- jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java | 10 +- .../src/main/java/jaxx/demo/DemoUIHandler.java | 2 + jaxx-demo/src/main/java/jaxx/demo/RunDemo.java | 2 +- jaxx-maven-plugin/pom.xml | 2 +- .../org/nuiton/jaxx/plugin/AbstractJaxxMojo.java | 1 - .../java/org/nuiton/jaxx/plugin/GenerateMojo.java | 16 --- jaxx-runtime/pom.xml | 7 +- .../jaxx/runtime/swing/editor/ClassCellEditor.java | 2 +- .../jaxx/runtime/swing/session/SwingSession.java | 4 + .../java/jaxx/runtime/swing/wizard/WizardUI.java | 2 +- jaxx-validator/pom.xml | 2 +- jaxx-widgets-extra/pom.xml | 4 +- .../jaxx/widgets/extra/editor/JEditEditor.java | 3 +- jaxx-widgets/pom.xml | 7 +- .../swing/editor/gis/DmdCoordinateConverter.java | 11 +- .../swing/editor/gis/DmsCoordinateConverter.java | 11 +- ...verter => org.nuiton.converter.NuitonConverter} | 0 .../editor/gis/DmdCoordinateConverterTest.java | 2 +- .../editor/gis/DmsCoordinateConverterTest.java | 2 +- pom.xml | 10 +- 38 files changed, 364 insertions(+), 305 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit 3d9003d389f88dbbcd05f520c776f2379a51c09a Author: Maven Release <maven-release@codelutin.com> Date: Mon Aug 25 14:53:11 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- jaxx-application-api/pom.xml | 2 +- jaxx-application-swing/pom.xml | 2 +- jaxx-compiler/pom.xml | 2 +- jaxx-config/pom.xml | 2 +- jaxx-demo/pom.xml | 2 +- jaxx-maven-plugin/pom.xml | 2 +- jaxx-runtime/pom.xml | 2 +- jaxx-validator/pom.xml | 2 +- jaxx-widgets-extra/pom.xml | 2 +- jaxx-widgets/pom.xml | 2 +- pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/jaxx-application-api/pom.xml b/jaxx-application-api/pom.xml index f65bba7..1d9e1ba 100644 --- a/jaxx-application-api/pom.xml +++ b/jaxx-application-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.12-SNAPSHOT</version> + <version>2.11</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-application-swing/pom.xml b/jaxx-application-swing/pom.xml index ca79286..03c0ec1 100644 --- a/jaxx-application-swing/pom.xml +++ b/jaxx-application-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.12-SNAPSHOT</version> + <version>2.11</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-compiler/pom.xml b/jaxx-compiler/pom.xml index b23dade..353ecdd 100644 --- a/jaxx-compiler/pom.xml +++ b/jaxx-compiler/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.12-SNAPSHOT</version> + <version>2.11</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-config/pom.xml b/jaxx-config/pom.xml index 06a690e..b71757e 100644 --- a/jaxx-config/pom.xml +++ b/jaxx-config/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.12-SNAPSHOT</version> + <version>2.11</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index cabcaa5..b5e8be0 100644 --- a/jaxx-demo/pom.xml +++ b/jaxx-demo/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.12-SNAPSHOT</version> + <version>2.11</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-maven-plugin/pom.xml b/jaxx-maven-plugin/pom.xml index 6bc3b95..1f09cd6 100644 --- a/jaxx-maven-plugin/pom.xml +++ b/jaxx-maven-plugin/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.12-SNAPSHOT</version> + <version>2.11</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-runtime/pom.xml b/jaxx-runtime/pom.xml index ee01ff9..021fe7a 100644 --- a/jaxx-runtime/pom.xml +++ b/jaxx-runtime/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.12-SNAPSHOT</version> + <version>2.11</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-validator/pom.xml b/jaxx-validator/pom.xml index 79e89cd..5a262f9 100644 --- a/jaxx-validator/pom.xml +++ b/jaxx-validator/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.12-SNAPSHOT</version> + <version>2.11</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-extra/pom.xml b/jaxx-widgets-extra/pom.xml index c93b3fc..9da011f 100644 --- a/jaxx-widgets-extra/pom.xml +++ b/jaxx-widgets-extra/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.12-SNAPSHOT</version> + <version>2.11</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets/pom.xml b/jaxx-widgets/pom.xml index 6c752e2..36bf82d 100644 --- a/jaxx-widgets/pom.xml +++ b/jaxx-widgets/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.12-SNAPSHOT</version> + <version>2.11</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/pom.xml b/pom.xml index eaedb02..3a4e041 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.12-SNAPSHOT</version> + <version>2.11</version> <modules> <module>jaxx-runtime</module> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit 605737d608bfc31d2416f3128e5003c964513cb1 Merge: 3d9003d d73743e Author: Maven Release <maven-release@codelutin.com> Date: Mon Aug 25 14:53:12 2014 +0200 Merge branch 'master' into develop -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit e3b932480d089a2d23293760661cd2d2bf361626 Author: Maven Release <maven-release@codelutin.com> Date: Mon Aug 25 14:53:12 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- jaxx-application-api/pom.xml | 2 +- jaxx-application-swing/pom.xml | 2 +- jaxx-compiler/pom.xml | 2 +- jaxx-config/pom.xml | 2 +- jaxx-demo/pom.xml | 2 +- jaxx-maven-plugin/pom.xml | 2 +- jaxx-runtime/pom.xml | 2 +- jaxx-validator/pom.xml | 2 +- jaxx-widgets-extra/pom.xml | 2 +- jaxx-widgets/pom.xml | 2 +- pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/jaxx-application-api/pom.xml b/jaxx-application-api/pom.xml index 1d9e1ba..f65bba7 100644 --- a/jaxx-application-api/pom.xml +++ b/jaxx-application-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.11</version> + <version>2.12-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-application-swing/pom.xml b/jaxx-application-swing/pom.xml index 03c0ec1..ca79286 100644 --- a/jaxx-application-swing/pom.xml +++ b/jaxx-application-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.11</version> + <version>2.12-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-compiler/pom.xml b/jaxx-compiler/pom.xml index 353ecdd..b23dade 100644 --- a/jaxx-compiler/pom.xml +++ b/jaxx-compiler/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.11</version> + <version>2.12-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-config/pom.xml b/jaxx-config/pom.xml index b71757e..06a690e 100644 --- a/jaxx-config/pom.xml +++ b/jaxx-config/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.11</version> + <version>2.12-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index b5e8be0..cabcaa5 100644 --- a/jaxx-demo/pom.xml +++ b/jaxx-demo/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.11</version> + <version>2.12-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-maven-plugin/pom.xml b/jaxx-maven-plugin/pom.xml index 1f09cd6..6bc3b95 100644 --- a/jaxx-maven-plugin/pom.xml +++ b/jaxx-maven-plugin/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.11</version> + <version>2.12-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-runtime/pom.xml b/jaxx-runtime/pom.xml index 021fe7a..ee01ff9 100644 --- a/jaxx-runtime/pom.xml +++ b/jaxx-runtime/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.11</version> + <version>2.12-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-validator/pom.xml b/jaxx-validator/pom.xml index 5a262f9..79e89cd 100644 --- a/jaxx-validator/pom.xml +++ b/jaxx-validator/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.11</version> + <version>2.12-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-extra/pom.xml b/jaxx-widgets-extra/pom.xml index 9da011f..c93b3fc 100644 --- a/jaxx-widgets-extra/pom.xml +++ b/jaxx-widgets-extra/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.11</version> + <version>2.12-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets/pom.xml b/jaxx-widgets/pom.xml index 36bf82d..6c752e2 100644 --- a/jaxx-widgets/pom.xml +++ b/jaxx-widgets/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.11</version> + <version>2.12-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/pom.xml b/pom.xml index 3a4e041..eaedb02 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.11</version> + <version>2.12-SNAPSHOT</version> <modules> <module>jaxx-runtime</module> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm