branch develop updated (3dbf7f0 -> eb07adf)
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 3dbf7f0 Fixes #8086 Merge branch 'feature/8086' into develop new 0df96ab [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds a7a9351 [jgitflow-maven-plugin]updating poms for 4.5-alpha-4 branch with snapshot versions new b1ed75e [jgitflow-maven-plugin]updating poms for branch'release/4.5-alpha-4' with non-snapshot versions new 5dfa54b Update help file new 0686017 [jgitflow-maven-plugin]merging 'release/4.5-alpha-4' into 'master' new dec18ac [jgitflow-maven-plugin]merging 'master' into 'develop' new eb07adf [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 eb07adfdb28cb85f32d17d79ce376896366157d6 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 10 16:57:20 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit dec18acb9c96c0d8846807c6dad1587fe4537fb6 Merge: 0df96ab 0686017 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 10 16:57:19 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 0df96abdc0cb16e943e410bc727fe2e39c41a9cc Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 10 16:57:19 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 068601705b01980abe3a59ad9b7ef2980a8748b3 Merge: 307bb66 5dfa54b Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 10 16:57:17 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.5-alpha-4' into 'master' commit 5dfa54ba0521e293949549a778f094580bf0d128 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 10 16:57:07 2016 +0100 Update help file commit b1ed75ee04f52f31fe9a5ed30663c3771e7fd7c6 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 10 16:48:33 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.5-alpha-4' 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 b1ed75ee04f52f31fe9a5ed30663c3771e7fd7c6 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 10 16:48:33 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.5-alpha-4' 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 d51a99f..02f5d39 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.5-alpha-4-SNAPSHOT</version> + <version>4.5-alpha-4</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 8d923c5..97377b1 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-alpha-4-SNAPSHOT</version> + <version>4.5-alpha-4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 823dbb0..f31f80e 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-alpha-4-SNAPSHOT</version> + <version>4.5-alpha-4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 6dc051d..3dd7ccc 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-alpha-4-SNAPSHOT</version> + <version>4.5-alpha-4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index be564ba..a86a5ff 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-alpha-4-SNAPSHOT</version> + <version>4.5-alpha-4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index e85feb8..a41b08b 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-alpha-4-SNAPSHOT</version> + <version>4.5-alpha-4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 676fdfb..439c1d4 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-alpha-4-SNAPSHOT</version> + <version>4.5-alpha-4</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 5dfa54ba0521e293949549a778f094580bf0d128 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 10 16:57:07 2016 +0100 Update help file --- .../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 e990a30..d0a8c9d 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 - 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% +### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo #Tue Mar 08 18:29:34 CET 2016 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 068601705b01980abe3a59ad9b7ef2980a8748b3 Merge: 307bb66 5dfa54b Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 10 16:57:17 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.5-alpha-4' into 'master' pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../tutti/persistence/TuttiPersistenceImpl.java | 5 + .../persistence/TuttiPersistenceNoDbImpl.java | 5 + .../persistence/entities/CaracteristicMap.java | 10 + .../entities/protocol/SpeciesProtocolBean.java | 4 +- .../CaracteristicPersistenceService.java | 2 + .../CaracteristicPersistenceServiceImpl.java | 9 + .../src/main/xmi/tutti-persistence.properties | 1 + .../src/main/xmi/tutti-persistence.zargo | Bin 62341 -> 62463 bytes tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PersistenceService.java | 34 ++++ .../fr/ifremer/tutti/service/TuttiDataContext.java | 28 +++ tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../filtered-resources/tutti-help-fr.properties | 3 +- .../IndividualObservationBatchRowModel.java | 21 +- .../IndividualObservationBatchTableModel.java | 68 ++++++- .../frequency/SpeciesFrequencyRowModel.java | 9 + .../frequency/SpeciesFrequencyTableModel.java | 11 +- .../frequency/SpeciesFrequencyUIHandler.java | 223 +++++++++++++++------ .../species/frequency/SpeciesFrequencyUIModel.java | 5 +- .../actions/ApplySpeciesFrequencyRafaleAction.java | 65 +++--- .../frequency/actions/RemoveObservationAction.java | 3 + .../protocol/EditProtocolSpeciesRowModel.java | 28 +-- .../protocol/EditProtocolSpeciesTableModel.java | 2 +- .../ui/swing/content/protocol/EditProtocolUI.jaxx | 4 + .../ui/swing/content/protocol/EditProtocolUI.jcss | 15 +- .../content/protocol/EditProtocolUIHandler.java | 92 ++++++--- .../content/protocol/EditProtocolUIModel.java | 85 +++++++- .../MinSizePopupUIHandler.java | 6 +- .../protocol/zones/ZoneEditorUIHandler.java | 30 +-- .../util/table/CaracteristicColumnIdentifier.java | 4 + .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 37 files changed, 596 insertions(+), 192 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 0df96abdc0cb16e943e410bc727fe2e39c41a9cc Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 10 16:57:19 2016 +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 1f59bad..02f5d39 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-alpha-4</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 13eb09f..97377b1 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-alpha-4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 304969a..f31f80e 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-alpha-4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index fa737a7..3dd7ccc 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-alpha-4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 95a7f93..a86a5ff 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-alpha-4</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..a41b08b 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-alpha-4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index a9d5671..439c1d4 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-alpha-4</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 dec18acb9c96c0d8846807c6dad1587fe4537fb6 Merge: 0df96ab 0686017 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 10 16:57:19 2016 +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 eb07adfdb28cb85f32d17d79ce376896366157d6 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 10 16:57:20 2016 +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 02f5d39..1f59bad 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.5-alpha-4</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 97377b1..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-alpha-4</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 f31f80e..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-alpha-4</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 3dd7ccc..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-alpha-4</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 a86a5ff..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-alpha-4</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 a41b08b..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-alpha-4</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 439c1d4..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-alpha-4</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