branch develop updated (5ed9d7e -> ec4489e)
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 5ed9d7e More in gitignore new 75cf42c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 8ad645b [jgitflow-maven-plugin]updating poms for 4.5-beta-2 branch with snapshot versions new 8d96dfa Add license headers new 7535407 [jgitflow-maven-plugin]updating poms for branch'release/4.5-beta-2' with non-snapshot versions new 4011d57 [jgitflow-maven-plugin]merging 'release/4.5-beta-2' into 'master' new 0ac0949 [jgitflow-maven-plugin]merging 'master' into 'develop' new ec4489e [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 ec4489e76bc56583ed896f0d82b3d281bdd8e761 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 24 18:34:46 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 0ac0949d0868532ff448f148534a7fcee9a9cd77 Merge: 75cf42c 4011d57 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 24 18:34:45 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 75cf42ce82142a81f0a55544cd9dc149b741db88 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 24 18:34:45 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 4011d576d1230a885446b5d8678cfa981f1a294b Merge: 7503a9b 7535407 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 24 18:34:44 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.5-beta-2' into 'master' commit 75354078b5cc785a53d029369e3f48c19d9f017c Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 24 18:34:04 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.5-beta-2' with non-snapshot versions commit 8d96dfa444b59df7fe7e2dea4b588f66052cb167 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 24 18:32:22 2016 +0100 Add license headers Summary of changes: .../entities/data/SpeciesBatchFrequencys.java | 24 ++++++++++++++++++++++ .../CalcifiedPiecesSamplingDefinitions.java | 24 ++++++++++++++++++++++ .../entities/protocol/MaturityCaracteristics.java | 24 ++++++++++++++++++++++ .../persistence/entities/protocol/ZoneBean.java | 24 ++++++++++++++++++++++ .../tutti/persistence/entities/protocol/Zones.java | 24 ++++++++++++++++++++++ .../entities/referential/TuttiLocationBean.java | 24 ++++++++++++++++++++++ .../samplingCache/CruiseSamplingCacheLoader.java | 24 ++++++++++++++++++++++ .../samplingCache/CruiseSamplingInternalCache.java | 24 ++++++++++++++++++++++ .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ .../SamplingCodeCellRenderer.java | 24 ++++++++++++++++++++++ .../catches/species/BenthosBatchUISupportImpl.java | 24 ++++++++++++++++++++++ .../species/EditSpeciesBatchPanelUIHandler.java | 24 ++++++++++++++++++++++ .../species/EditSpeciesBatchPanelUIModel.java | 24 ++++++++++++++++++++++ .../catches/species/SpeciesBatchUISupportImpl.java | 24 ++++++++++++++++++++++ .../species/SpeciesOrBenthosBatchUISupport.java | 24 ++++++++++++++++++++++ .../frequency/IndividualObservationUICache.java | 24 ++++++++++++++++++++++ .../frequency/actions/DeleteSampleCodeAction.java | 24 ++++++++++++++++++++++ .../actions/EditMaturityCaracteristicAction.java | 24 ++++++++++++++++++++++ .../EditMaturityCaracteristicPopupUIModel.java | 24 ++++++++++++++++++++++ 19 files changed, 455 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 8d96dfa444b59df7fe7e2dea4b588f66052cb167 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 24 18:32:22 2016 +0100 Add license headers --- .../entities/data/SpeciesBatchFrequencys.java | 24 ++++++++++++++++++++++ .../CalcifiedPiecesSamplingDefinitions.java | 24 ++++++++++++++++++++++ .../entities/protocol/MaturityCaracteristics.java | 24 ++++++++++++++++++++++ .../persistence/entities/protocol/ZoneBean.java | 24 ++++++++++++++++++++++ .../tutti/persistence/entities/protocol/Zones.java | 24 ++++++++++++++++++++++ .../entities/referential/TuttiLocationBean.java | 24 ++++++++++++++++++++++ .../samplingCache/CruiseSamplingCacheLoader.java | 24 ++++++++++++++++++++++ .../samplingCache/CruiseSamplingInternalCache.java | 24 ++++++++++++++++++++++ .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ .../SamplingCodeCellRenderer.java | 24 ++++++++++++++++++++++ .../catches/species/BenthosBatchUISupportImpl.java | 24 ++++++++++++++++++++++ .../species/EditSpeciesBatchPanelUIHandler.java | 24 ++++++++++++++++++++++ .../species/EditSpeciesBatchPanelUIModel.java | 24 ++++++++++++++++++++++ .../catches/species/SpeciesBatchUISupportImpl.java | 24 ++++++++++++++++++++++ .../species/SpeciesOrBenthosBatchUISupport.java | 24 ++++++++++++++++++++++ .../frequency/IndividualObservationUICache.java | 24 ++++++++++++++++++++++ .../frequency/actions/DeleteSampleCodeAction.java | 24 ++++++++++++++++++++++ .../actions/EditMaturityCaracteristicAction.java | 24 ++++++++++++++++++++++ .../EditMaturityCaracteristicPopupUIModel.java | 24 ++++++++++++++++++++++ 19 files changed, 455 insertions(+) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesBatchFrequencys.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesBatchFrequencys.java index 34ab58a..8b4902e 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesBatchFrequencys.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesBatchFrequencys.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.entities.data; +/* + * #%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% + */ + public class SpeciesBatchFrequencys extends AbstractSpeciesBatchFrequencys { public static SpeciesBatchFrequency newBenthosBatchFrequency() { SpeciesBatchFrequency speciesBatchFrequency = newSpeciesBatchFrequency(); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/CalcifiedPiecesSamplingDefinitions.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/CalcifiedPiecesSamplingDefinitions.java index a4cd053..a3571ce 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/CalcifiedPiecesSamplingDefinitions.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/CalcifiedPiecesSamplingDefinitions.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.entities.protocol; +/* + * #%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% + */ + public class CalcifiedPiecesSamplingDefinitions extends AbstractCalcifiedPiecesSamplingDefinitions { public static boolean isOperationValueUpperMax(CalcifiedPiecesSamplingDefinition cpsDef, int value) { diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/MaturityCaracteristics.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/MaturityCaracteristics.java index c43f284..a28fa0c 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/MaturityCaracteristics.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/MaturityCaracteristics.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.entities.protocol; +/* + * #%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 javax.annotation.Generated; @Generated(value = "org.nuiton.eugene.java.SimpleJavaBeanTransformer", date = "Wed Mar 23 10:50:48 CET 2016") diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/ZoneBean.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/ZoneBean.java index b14857b..a76a75d 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/ZoneBean.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/ZoneBean.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.entities.protocol; +/* + * #%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 ZoneBean extends AbstractZoneBean { diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/Zones.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/Zones.java index 21a1764..31004b9 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/Zones.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/Zones.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.entities.protocol; +/* + * #%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.collect.ImmutableSet; public class Zones extends AbstractZones { diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TuttiLocationBean.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TuttiLocationBean.java index 8aa8bbf..e493133 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TuttiLocationBean.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TuttiLocationBean.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 TuttiLocationBean extends AbstractTuttiLocationBean { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/samplingCache/CruiseSamplingCacheLoader.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/samplingCache/CruiseSamplingCacheLoader.java index 44354f5..330d15f 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/samplingCache/CruiseSamplingCacheLoader.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/samplingCache/CruiseSamplingCacheLoader.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.samplingCache; +/* + * #%L + * Tutti :: Service + * $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.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.IndividualObservationBatch; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/samplingCache/CruiseSamplingInternalCache.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/samplingCache/CruiseSamplingInternalCache.java index 4e3a2e4..858c3cf 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/samplingCache/CruiseSamplingInternalCache.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/samplingCache/CruiseSamplingInternalCache.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.samplingCache; +/* + * #%L + * Tutti :: Service + * $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.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; import org.apache.commons.lang3.mutable.MutableInt; 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 7393967..d4a116c 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 22 13:24:39 CET 2016 tutti.config.help=config.html diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/SamplingCodeCellRenderer.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/SamplingCodeCellRenderer.java index 36caba8..e1832c4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/SamplingCodeCellRenderer.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/SamplingCodeCellRenderer.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation; +/* + * #%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 org.apache.commons.lang3.StringUtils; import javax.swing.JTable; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/BenthosBatchUISupportImpl.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/BenthosBatchUISupportImpl.java index 901bb39..6507ca1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/BenthosBatchUISupportImpl.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/BenthosBatchUISupportImpl.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species; +/* + * #%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 com.google.common.collect.ImmutableMap; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/EditSpeciesBatchPanelUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/EditSpeciesBatchPanelUIHandler.java index 8a7421c..2e98a91 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/EditSpeciesBatchPanelUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/EditSpeciesBatchPanelUIHandler.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species; +/* + * #%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.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.SpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.SpeciesBatchTableModel; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/EditSpeciesBatchPanelUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/EditSpeciesBatchPanelUIModel.java index 71eaeb2..30f809d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/EditSpeciesBatchPanelUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/EditSpeciesBatchPanelUIModel.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species; +/* + * #%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.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUISupportImpl.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUISupportImpl.java index a662f52..1144556 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUISupportImpl.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUISupportImpl.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species; +/* + * #%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 com.google.common.collect.ImmutableMap; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesOrBenthosBatchUISupport.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesOrBenthosBatchUISupport.java index f2cb397..a34a055 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesOrBenthosBatchUISupport.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesOrBenthosBatchUISupport.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species; +/* + * #%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.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationUICache.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationUICache.java index 80447c6..e4a8f0d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationUICache.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationUICache.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency; +/* + * #%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.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.protocol.CalcifiedPiecesSamplingDefinition; import fr.ifremer.tutti.persistence.entities.protocol.CalcifiedPiecesSamplingDefinitions; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteSampleCodeAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteSampleCodeAction.java index 3002237..b76840f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteSampleCodeAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteSampleCodeAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.actions; +/* + * #%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.content.operation.catches.individualobservation.IndividualObservationBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.IndividualObservationBatchTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUI; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/EditMaturityCaracteristicAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/EditMaturityCaracteristicAction.java index 77acba6..a17fea4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/EditMaturityCaracteristicAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/EditMaturityCaracteristicAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.protocol.actions; +/* + * #%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.persistence.entities.protocol.MaturityCaracteristic; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUI; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/maturity/EditMaturityCaracteristicPopupUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/maturity/EditMaturityCaracteristicPopupUIModel.java index 7c57f15..d7ce290 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/maturity/EditMaturityCaracteristicPopupUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/maturity/EditMaturityCaracteristicPopupUIModel.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.protocol.maturity; +/* + * #%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.persistence.entities.referential.CaracteristicQualitativeValue; import org.jdesktop.beans.AbstractSerializableBean; -- 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 75354078b5cc785a53d029369e3f48c19d9f017c Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 24 18:34:04 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.5-beta-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 20c425e..52fbabb 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.5-beta-2-SNAPSHOT</version> + <version>4.5-beta-2</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 6e0104a..088e6f0 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-beta-2-SNAPSHOT</version> + <version>4.5-beta-2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 29101af..f1ccd80 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-beta-2-SNAPSHOT</version> + <version>4.5-beta-2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index cf6a2b3..69b6788 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-beta-2-SNAPSHOT</version> + <version>4.5-beta-2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index c91ab55..13a4f38 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-beta-2-SNAPSHOT</version> + <version>4.5-beta-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 7ba4dcb..a58197b 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-beta-2-SNAPSHOT</version> + <version>4.5-beta-2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 88aab8d..989859a 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-beta-2-SNAPSHOT</version> + <version>4.5-beta-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 https://gitlab.nuiton.org/codelutin/tutti.git commit 4011d576d1230a885446b5d8678cfa981f1a294b Merge: 7503a9b 7535407 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 24 18:34:44 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.5-beta-2' into 'master' .gitignore | 1 + README.md | 9 +- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 8 + .../fr/ifremer/tutti/TuttiConfigurationOption.java | 17 + .../tutti/persistence/TuttiPersistenceImpl.java | 43 +- .../persistence/TuttiPersistenceNoDbImpl.java | 41 +- .../persistence/entities/CaracteristicMap.java | 24 + .../persistence/entities/TuttiEntityBean.java | 9 +- .../entities/data/SpeciesAbleBatchs.java | 142 -- .../entities/data/SpeciesBatchFrequencys.java | 24 +- .../persistence/entities/data/SpeciesBatchs.java | 73 + .../CalcifiedPiecesSamplingDefinitionBean.java | 30 +- ...ava => CalcifiedPiecesSamplingDefinitions.java} | 25 +- .../entities/protocol/MaturityCaracteristics.java | 25 +- .../entities/protocol/TuttiProtocols.java | 1 + .../persistence/entities/protocol/ZoneBean.java | 24 +- .../tutti/persistence/entities/protocol/Zones.java | 29 +- .../entities/referential/TaxonCache.java | 16 +- .../entities/referential/TuttiLocationBean.java | 25 +- .../service/BenthosBatchPersistenceService.java | 48 +- .../BenthosBatchPersistenceServiceImpl.java | 658 +++++---- .../service/CatchBatchPersistenceServiceImpl.java | 2 +- ...dualObservationBatchPersistenceServiceImpl.java | 10 +- .../MarineLitterBatchPersistenceServiceImpl.java | 24 +- .../service/ProtocolPersistenceServiceImpl.java | 34 +- .../service/SpeciesBatchPersistenceService.java | 9 + .../SpeciesBatchPersistenceServiceImpl.java | 700 +++++----- .../SpeciesBatchPersistenceServiceSupport.java | 938 +++++++++++++ .../batch/ScientificCruiseCatchBatchValidator.java | 16 +- .../service/batch/TuttiCatchBatchValidator.java | 3 +- .../CaracteristicPersistenceService.java | 11 +- .../CaracteristicPersistenceServiceImpl.java | 19 +- .../referential/LocationPersistenceService.java | 10 + .../LocationPersistenceServiceImpl.java | 30 + .../referential/SpeciesPersistenceServiceImpl.java | 4 + .../service/util/BatchPersistenceHelper.java | 1281 +++++++++-------- .../persistence/service/util/BatchTreeHelper.java | 713 ---------- .../service/util/tree/BatchTreeHelper.java | 330 +++++ .../service/util/tree/BatchTreeHelperSupport.java | 365 +++++ .../service/util/tree/BenthosBatchTreeHelper.java | 25 +- .../service/util/tree/SpeciesBatchTreeHelper.java | 25 +- .../util/tree/SpeciesBatchTreeHelperSupport.java | 424 ++++++ .../main/java/fr/ifremer/tutti/util/Weights.java | 2 +- .../i18n/tutti-persistence_en_GB.properties | 2 + .../i18n/tutti-persistence_fr_FR.properties | 2 + .../src/main/xmi/tutti-persistence.properties | 3 +- .../src/main/xmi/tutti-persistence.zargo | Bin 65155 -> 59750 bytes .../BenthosBatchPersistenceServiceReadTest.java | 11 +- .../BenthosBatchPersistenceServiceWriteTest.java | 94 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../fr/ifremer/tutti/service/DecoratorService.java | 11 +- .../ifremer/tutti/service/PersistenceService.java | 218 ++- .../fr/ifremer/tutti/service/TuttiDataContext.java | 85 +- .../ifremer/tutti/service/ValidationService.java | 9 +- .../catches/ValidateCruiseOperationsService.java | 45 +- .../service/catches/WeightCleaningService.java | 78 +- .../service/catches/WeightComputingService.java | 40 +- .../catches/multipost/MultiPostExportContext.java | 10 +- .../catches/multipost/MultiPostExportService.java | 38 +- .../catches/multipost/MultiPostImportService.java | 152 +- .../tutti/service/export/ExportBatchEntry.java | 8 +- .../tutti/service/export/ExportCatchContext.java | 48 +- .../export/pdf/CatchesPdfExportService.java | 4 +- .../ToConfirmReportFishingOperationData.java | 9 +- .../toconfirmreport/ToConfirmReportService.java | 10 +- .../GenericFormatCheckDataService.java | 3 +- .../genericformat/GenericFormatContextSupport.java | 1 - .../GenericFormatExportOperationContext.java | 11 +- .../GenericFormatImportOperationContext.java | 38 +- .../GenericformatImportPersistenceHelper.java | 10 +- .../consumer/CsvConsumerForCatch.java | 28 +- .../tutti/service/genericformat/csv/CatchRow.java | 4 +- .../exportactions/CreateCatchBatchRowsAction.java | 5 +- .../importactions/ImportCatchAction.java | 26 +- .../producer/CsvProducerForCatch.java | 22 +- .../producer/CsvProducerForSpecies.java | 5 +- .../service/samplingCache/CruiseSamplingCache.java | 532 +++++-- .../samplingCache/CruiseSamplingCacheLoader.java | 147 ++ .../samplingCache/CruiseSamplingInternalCache.java | 148 ++ .../data/BenthosBatch-edit-error-validation.xml | 53 - .../tutti/service/BeanValidatorDetectorTest.java | 5 +- .../tutti/service/PersistenceServiceTest.java | 22 +- .../service/bigfin/BigfinImportService2Test.java | 10 +- .../service/bigfin/BigfinImportServiceTest.java | 7 +- .../catches/WeightComputingServiceTest.java | 17 +- .../multipost/MultiPostImportServiceTest.java | 2 +- .../psionimport/PsionImportServiceTest.java | 7 +- .../pupitri/PupitriImportServiceEvo6116Test.java | 17 +- .../pupitri/PupitriImportServiceEvo6149Test.java | 11 +- .../pupitri/PupitriImportServiceEvo6592Test.java | 11 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../src/main/filtered-resources/log4j.properties | 5 +- .../filtered-resources/tutti-help-fr.properties | 5 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 24 +- .../tutti/ui/swing/content/MainUIHandler.java | 57 +- .../actions/AbstractChangeScreenAction.java | 9 +- .../EditCatchesForSelectedCruiseAction.java | 55 +- .../EditCatchesSupportAction.java} | 71 +- .../swing/content/config/TuttiConfigUIHandler.java | 6 + .../content/home/actions/EditCatchesAction.java | 56 +- .../operation/FishingOperationsUIHandler.java | 20 +- .../catches/AbstractTuttiBatchUIModel.java | 93 +- .../content/operation/catches/EditCatchesUI.jaxx | 103 +- .../content/operation/catches/EditCatchesUI.jcss | 20 - .../operation/catches/EditCatchesUIHandler.java | 381 +++-- .../catches/MultiPostImportLogDialog.jcss | 2 +- .../catches/actions/CleanBatchWeightsAction.java | 15 +- .../catches/actions/ComputeBatchWeightsAction.java | 225 +-- .../ExportFishingOperationForSumatraAction.java | 29 +- .../ExportFishingOperationReportAction.java | 19 +- .../MultiPostImportLogCloseDialogAction.java | 2 +- .../catches/actions/SaveCatchBatchAction.java | 24 +- .../catches/benthos/BenthosBatchRowModel.java | 667 --------- .../catches/benthos/BenthosBatchTableModel.java | 429 ------ .../operation/catches/benthos/BenthosBatchUI.jaxx | 178 --- .../operation/catches/benthos/BenthosBatchUI.jcss | 339 ----- .../catches/benthos/BenthosBatchUIHandler.java | 1456 -------------------- .../catches/benthos/BenthosBatchUIModel.java | 488 ------- .../ChangeBenthosBatchSampleCategoryAction.java | 205 --- .../benthos/actions/CreateBenthosMelagAction.java | 249 ---- .../actions/ExportMultiPostBenthosAction.java | 78 -- .../actions/ImportMultiPostBenthosAction.java | 111 -- .../OpenAddBenthosBatchSampleCategoryUIAction.java | 107 -- .../actions/OpenCreateBenthosBatchUIAction.java | 57 - .../OpenEditBenthosBatchFrequencyUIAction.java | 70 - .../actions/OpenSplitBenthosBatchUIAction.java | 122 -- .../benthos/actions/RemoveBenthosBatchAction.java | 181 --- .../actions/RemoveBenthosSubBatchAction.java | 138 -- .../benthos/actions/RenameBenthosBatchAction.java | 149 -- .../benthos/create/CreateBenthosBatchUI.jaxx | 185 --- .../benthos/create/CreateBenthosBatchUI.jcss | 218 --- .../create/CreateBenthosBatchUIHandler.java | 535 ------- .../benthos/create/CreateBenthosBatchUIModel.java | 358 ----- .../actions/CreateBenthosBatchAndCloseAction.java | 64 - .../CreateBenthosBatchAndContinueAction.java | 66 - .../CreateBenthosBatchAndFrequenciesAction.java | 78 -- .../actions/CreateBenthosBatchCancelAction.java | 59 - .../SelectSpeciesForBenthosBatchAction.java | 117 -- .../frequency/BenthosFrequencyCellComponent.java | 370 ----- .../BenthosFrequencyLogCellComponent.java | 156 --- .../frequency/BenthosFrequencyLogRowModel.java | 70 - .../frequency/BenthosFrequencyLogsTableModel.java | 57 - .../frequency/BenthosFrequencyRowModel.java | 240 ---- .../frequency/BenthosFrequencyTableModel.java | 318 ----- .../benthos/frequency/BenthosFrequencyUI.jaxx | 240 ---- .../benthos/frequency/BenthosFrequencyUI.jcss | 326 ----- .../frequency/BenthosFrequencyUIHandler.java | 639 --------- .../benthos/frequency/BenthosFrequencyUIModel.java | 613 -------- .../frequency/BenthosFrequencyUIModelCache.java | 156 --- ...thosFrequencyLengthStepCaracteristicAction.java | 99 -- .../actions/ApplyBenthosFrequencyRafaleAction.java | 130 -- .../actions/CancelEditBenthosFrequencyAction.java | 73 - .../DeleteBenthosFrequencyLogRowAction.java | 98 -- .../GenerateBenthosFrequencyLengthStepsAction.java | 102 -- .../actions/ResetBenthosFrequencyAction.java | 67 - .../SaveAndCloseBenthosFrequencyAction.java | 79 -- .../SaveAndContinueBenthosFrequencyAction.java | 73 - .../frequency/actions/SaveSupportAction.java | 129 -- .../benthos/split/SplitBenthosBatchRowModel.java | 151 -- .../benthos/split/SplitBenthosBatchTableModel.java | 106 -- .../catches/benthos/split/SplitBenthosBatchUI.jaxx | 115 -- .../catches/benthos/split/SplitBenthosBatchUI.jcss | 96 -- .../benthos/split/SplitBenthosBatchUIHandler.java | 487 ------- .../benthos/split/SplitBenthosBatchUIModel.java | 174 --- .../actions/SplitBenthosBatchCancelAction.java | 58 - .../split/actions/SplitBenthosBatchSaveAction.java | 79 -- .../IndividualObservationBatchRowModel.java | 116 +- .../IndividualObservationBatchTableModel.java | 33 + .../SampleCodeEditionPopupUI.jaxx} | 40 +- .../SampleCodeEditionPopupUI.jcss} | 40 +- .../SampleCodeEditionPopupUIHandler.java | 90 ++ .../SampleCodeEditionPopupUIModel.java | 75 + .../SamplingCodeCellEditor.java | 157 +++ .../SamplingCodeCellRenderer.java | 75 + .../catches/species/BenthosBatchUISupportImpl.java | 272 ++++ .../catches/species/EditSpeciesBatchPanelUI.jaxx | 98 ++ .../EditSpeciesBatchPanelUI.jcss} | 22 +- .../species/EditSpeciesBatchPanelUIHandler.java | 181 +++ ...tion.java => EditSpeciesBatchPanelUIModel.java} | 32 +- .../{ => species}/SelectedCategoryAble.java | 2 +- .../catches/species/SpeciesBatchUISupportImpl.java | 272 ++++ .../species/SpeciesOrBenthosBatchUISupport.java | 165 +++ .../species/create/CreateSpeciesBatchUI.jaxx | 9 +- .../create/CreateSpeciesBatchUIHandler.java | 92 +- .../species/create/CreateSpeciesBatchUIModel.java | 13 +- .../actions/CreateSpeciesBatchAndCloseAction.java | 6 +- .../CreateSpeciesBatchAndContinueAction.java | 12 +- .../CreateSpeciesBatchAndFrequenciesAction.java | 10 +- .../SelectSpeciesForSpeciesBatchAction.java | 10 +- .../ImportPupitriMelagWeightPopupUI.jaxx | 0 .../ImportPupitriMelagWeightPopupUI.jcss | 2 +- .../ImportPupitriMelagWeightPopupUIHandler.java | 2 +- .../ImportPupitriMelagWeightPopupUIModel.java | 2 +- .../species/{ => edit}/ImportPupitriPopupUI.jaxx | 0 .../species/{ => edit}/ImportPupitriPopupUI.jcss | 4 +- .../{ => edit}/ImportPupitriPopupUIHandler.java | 2 +- .../{ => edit}/ImportPupitriPopupUIModel.java | 2 +- .../{ => species/edit}/SampleCategoryAble.java | 2 +- .../edit}/SampleCategoryColumnIdentifier.java | 28 +- .../edit}/SampleCategoryComponent.java | 2 +- .../{ => species/edit}/SpeciesBatchDecorator.java | 16 +- .../edit}/SpeciesBatchDecoratorComparator.java | 8 +- .../edit}/SpeciesBatchNaturalOrderComparator.java | 18 +- .../edit/SpeciesBatchRowHelper.java} | 60 +- .../species/{ => edit}/SpeciesBatchRowModel.java | 13 +- .../species/{ => edit}/SpeciesBatchTableModel.java | 18 +- .../catches/species/{ => edit}/SpeciesBatchUI.jaxx | 52 +- .../catches/species/{ => edit}/SpeciesBatchUI.jcss | 105 +- .../species/{ => edit}/SpeciesBatchUIHandler.java | 101 +- .../species/{ => edit}/SpeciesBatchUIModel.java | 209 +-- .../{ => species/edit}/SpeciesSortMode.java | 2 +- .../edit}/SpeciesSortableRowModel.java | 2 +- .../catches/{ => species/edit}/TableViewMode.java | 2 +- .../ChangeSpeciesBatchSampleCategoryAction.java | 40 +- .../actions/CreateSpeciesMelagAction.java | 18 +- .../actions/ExportMultiPostSpeciesFullAction.java | 10 +- ...xportMultiPostSpeciesOnlyFrequenciesAction.java | 10 +- ...ostSpeciesOnlyIndividualObservationsAction.java | 10 +- .../{ => edit}/actions/ImportBigfinAction.java | 16 +- .../actions/ImportMultiPostSpeciesFullAction.java | 4 +- ...mportMultiPostSpeciesOnlyFrequenciesAction.java | 4 +- ...ostSpeciesOnlyIndividualObservationsAction.java | 4 +- .../ImportMultiPostSpeciesSupportAction.java | 14 +- .../{ => edit}/actions/ImportPsionAction.java | 26 +- .../{ => edit}/actions/ImportPupitriAction.java | 31 +- ...mportPupitriMelagWeightPopupValidateAction.java | 4 +- .../actions/ImportPupitriPopupCancelAction.java | 4 +- .../actions/ImportPupitriPopupValidateAction.java | 4 +- .../OpenAddSpeciesBatchSampleCategoryUIAction.java | 23 +- .../actions/OpenCreateSpeciesBatchUIAction.java | 13 +- .../OpenEditSpeciesBatchFrequencyUIAction.java | 12 +- .../actions/OpenSplitSpeciesBatchUIAction.java | 25 +- .../actions/RemoveSpeciesBatchAction.java | 25 +- .../actions/RemoveSpeciesSubBatchAction.java | 25 +- .../actions/RenameSpeciesBatchAction.java | 18 +- .../frequency}/FrequencyConfigurationMode.java | 2 +- .../frequency/IndividualObservationUICache.java | 329 +++++ .../frequency/SpeciesFrequencyCellComponent.java | 26 +- .../frequency/SpeciesFrequencyRowModel.java | 10 + .../species/frequency/SpeciesFrequencyUI.jaxx | 12 +- .../species/frequency/SpeciesFrequencyUI.jcss | 19 + .../frequency/SpeciesFrequencyUIHandler.java | 336 +++-- .../species/frequency/SpeciesFrequencyUIModel.java | 33 +- ...ciesFrequencyLengthStepCaracteristicAction.java | 4 +- .../actions/ApplySpeciesFrequencyRafaleAction.java | 4 +- .../actions/CancelEditSpeciesFrequencyAction.java | 35 +- .../frequency/actions/DeleteSampleCodeAction.java | 66 + .../frequency/actions/EditSampleCodeAction.java | 60 + .../actions/ExportMultiPostSpeciesFullAction.java | 19 +- ...xportMultiPostSpeciesOnlyFrequenciesAction.java | 18 +- ...ostSpeciesOnlyIndividualObservationsAction.java | 18 +- ...va => ExportMultiPostSpeciesSupportAction.java} | 37 +- .../GenerateSpeciesFrequencyLengthStepsAction.java | 8 +- .../ImportMultiPostSpeciesSupportAction.java | 7 +- .../frequency/actions/RemoveObservationAction.java | 5 +- .../actions/ResetSpeciesFrequencyAction.java | 11 +- .../frequency/actions/SaveSupportAction.java | 4 +- .../species/split/SplitSpeciesBatchTableModel.java | 24 +- .../catches/species/split/SplitSpeciesBatchUI.jaxx | 8 +- .../species/split/SplitSpeciesBatchUIHandler.java | 102 +- .../species/split/SplitSpeciesBatchUIModel.java | 4 +- .../split/actions/SplitSpeciesBatchSaveAction.java | 33 +- .../actions/EditFishingOperationAction.java | 9 +- .../ui/swing/content/protocol/EditProtocolUI.jaxx | 3 + .../ui/swing/content/protocol/EditProtocolUI.jcss | 10 + .../content/protocol/EditProtocolUIHandler.java | 349 ++++- .../content/protocol/EditProtocolUIModel.java | 410 +++--- .../actions/EditMaturityCaracteristicAction.java | 72 + .../maturity/EditMaturityCaracteristicPopupUI.jaxx | 80 ++ .../EditMaturityCaracteristicPopupUI.jcss} | 40 +- .../EditMaturityCaracteristicPopupUIHandler.java | 146 ++ .../EditMaturityCaracteristicPopupUIModel.java | 123 ++ .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 9 +- .../swing/content/protocol/zones/ZoneEditorUI.jcss | 8 + .../protocol/zones/ZoneEditorUIHandler.java | 274 +--- .../protocol/zones/actions/AddStratasAction.java | 115 +- .../protocol/zones/actions/CreateZoneAction.java | 19 +- .../protocol/zones/actions/DeleteZoneAction.java | 35 +- .../zones/actions/RemoveStratasAction.java | 99 +- .../protocol/zones/actions/RenameZoneAction.java | 24 +- .../protocol/zones/models/StrataUIModel.java | 249 ---- .../protocol/zones/models/SubStrataUIModel.java | 146 -- .../content/protocol/zones/models/ZoneUIModel.java | 228 --- ...ataNode.java => AvailableStratasTreeModel.java} | 20 +- .../protocol/zones/tree/StratasTreeModel.java | 153 -- .../protocol/zones/tree/ZoneEditorNode.java | 70 - .../zones/tree/ZoneEditorTreeCellRenderer.java | 16 +- .../zones/tree/ZoneEditorTreeModelSupport.java | 199 +++ .../protocol/zones/tree/ZonesTreeModel.java | 187 +-- .../protocol/zones/tree/node/StrataNode.java | 69 + .../SubStrataNode.java} | 34 +- .../zones/tree/node/ZoneEditorNodeSupport.java | 94 ++ .../content/protocol/zones/tree/node/ZoneNode.java | 73 + .../EditFishingOperationInValidationUIAction.java | 32 +- .../tutti/ui/swing/util/TuttiExceptionHandler.java | 4 +- .../util/table/AbstractTuttiTableUIHandler.java | 2 +- ...pleCodeEditionPopupUIModel-error-validation.xml | 18 +- ...ualObservationBatchUIModel-error-validation.xml | 83 -- .../EditProtocolUIModel-error-validation.xml | 13 +- ...CaracteristicPopupUIModel-error-validation.xml} | 17 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 31 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 37 +- .../tutti/ui/swing/BeanValidatorDetectorTest.java | 11 +- 308 files changed, 10669 insertions(+), 18496 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 75cf42ce82142a81f0a55544cd9dc149b741db88 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 24 18:34:45 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..52fbabb 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-beta-2</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 13eb09f..088e6f0 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-beta-2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 304969a..f1ccd80 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-beta-2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index fa737a7..69b6788 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-beta-2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 95a7f93..13a4f38 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-beta-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 fe3098a..a58197b 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-beta-2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index a9d5671..989859a 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-beta-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 https://gitlab.nuiton.org/codelutin/tutti.git commit 0ac0949d0868532ff448f148534a7fcee9a9cd77 Merge: 75cf42c 4011d57 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 24 18:34:45 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' .../entities/data/SpeciesBatchFrequencys.java | 24 ++++++++++++++++++++++ .../CalcifiedPiecesSamplingDefinitions.java | 24 ++++++++++++++++++++++ .../entities/protocol/MaturityCaracteristics.java | 24 ++++++++++++++++++++++ .../persistence/entities/protocol/ZoneBean.java | 24 ++++++++++++++++++++++ .../tutti/persistence/entities/protocol/Zones.java | 24 ++++++++++++++++++++++ .../entities/referential/TuttiLocationBean.java | 24 ++++++++++++++++++++++ .../samplingCache/CruiseSamplingCacheLoader.java | 24 ++++++++++++++++++++++ .../samplingCache/CruiseSamplingInternalCache.java | 24 ++++++++++++++++++++++ .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ .../SamplingCodeCellRenderer.java | 24 ++++++++++++++++++++++ .../catches/species/BenthosBatchUISupportImpl.java | 24 ++++++++++++++++++++++ .../species/EditSpeciesBatchPanelUIHandler.java | 24 ++++++++++++++++++++++ .../species/EditSpeciesBatchPanelUIModel.java | 24 ++++++++++++++++++++++ .../catches/species/SpeciesBatchUISupportImpl.java | 24 ++++++++++++++++++++++ .../species/SpeciesOrBenthosBatchUISupport.java | 24 ++++++++++++++++++++++ .../frequency/IndividualObservationUICache.java | 24 ++++++++++++++++++++++ .../frequency/actions/DeleteSampleCodeAction.java | 24 ++++++++++++++++++++++ .../actions/EditMaturityCaracteristicAction.java | 24 ++++++++++++++++++++++ .../EditMaturityCaracteristicPopupUIModel.java | 24 ++++++++++++++++++++++ 19 files changed, 455 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 ec4489e76bc56583ed896f0d82b3d281bdd8e761 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 24 18:34:46 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 52fbabb..1f59bad 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.5-beta-2</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 088e6f0..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-beta-2</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 f1ccd80..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-beta-2</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 69b6788..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-beta-2</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 13a4f38..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-beta-2</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 a58197b..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-beta-2</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 989859a..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-beta-2</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