branch develop updated (e2d5883 -> 1ca2447)
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 e2d5883 [jgitflow-maven-plugin]updating poms for 4.0.3-SNAPSHOT development new 4126d75 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new fd99a43 fix license header new 373bdd1 [jgitflow-maven-plugin]updating poms for branch'release/4.0.2' with non-snapshot versions new 32b113c fixes #7212: [TECH] Utilisation adagio 3.8.6.2 new 5604b98 Merge branch 'release/4.0.2' new e240d41 Merge branch 'master' into develop new 1ca2447 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 7 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 1ca24473996cdde45066d4bf514dd0601c99124d Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 11 10:14:45 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit e240d4192a1e621c07356f54b4e53cd89584ed9a Merge: 4126d75 5604b98 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 11 10:14:44 2015 +0000 Merge branch 'master' into develop commit 4126d75096ea26d0962c2224d974261221173b42 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 11 10:14:41 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 5604b984c699900d3477a83b56c42e7fccc9f99d Merge: d69a3c6 32b113c Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 11 10:14:36 2015 +0000 Merge branch 'release/4.0.2' commit 32b113c5409ec4a2f33f0aedbdc296e9a4b625cf Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 11 10:05:27 2015 +0000 fixes #7212: [TECH] Utilisation adagio 3.8.6.2 commit 373bdd159e235f6f94faa5947812eaf08e2bb3c9 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 11 09:53:40 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0.2' with non-snapshot versions commit fd99a4345e7644630464b094153229849a5cc2d0 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 11 09:53:27 2015 +0000 fix license header Summary of changes: pom.xml | 2 +- .../catches/MultiPostImportLogDialogHandler.java | 24 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) -- 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 fd99a4345e7644630464b094153229849a5cc2d0 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 11 09:53:27 2015 +0000 fix license header --- .../catches/MultiPostImportLogDialogHandler.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialogHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialogHandler.java index 05a4b47..01447f1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialogHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialogHandler.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches; +/* + * #%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% + */ + import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import jaxx.runtime.spi.UIHandler; -- 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 373bdd159e235f6f94faa5947812eaf08e2bb3c9 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 11 09:53:40 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0.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 fa4f619..ace9531 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0.2-SNAPSHOT</version> + <version>4.0.2</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index d12f727..652eb7d 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.2-SNAPSHOT</version> + <version>4.0.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index a26ca9f..62c1f56 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.2-SNAPSHOT</version> + <version>4.0.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index e81e72c..016efe4 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.2-SNAPSHOT</version> + <version>4.0.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index a08de58..6f0733a 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.2-SNAPSHOT</version> + <version>4.0.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 13ef018..64fc85d 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.2-SNAPSHOT</version> + <version>4.0.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index ea7dd0a..806c647 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.2-SNAPSHOT</version> + <version>4.0.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 32b113c5409ec4a2f33f0aedbdc296e9a4b625cf Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 11 10:05:27 2015 +0000 fixes #7212: [TECH] Utilisation adagio 3.8.6.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ace9531..a62043c 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ <slf4jVersion>1.7.9</slf4jVersion> <adagioSharedVersion>3.8.3</adagioSharedVersion> <!-- Can't use now adagio previous to 3.9.1 after this version --> - <adagioVersion>3.8.6.1</adagioVersion> + <adagioVersion>3.8.6.2</adagioVersion> <bluecoveVersion>2.1.0</bluecoveVersion> <hibernateVersion>4.3.7.Final</hibernateVersion> <springVersion>4.1.4.RELEASE</springVersion> -- 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 5604b984c699900d3477a83b56c42e7fccc9f99d Merge: d69a3c6 32b113c Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 11 10:14:36 2015 +0000 Merge branch 'release/4.0.2' pom.xml | 4 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../service/util/MeasurementPersistenceHelper.java | 2 + tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../genericformat/GenericFormatImportService.java | 34 +---------- .../consumer/CsvConsumerForCatch.java | 1 + .../FishingOperationImportService.java | 9 +-- .../protocol/ProtocolImportExportService.java | 33 ++++++++--- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../ifremer/tutti/ui/swing/TuttiActionFactory.java | 16 ++++++ .../ui/swing/content/home/SelectCruiseUI.jaxx | 15 ++++- .../swing/content/home/SelectCruiseUIHandler.java | 5 ++ .../operation/catches/MultiPostImportLogDialog.css | 2 +- .../catches/MultiPostImportLogDialogHandler.java | 56 ++++++++++++++++++ .../species/ImportPupitriPopupUIHandler.java | 5 ++ .../actions/ApplySpeciesFrequencyRafaleAction.java | 7 +-- ...perationCaracteristicsFromColumnFileAction.java | 3 +- .../actions/LoadProtocolImportColumnsAction.java | 19 +++--- .../ui/swing/util/AbstractTuttiUIHandler.java | 67 ++++++++++------------ .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 43 ++++++++++++++ .../computable/ComputableDataEditorHandler.java | 27 ++++++++- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 12 ++-- 25 files changed, 261 insertions(+), 111 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 4126d75096ea26d0962c2224d974261221173b42 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 11 10:14:41 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 5d92ca6..ace9531 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0.3-SNAPSHOT</version> + <version>4.0.2</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 41e4064..652eb7d 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.3-SNAPSHOT</version> + <version>4.0.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index c642d1b..62c1f56 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.3-SNAPSHOT</version> + <version>4.0.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 327c79d..016efe4 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.3-SNAPSHOT</version> + <version>4.0.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 0ddc3cf..6f0733a 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.3-SNAPSHOT</version> + <version>4.0.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 9f90cfe..64fc85d 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.3-SNAPSHOT</version> + <version>4.0.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 763e2eb..806c647 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.3-SNAPSHOT</version> + <version>4.0.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 e240d4192a1e621c07356f54b4e53cd89584ed9a Merge: 4126d75 5604b98 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 11 10:14:44 2015 +0000 Merge branch 'master' into develop pom.xml | 2 +- .../catches/MultiPostImportLogDialogHandler.java | 24 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) -- 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 1ca24473996cdde45066d4bf514dd0601c99124d Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 11 10:14:45 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 a62043c..8158725 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0.2</version> + <version>4.0.3-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 652eb7d..41e4064 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.2</version> + <version>4.0.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 62c1f56..c642d1b 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.2</version> + <version>4.0.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 016efe4..327c79d 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.2</version> + <version>4.0.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 6f0733a..0ddc3cf 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.2</version> + <version>4.0.3-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 64fc85d..9f90cfe 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.2</version> + <version>4.0.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 806c647..763e2eb 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.2</version> + <version>4.0.3-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