branch develop updated (d5beb1c -> 8713385)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from d5beb1c [jgitflow-maven-plugin]updating poms for 4.6-SNAPSHOT development new 95ec88c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new b388fb8 [jgitflow-maven-plugin]updating poms for branch'release/4.5.5' with non-snapshot versions new 3eb2927 fixes header and i18n file new bd2cea1 [jgitflow-maven-plugin]merging 'release/4.5.5' into 'master' new 82bb5a4 [jgitflow-maven-plugin]merging 'master' into 'develop' new 8713385 [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 8713385e7f4bad16131ae17e96addc3534943b1e Author: Maven Release <maven-release@codelutin.com> Date: Tue Jun 28 17:44:37 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 82bb5a46ec6075428c029ee6e2203046d5e10cc9 Merge: 95ec88c bd2cea1 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jun 28 17:44:36 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 95ec88ce25a03a1c77a86da3daa2a14855f76461 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jun 28 17:44:36 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit bd2cea103f37188ce2ad212d8a531150a2b2a8f5 Merge: 78bf27f 3eb2927 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jun 28 17:44:33 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.5.5' into 'master' commit 3eb2927762993e25a136dee31a7bee62e56e3da0 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jun 28 16:38:46 2016 +0200 fixes header and i18n file commit b388fb8eb8a5937a661218f95ab540228d248dc6 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jun 28 16:21:42 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.5.5' with non-snapshot versions Summary of changes: .../swing/content/actions/FixesBatchRankOrder.java | 24 ++++++++++++++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + 2 files changed, 25 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 https://gitlab.nuiton.org/codelutin/tutti.git commit b388fb8eb8a5937a661218f95ab540228d248dc6 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jun 28 16:21:42 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.5.5' with non-snapshot versions --- pom.xml | 2 +- tutti-caliper/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 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index b7a882d..b85517b 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.5.5-SNAPSHOT</version> + <version>4.5.5</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-caliper/pom.xml b/tutti-caliper/pom.xml index 2e9f2e7..20381b3 100644 --- a/tutti-caliper/pom.xml +++ b/tutti-caliper/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.5.5-SNAPSHOT</version> + <version>4.5.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 702acef..3eed2c4 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.5.5-SNAPSHOT</version> + <version>4.5.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index e53536a..c2b82e2 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.5.5-SNAPSHOT</version> + <version>4.5.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 0a4dba6..03afd64 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.5.5-SNAPSHOT</version> + <version>4.5.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 3e32027..e009a53 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.5.5-SNAPSHOT</version> + <version>4.5.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index e843f95..acc8b6a 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.5.5-SNAPSHOT</version> + <version>4.5.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 49b582d..43e7026 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.5.5-SNAPSHOT</version> + <version>4.5.5</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 https://gitlab.nuiton.org/codelutin/tutti.git commit 3eb2927762993e25a136dee31a7bee62e56e3da0 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jun 28 16:38:46 2016 +0200 fixes header and i18n file --- .../swing/content/actions/FixesBatchRankOrder.java | 24 ++++++++++++++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + 2 files changed, 25 insertions(+) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/FixesBatchRankOrder.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/FixesBatchRankOrder.java index 8597a19..d73e23c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/FixesBatchRankOrder.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/FixesBatchRankOrder.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2016 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 java.sql.Connection; import java.sql.DriverManager; diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index 5e2f89d..ada0de7 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -139,6 +139,7 @@ tutti.common.file.protocol= tutti.common.file.tuttiAccidental= tutti.common.file.tuttiBenthos= tutti.common.file.tuttiBenthosBatchFull= +tutti.common.file.tuttiBenthosBatchOnlyFrequencies= tutti.common.file.tuttiBenthosBatchOnlyIndividualObservations= tutti.common.file.tuttiBenthosFull= tutti.common.file.tuttiBenthosOnlyFrequencies= -- 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 https://gitlab.nuiton.org/codelutin/tutti.git commit bd2cea103f37188ce2ad212d8a531150a2b2a8f5 Merge: 78bf27f 3eb2927 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jun 28 17:44:33 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.5.5' into 'master' pom.xml | 2 +- tutti-caliper/pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../service/sampling/CruiseSamplingCache.java | 11 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../swing/content/actions/FixesBatchRankOrder.java | 164 +++++++++++++++++++++ .../catches/actions/ComputeBatchWeightsAction.java | 58 ++++---- .../species/edit/SpeciesBatchUIHandler.java | 35 ++++- .../actions/ExportMultiPostSpeciesFullAction.java | 18 ++- ...xportMultiPostSpeciesOnlyFrequenciesAction.java | 18 ++- ...ostSpeciesOnlyIndividualObservationsAction.java | 18 ++- .../actions/ImportMultiPostSpeciesFullAction.java | 20 ++- ...mportMultiPostSpeciesOnlyFrequenciesAction.java | 18 ++- ...ostSpeciesOnlyIndividualObservationsAction.java | 18 ++- .../actions/ExportMultiPostSpeciesFullAction.java | 17 ++- ...xportMultiPostSpeciesOnlyFrequenciesAction.java | 17 ++- ...ostSpeciesOnlyIndividualObservationsAction.java | 17 ++- .../actions/ImportMultiPostSpeciesFullAction.java | 17 ++- ...mportMultiPostSpeciesOnlyFrequenciesAction.java | 19 ++- ...ostSpeciesOnlyIndividualObservationsAction.java | 17 ++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 6 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 6 + 26 files changed, 434 insertions(+), 76 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 https://gitlab.nuiton.org/codelutin/tutti.git commit 95ec88ce25a03a1c77a86da3daa2a14855f76461 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jun 28 17:44:36 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- tutti-caliper/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 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 2a53e7e..b85517b 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6-SNAPSHOT</version> + <version>4.5.5</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-caliper/pom.xml b/tutti-caliper/pom.xml index aaddcf0..20381b3 100644 --- a/tutti-caliper/pom.xml +++ b/tutti-caliper/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6-SNAPSHOT</version> + <version>4.5.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 2b3a5f7..3eed2c4 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.6-SNAPSHOT</version> + <version>4.5.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 776c502..c2b82e2 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.6-SNAPSHOT</version> + <version>4.5.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 645376a..03afd64 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.6-SNAPSHOT</version> + <version>4.5.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index f7c0d63..e009a53 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.6-SNAPSHOT</version> + <version>4.5.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 4514188..acc8b6a 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.6-SNAPSHOT</version> + <version>4.5.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 96bcb64..43e7026 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.6-SNAPSHOT</version> + <version>4.5.5</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 https://gitlab.nuiton.org/codelutin/tutti.git commit 82bb5a46ec6075428c029ee6e2203046d5e10cc9 Merge: 95ec88c bd2cea1 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jun 28 17:44:36 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' .../swing/content/actions/FixesBatchRankOrder.java | 24 ++++++++++++++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + 2 files changed, 25 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 https://gitlab.nuiton.org/codelutin/tutti.git commit 8713385e7f4bad16131ae17e96addc3534943b1e Author: Maven Release <maven-release@codelutin.com> Date: Tue Jun 28 17:44:37 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- tutti-caliper/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 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index b85517b..2a53e7e 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.5.5</version> + <version>4.6-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-caliper/pom.xml b/tutti-caliper/pom.xml index 20381b3..aaddcf0 100644 --- a/tutti-caliper/pom.xml +++ b/tutti-caliper/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.5.5</version> + <version>4.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 3eed2c4..2b3a5f7 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.5.5</version> + <version>4.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index c2b82e2..776c502 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.5.5</version> + <version>4.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 03afd64..645376a 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.5.5</version> + <version>4.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index e009a53..f7c0d63 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.5.5</version> + <version>4.6-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 acc8b6a..4514188 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.5.5</version> + <version>4.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 43e7026..96bcb64 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.5.5</version> + <version>4.6-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