branch develop updated (f080a44 -> e9d165d)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from f080a44 Utilisation codelutinpom 5.1 new 41c0de8 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds b076e1d [jgitflow-maven-plugin]updating poms for 4.2-rc-2 branch with snapshot versions new d2a8444 [jgitflow-maven-plugin]updating poms for branch'release/4.2-rc-2' with non-snapshot versions new 5c11dd5 Add license header new 6a1d158 [jgitflow-maven-plugin]merging 'release/4.2-rc-2' into 'master' new 421f97b [jgitflow-maven-plugin]merging 'master' into 'develop' new e9d165d [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 e9d165d8519a122afd473e163bd64f5eb9c3113d Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 24 14:30:10 2015 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 421f97b90b96fa46fca3c5f7548e994f38bd6b27 Merge: 41c0de8 6a1d158 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 24 14:30:09 2015 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 41c0de83a42b93117d437320e515006083b08478 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 24 14:30:09 2015 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 6a1d15888b8367bc3a9e6651ad8fcff3612ed9a5 Merge: 771ce24 5c11dd5 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 24 14:30:07 2015 +0100 [jgitflow-maven-plugin]merging 'release/4.2-rc-2' into 'master' commit 5c11dd5a3ebeb12ae466e7756b6581b9caccae59 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 24 14:29:55 2015 +0100 Add license header commit d2a84445ef8d842f8129be1855c54f3c2f50242d Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 24 14:26:37 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.2-rc-2' with non-snapshot versions Summary of changes: .../filtered-resources/tutti-help-fr.properties | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit d2a84445ef8d842f8129be1855c54f3c2f50242d Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 24 14:26:37 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.2-rc-2' with non-snapshot versions --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 515105b..777464a 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2-rc-2-SNAPSHOT</version> + <version>4.2-rc-2</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 885e147..03d3596 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2-rc-2-SNAPSHOT</version> + <version>4.2-rc-2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index edc5930..f166eed 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2-rc-2-SNAPSHOT</version> + <version>4.2-rc-2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 9710af0..6585c68 100644 --- a/tutti-report-generator/pom.xml +++ b/tutti-report-generator/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2-rc-2-SNAPSHOT</version> + <version>4.2-rc-2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 97a49ad..5c9a798 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2-rc-2-SNAPSHOT</version> + <version>4.2-rc-2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 17937c7..23cc1e4 100644 --- a/tutti-ui-swing-updater/pom.xml +++ b/tutti-ui-swing-updater/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2-rc-2-SNAPSHOT</version> + <version>4.2-rc-2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 2248d7a..bff1e3a 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2-rc-2-SNAPSHOT</version> + <version>4.2-rc-2</version> </parent> <groupId>fr.ifremer.tutti</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 5c11dd5a3ebeb12ae466e7756b6581b9caccae59 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 24 14:29:55 2015 +0100 Add license header --- .../filtered-resources/tutti-help-fr.properties | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties index 97a74ec..4b45b20 100644 --- a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties +++ b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties @@ -1,3 +1,26 @@ +### +# #%L +# Tutti :: UI +# $Id:$ +# $HeadURL:$ +# %% +# Copyright (C) 2012 - 2015 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo #Wed Dec 23 19:23:27 CET 2015 tutti.config.help=config.html -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 6a1d15888b8367bc3a9e6651ad8fcff3612ed9a5 Merge: 771ce24 5c11dd5 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 24 14:30:07 2015 +0100 [jgitflow-maven-plugin]merging 'release/4.2-rc-2' into 'master' pom.xml | 6 +- src/site/site_fr.xml | 3 - tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../tutti/persistence/TuttiPersistenceImpl.java | 5 + .../persistence/TuttiPersistenceNoDbImpl.java | 6 + .../service/ProtocolPersistenceServiceImpl.java | 1 + .../service/ReferentialPersistenceService.java | 8 +- .../referential/SpeciesPersistenceService.java | 18 +- .../referential/SpeciesPersistenceServiceImpl.java | 51 +++++- .../resources/applicationContext-service-tutti.xml | 4 + .../src/main/xmi/tutti-persistence.zargo | Bin 58384 -> 58480 bytes tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../fr/ifremer/tutti/service/DecoratorService.java | 42 +++-- .../ifremer/tutti/service/PersistenceService.java | 6 +- ...enericFormatReferentialSpeciesImportResult.java | 19 +- .../GenericformatImportPersistenceHelper.java | 5 + .../ImportReferentialSpeciesAction.java | 4 + .../tutti/service/DecoratorServiceTest.java | 9 + tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../src/main/filtered-resources/log4j.properties | 6 +- .../filtered-resources/tutti-help-fr.properties | 26 ++- .../EditCatchesForSelectedCruiseAction.java | 34 ++++ .../EditSampleCategoryModelTableModel.java | 14 +- .../content/home/actions/EditCatchesAction.java | 8 +- .../home/actions/SendCruiseReportAction.java | 17 +- .../catches/AbstractTuttiBatchTableUIHandler.java | 42 ++++- .../operation/catches/EditCatchesSvgHandler.java | 68 +++++-- .../operation/catches/EditCatchesUIHandler.java | 41 ++++- .../operation/catches/EditCatchesUIModel.java | 26 +++ .../catches/SpeciesAbleBatchRowHelper.java | 4 - .../accidental/AccidentalBatchUIHandler.java | 2 +- .../operation/catches/benthos/BenthosBatchUI.css | 2 - .../catches/benthos/BenthosBatchUIHandler.java | 55 +++++- .../catches/benthos/BenthosBatchUIModel.java | 23 +++ .../benthos/actions/RemoveBenthosBatchAction.java | 109 +++++++---- .../benthos/create/CreateBenthosBatchUI.css | 27 ++- .../benthos/create/CreateBenthosBatchUI.jaxx | 32 +++- .../create/CreateBenthosBatchUIHandler.java | 175 ++++++++++-------- .../benthos/create/CreateBenthosBatchUIModel.java | 53 +++++- .../CreateBenthosBatchAndFrequenciesAction.java | 79 ++++++++ .../frequency/BenthosFrequencyCellComponent.java | 32 ++-- .../benthos/frequency/BenthosFrequencyUI.css | 30 ++- .../benthos/frequency/BenthosFrequencyUI.jaxx | 12 +- .../frequency/BenthosFrequencyUIHandler.java | 5 +- .../benthos/split/SplitBenthosBatchUIHandler.java | 92 ++++++---- .../IndividualObservationBatchUIHandler.java | 2 +- .../marinelitter/MarineLitterBatchUIHandler.java | 2 +- .../operation/catches/species/SpeciesBatchUI.css | 2 - .../catches/species/SpeciesBatchUIHandler.java | 54 +++++- .../catches/species/SpeciesBatchUIModel.java | 23 +++ .../species/actions/RemoveSpeciesBatchAction.java | 102 ++++++++--- .../species/create/CreateSpeciesBatchUI.css | 27 ++- .../species/create/CreateSpeciesBatchUI.jaxx | 32 +++- .../create/CreateSpeciesBatchUIHandler.java | 173 ++++++++++-------- .../species/create/CreateSpeciesBatchUIModel.java | 50 +++++ .../CreateSpeciesBatchAndFrequenciesAction.java | 79 ++++++++ .../frequency/SpeciesFrequencyCellComponent.java | 24 ++- .../species/frequency/SpeciesFrequencyUI.css | 29 ++- .../species/frequency/SpeciesFrequencyUI.jaxx | 12 +- .../frequency/SpeciesFrequencyUIHandler.java | 6 +- .../species/split/SplitSpeciesBatchUIHandler.java | 92 ++++++---- .../EditProtocolCaracteristicsRowModel.java | 7 + .../EditProtocolCaracteristicsTableModel.java | 8 +- .../EditProtocolOperationFieldsRowModel.java | 4 + .../EditProtocolOperationFieldsTableModel.java | 2 + .../protocol/EditProtocolSpeciesTableModel.java | 4 +- .../ui/swing/content/protocol/EditProtocolUI.css | 21 +++ .../ui/swing/content/protocol/EditProtocolUI.jaxx | 2 + .../content/protocol/EditProtocolUIHandler.java | 35 +++- .../content/protocol/EditProtocolUIModel.java | 27 +++ .../MoveDownCaracteristicMappingAction.java | 58 ++++++ .../actions/MoveUpCaracteristicMappingAction.java | 59 ++++++ .../swing/util/table/AbstractTuttiTableModel.java | 54 ++++++ tutti-ui-swing/src/main/resources/EcranResume.svg | 202 ++++++++++++++++++--- .../CreateBenthosBatchUIModel-error-validation.xml | 34 +++- .../CreateSpeciesBatchUIModel-error-validation.xml | 31 +++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 54 +++++- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 63 +++++-- 81 files changed, 2036 insertions(+), 551 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 41c0de83a42b93117d437320e515006083b08478 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 24 14:30:09 2015 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 839bb8d..777464a 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2-SNAPSHOT</version> + <version>4.2-rc-2</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 3ed48a6..03d3596 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2-SNAPSHOT</version> + <version>4.2-rc-2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index d3f912b..f166eed 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2-SNAPSHOT</version> + <version>4.2-rc-2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 8be9374..6585c68 100644 --- a/tutti-report-generator/pom.xml +++ b/tutti-report-generator/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2-SNAPSHOT</version> + <version>4.2-rc-2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 7fc7490..5c9a798 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2-SNAPSHOT</version> + <version>4.2-rc-2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index cb0bac3..23cc1e4 100644 --- a/tutti-ui-swing-updater/pom.xml +++ b/tutti-ui-swing-updater/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2-SNAPSHOT</version> + <version>4.2-rc-2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 604319c..bff1e3a 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2-SNAPSHOT</version> + <version>4.2-rc-2</version> </parent> <groupId>fr.ifremer.tutti</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 421f97b90b96fa46fca3c5f7548e994f38bd6b27 Merge: 41c0de8 6a1d158 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 24 14:30:09 2015 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' .../filtered-resources/tutti-help-fr.properties | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit e9d165d8519a122afd473e163bd64f5eb9c3113d Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 24 14:30:10 2015 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 777464a..839bb8d 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2-rc-2</version> + <version>4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 03d3596..3ed48a6 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2-rc-2</version> + <version>4.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index f166eed..d3f912b 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2-rc-2</version> + <version>4.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 6585c68..8be9374 100644 --- a/tutti-report-generator/pom.xml +++ b/tutti-report-generator/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2-rc-2</version> + <version>4.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 5c9a798..7fc7490 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2-rc-2</version> + <version>4.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 23cc1e4..cb0bac3 100644 --- a/tutti-ui-swing-updater/pom.xml +++ b/tutti-ui-swing-updater/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2-rc-2</version> + <version>4.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index bff1e3a..604319c 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2-rc-2</version> + <version>4.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm