[jaxx] branch develop updated (9911f76 -> cc2fa5d)
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 9911f76 [jgitflow-maven-plugin]updating poms for 2.14-SNAPSHOT development new 068b97a [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 764b434 prepare release 2.13 new ee1a090 [jgitflow-maven-plugin]updating poms for branch'release/2.13' with non-snapshot versions new 6a647b9 Merge branch 'release/2.13' new 570b0c1 Merge branch 'master' into develop new cc2fa5d [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 cc2fa5d1b38411b3e9f507afc06790c374b4a067 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 26 15:06:26 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 570b0c10465b0d7bf4a37eede7dd3e2554981482 Merge: 068b97a 6a647b9 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 26 15:06:25 2014 +0200 Merge branch 'master' into develop commit 068b97a32ea5ebd8681f667058d13852af442f97 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 26 15:06:24 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 6a647b9ee312fbdf34489c11b9cefff7da361153 Merge: b35cfe8 ee1a090 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 26 15:06:22 2014 +0200 Merge branch 'release/2.13' commit ee1a09075afa00ea31e1ae5c446b713708480235 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 26 15:03:02 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.13' with non-snapshot versions commit 764b434396b6daaf71219b3c4b3310ace8b32d25 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 26 15:02:51 2014 +0200 prepare release 2.13 Summary of changes: .../swing/ApplicationUIConfiguration.java | 22 +++++++++++++++++++ .../jaxx/runtime/swing/list/CheckListAction.java | 25 +++++++++++++++++++++- .../swing/list/filter/CheckListFilterType.java | 25 +++++++++++++++++++++- .../filter/DefaultFilterableCheckListModel.java | 22 +++++++++++++++++++ .../swing/list/filter/FilterableCheckList.java | 22 +++++++++++++++++++ .../list/filter/FilterableCheckListModel.java | 22 +++++++++++++++++++ 6 files changed, 136 insertions(+), 2 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 764b434396b6daaf71219b3c4b3310ace8b32d25 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 26 15:02:51 2014 +0200 prepare release 2.13 --- .../swing/ApplicationUIConfiguration.java | 22 +++++++++++++++++++ .../jaxx/runtime/swing/list/CheckListAction.java | 25 +++++++++++++++++++++- .../swing/list/filter/CheckListFilterType.java | 25 +++++++++++++++++++++- .../filter/DefaultFilterableCheckListModel.java | 22 +++++++++++++++++++ .../swing/list/filter/FilterableCheckList.java | 22 +++++++++++++++++++ .../list/filter/FilterableCheckListModel.java | 22 +++++++++++++++++++ 6 files changed, 136 insertions(+), 2 deletions(-) diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/ApplicationUIConfiguration.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/ApplicationUIConfiguration.java index 6202249..2d6391e 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/ApplicationUIConfiguration.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/ApplicationUIConfiguration.java @@ -1,5 +1,27 @@ package org.nuiton.jaxx.application.swing; +/* + * #%L + * JAXX :: Application Swing + * %% + * Copyright (C) 2008 - 2014 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% + */ + import javax.swing.KeyStroke; /** diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/CheckListAction.java b/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/CheckListAction.java index c5f8db3..6ecc688 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/CheckListAction.java +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/CheckListAction.java @@ -1,4 +1,27 @@ -package jaxx.runtime.swing.list; +package jaxx.runtime.swing.list; + +/* + * #%L + * JAXX :: Widgets + * %% + * Copyright (C) 2008 - 2014 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% + */ + import java.util.ArrayList; import java.util.Collection; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/CheckListFilterType.java b/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/CheckListFilterType.java index 6f61a9b..57c8cd5 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/CheckListFilterType.java +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/CheckListFilterType.java @@ -1,4 +1,27 @@ -package jaxx.runtime.swing.list.filter; +package jaxx.runtime.swing.list.filter; + +/* + * #%L + * JAXX :: Widgets + * %% + * Copyright (C) 2008 - 2014 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% + */ + public enum CheckListFilterType { diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/DefaultFilterableCheckListModel.java b/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/DefaultFilterableCheckListModel.java index 4aa39c0..cf42ba0 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/DefaultFilterableCheckListModel.java +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/DefaultFilterableCheckListModel.java @@ -1,5 +1,27 @@ package jaxx.runtime.swing.list.filter; +/* + * #%L + * JAXX :: Widgets + * %% + * Copyright (C) 2008 - 2014 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% + */ + import jaxx.runtime.JAXXUtil; import jaxx.runtime.swing.list.DefaultCheckListModel; import org.nuiton.decorator.Decorator; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/FilterableCheckList.java b/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/FilterableCheckList.java index f1f7956..32ea503 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/FilterableCheckList.java +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/FilterableCheckList.java @@ -1,5 +1,27 @@ package jaxx.runtime.swing.list.filter; +/* + * #%L + * JAXX :: Widgets + * %% + * Copyright (C) 2008 - 2014 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% + */ + import jaxx.runtime.swing.list.CheckList; import jaxx.runtime.swing.list.CheckListModel; import org.nuiton.decorator.Decorator; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/FilterableCheckListModel.java b/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/FilterableCheckListModel.java index 402475c..481e74b 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/FilterableCheckListModel.java +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/FilterableCheckListModel.java @@ -1,5 +1,27 @@ package jaxx.runtime.swing.list.filter; +/* + * #%L + * JAXX :: Widgets + * %% + * Copyright (C) 2008 - 2014 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% + */ + import jaxx.runtime.swing.list.CheckListModel; import org.nuiton.decorator.Decorator; -- 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 ee1a09075afa00ea31e1ae5c446b713708480235 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 26 15:03:02 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.13' 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-datetime/pom.xml | 2 +- jaxx-widgets-extra/pom.xml | 2 +- jaxx-widgets-gis/pom.xml | 2 +- jaxx-widgets/pom.xml | 2 +- pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/jaxx-application-api/pom.xml b/jaxx-application-api/pom.xml index aaf714c..7192804 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.13-SNAPSHOT</version> + <version>2.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-application-swing/pom.xml b/jaxx-application-swing/pom.xml index 4550075..53f4d9f 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.13-SNAPSHOT</version> + <version>2.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-compiler/pom.xml b/jaxx-compiler/pom.xml index 78f2d16..39e9574 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.13-SNAPSHOT</version> + <version>2.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-config/pom.xml b/jaxx-config/pom.xml index 52b92d7..040d34a 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.13-SNAPSHOT</version> + <version>2.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index 3e7be19..a1bfe2b 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.13-SNAPSHOT</version> + <version>2.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-maven-plugin/pom.xml b/jaxx-maven-plugin/pom.xml index 581d613..2e25ee4 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.13-SNAPSHOT</version> + <version>2.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-runtime/pom.xml b/jaxx-runtime/pom.xml index 98b5022..bccefec 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.13-SNAPSHOT</version> + <version>2.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-validator/pom.xml b/jaxx-validator/pom.xml index 66ee604..b90e541 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.13-SNAPSHOT</version> + <version>2.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-datetime/pom.xml b/jaxx-widgets-datetime/pom.xml index 906e106..2106b54 100644 --- a/jaxx-widgets-datetime/pom.xml +++ b/jaxx-widgets-datetime/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.13-SNAPSHOT</version> + <version>2.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-extra/pom.xml b/jaxx-widgets-extra/pom.xml index 955f13c..9b2951f 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.13-SNAPSHOT</version> + <version>2.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-gis/pom.xml b/jaxx-widgets-gis/pom.xml index dad8029..61cb066 100644 --- a/jaxx-widgets-gis/pom.xml +++ b/jaxx-widgets-gis/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.13-SNAPSHOT</version> + <version>2.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets/pom.xml b/jaxx-widgets/pom.xml index 13c5a1f..0fa10f8 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.13-SNAPSHOT</version> + <version>2.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/pom.xml b/pom.xml index 4027e7e..451400d 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.13-SNAPSHOT</version> + <version>2.13</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 6a647b9ee312fbdf34489c11b9cefff7da361153 Merge: b35cfe8 ee1a090 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 26 15:06:22 2014 +0200 Merge branch 'release/2.13' jaxx-application-api/pom.xml | 2 +- .../jaxx/application/ApplicationConfiguration.java | 4 + jaxx-application-swing/pom.xml | 2 +- .../swing/AbstractApplicationUIHandler.java | 81 ++- .../swing/ApplicationUIConfiguration.java | 43 ++ .../swing/action/AbstractApplicationAction.java | 16 +- .../swing/action/ApplicationUIAction.java | 4 +- .../application/swing/table/ColumnIdentifier.java | 6 +- jaxx-compiler/pom.xml | 2 +- .../java/jaxx/compiler/CompilerConfiguration.java | 6 + .../compiler/DefaultCompilerConfiguration.java | 16 + .../jaxx/compiler/tasks/CompileFirstPassTask.java | 9 + jaxx-config/pom.xml | 2 +- jaxx-demo/pom.xml | 2 +- jaxx-maven-plugin/pom.xml | 2 +- .../java/org/nuiton/jaxx/plugin/GenerateMojo.java | 13 + jaxx-runtime/pom.xml | 2 +- jaxx-validator/pom.xml | 2 +- .../validator/swing/SwingListValidator.java | 133 +++++ .../validator/swing/SwingValidatorUtil.java | 34 +- .../unified/UnifiedValidatorMessageTableModel.java | 71 +-- .../UnifiedValidatorMessageTableRenderer.java | 15 +- jaxx-widgets-datetime/pom.xml | 2 +- jaxx-widgets-extra/pom.xml | 2 +- jaxx-widgets-gis/pom.xml | 2 +- jaxx-widgets/pom.xml | 2 +- .../main/java/jaxx/runtime/swing/CompoundIcon.java | 302 +++++++++++ .../java/jaxx/runtime/swing/JSearchTextField.java | 76 +++ .../runtime/swing/editor/bean/BeanComboBox.css | 1 + .../runtime/swing/editor/bean/BeanComboBox.jaxx | 2 + .../swing/editor/bean/BeanFilterableComboBox.css | 1 + .../swing/editor/bean/BeanFilterableComboBox.jaxx | 2 + .../swing/editor/cell/NumberCellEditor.java | 3 +- .../runtime/swing/list/ActionCheckListModel.java | 194 +++++++ .../java/jaxx/runtime/swing/list/CheckList.java | 144 ++++++ .../jaxx/runtime/swing/list/CheckListAction.java | 58 +++ .../jaxx/runtime/swing/list/CheckListEditor.java | 86 ++++ .../jaxx/runtime/swing/list/CheckListModel.java | 75 +++ .../jaxx/runtime/swing/list/CheckListRenderer.java | 229 +++++++++ .../runtime/swing/list/DefaultCheckListModel.java | 145 ++++++ .../swing/list/filter/CheckListFilterType.java | 54 ++ .../filter/DefaultFilterableCheckListModel.java | 84 +++ .../filter/FilterableActionCheckListModel.java | 49 ++ .../swing/list/filter/FilterableCheckList.java | 55 ++ .../list/filter/FilterableCheckListModel.java | 40 ++ .../swing/table/filter/AbstractTableFilter.java | 173 +++++++ .../swing/table/filter/FilterChangeListener.java | 38 ++ .../table/filter/FilterTableHeaderRenderer.java | 118 +++++ .../runtime/swing/table/filter/JTableFilter.java | 134 +++++ .../table/filter/TableAwareCheckListRenderer.java | 67 +++ .../runtime/swing/table/filter/TableFilter.java | 105 ++++ .../swing/table/filter/TableFilterColumnPopup.java | 567 +++++++++++++++++++++ .../swing/table/filter/TableFilterState.java | 130 +++++ .../swing/table/filter/TableRowFilterSupport.java | 162 ++++++ .../resources/i18n/jaxx-widgets_en_GB.properties | 4 + .../resources/i18n/jaxx-widgets_es_ES.properties | 4 + .../resources/i18n/jaxx-widgets_fr_FR.properties | 4 + jaxx-widgets/src/main/resources/icons/funnel.png | Bin 0 -> 797 bytes .../src/main/resources/icons/funnel_delete.png | Bin 0 -> 906 bytes jaxx-widgets/src/main/resources/icons/search.png | Bin 0 -> 851 bytes pom.xml | 4 +- src/site/rst/index.rst | 2 +- 62 files changed, 3512 insertions(+), 75 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 068b97a32ea5ebd8681f667058d13852af442f97 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 26 15:06:24 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-datetime/pom.xml | 2 +- jaxx-widgets-extra/pom.xml | 2 +- jaxx-widgets-gis/pom.xml | 2 +- jaxx-widgets/pom.xml | 2 +- pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/jaxx-application-api/pom.xml b/jaxx-application-api/pom.xml index 58ac93e..7192804 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.14-SNAPSHOT</version> + <version>2.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-application-swing/pom.xml b/jaxx-application-swing/pom.xml index de07640..53f4d9f 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.14-SNAPSHOT</version> + <version>2.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-compiler/pom.xml b/jaxx-compiler/pom.xml index 998e771..39e9574 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.14-SNAPSHOT</version> + <version>2.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-config/pom.xml b/jaxx-config/pom.xml index 5705bba..040d34a 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.14-SNAPSHOT</version> + <version>2.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index 3fac04d..a1bfe2b 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.14-SNAPSHOT</version> + <version>2.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-maven-plugin/pom.xml b/jaxx-maven-plugin/pom.xml index 9bc6700..2e25ee4 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.14-SNAPSHOT</version> + <version>2.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-runtime/pom.xml b/jaxx-runtime/pom.xml index 118f88e..bccefec 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.14-SNAPSHOT</version> + <version>2.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-validator/pom.xml b/jaxx-validator/pom.xml index f7f11e8..b90e541 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.14-SNAPSHOT</version> + <version>2.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-datetime/pom.xml b/jaxx-widgets-datetime/pom.xml index b0194a2..2106b54 100644 --- a/jaxx-widgets-datetime/pom.xml +++ b/jaxx-widgets-datetime/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.14-SNAPSHOT</version> + <version>2.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-extra/pom.xml b/jaxx-widgets-extra/pom.xml index 8e5a991..9b2951f 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.14-SNAPSHOT</version> + <version>2.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-gis/pom.xml b/jaxx-widgets-gis/pom.xml index 3803f22..61cb066 100644 --- a/jaxx-widgets-gis/pom.xml +++ b/jaxx-widgets-gis/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.14-SNAPSHOT</version> + <version>2.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets/pom.xml b/jaxx-widgets/pom.xml index 33a6099..0fa10f8 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.14-SNAPSHOT</version> + <version>2.13</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/pom.xml b/pom.xml index a94a385..451400d 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.14-SNAPSHOT</version> + <version>2.13</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 570b0c10465b0d7bf4a37eede7dd3e2554981482 Merge: 068b97a 6a647b9 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 26 15:06:25 2014 +0200 Merge branch 'master' into develop .../swing/ApplicationUIConfiguration.java | 22 +++++++++++++++++++ .../jaxx/runtime/swing/list/CheckListAction.java | 25 +++++++++++++++++++++- .../swing/list/filter/CheckListFilterType.java | 25 +++++++++++++++++++++- .../filter/DefaultFilterableCheckListModel.java | 22 +++++++++++++++++++ .../swing/list/filter/FilterableCheckList.java | 22 +++++++++++++++++++ .../list/filter/FilterableCheckListModel.java | 22 +++++++++++++++++++ 6 files changed, 136 insertions(+), 2 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 cc2fa5d1b38411b3e9f507afc06790c374b4a067 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 26 15:06:26 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-datetime/pom.xml | 2 +- jaxx-widgets-extra/pom.xml | 2 +- jaxx-widgets-gis/pom.xml | 2 +- jaxx-widgets/pom.xml | 2 +- pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/jaxx-application-api/pom.xml b/jaxx-application-api/pom.xml index 7192804..58ac93e 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.13</version> + <version>2.14-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-application-swing/pom.xml b/jaxx-application-swing/pom.xml index 53f4d9f..de07640 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.13</version> + <version>2.14-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-compiler/pom.xml b/jaxx-compiler/pom.xml index 39e9574..998e771 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.13</version> + <version>2.14-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-config/pom.xml b/jaxx-config/pom.xml index 040d34a..5705bba 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.13</version> + <version>2.14-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index a1bfe2b..3fac04d 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.13</version> + <version>2.14-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-maven-plugin/pom.xml b/jaxx-maven-plugin/pom.xml index 2e25ee4..9bc6700 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.13</version> + <version>2.14-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-runtime/pom.xml b/jaxx-runtime/pom.xml index bccefec..118f88e 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.13</version> + <version>2.14-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-validator/pom.xml b/jaxx-validator/pom.xml index b90e541..f7f11e8 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.13</version> + <version>2.14-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-datetime/pom.xml b/jaxx-widgets-datetime/pom.xml index 2106b54..b0194a2 100644 --- a/jaxx-widgets-datetime/pom.xml +++ b/jaxx-widgets-datetime/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.13</version> + <version>2.14-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-extra/pom.xml b/jaxx-widgets-extra/pom.xml index 9b2951f..8e5a991 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.13</version> + <version>2.14-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-gis/pom.xml b/jaxx-widgets-gis/pom.xml index 61cb066..3803f22 100644 --- a/jaxx-widgets-gis/pom.xml +++ b/jaxx-widgets-gis/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.13</version> + <version>2.14-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets/pom.xml b/jaxx-widgets/pom.xml index 0fa10f8..33a6099 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.13</version> + <version>2.14-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/pom.xml b/pom.xml index 451400d..a94a385 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.13</version> + <version>2.14-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