branch develop updated (5eb7a22 -> a616426)
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 5eb7a22 [jgitflow-maven-plugin]updating poms for 4.0-RC5-SNAPSHOT development new 3d96d02 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new a5c8891 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC4' with non-snapshot versions new 58bd046 add license header new 3998c48 Merge branch 'release/4.0-RC4' new 56834e2 Merge branch 'master' into develop new a616426 [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 a6164265568a9b350170c22c7b14a8cd74d29242 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 28 13:32:26 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 56834e29d3d8aa3f0ae91caf0de27c3f73b3f96e Merge: 3d96d02 3998c48 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 28 13:32:26 2015 +0000 Merge branch 'master' into develop commit 3d96d0232ebe22ced868538bb8903ef9773b27ac Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 28 13:32:25 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 3998c48913d06826b70a7d8f736dfbaf25ba581d Merge: b987ea6 58bd046 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 28 13:32:22 2015 +0000 Merge branch 'release/4.0-RC4' commit 58bd046b1486ef42cc97b1672dffc843a047f01f Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 28 13:32:06 2015 +0000 add license header commit a5c8891685453b361f65cab454791fb4d4ec0163 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 28 13:23:13 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC4' with non-snapshot versions Summary of changes: ...enericFormatReferentialSpeciesImportResult.java | 24 ++++++++++++++++++++++ 1 file changed, 24 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 a5c8891685453b361f65cab454791fb4d4ec0163 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 28 13:23:13 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC4' 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 8ff313f..203261e 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-RC4-SNAPSHOT</version> + <version>4.0-RC4</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 895d9ea..cc8e8f4 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.0-RC4-SNAPSHOT</version> + <version>4.0-RC4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 08e7f83..6865345 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.0-RC4-SNAPSHOT</version> + <version>4.0-RC4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 426c6d2..6399673 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.0-RC4-SNAPSHOT</version> + <version>4.0-RC4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 69125f4..d3e77e8 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.0-RC4-SNAPSHOT</version> + <version>4.0-RC4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index b6f8c7c..3c66422 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.0-RC4-SNAPSHOT</version> + <version>4.0-RC4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index acc022a..2e2672f 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.0-RC4-SNAPSHOT</version> + <version>4.0-RC4</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 58bd046b1486ef42cc97b1672dffc843a047f01f Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 28 13:32:06 2015 +0000 add license header --- ...enericFormatReferentialSpeciesImportResult.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatReferentialSpeciesImportResult.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatReferentialSpeciesImportResult.java index fb32101..0856ea5 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatReferentialSpeciesImportResult.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatReferentialSpeciesImportResult.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat; +/* + * #%L + * Tutti :: Service + * $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% + */ + import fr.ifremer.tutti.persistence.entities.referential.Species; import java.util.Collections; -- 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 3998c48913d06826b70a7d8f736dfbaf25ba581d Merge: b987ea6 58bd046 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 28 13:32:22 2015 +0000 Merge branch 'release/4.0-RC4' pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../entities/protocol/TuttiProtocols.java | 10 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../tutti/service/csv/SpeciesParserFormatter.java | 22 +- .../tutti/service/export/ExportCatchContext.java | 50 +-- .../genericformat/GenericFormatContextSupport.java | 10 +- .../genericformat/GenericFormatExportContext.java | 2 +- .../GenericFormatImportEntityParserFactory.java | 2 +- .../GenericFormatReferentialImportResult.java | 6 +- ...enericFormatReferentialSpeciesImportResult.java | 77 +++++ .../exportactions/CreateCatchBatchRowsAction.java | 13 +- .../importactions/ImportCatchAction.java | 37 ++- .../importactions/ImportProtocolAction.java | 6 +- .../ImportReferentialSpeciesAction.java | 10 +- .../importactions/RestoreAfterImportAction.java | 35 +- .../importactions/RestoreAfterValidateAction.java | 3 + .../ReferentialTemporarySpeciesService.java | 4 +- .../consumer/CsvConsumerForTemporarySpecies.java | 4 +- .../service/referential/csv/SpeciesModel.java | 22 +- .../tutti/service/referential/csv/SpeciesRow.java | 14 + .../producer/CsvProducerForTemporarySpecies.java | 4 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- tutti-ui-swing/src/main/help/fr/config.html | Bin 15560 -> 7634 bytes .../src/main/help/fr/editFishingOperation.html | Bin 135058 -> 59101 bytes tutti-ui-swing/src/main/help/fr/editProtocol.html | Bin 21122 -> 9585 bytes .../src/main/help/fr/editSampleCategory.html | Bin 7262 -> 3042 bytes tutti-ui-swing/src/main/help/fr/faq.html | Bin 29980 -> 15427 bytes .../main/help/fr/manageTemporaryReferential.html | Bin 10688 -> 4907 bytes tutti-ui-swing/src/main/help/fr/report.html | Bin 6128 -> 2066 bytes tutti-ui-swing/src/main/help/fr/selectCruise.html | Bin 16034 -> 6626 bytes .../catches/actions/ComputeBatchWeightsAction.java | 366 ++++++++++++++------- .../catches/benthos/BenthosBatchTableModel.java | 8 +- .../benthos/create/CreateBenthosBatchUI.css | 1 + .../create/CreateIndividualObservationBatchUI.css | 1 + .../catches/species/SpeciesBatchTableModel.java | 8 +- .../species/create/CreateSpeciesBatchUI.css | 1 + .../util/actions/ShowComboBoxPopupActions.java | 5 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 6 +- 42 files changed, 521 insertions(+), 220 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 3d96d0232ebe22ced868538bb8903ef9773b27ac Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 28 13:32:25 2015 +0000 [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 15ccda4..203261e 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-RC5-SNAPSHOT</version> + <version>4.0-RC4</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index eca5562..cc8e8f4 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.0-RC5-SNAPSHOT</version> + <version>4.0-RC4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 47eaf35..6865345 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.0-RC5-SNAPSHOT</version> + <version>4.0-RC4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index b29b894..6399673 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.0-RC5-SNAPSHOT</version> + <version>4.0-RC4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 0ad6e76..d3e77e8 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.0-RC5-SNAPSHOT</version> + <version>4.0-RC4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 4c0977a..3c66422 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.0-RC5-SNAPSHOT</version> + <version>4.0-RC4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 0ed4b91..2e2672f 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.0-RC5-SNAPSHOT</version> + <version>4.0-RC4</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 56834e29d3d8aa3f0ae91caf0de27c3f73b3f96e Merge: 3d96d02 3998c48 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 28 13:32:26 2015 +0000 Merge branch 'master' into develop ...enericFormatReferentialSpeciesImportResult.java | 24 ++++++++++++++++++++++ 1 file changed, 24 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 a6164265568a9b350170c22c7b14a8cd74d29242 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 28 13:32:26 2015 +0000 [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 203261e..15ccda4 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-RC4</version> + <version>4.0-RC5-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index cc8e8f4..eca5562 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.0-RC4</version> + <version>4.0-RC5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 6865345..47eaf35 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.0-RC4</version> + <version>4.0-RC5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 6399673..b29b894 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.0-RC4</version> + <version>4.0-RC5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index d3e77e8..0ad6e76 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.0-RC4</version> + <version>4.0-RC5-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 3c66422..4c0977a 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.0-RC4</version> + <version>4.0-RC5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 2e2672f..0ed4b91 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.0-RC4</version> + <version>4.0-RC5-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