branch develop updated (6de0bdc -> 76a7d22)
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 6de0bdc Livrable #8157 Merge branch 'feature/8157' into develop new 8477246 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 6de2446 [jgitflow-maven-plugin]updating poms for 4.5-rc-3 branch with snapshot versions new 61076f2 Add license header new de610b6 [jgitflow-maven-plugin]updating poms for branch'release/4.5-rc-3' with non-snapshot versions new 3f32dfd [jgitflow-maven-plugin]merging 'release/4.5-rc-3' into 'master' new 272d651 [jgitflow-maven-plugin]merging 'master' into 'develop' new 76a7d22 [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 76a7d22fc10177984782397027585b99f08dd013 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 12 13:17:49 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 272d6515c03d9eb9f9c2b3b893e4343feb8f3c41 Merge: 8477246 3f32dfd Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 12 13:17:43 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 847724690aec89367bbc85ccc711596b6eea8926 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 12 13:17:43 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 3f32dfdacdeeeaa65b74e109f4dd59d182d9162e Merge: e8d61cd de610b6 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 12 13:17:41 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.5-rc-3' into 'master' commit de610b6af341ef278358e0a59cd9607d579f0e92 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 12 13:15:05 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.5-rc-3' with non-snapshot versions commit 61076f2894fba435f7aa3491ba47ef123a6d637c Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 12 13:14:56 2016 +0200 Add license header Summary of changes: .../entities/referential/CaracteristicBean.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 https://gitlab.nuiton.org/codelutin/tutti.git commit 61076f2894fba435f7aa3491ba47ef123a6d637c Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 12 13:14:56 2016 +0200 Add license header --- .../entities/referential/CaracteristicBean.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/CaracteristicBean.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/CaracteristicBean.java index b87e179..b3a3b35 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/CaracteristicBean.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/CaracteristicBean.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.entities.referential; +/* + * #%L + * Tutti :: Persistence + * $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 com.google.common.base.MoreObjects; public class CaracteristicBean extends AbstractCaracteristicBean { -- 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 de610b6af341ef278358e0a59cd9607d579f0e92 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 12 13:15:05 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.5-rc-3' 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 1af71dd..a2a0aaa 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.5-rc-3-SNAPSHOT</version> + <version>4.5-rc-3</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 8094276..55bfd79 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-rc-3-SNAPSHOT</version> + <version>4.5-rc-3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 55f9882..db7cbe4 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-rc-3-SNAPSHOT</version> + <version>4.5-rc-3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index e246444..ac0f6bd 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-rc-3-SNAPSHOT</version> + <version>4.5-rc-3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index b2fa1c3..8312237 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-rc-3-SNAPSHOT</version> + <version>4.5-rc-3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 2de5b15..555cca0 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-rc-3-SNAPSHOT</version> + <version>4.5-rc-3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index afba72e..251b7ac 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-rc-3-SNAPSHOT</version> + <version>4.5-rc-3</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 3f32dfdacdeeeaa65b74e109f4dd59d182d9162e Merge: e8d61cd de610b6 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 12 13:17:41 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.5-rc-3' into 'master' pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../entities/referential/CaracteristicBean.java | 45 ++ tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PersistenceService.java | 6 +- .../service/export/cps/SamplingNumberRowModel.java | 13 +- .../tutti/service/sampling/CacheExtractedKey.java | 18 +- .../service/sampling/CruiseSamplingCache.java | 778 ++++++++++++--------- .../sampling/CruiseSamplingCacheLoader.java | 21 +- .../sampling/CruiseSamplingInternalCache.java | 32 +- .../tutti/service/sampling/SamplingEvent.java | 7 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 23 +- .../tutti/ui/swing/content/MainUIHandler.java | 56 +- .../content/actions/EditCatchesSupportAction.java | 8 +- .../catches/actions/ComputeBatchWeightsAction.java | 35 +- .../IndividualObservationBatchRowModel.java | 53 +- .../IndividualObservationBatchTableModel.java | 69 +- .../species/EditSpeciesBatchPanelUIHandler.java | 2 +- .../frequency/IndividualObservationUICache.java | 152 ++-- .../frequency/SpeciesFrequencyTableModel.java | 167 +++++ .../frequency/SpeciesFrequencyUIHandler.java | 305 +++----- .../species/frequency/SpeciesFrequencyUIModel.java | 84 ++- .../frequency/actions/RemoveObservationAction.java | 27 +- .../actions/EditFishingOperationAction.java | 31 + .../content/protocol/EditProtocolUIHandler.java | 11 + .../content/protocol/EditProtocolUIModel.java | 6 +- .../MoveDownCaracteristicMappingAction.java | 8 +- .../actions/MoveUpCaracteristicMappingAction.java | 8 +- .../util/table/AbstractTuttiTableUIHandler.java | 109 +-- .../util/table/CaracteristicColumnIdentifier.java | 4 +- 34 files changed, 1218 insertions(+), 874 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 847724690aec89367bbc85ccc711596b6eea8926 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 12 13:17:43 2016 +0200 [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 1f59bad..a2a0aaa 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.5-SNAPSHOT</version> + <version>4.5-rc-3</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 13eb09f..55bfd79 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-SNAPSHOT</version> + <version>4.5-rc-3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 304969a..db7cbe4 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-SNAPSHOT</version> + <version>4.5-rc-3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index fa737a7..ac0f6bd 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-SNAPSHOT</version> + <version>4.5-rc-3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 95a7f93..8312237 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-SNAPSHOT</version> + <version>4.5-rc-3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index fe3098a..555cca0 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-SNAPSHOT</version> + <version>4.5-rc-3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index a9d5671..251b7ac 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-SNAPSHOT</version> + <version>4.5-rc-3</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 272d6515c03d9eb9f9c2b3b893e4343feb8f3c41 Merge: 8477246 3f32dfd Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 12 13:17:43 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' .../entities/referential/CaracteristicBean.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 https://gitlab.nuiton.org/codelutin/tutti.git commit 76a7d22fc10177984782397027585b99f08dd013 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 12 13:17:49 2016 +0200 [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 a2a0aaa..1f59bad 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.5-rc-3</version> + <version>4.5-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 55bfd79..13eb09f 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-rc-3</version> + <version>4.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index db7cbe4..304969a 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-rc-3</version> + <version>4.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index ac0f6bd..fa737a7 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-rc-3</version> + <version>4.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 8312237..95a7f93 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-rc-3</version> + <version>4.5-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 555cca0..fe3098a 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-rc-3</version> + <version>4.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 251b7ac..a9d5671 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-rc-3</version> + <version>4.5-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