branch develop-4.4.x updated (cd4c1a9 -> 665af62)
This is an automated email from the git hooks/post-receive script. New change to branch develop-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git from cd4c1a9 [jgitflow-maven-plugin]updating poms for 4.4.3-SNAPSHOT development new bc7fae2 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new f3ed97b [jgitflow-maven-plugin]updating poms for branch'release/4.4.2' with non-snapshot versions new 65bbc9e merge from develop new f160653 [jgitflow-maven-plugin]merging 'release/4.4.2' into 'master-4.4.x' new 3b2275d [jgitflow-maven-plugin]merging 'master-4.4.x' into 'develop-4.4.x' new 665af62 [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 665af628ef492bdf6868090d192b745f0a7d76b7 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 11 15:33:03 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 3b2275d260ebcc9ec4f05b9b85b26bfeec4d0a53 Merge: bc7fae2 f160653 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 11 15:33:03 2016 +0100 [jgitflow-maven-plugin]merging 'master-4.4.x' into 'develop-4.4.x' commit bc7fae2c4f0246f07e05fb57733d4ada11be71bd Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 11 15:33:02 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit f160653453d0df0fd9310226a637170b617f9aee Merge: b018628 65bbc9e Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 11 15:33:01 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.4.2' into 'master-4.4.x' commit 65bbc9e5307c588e0aef5f85dae24a06b18ec56c Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 11 15:32:44 2016 +0100 merge from develop commit f3ed97b20f5ddadcca8f0e53e61941cc9006f505 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 11 15:19:34 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.4.2' with non-snapshot versions Summary of changes: .../content/operation/catches/BatchSavedEvent.java | 24 ++++++++++++++++++++++ .../operation/catches/BatchSavedListener.java | 24 ++++++++++++++++++++++ 2 files changed, 48 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-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git commit f3ed97b20f5ddadcca8f0e53e61941cc9006f505 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 11 15:19:34 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.4.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 b8e8d46..c5a3aa7 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4.2-SNAPSHOT</version> + <version>4.4.2</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 8c00582..a7f56a6 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.4.2-SNAPSHOT</version> + <version>4.4.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 541a931..d5353b2 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.4.2-SNAPSHOT</version> + <version>4.4.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index de84568..3067e9a 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.4.2-SNAPSHOT</version> + <version>4.4.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 6b74cca..f502f1a 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.4.2-SNAPSHOT</version> + <version>4.4.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 46333b3..0146772 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.4.2-SNAPSHOT</version> + <version>4.4.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 600b4fb..4322484 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.4.2-SNAPSHOT</version> + <version>4.4.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-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git commit 65bbc9e5307c588e0aef5f85dae24a06b18ec56c Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 11 15:32:44 2016 +0100 merge from develop --- .../content/operation/catches/BatchSavedEvent.java | 24 ++++++++++++++++++++++ .../operation/catches/BatchSavedListener.java | 24 ++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/BatchSavedEvent.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/BatchSavedEvent.java index 0fb4dae..444b027 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/BatchSavedEvent.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/BatchSavedEvent.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches; +/* + * #%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 fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import java.util.EventObject; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/BatchSavedListener.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/BatchSavedListener.java index 938543d..3f19240 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/BatchSavedListener.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/BatchSavedListener.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches; +/* + * #%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.util.EventListener; /** -- 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-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git commit f160653453d0df0fd9310226a637170b617f9aee Merge: b018628 65bbc9e Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 11 15:33:01 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.4.2' into 'master-4.4.x' pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../main/java/fr/ifremer/tutti/util/Numbers.java | 5 ++- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../catches/AbstractTuttiBatchTableUIHandler.java | 25 ++++++++++- .../content/operation/catches/BatchSavedEvent.java | 52 ++++++++++++++++++++++ .../operation/catches/BatchSavedListener.java | 36 +++++++++++++++ .../accidental/AccidentalBatchUIHandler.java | 1 + .../catches/benthos/BenthosBatchUIHandler.java | 2 + .../IndividualObservationBatchUIHandler.java | 1 + .../marinelitter/MarineLitterBatchUIHandler.java | 2 + .../catches/species/SpeciesBatchUIHandler.java | 2 + .../EditFishingOperationInValidationUIAction.java | 51 +++++++++++++++++++-- 17 files changed, 177 insertions(+), 14 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-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git commit bc7fae2c4f0246f07e05fb57733d4ada11be71bd Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 11 15:33:02 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 d46973c..c5a3aa7 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4.3-SNAPSHOT</version> + <version>4.4.2</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index f13f581..a7f56a6 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.4.3-SNAPSHOT</version> + <version>4.4.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index eb20a05..d5353b2 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.4.3-SNAPSHOT</version> + <version>4.4.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 3b701f5..3067e9a 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.4.3-SNAPSHOT</version> + <version>4.4.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 359f587..f502f1a 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.4.3-SNAPSHOT</version> + <version>4.4.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 4bae221..0146772 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.4.3-SNAPSHOT</version> + <version>4.4.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 8a9f8a1..4322484 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.4.3-SNAPSHOT</version> + <version>4.4.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-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git commit 3b2275d260ebcc9ec4f05b9b85b26bfeec4d0a53 Merge: bc7fae2 f160653 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 11 15:33:03 2016 +0100 [jgitflow-maven-plugin]merging 'master-4.4.x' into 'develop-4.4.x' .../content/operation/catches/BatchSavedEvent.java | 24 ++++++++++++++++++++++ .../operation/catches/BatchSavedListener.java | 24 ++++++++++++++++++++++ 2 files changed, 48 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-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git commit 665af628ef492bdf6868090d192b745f0a7d76b7 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 11 15:33:03 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 c5a3aa7..d46973c 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4.2</version> + <version>4.4.3-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index a7f56a6..f13f581 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.4.2</version> + <version>4.4.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index d5353b2..eb20a05 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.4.2</version> + <version>4.4.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 3067e9a..3b701f5 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.4.2</version> + <version>4.4.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index f502f1a..359f587 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.4.2</version> + <version>4.4.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 0146772..4bae221 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.4.2</version> + <version>4.4.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 4322484..8a9f8a1 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.4.2</version> + <version>4.4.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