[tutti] branch develop updated (f98096c -> 1aefc79)
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 f98096c [jgitflow-maven-plugin]updating poms for 3.8-SNAPSHOT development new b913ae0 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 9e39300 [jgitflow-maven-plugin]updating poms for branch'release/3.7' with non-snapshot versions new f0cac9b add missing license headers new fec7edc Merge branch 'release/3.7' new f3e3b68 Merge branch 'master' into develop new 1aefc79 [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 1aefc79ef9b61b2c16604f356379875756128527 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 1 08:46:12 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit f3e3b68a2c260e8c401946d33ecd31ea0c41284b Merge: b913ae0 fec7edc Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 1 08:46:11 2014 +0200 Merge branch 'master' into develop commit b913ae022a1cf6a42c9f7149ce89d7e972c96e4f Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 1 08:46:11 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit fec7edceb8677ed8fdcbec064df8ac50f2024e19 Merge: da764ac f0cac9b Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 1 08:46:08 2014 +0200 Merge branch 'release/3.7' commit f0cac9b7ade11d29a7b72dada6745a0989927c03 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 1 08:45:54 2014 +0200 add missing license headers commit 9e39300d04400be6236aa39f71be1af6cf523199 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 1 08:36:24 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.7' with non-snapshot versions Summary of changes: .../entities/data/SpeciesAbleBatchs.java | 24 ++++++++++++++++++++++ .../entities/referential/Caracteristics.java | 24 ++++++++++++++++++++++ .../persistence/entities/referential/Gears.java | 24 ++++++++++++++++++++++ .../persistence/entities/referential/Speciess.java | 24 ++++++++++++++++++++++ .../main/java/fr/ifremer/tutti/util/Distances.java | 24 ++++++++++++++++++++++ .../src/main/java/fr/ifremer/tutti/util/Jdbcs.java | 24 ++++++++++++++++++++++ .../main/java/fr/ifremer/tutti/util/Numbers.java | 24 ++++++++++++++++++++++ .../main/java/fr/ifremer/tutti/util/Weights.java | 24 ++++++++++++++++++++++ .../SpeciesBatchNaturalOrderComparator.java | 24 ++++++++++++++++++++++ 9 files changed, 216 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 9e39300d04400be6236aa39f71be1af6cf523199 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 1 08:36:24 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.7' with non-snapshot versions --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 0799394..b3288b1 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7-SNAPSHOT</version> + <version>3.7</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 75bce10..36d46fd 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7-SNAPSHOT</version> + <version>3.7</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 696e622..f06a48a 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7-SNAPSHOT</version> + <version>3.7</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 099a866..0f5b107 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7-SNAPSHOT</version> + <version>3.7</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 361eb76..71414b3 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>3.7-SNAPSHOT</version> + <version>3.7</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 f0cac9b7ade11d29a7b72dada6745a0989927c03 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 1 08:45:54 2014 +0200 add missing license headers --- .../entities/data/SpeciesAbleBatchs.java | 24 ++++++++++++++++++++++ .../entities/referential/Caracteristics.java | 24 ++++++++++++++++++++++ .../persistence/entities/referential/Gears.java | 24 ++++++++++++++++++++++ .../persistence/entities/referential/Speciess.java | 24 ++++++++++++++++++++++ .../main/java/fr/ifremer/tutti/util/Distances.java | 24 ++++++++++++++++++++++ .../src/main/java/fr/ifremer/tutti/util/Jdbcs.java | 24 ++++++++++++++++++++++ .../main/java/fr/ifremer/tutti/util/Numbers.java | 24 ++++++++++++++++++++++ .../main/java/fr/ifremer/tutti/util/Weights.java | 24 ++++++++++++++++++++++ .../SpeciesBatchNaturalOrderComparator.java | 24 ++++++++++++++++++++++ 9 files changed, 216 insertions(+) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesAbleBatchs.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesAbleBatchs.java index 7f2715d..3177d2a 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesAbleBatchs.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesAbleBatchs.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.entities.data; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 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.Predicate; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Caracteristics.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Caracteristics.java index 5103037..3159d36 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Caracteristics.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Caracteristics.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.entities.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 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.Predicate; public class Caracteristics extends AbstractCaracteristics { diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Gears.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Gears.java index 9e23ee3..85d508b 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Gears.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Gears.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.entities.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 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.Predicate; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Speciess.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Speciess.java index 5cb12df..d29899c 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Speciess.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Speciess.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.entities.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 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.Function; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Distances.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Distances.java index d375e60..22270af 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Distances.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Distances.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.util; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 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% + */ + /** * Created on 8/26/14. * diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Jdbcs.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Jdbcs.java index 82489d1..cc48b77 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Jdbcs.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Jdbcs.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.util; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 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 org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.Environment; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Numbers.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Numbers.java index fda87bb..dd73651 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Numbers.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Numbers.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.util; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 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% + */ + /** * Created on 8/26/14. * diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Weights.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Weights.java index 07e65c7..87f12d7 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Weights.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Weights.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.util; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 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.math.BigDecimal; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchNaturalOrderComparator.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchNaturalOrderComparator.java index 3744370..01a5759 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchNaturalOrderComparator.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchNaturalOrderComparator.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 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.persistence.entities.data.SpeciesAbleBatch; import java.io.Serializable; -- 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 fec7edceb8677ed8fdcbec064df8ac50f2024e19 Merge: da764ac f0cac9b Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 1 08:46:08 2014 +0200 Merge branch 'release/3.7' pom.xml | 24 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 7 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 2 +- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 4 +- .../tutti/persistence/TuttiPersistenceImpl.java | 6 +- .../persistence/TuttiPersistenceNoDbImpl.java | 2 +- .../tutti/persistence/entities/TuttiEntities.java | 465 +------------------- .../data/SampleCategoryModelConverter.java | 7 +- .../entities/data/SpeciesAbleBatchs.java | 61 +++ .../CaracteristicQualitativeValues.java | 42 ++ .../entities/referential/Caracteristics.java | 67 +++ ...acteristicQualitativeValues.java => Gears.java} | 35 +- .../persistence/entities/referential/Speciess.java | 99 +++++ .../AccidentalBatchPersistenceServiceImpl.java | 2 +- .../service/CatchBatchPersistenceServiceImpl.java | 9 +- .../service/CruisePersistenceServiceImpl.java | 47 +-- ...dualObservationBatchPersistenceServiceImpl.java | 2 +- .../service/ProtocolPersistenceServiceImpl.java | 10 +- .../service/ReferentialPersistenceServiceImpl.java | 16 +- .../SpeciesBatchPersistenceServiceImpl.java | 42 +- .../service/TechnicalPersistenceService.java | 2 +- .../service/TechnicalPersistenceServiceImpl.java | 8 +- .../service/TuttiPersistenceServiceLocator.java | 2 +- .../service/util/BatchPersistenceHelper.java | 4 +- .../service/util/MeasurementPersistenceHelper.java | 2 +- .../service/util/SamplePersistenceHelper.java | 6 +- .../tutti/persistence/test/DatabaseFixtures.java | 8 +- .../tutti/persistence/test/DatabaseResource.java | 15 +- .../main/java/fr/ifremer/tutti/util/Distances.java | 63 +++ .../src/main/java/fr/ifremer/tutti/util/Jdbcs.java | 126 ++++++ .../main/java/fr/ifremer/tutti/util/Numbers.java | 54 +++ .../main/java/fr/ifremer/tutti/util/Weights.java | 130 ++++++ ...verter => org.nuiton.converter.NuitonConverter} | 0 .../src/main/xmi/tutti-persistence.properties | 7 +- .../persistence/TuttiPersistenceWriteTest.java | 2 +- .../config/TuttiPersistenceConfigTest.java | 2 +- .../ReferentialPersistenceServiceReadTest.java | 6 +- tutti-service/pom.xml | 6 +- .../ifremer/tutti/service/PersistenceService.java | 7 +- .../fr/ifremer/tutti/service/TuttiCsvUtil.java | 13 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 4 +- .../service/catches/WeightCleaningService.java | 8 +- .../service/catches/WeightComputingService.java | 83 ++-- .../catches/multipost/MultiPostImportService.java | 6 +- .../tutti/service/export/ExportCatchContext.java | 26 +- .../service/export/generic/CatchExportModel.java | 92 ++-- .../service/export/generic/OperationExportRow.java | 77 ++-- .../service/export/generic/TuttiExportService.java | 7 +- .../export/pdf/CatchesPdfExportService.java | 32 +- .../service/export/pdf/PdfExportBatchEntry.java | 10 +- .../service/psionimport/PsionImportModel.java | 56 ++- .../service/psionimport/PsionImportService.java | 22 +- .../tutti/service/pupitri/PupitriCatch.java | 27 +- .../pupitri/PupitriImportExportService.java | 26 +- .../tutti/service/pupitri/PupitriImportResult.java | 27 +- .../fr/ifremer/tutti/service/pupitri/Signs.java | 4 +- .../src/main/resources/ftl/catchesReport_fr.ftl | 4 +- .../resources/i18n/tutti-service_en_GB.properties | 2 + .../resources/i18n/tutti-service_fr_FR.properties | 20 +- .../ifremer/tutti/service/AbstractServiceTest.java | 3 +- .../fr/ifremer/tutti/service/UpdateSchemaTest.java | 2 +- .../psionimport/PsionImportServiceTest.java | 4 +- tutti-ui-swing/pom.xml | 13 +- tutti-ui-swing/src/main/help/fr/config.html | 4 + .../src/main/help/fr/editFishingOperation.html | 96 ++++- tutti-ui-swing/src/main/help/fr/faq.html | 5 + tutti-ui-swing/src/main/help/fr/selectCruise.html | 8 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 2 +- .../ui/swing/action/ComputeBatchWeightsAction.java | 85 +++- .../ui/swing/action/CreateBenthosMelagAction.java | 7 +- .../ui/swing/action/CreateSpeciesMelagAction.java | 8 +- .../swing/action/EditFishingOperationAction.java | 22 +- .../swing/action/ExportCruiseForSumatraAction.java | 18 +- .../ExportFishingOperationForSumatraAction.java | 22 +- .../tutti/ui/swing/action/ImportDbAction.java | 2 +- .../ui/swing/action/ImportProtocolAction.java | 4 +- .../tutti/ui/swing/action/OpenDbAction.java | 2 +- .../swing/action/RemoveBenthosProtocolAction.java | 4 +- .../swing/action/RemoveSpeciesProtocolAction.java | 4 +- .../action/SelectSpeciesForBenthosBatchAction.java | 4 +- ...SpeciesForIndividualObservationBatchAction.java | 4 +- .../action/SelectSpeciesForSpeciesBatchAction.java | 4 +- .../swing/content/cruise/EditCruiseUIHandler.java | 6 +- .../ui/swing/content/db/DbManagerUIHandler.java | 2 +- .../tutti/ui/swing/content/home/SelectCruiseUI.css | 8 +- .../operation/EditFishingOperationUIHandler.java | 3 +- .../operation/EditFishingOperationUIModel.java | 3 +- .../operation/catches/EditCatchesUIHandler.java | 4 +- .../operation/catches/SampleCategoryComponent.java | 6 +- .../SpeciesBatchNaturalOrderComparator.java | 108 +++++ .../catches/benthos/BenthosBatchRowModel.java | 467 ++++++++++----------- .../catches/benthos/BenthosBatchUIHandler.java | 20 +- .../frequency/BenthosFrequencyUIHandler.java | 3 +- .../IndividualObservationBatchUIHandler.java | 10 +- .../catches/species/SpeciesBatchUIHandler.java | 20 +- .../catches/species/SpeciesBatchUIModel.java | 6 +- .../frequency/SpeciesFrequencyUIHandler.java | 32 +- .../species/frequency/SpeciesFrequencyUIModel.java | 8 + .../content/protocol/EditProtocolUIHandler.java | 5 +- .../ui/swing/util/AbstractTuttiUIHandler.java | 4 +- .../computable/ComputableDataEditorHandler.java | 4 +- .../util/computable/ComputableDataTableCell.java | 4 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 37 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 43 +- 105 files changed, 1869 insertions(+), 1208 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 b913ae022a1cf6a42c9f7149ce89d7e972c96e4f Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 1 08:46:11 2014 +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-service/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 032cff7..b3288b1 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.7</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 599d56f..36d46fd 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.7</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 21e61cb..f06a48a 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.7</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 3724bf6..0f5b107 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.7</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index e173798..71414b3 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>3.8-SNAPSHOT</version> + <version>3.7</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 f3e3b68a2c260e8c401946d33ecd31ea0c41284b Merge: b913ae0 fec7edc Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 1 08:46:11 2014 +0200 Merge branch 'master' into develop .../entities/data/SpeciesAbleBatchs.java | 24 ++++++++++++++++++++++ .../entities/referential/Caracteristics.java | 24 ++++++++++++++++++++++ .../persistence/entities/referential/Gears.java | 24 ++++++++++++++++++++++ .../persistence/entities/referential/Speciess.java | 24 ++++++++++++++++++++++ .../main/java/fr/ifremer/tutti/util/Distances.java | 24 ++++++++++++++++++++++ .../src/main/java/fr/ifremer/tutti/util/Jdbcs.java | 24 ++++++++++++++++++++++ .../main/java/fr/ifremer/tutti/util/Numbers.java | 24 ++++++++++++++++++++++ .../main/java/fr/ifremer/tutti/util/Weights.java | 24 ++++++++++++++++++++++ .../SpeciesBatchNaturalOrderComparator.java | 24 ++++++++++++++++++++++ 9 files changed, 216 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 1aefc79ef9b61b2c16604f356379875756128527 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 1 08:46:12 2014 +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-service/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index b3288b1..032cff7 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7</version> + <version>3.8-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 36d46fd..599d56f 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7</version> + <version>3.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index f06a48a..21e61cb 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7</version> + <version>3.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 0f5b107..3724bf6 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7</version> + <version>3.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 71414b3..e173798 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>3.7</version> + <version>3.8-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