branch develop updated (17b3b9c -> 9c3f1bd)
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 17b3b9c refs #6822 , mieux gérer les fichiers non importés new b05a6ba [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 6cddf72 [jgitflow-maven-plugin]updating poms for branch '3.14.3' with snapshot versions new eb3e8a2 prepare release new 6adb3a8 [jgitflow-maven-plugin]updating poms for branch'release/3.14.3' with non-snapshot versions new 8bc5347 Merge branch 'release/3.14.3' new 24dcf52 Merge branch 'master' into develop new 9c3f1bd [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 9c3f1bd3fae02eae11ca9acd1835648f4d576920 Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 2 18:02:51 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 24dcf521e257b19ee69d33ff25c2f41f7ca1eda5 Merge: b05a6ba 8bc5347 Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 2 18:02:50 2015 +0000 Merge branch 'master' into develop commit b05a6ba20bc289f1dd0611672e1f4dd77a84794b Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 2 18:02:49 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 8bc5347cd2edd4c0eeae9b1d983f88bfd15c91f5 Merge: d6c044c 6adb3a8 Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 2 18:02:43 2015 +0000 Merge branch 'release/3.14.3' commit 6adb3a84ecba79fe19fd70e06c6aa6ef5081d2d3 Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 2 17:57:43 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.14.3' with non-snapshot versions commit eb3e8a210cc4c52fb15be83ec516ed7dd099064e Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 2 17:57:25 2015 +0000 prepare release Summary of changes: .../tutti/persistence/model/CruiseDataModel.java | 24 +++++++++++++++++++++ .../tutti/persistence/model/DataModelSupport.java | 24 +++++++++++++++++++++ .../persistence/model/OperationDataModel.java | 24 +++++++++++++++++++++ .../tutti/persistence/model/ProgramDataModel.java | 24 +++++++++++++++++++++ .../referential/CouldNotLoadTaxonException.java | 24 +++++++++++++++++++++ .../GenericFormatCheckDataService.java | 24 +++++++++++++++++++++ .../GenericFormatExportActionEngine.java | 24 +++++++++++++++++++++ .../GenericFormatExportConfiguration.java | 24 +++++++++++++++++++++ .../GenericFormatExportCruiseContext.java | 24 +++++++++++++++++++++ .../genericformat/GenericFormatExportRequest.java | 24 +++++++++++++++++++++ .../genericformat/GenericFormatExportResult.java | 24 +++++++++++++++++++++ .../consumer/CsvConsumerForAttachment.java | 24 +++++++++++++++++++++ .../service/genericformat/csv/AttachmentModel.java | 24 +++++++++++++++++++++ .../service/genericformat/csv/AttachmentRow.java | 24 +++++++++++++++++++++ .../exportactions/CheckDataAction.java | 24 +++++++++++++++++++++ .../CreateAccidentalCatchRowsAction.java | 24 +++++++++++++++++++++ .../exportactions/CreateCatchBatchRowsAction.java | 24 +++++++++++++++++++++ .../CreateIndividualObservationRowsAction.java | 24 +++++++++++++++++++++ .../CreateMarineLitterRowsAction.java | 24 +++++++++++++++++++++ .../exportactions/CreateOperationRowsAction.java | 24 +++++++++++++++++++++ .../exportactions/CreateParameterRowsAction.java | 24 +++++++++++++++++++++ .../exportactions/ExportCruiseActionSupport.java | 24 +++++++++++++++++++++ .../ExportFishingOperationActionSupport.java | 24 +++++++++++++++++++++ .../ExportGearCaracteristicAction.java | 24 +++++++++++++++++++++ .../exportactions/ExportProtocolAction.java | 24 +++++++++++++++++++++ .../exportactions/ExportReferentialGearAction.java | 24 +++++++++++++++++++++ .../ExportReferentialPersonAction.java | 24 +++++++++++++++++++++ .../ExportReferentialSpeciesAction.java | 24 +++++++++++++++++++++ .../ExportReferentialVesselAction.java | 24 +++++++++++++++++++++ .../ExportSampleCategoryModelAction.java | 24 +++++++++++++++++++++ .../exportactions/ExportSpeciesUsedAction.java | 24 +++++++++++++++++++++ .../exportactions/ExportSurveyAction.java | 24 +++++++++++++++++++++ .../ExportTechnicalActionSupport.java | 24 +++++++++++++++++++++ .../exportactions/FinalizeExportAction.java | 24 +++++++++++++++++++++ .../exportactions/FlushOperationAction.java | 24 +++++++++++++++++++++ .../exportactions/GenerateExportArchiveAction.java | 24 +++++++++++++++++++++ .../exportactions/LoadDataAction.java | 24 +++++++++++++++++++++ .../importactions/LoadAttachmentsAction.java | 24 +++++++++++++++++++++ .../producer/CsvProducerForAttachment.java | 24 +++++++++++++++++++++ .../genericformat/GenericFormatArchiveTest.java | 24 +++++++++++++++++++++ .../filtered-resources/tutti-help-fr.properties | 23 ++++++++++++++++++++ tutti-ui-swing/src/main/help/fr/config.html | Bin 14500 -> 15560 bytes .../src/main/help/fr/editFishingOperation.html | Bin 131676 -> 135058 bytes tutti-ui-swing/src/main/help/fr/editProtocol.html | Bin 20026 -> 21122 bytes .../src/main/help/fr/editSampleCategory.html | Bin 6430 -> 7262 bytes tutti-ui-swing/src/main/help/fr/faq.html | Bin 28628 -> 29980 bytes .../main/help/fr/manageTemporaryReferential.html | Bin 9702 -> 10688 bytes tutti-ui-swing/src/main/help/fr/report.html | Bin 5298 -> 6128 bytes tutti-ui-swing/src/main/help/fr/selectCruise.html | Bin 15016 -> 16034 bytes .../actions/OpenGenericFormatExportScreen.java | 24 +++++++++++++++++++++ .../GenericFormatExportUIHandler.java | 24 +++++++++++++++++++++ .../genericformat/GenericFormatExportUIModel.java | 24 +++++++++++++++++++++ .../actions/ExportFoldAllDataAction.java | 24 +++++++++++++++++++++ .../actions/ExportSelectAllDataAction.java | 24 +++++++++++++++++++++ .../actions/ExportUnfoldAllDataAction.java | 24 +++++++++++++++++++++ .../actions/ExportUnselectAllDataAction.java | 24 +++++++++++++++++++++ .../actions/GenericFormatExportAction.java | 24 +++++++++++++++++++++ .../actions/ImportFoldAllDataAction.java | 24 +++++++++++++++++++++ .../actions/ImportSelectAllDataAction.java | 24 +++++++++++++++++++++ .../actions/ImportUnfoldAllDataAction.java | 24 +++++++++++++++++++++ .../actions/ImportUnselectAllDataAction.java | 24 +++++++++++++++++++++ .../genericformat/tree/CruiseSelectTreeNode.java | 24 +++++++++++++++++++++ .../genericformat/tree/DataSelectTreeModel.java | 24 +++++++++++++++++++++ .../tree/DataSelectTreeNodeSupport.java | 24 +++++++++++++++++++++ .../tree/ExportDataSelectTreeCellRenderer.java | 24 +++++++++++++++++++++ .../tree/ImportDataSelectTreeCellRenderer.java | 24 +++++++++++++++++++++ .../tree/OperationSelectTreeNode.java | 24 +++++++++++++++++++++ .../genericformat/tree/ProgramSelectTreeNode.java | 24 +++++++++++++++++++++ 68 files changed, 1439 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 eb3e8a210cc4c52fb15be83ec516ed7dd099064e Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 2 17:57:25 2015 +0000 prepare release --- .../tutti/persistence/model/CruiseDataModel.java | 24 +++++++++++++++++++++ .../tutti/persistence/model/DataModelSupport.java | 24 +++++++++++++++++++++ .../persistence/model/OperationDataModel.java | 24 +++++++++++++++++++++ .../tutti/persistence/model/ProgramDataModel.java | 24 +++++++++++++++++++++ .../referential/CouldNotLoadTaxonException.java | 24 +++++++++++++++++++++ .../GenericFormatCheckDataService.java | 24 +++++++++++++++++++++ .../GenericFormatExportActionEngine.java | 24 +++++++++++++++++++++ .../GenericFormatExportConfiguration.java | 24 +++++++++++++++++++++ .../GenericFormatExportCruiseContext.java | 24 +++++++++++++++++++++ .../genericformat/GenericFormatExportRequest.java | 24 +++++++++++++++++++++ .../genericformat/GenericFormatExportResult.java | 24 +++++++++++++++++++++ .../consumer/CsvConsumerForAttachment.java | 24 +++++++++++++++++++++ .../service/genericformat/csv/AttachmentModel.java | 24 +++++++++++++++++++++ .../service/genericformat/csv/AttachmentRow.java | 24 +++++++++++++++++++++ .../exportactions/CheckDataAction.java | 24 +++++++++++++++++++++ .../CreateAccidentalCatchRowsAction.java | 24 +++++++++++++++++++++ .../exportactions/CreateCatchBatchRowsAction.java | 24 +++++++++++++++++++++ .../CreateIndividualObservationRowsAction.java | 24 +++++++++++++++++++++ .../CreateMarineLitterRowsAction.java | 24 +++++++++++++++++++++ .../exportactions/CreateOperationRowsAction.java | 24 +++++++++++++++++++++ .../exportactions/CreateParameterRowsAction.java | 24 +++++++++++++++++++++ .../exportactions/ExportCruiseActionSupport.java | 24 +++++++++++++++++++++ .../ExportFishingOperationActionSupport.java | 24 +++++++++++++++++++++ .../ExportGearCaracteristicAction.java | 24 +++++++++++++++++++++ .../exportactions/ExportProtocolAction.java | 24 +++++++++++++++++++++ .../exportactions/ExportReferentialGearAction.java | 24 +++++++++++++++++++++ .../ExportReferentialPersonAction.java | 24 +++++++++++++++++++++ .../ExportReferentialSpeciesAction.java | 24 +++++++++++++++++++++ .../ExportReferentialVesselAction.java | 24 +++++++++++++++++++++ .../ExportSampleCategoryModelAction.java | 24 +++++++++++++++++++++ .../exportactions/ExportSpeciesUsedAction.java | 24 +++++++++++++++++++++ .../exportactions/ExportSurveyAction.java | 24 +++++++++++++++++++++ .../ExportTechnicalActionSupport.java | 24 +++++++++++++++++++++ .../exportactions/FinalizeExportAction.java | 24 +++++++++++++++++++++ .../exportactions/FlushOperationAction.java | 24 +++++++++++++++++++++ .../exportactions/GenerateExportArchiveAction.java | 24 +++++++++++++++++++++ .../exportactions/LoadDataAction.java | 24 +++++++++++++++++++++ .../importactions/LoadAttachmentsAction.java | 24 +++++++++++++++++++++ .../producer/CsvProducerForAttachment.java | 24 +++++++++++++++++++++ .../genericformat/GenericFormatArchiveTest.java | 24 +++++++++++++++++++++ .../filtered-resources/tutti-help-fr.properties | 23 ++++++++++++++++++++ tutti-ui-swing/src/main/help/fr/config.html | Bin 14500 -> 15560 bytes .../src/main/help/fr/editFishingOperation.html | Bin 131676 -> 135058 bytes tutti-ui-swing/src/main/help/fr/editProtocol.html | Bin 20026 -> 21122 bytes .../src/main/help/fr/editSampleCategory.html | Bin 6430 -> 7262 bytes tutti-ui-swing/src/main/help/fr/faq.html | Bin 28628 -> 29980 bytes .../main/help/fr/manageTemporaryReferential.html | Bin 9702 -> 10688 bytes tutti-ui-swing/src/main/help/fr/report.html | Bin 5298 -> 6128 bytes tutti-ui-swing/src/main/help/fr/selectCruise.html | Bin 15016 -> 16034 bytes .../actions/OpenGenericFormatExportScreen.java | 24 +++++++++++++++++++++ .../GenericFormatExportUIHandler.java | 24 +++++++++++++++++++++ .../genericformat/GenericFormatExportUIModel.java | 24 +++++++++++++++++++++ .../actions/ExportFoldAllDataAction.java | 24 +++++++++++++++++++++ .../actions/ExportSelectAllDataAction.java | 24 +++++++++++++++++++++ .../actions/ExportUnfoldAllDataAction.java | 24 +++++++++++++++++++++ .../actions/ExportUnselectAllDataAction.java | 24 +++++++++++++++++++++ .../actions/GenericFormatExportAction.java | 24 +++++++++++++++++++++ .../actions/ImportFoldAllDataAction.java | 24 +++++++++++++++++++++ .../actions/ImportSelectAllDataAction.java | 24 +++++++++++++++++++++ .../actions/ImportUnfoldAllDataAction.java | 24 +++++++++++++++++++++ .../actions/ImportUnselectAllDataAction.java | 24 +++++++++++++++++++++ .../genericformat/tree/CruiseSelectTreeNode.java | 24 +++++++++++++++++++++ .../genericformat/tree/DataSelectTreeModel.java | 24 +++++++++++++++++++++ .../tree/DataSelectTreeNodeSupport.java | 24 +++++++++++++++++++++ .../tree/ExportDataSelectTreeCellRenderer.java | 24 +++++++++++++++++++++ .../tree/ImportDataSelectTreeCellRenderer.java | 24 +++++++++++++++++++++ .../tree/OperationSelectTreeNode.java | 24 +++++++++++++++++++++ .../genericformat/tree/ProgramSelectTreeNode.java | 24 +++++++++++++++++++++ 68 files changed, 1439 insertions(+) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/CruiseDataModel.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/CruiseDataModel.java index ba44aa6..e603bc8 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/CruiseDataModel.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/CruiseDataModel.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.model; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.ImmutableSet; import fr.ifremer.tutti.persistence.entities.data.Cruise; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/DataModelSupport.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/DataModelSupport.java index 2fee663..e23880e 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/DataModelSupport.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/DataModelSupport.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.model; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.io.Serializable; /** diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/OperationDataModel.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/OperationDataModel.java index e5e541e..cb86509 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/OperationDataModel.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/OperationDataModel.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.model; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.FishingOperation; /** diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/ProgramDataModel.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/ProgramDataModel.java index 5616868..c2b3913 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/ProgramDataModel.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/ProgramDataModel.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.model; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.ImmutableSet; import fr.ifremer.tutti.persistence.entities.data.Program; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CouldNotLoadTaxonException.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CouldNotLoadTaxonException.java index 19a78e2..10bc9a0 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CouldNotLoadTaxonException.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CouldNotLoadTaxonException.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.nuiton.jaxx.application.ApplicationTechnicalException; /** diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatCheckDataService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatCheckDataService.java index 4e744d4..fdc4217 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatCheckDataService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatCheckDataService.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportActionEngine.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportActionEngine.java index d4cb72d..d374d47 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportActionEngine.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportActionEngine.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiServiceContext; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportConfiguration.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportConfiguration.java index 1c9a50b..c20d9da 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportConfiguration.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportConfiguration.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.model.ProgramDataModel; import java.io.File; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportCruiseContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportCruiseContext.java index 2a0ee5c..5e98d93 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportCruiseContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportCruiseContext.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.ImmutableSet; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportRequest.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportRequest.java index a2c6a39..2352546 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportRequest.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportRequest.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportResult.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportResult.java index fa88bb5..858581f 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportResult.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportResult.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.io.Serializable; import java.util.List; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForAttachment.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForAttachment.java index c0f16a4..9054e7d 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForAttachment.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForAttachment.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.consumer; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.service.csv.CsvComsumer; import fr.ifremer.tutti.service.genericformat.GenericFormatImportEntityParserFactory; import fr.ifremer.tutti.service.genericformat.csv.AttachmentModel; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AttachmentModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AttachmentModel.java index 11c4845..09aa8e8 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AttachmentModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AttachmentModel.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.csv; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.service.csv.AbstractTuttiImportExportModel; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AttachmentRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AttachmentRow.java index abc17e7..39a58fa 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AttachmentRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AttachmentRow.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.csv; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.Attachments; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CheckDataAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CheckDataAction.java index 2ffc165..a0b3301 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CheckDataAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CheckDataAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.exportactions; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateAccidentalCatchRowsAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateAccidentalCatchRowsAction.java index b44964d..09af816 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateAccidentalCatchRowsAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateAccidentalCatchRowsAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.exportactions; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; import fr.ifremer.tutti.persistence.entities.data.Attachment; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateCatchBatchRowsAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateCatchBatchRowsAction.java index 88f15aa..f1fca69 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateCatchBatchRowsAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateCatchBatchRowsAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.exportactions; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateIndividualObservationRowsAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateIndividualObservationRowsAction.java index 17210d6..a025b6c 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateIndividualObservationRowsAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateIndividualObservationRowsAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.exportactions; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.IndividualObservationBatch; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateMarineLitterRowsAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateMarineLitterRowsAction.java index b6a2855..6e3c653 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateMarineLitterRowsAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateMarineLitterRowsAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.exportactions; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateOperationRowsAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateOperationRowsAction.java index 373c863..35ac5ad 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateOperationRowsAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateOperationRowsAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.exportactions; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateParameterRowsAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateParameterRowsAction.java index f5cdec5..137ffd1 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateParameterRowsAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateParameterRowsAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.exportactions; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.genericformat.GenericFormatExportContext; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportCruiseActionSupport.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportCruiseActionSupport.java index 687cb8d..00c3fe9 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportCruiseActionSupport.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportCruiseActionSupport.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.exportactions; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.genericformat.GenericFormatExportContext; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportFishingOperationActionSupport.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportFishingOperationActionSupport.java index 3ee5466..f554ede 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportFishingOperationActionSupport.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportFishingOperationActionSupport.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.exportactions; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.service.genericformat.GenericFormatExportContext; import fr.ifremer.tutti.service.genericformat.GenericFormatExportOperationContext; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportGearCaracteristicAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportGearCaracteristicAction.java index 781ce39..45be2a8 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportGearCaracteristicAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportGearCaracteristicAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.exportactions; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.data.Cruise; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportProtocolAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportProtocolAction.java index da82a62..e4b10f6 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportProtocolAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportProtocolAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.exportactions; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.service.genericformat.GenericFormatExportContext; import fr.ifremer.tutti.service.protocol.ProtocolImportExportService; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportReferentialGearAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportReferentialGearAction.java index 7fdd0e4..41ebe61 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportReferentialGearAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportReferentialGearAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.exportactions; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.service.genericformat.GenericFormatExportContext; import fr.ifremer.tutti.service.referential.ReferentialTemporaryGearService; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportReferentialPersonAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportReferentialPersonAction.java index cd46025..af2f536 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportReferentialPersonAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportReferentialPersonAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.exportactions; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.service.genericformat.GenericFormatExportContext; import fr.ifremer.tutti.service.referential.ReferentialTemporaryPersonService; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportReferentialSpeciesAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportReferentialSpeciesAction.java index 1589175..dc93a52 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportReferentialSpeciesAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportReferentialSpeciesAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.exportactions; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.genericformat.GenericFormatExportContext; import fr.ifremer.tutti.service.referential.ReferentialTemporarySpeciesService; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportReferentialVesselAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportReferentialVesselAction.java index b4a28fb..8213e9b 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportReferentialVesselAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportReferentialVesselAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.exportactions; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.service.genericformat.GenericFormatExportContext; import fr.ifremer.tutti.service.referential.ReferentialTemporaryVesselService; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportSampleCategoryModelAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportSampleCategoryModelAction.java index 08a865b..c1adfb8 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportSampleCategoryModelAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportSampleCategoryModelAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.exportactions; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.service.genericformat.GenericFormatExportContext; import fr.ifremer.tutti.service.genericformat.csv.SampleCategoryRow; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportSpeciesUsedAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportSpeciesUsedAction.java index 02c96b3..9738a46 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportSpeciesUsedAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportSpeciesUsedAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.exportactions; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.service.genericformat.GenericFormatExportContext; import fr.ifremer.tutti.service.genericformat.csv.SpeciesExportRow; import fr.ifremer.tutti.service.genericformat.producer.CsvProducerForSpecies; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportSurveyAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportSurveyAction.java index 1602071..60665d6 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportSurveyAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportSurveyAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.exportactions; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Attachment; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportTechnicalActionSupport.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportTechnicalActionSupport.java index dc1f413..9375926 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportTechnicalActionSupport.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportTechnicalActionSupport.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.exportactions; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.service.genericformat.GenericFormatExportContext; /** diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/FinalizeExportAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/FinalizeExportAction.java index c8f530d..06a69d8 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/FinalizeExportAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/FinalizeExportAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.exportactions; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.service.csv.CsvProducer; import fr.ifremer.tutti.service.genericformat.GenericFormatExportContext; import org.apache.commons.logging.Log; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/FlushOperationAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/FlushOperationAction.java index a226f0e..f0852db 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/FlushOperationAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/FlushOperationAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.exportactions; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.service.genericformat.GenericFormatExportContext; import fr.ifremer.tutti.service.genericformat.GenericFormatExportOperationContext; import org.nuiton.jaxx.application.ApplicationTechnicalException; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/GenerateExportArchiveAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/GenerateExportArchiveAction.java index b88917f..b403bf5 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/GenerateExportArchiveAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/GenerateExportArchiveAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.exportactions; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.service.genericformat.GenericFormatArchive; import fr.ifremer.tutti.service.genericformat.GenericFormatExportContext; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/LoadDataAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/LoadDataAction.java index fa45a02..4ea3c0a 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/LoadDataAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/LoadDataAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.exportactions; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/LoadAttachmentsAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/LoadAttachmentsAction.java index 392a63a..efd09c4 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/LoadAttachmentsAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/LoadAttachmentsAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.importactions; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; import fr.ifremer.tutti.service.genericformat.GenericFormatContextSupport; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForAttachment.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForAttachment.java index 11292e4..88f1beb 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForAttachment.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForAttachment.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.producer; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.service.csv.CsvProducer; import fr.ifremer.tutti.service.genericformat.csv.AttachmentModel; diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatArchiveTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatArchiveTest.java index 0e25f43..f1379ee 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatArchiveTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatArchiveTest.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.junit.Assert; import org.junit.Test; 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 e1be6c2..4eb0123 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 - 2015 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo #Tue Mar 31 13:19:15 CEST 2015 tutti.config.help=config.html diff --git a/tutti-ui-swing/src/main/help/fr/config.html b/tutti-ui-swing/src/main/help/fr/config.html index 1b6dc34..30caf76 100644 Binary files a/tutti-ui-swing/src/main/help/fr/config.html and b/tutti-ui-swing/src/main/help/fr/config.html differ diff --git a/tutti-ui-swing/src/main/help/fr/editFishingOperation.html b/tutti-ui-swing/src/main/help/fr/editFishingOperation.html index 5bad258..3416183 100644 Binary files a/tutti-ui-swing/src/main/help/fr/editFishingOperation.html and b/tutti-ui-swing/src/main/help/fr/editFishingOperation.html differ diff --git a/tutti-ui-swing/src/main/help/fr/editProtocol.html b/tutti-ui-swing/src/main/help/fr/editProtocol.html index 266a848..204b26f 100644 Binary files a/tutti-ui-swing/src/main/help/fr/editProtocol.html and b/tutti-ui-swing/src/main/help/fr/editProtocol.html differ diff --git a/tutti-ui-swing/src/main/help/fr/editSampleCategory.html b/tutti-ui-swing/src/main/help/fr/editSampleCategory.html index 3e8aa27..73d4a2f 100644 Binary files a/tutti-ui-swing/src/main/help/fr/editSampleCategory.html and b/tutti-ui-swing/src/main/help/fr/editSampleCategory.html differ diff --git a/tutti-ui-swing/src/main/help/fr/faq.html b/tutti-ui-swing/src/main/help/fr/faq.html index cdc7d5d..bf419f7 100644 Binary files a/tutti-ui-swing/src/main/help/fr/faq.html and b/tutti-ui-swing/src/main/help/fr/faq.html differ diff --git a/tutti-ui-swing/src/main/help/fr/manageTemporaryReferential.html b/tutti-ui-swing/src/main/help/fr/manageTemporaryReferential.html index f2173a2..3f7c6f2 100644 Binary files a/tutti-ui-swing/src/main/help/fr/manageTemporaryReferential.html and b/tutti-ui-swing/src/main/help/fr/manageTemporaryReferential.html differ diff --git a/tutti-ui-swing/src/main/help/fr/report.html b/tutti-ui-swing/src/main/help/fr/report.html index 352dc7a..8f04e94 100644 Binary files a/tutti-ui-swing/src/main/help/fr/report.html and b/tutti-ui-swing/src/main/help/fr/report.html differ diff --git a/tutti-ui-swing/src/main/help/fr/selectCruise.html b/tutti-ui-swing/src/main/help/fr/selectCruise.html index 873d169..2bb4c76 100644 Binary files a/tutti-ui-swing/src/main/help/fr/selectCruise.html and b/tutti-ui-swing/src/main/help/fr/selectCruise.html differ diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenGenericFormatExportScreen.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenGenericFormatExportScreen.java index 2825e49..9a53df4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenGenericFormatExportScreen.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenGenericFormatExportScreen.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.ui.swing.TuttiScreen; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUIHandler.java index 8177f83..8c2c26b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUIHandler.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.genericformat; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.entities.data.Program; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUIModel.java index 4a9f230..c1e177c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUIModel.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.genericformat; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.persistence.model.ProgramDataModel; import fr.ifremer.tutti.service.genericformat.GenericFormatExportConfiguration; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ExportFoldAllDataAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ExportFoldAllDataAction.java index ef8c30c..8fc22d9 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ExportFoldAllDataAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ExportFoldAllDataAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.genericformat.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.ui.swing.content.genericformat.GenericFormatExportUI; import fr.ifremer.tutti.ui.swing.content.genericformat.tree.CruiseSelectTreeNode; import fr.ifremer.tutti.ui.swing.content.genericformat.tree.DataSelectTreeModel; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ExportSelectAllDataAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ExportSelectAllDataAction.java index 4857768..05ce24d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ExportSelectAllDataAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ExportSelectAllDataAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.genericformat.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.ui.swing.content.genericformat.GenericFormatExportUI; import fr.ifremer.tutti.ui.swing.content.genericformat.tree.DataSelectTreeModel; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ExportUnfoldAllDataAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ExportUnfoldAllDataAction.java index 91e3704..31baa54 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ExportUnfoldAllDataAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ExportUnfoldAllDataAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.genericformat.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.ui.swing.content.genericformat.GenericFormatExportUI; import fr.ifremer.tutti.ui.swing.content.genericformat.tree.CruiseSelectTreeNode; import fr.ifremer.tutti.ui.swing.content.genericformat.tree.DataSelectTreeModel; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ExportUnselectAllDataAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ExportUnselectAllDataAction.java index 61f28f7..543d2a6 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ExportUnselectAllDataAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ExportUnselectAllDataAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.genericformat.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.ui.swing.content.genericformat.GenericFormatExportUI; import fr.ifremer.tutti.ui.swing.content.genericformat.tree.DataSelectTreeModel; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/GenericFormatExportAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/GenericFormatExportAction.java index 44e39dd..2332b92 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/GenericFormatExportAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/GenericFormatExportAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.genericformat.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.base.Joiner; import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.service.genericformat.GenericFormatExportConfiguration; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ImportFoldAllDataAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ImportFoldAllDataAction.java index 0a8c524..86861fc 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ImportFoldAllDataAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ImportFoldAllDataAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.genericformat.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.ui.swing.content.genericformat.GenericFormatImportUI; import fr.ifremer.tutti.ui.swing.content.genericformat.tree.CruiseSelectTreeNode; import fr.ifremer.tutti.ui.swing.content.genericformat.tree.DataSelectTreeModel; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ImportSelectAllDataAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ImportSelectAllDataAction.java index 0e72e6e..ab217d2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ImportSelectAllDataAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ImportSelectAllDataAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.genericformat.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.ui.swing.content.genericformat.GenericFormatImportUI; import fr.ifremer.tutti.ui.swing.content.genericformat.tree.DataSelectTreeModel; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ImportUnfoldAllDataAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ImportUnfoldAllDataAction.java index 644f120..3fae7c2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ImportUnfoldAllDataAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ImportUnfoldAllDataAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.genericformat.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.ui.swing.content.genericformat.GenericFormatImportUI; import fr.ifremer.tutti.ui.swing.content.genericformat.tree.CruiseSelectTreeNode; import fr.ifremer.tutti.ui.swing.content.genericformat.tree.DataSelectTreeModel; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ImportUnselectAllDataAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ImportUnselectAllDataAction.java index 8cb9f47..690d5ff 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ImportUnselectAllDataAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ImportUnselectAllDataAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.genericformat.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.ui.swing.content.genericformat.GenericFormatImportUI; import fr.ifremer.tutti.ui.swing.content.genericformat.tree.DataSelectTreeModel; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/CruiseSelectTreeNode.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/CruiseSelectTreeNode.java index 07b3786..1e93c3e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/CruiseSelectTreeNode.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/CruiseSelectTreeNode.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.genericformat.tree; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.Iterators; import fr.ifremer.tutti.persistence.model.CruiseDataModel; import fr.ifremer.tutti.persistence.model.OperationDataModel; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/DataSelectTreeModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/DataSelectTreeModel.java index 10e0808..fdb1709 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/DataSelectTreeModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/DataSelectTreeModel.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.genericformat.tree; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import javax.swing.JTree; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/DataSelectTreeNodeSupport.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/DataSelectTreeNodeSupport.java index 557f93a..45e181b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/DataSelectTreeNodeSupport.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/DataSelectTreeNodeSupport.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.genericformat.tree; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.model.DataModelSupport; import javax.swing.tree.DefaultMutableTreeNode; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ExportDataSelectTreeCellRenderer.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ExportDataSelectTreeCellRenderer.java index 7ff8d7a..b29e2ef 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ExportDataSelectTreeCellRenderer.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ExportDataSelectTreeCellRenderer.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.genericformat.tree; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import javax.swing.JCheckBox; import javax.swing.JLabel; import javax.swing.JTree; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ImportDataSelectTreeCellRenderer.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ImportDataSelectTreeCellRenderer.java index 2530a0f..ae4e1f7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ImportDataSelectTreeCellRenderer.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ImportDataSelectTreeCellRenderer.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.genericformat.tree; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import javax.swing.JCheckBox; import javax.swing.JLabel; import javax.swing.JTree; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/OperationSelectTreeNode.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/OperationSelectTreeNode.java index 607f5b3..da886a7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/OperationSelectTreeNode.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/OperationSelectTreeNode.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.genericformat.tree; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.model.OperationDataModel; /** diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ProgramSelectTreeNode.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ProgramSelectTreeNode.java index 5e14bea..c0f3fab 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ProgramSelectTreeNode.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ProgramSelectTreeNode.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.genericformat.tree; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.Iterators; import fr.ifremer.tutti.persistence.model.CruiseDataModel; import fr.ifremer.tutti.persistence.model.ProgramDataModel; -- 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 6adb3a84ecba79fe19fd70e06c6aa6ef5081d2d3 Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 2 17:57:43 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.14.3' 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 0fced2d..a92d417 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.14.3-SNAPSHOT</version> + <version>3.14.3</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 2ecdcf3..3dba7d6 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.14.3-SNAPSHOT</version> + <version>3.14.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index de6018e..2f7c9ba 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.14.3-SNAPSHOT</version> + <version>3.14.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 421114a..b0f8cf6 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>3.14.3-SNAPSHOT</version> + <version>3.14.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 3f33c63..c95fc33 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.14.3-SNAPSHOT</version> + <version>3.14.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index cb1c25d..0193155 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>3.14.3-SNAPSHOT</version> + <version>3.14.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index e16dd1f..9f68d9d 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.14.3-SNAPSHOT</version> + <version>3.14.3</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 8bc5347cd2edd4c0eeae9b1d983f88bfd15c91f5 Merge: d6c044c 6adb3a8 Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 2 18:02:43 2015 +0000 Merge branch 'release/3.14.3' pom.xml | 5 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 5 + .../fr/ifremer/tutti/TuttiConfigurationOption.java | 7 + .../tutti/persistence/TuttiPersistence.java | 33 + .../tutti/persistence/TuttiPersistenceImpl.java | 78 +- .../persistence/TuttiPersistenceNoDbImpl.java | 16 + .../tutti/persistence/entities/data/Cruises.java | 49 +- .../entities/data/FishingOperations.java | 19 + .../tutti/persistence/model/CruiseDataModel.java | 77 ++ .../tutti/persistence/model/DataModelSupport.java | 90 +++ .../persistence/model/OperationDataModel.java | 57 ++ .../tutti/persistence/model/ProgramDataModel.java | 77 ++ .../service/AttachmentPersistenceServiceImpl.java | 32 +- .../FishingOperationPersistenceServiceImpl.java | 15 +- .../CaracteristicPersistenceServiceImpl.java | 4 +- .../referential/CouldNotLoadTaxonException.java | 23 +- .../referential/GearPersistenceServiceImpl.java | 56 +- .../LocationPersistenceServiceImpl.java | 11 +- .../referential/PersonPersistenceServiceImpl.java | 24 +- .../ReferentialPersistenceServiceSupport.java | 5 +- .../referential/SpeciesPersistenceServiceImpl.java | 37 +- .../referential/VesselPersistenceServiceImpl.java | 25 +- .../service/util/BatchPersistenceHelper.java | 9 + .../i18n/tutti-persistence_en_GB.properties | 1 + .../i18n/tutti-persistence_fr_FR.properties | 1 + .../src/main/resources/queries-failsafe.hbm.xml | 36 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PersistenceService.java | 18 +- .../service/catches/WeightCleaningService.java | 10 +- .../fr/ifremer/tutti/service/csv/CsvProducer.java | 37 +- .../genericformat/GenericFormatArchive.java | 195 ++--- ...ort.java => GenericFormatCheckDataService.java} | 98 ++- .../genericformat/GenericFormatContextSupport.java | 147 ++-- .../GenericFormatExportActionEngine.java | 218 ++++++ .../GenericFormatExportConfiguration.java | 146 ++++ .../genericformat/GenericFormatExportContext.java | 268 ++++--- ....java => GenericFormatExportCruiseContext.java} | 44 +- .../GenericFormatExportOperationContext.java | 35 +- .../genericformat/GenericFormatExportRequest.java | 101 +++ .../genericformat/GenericFormatExportResult.java | 69 ++ .../genericformat/GenericFormatExportService.java | 723 +++-------------- .../genericformat/GenericFormatFileResult.java | 12 +- .../GenericFormatImportConfiguration.java | 139 +++- .../GenericFormatImportCruiseContext.java | 115 ++- .../GenericFormatImportCruiseResult.java | 80 +- .../GenericFormatImportOperationContext.java | 39 + .../GenericFormatImportOperationResult.java | 100 ++- .../genericformat/GenericFormatImportRequest.java | 93 ++- .../genericformat/GenericFormatImportResult.java | 76 +- .../genericformat/GenericFormatImportService.java | 70 +- .../GenericFormatImportValidationHelper.java | 74 +- .../genericformat/GenericFormatResultSupport.java | 21 +- .../GenericFormatValidateFileContext.java | 64 +- .../GenericFormatValidateFileResult.java | 1 + .../GenericformatImportPersistenceHelper.java | 287 +++++++ .../GenericformatImportPersitenceHelper.java | 472 ----------- .../consumer/CsvConsumerForAccidentalCatch.java | 45 +- .../CsvConsumerForAttachment.java} | 31 +- .../consumer/CsvConsumerForCatch.java | 34 +- .../consumer/CsvConsumerForGearCaracteristic.java | 55 +- .../CsvConsumerForIndividualObservation.java | 45 +- .../consumer/CsvConsumerForMarineLitter.java | 14 +- .../consumer/CsvConsumerForOperation.java | 81 +- .../consumer/CsvConsumerForParameter.java | 57 +- .../consumer/CsvConsumerForSurvey.java | 12 +- .../service/genericformat/csv/AttachmentModel.java | 89 +++ .../service/genericformat/csv/AttachmentRow.java | 110 +++ .../service/genericformat/csv/CatchModel.java | 5 +- .../tutti/service/genericformat/csv/CatchRow.java | 6 +- .../genericformat/csv/ExportSampleCategory.java | 12 + .../genericformat/csv/MarineLitterModel.java | 2 + .../service/genericformat/csv/MarineLitterRow.java | 14 +- .../service/genericformat/csv/OperationModel.java | 22 +- .../service/genericformat/csv/OperationRow.java | 211 +++-- .../service/genericformat/csv/SurveyModel.java | 2 + .../tutti/service/genericformat/csv/SurveyRow.java | 12 + .../exportactions/CheckDataAction.java | 69 ++ .../CreateAccidentalCatchRowsAction.java | 90 +++ .../exportactions/CreateCatchBatchRowsAction.java | 248 ++++++ .../CreateIndividualObservationRowsAction.java | 89 +++ .../CreateMarineLitterRowsAction.java | 90 +++ .../exportactions/CreateOperationRowsAction.java | 110 +++ .../exportactions/CreateParameterRowsAction.java | 58 ++ .../ExportCruiseActionSupport.java} | 22 +- .../ExportFishingOperationActionSupport.java} | 20 +- .../ExportGearCaracteristicAction.java | 84 ++ .../exportactions/ExportProtocolAction.java | 65 ++ .../exportactions/ExportReferentialGearAction.java | 70 ++ .../ExportReferentialPersonAction.java | 70 ++ .../ExportReferentialSpeciesAction.java | 70 ++ .../ExportReferentialVesselAction.java | 71 ++ .../ExportSampleCategoryModelAction.java | 63 ++ .../exportactions/ExportSpeciesUsedAction.java | 60 ++ .../exportactions/ExportSurveyAction.java | 103 +++ .../ExportTechnicalActionSupport.java} | 18 +- .../exportactions/FinalizeExportAction.java | 77 ++ .../exportactions/FlushOperationAction.java | 67 ++ .../GenerateExportArchiveAction.java} | 23 +- .../exportactions/LoadDataAction.java | 76 ++ .../importactions/DoCheckWeightAction.java | 14 +- .../importactions/DoCleanWeightAction.java | 6 +- .../importactions/ImportAccidentalCatchAction.java | 102 ++- .../importactions/ImportCatchAction.java | 231 +++++- .../ImportGearCaracteristicAction.java | 57 +- .../ImportIndividualObservationAction.java | 102 ++- .../importactions/ImportMarineLitterAction.java | 102 ++- .../importactions/ImportOperationAction.java | 242 +++++- .../importactions/ImportParameterAction.java | 87 ++- .../importactions/ImportProtocolAction.java | 46 +- .../importactions/ImportReferentialGearAction.java | 32 +- .../ImportReferentialPersonAction.java | 32 +- .../ImportReferentialSpeciesAction.java | 32 +- .../ImportReferentialVesselAction.java | 31 +- .../importactions/ImportSurveyAction.java | 168 +++- .../importactions/ImpotSampleCategoryAction.java | 10 +- ...ationAction.java => LoadAttachmentsAction.java} | 61 +- .../ValidateAccidentalCatchAction.java | 2 +- .../importactions/ValidateCatchAction.java | 2 +- .../ValidateGearCaracteristicAction.java | 6 +- .../ValidateIndividualObservationAction.java | 2 +- .../importactions/ValidateMarineLitterAction.java | 2 +- .../importactions/ValidateOperationAction.java | 11 +- .../importactions/ValidateParameterAction.java | 2 +- .../importactions/ValidateSurveyAction.java | 35 +- .../producer/CsvProducerForAttachment.java | 84 ++ .../producer/CsvProducerForCatch.java | 39 +- .../producer/CsvProducerForOperation.java | 1 - .../producer/CsvProducerForSurvey.java | 1 + .../service/report/ReportGenerationRequest.java | 13 + .../service/report/ReportGenerationService.java | 24 +- .../resources/ftl/genericFormatImportReport_fr.ftl | 343 +++++--- .../ftl/genericFormatValidateReport_fr.ftl | 19 +- .../resources/i18n/tutti-service_en_GB.properties | 21 + .../resources/i18n/tutti-service_fr_FR.properties | 38 +- .../genericformat/GenericFormatArchiveTest.java | 62 ++ .../GenericFormatExportServiceAno5804Test.java | 11 +- .../GenericFormatExportServiceTest.java | 378 ++++----- .../GenericFormatImportServiceTest.java | 26 +- .../GenericFormatImportServiceValidTest.java | 13 +- .../genericFormat/default/attachments.csv | 1 + .../test/resources/genericFormat/default/catch.csv | 866 ++++++++++----------- .../genericFormat/default/marineLitter.csv | 8 +- .../resources/genericFormat/default/operation.csv | 6 +- .../resources/genericFormat/default/survey.csv | 4 +- .../resources/genericFormat/empty/attachments.csv | 1 + .../test/resources/genericFormat/empty/catch.csv | 2 +- .../resources/genericFormat/empty/marineLitter.csv | 2 +- .../resources/genericFormat/empty/operation.csv | 2 +- .../test/resources/genericFormat/empty/survey.csv | 2 +- .../genericFormat/test_countLines/oneEmptyLine.txt | 0 .../genericFormat/test_countLines/oneLine.txt | 1 + .../genericFormat/test_countLines/twoLines.txt | 2 + .../test_countLines/twoLines_secondEmpty.txt | 1 + .../genericFormat/test_countLines/zeroLines.txt | 0 tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../src/main/assembly/launcher/README.txt | 3 + .../filtered-resources/tutti-help-fr.properties | 28 +- .../help/Guide_utilisation_Allegro_Campagne.pdf | Bin 0 -> 1996569 bytes .../src/main/help/fr/Aide_Allegro_Campagne.odt | Bin 37715 -> 0 bytes tutti-ui-swing/src/main/help/fr/config.html | Bin 6741 -> 15560 bytes .../src/main/help/fr/editFishingOperation.html | Bin 50215 -> 135058 bytes tutti-ui-swing/src/main/help/fr/editProtocol.html | Bin 9132 -> 21122 bytes .../src/main/help/fr/editSampleCategory.html | Bin 3016 -> 7262 bytes tutti-ui-swing/src/main/help/fr/faq.html | Bin 14048 -> 29980 bytes .../main/help/fr/manageTemporaryReferential.html | Bin 3904 -> 10688 bytes tutti-ui-swing/src/main/help/fr/report.html | Bin 2186 -> 6128 bytes tutti-ui-swing/src/main/help/fr/selectCruise.html | Bin 6285 -> 16034 bytes .../fr/ifremer/tutti/ui/swing/TuttiScreen.java | 6 + .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 2 + .../fr/ifremer/tutti/ui/swing/content/MainUI.css | 17 +- .../fr/ifremer/tutti/ui/swing/content/MainUI.jaxx | 2 + .../tutti/ui/swing/content/MainUIHandler.java | 8 + .../OpenGenericFormatExportScreen.java} | 23 +- .../actions/OpenGenericFormatImportScreen.java | 3 +- .../swing/content/config/TuttiConfigUIHandler.java | 4 + .../genericformat/GenericFormatExportUI.css | 164 ++++ .../genericformat/GenericFormatExportUI.jaxx | 112 +++ .../GenericFormatExportUIHandler.java | 206 +++++ .../genericformat/GenericFormatExportUIModel.java | 193 +++++ .../genericformat/GenericFormatImportUI.css | 106 ++- .../genericformat/GenericFormatImportUI.jaxx | 43 +- .../GenericFormatImportUIHandler.java | 69 +- .../genericformat/GenericFormatImportUIModel.java | 161 +++- .../actions/ExportFoldAllDataAction.java | 68 ++ .../actions/ExportSelectAllDataAction.java | 26 +- .../actions/ExportUnfoldAllDataAction.java | 68 ++ .../actions/ExportUnselectAllDataAction.java | 26 +- .../actions/GenericFormatExportAction.java | 137 ++++ .../actions/GenericFormatImportAction.java | 2 +- .../actions/GenericFormatValidateAction.java | 2 +- .../actions/ImportFoldAllDataAction.java | 68 ++ .../actions/ImportSelectAllDataAction.java | 28 +- .../actions/ImportUnfoldAllDataAction.java | 68 ++ .../actions/ImportUnselectAllDataAction.java | 28 +- .../OpenGenericFormatImportReportAction.java | 41 +- .../OpenGenericFormatValidateReportAction.java | 41 +- .../genericformat/tree/CruiseSelectTreeNode.java | 154 ++++ .../genericformat/tree/DataSelectTreeModel.java | 199 +++++ .../tree/DataSelectTreeNodeSupport.java | 82 ++ .../tree/ExportDataSelectTreeCellRenderer.java | 136 ++++ .../tree/ImportDataSelectTreeCellRenderer.java | 167 ++++ .../tree/OperationSelectTreeNode.java | 75 ++ .../genericformat/tree/ProgramSelectTreeNode.java | 88 +++ .../tutti/ui/swing/content/home/SelectCruiseUI.css | 32 +- .../ui/swing/content/home/SelectCruiseUI.jaxx | 31 +- .../swing/content/home/SelectCruiseUIHandler.java | 90 +-- .../actions/ExportGenericFormatCruiseAction.java | 127 --- .../ExportGenericFormatProgramCruisesAction.java | 130 ---- .../ImportGenericFormatProgramCruisesAction.java | 138 ---- .../ui/swing/content/report/ReportUIHandler.java | 4 + .../ui/swing/content/report/ReportUIModel.java | 10 + .../report/actions/GenerateReportAction.java | 17 +- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 33 - .../resources/i18n/tutti-ui-swing_en_GB.properties | 82 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 92 ++- .../src/main/resources/icons/action-collapse.png | Bin 0 -> 372 bytes .../src/main/resources/icons/action-expand.png | Bin 0 -> 371 bytes .../src/main/resources/icons/action-select.png | Bin 0 -> 392 bytes .../src/main/resources/icons/action-unselect.png | Bin 0 -> 311 bytes 223 files changed, 10257 insertions(+), 3699 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 b05a6ba20bc289f1dd0611672e1f4dd77a84794b Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 2 18:02:49 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 640d74c..a92d417 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.15-SNAPSHOT</version> + <version>3.14.3</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index da19820..3dba7d6 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.15-SNAPSHOT</version> + <version>3.14.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 22d9a02..2f7c9ba 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.15-SNAPSHOT</version> + <version>3.14.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 44417b4..b0f8cf6 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>3.15-SNAPSHOT</version> + <version>3.14.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 130c27a..c95fc33 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.15-SNAPSHOT</version> + <version>3.14.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 448289e..0193155 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>3.15-SNAPSHOT</version> + <version>3.14.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 3345023..9f68d9d 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.15-SNAPSHOT</version> + <version>3.14.3</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 24dcf521e257b19ee69d33ff25c2f41f7ca1eda5 Merge: b05a6ba 8bc5347 Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 2 18:02:50 2015 +0000 Merge branch 'master' into develop .../tutti/persistence/model/CruiseDataModel.java | 24 +++++++++++++++++++++ .../tutti/persistence/model/DataModelSupport.java | 24 +++++++++++++++++++++ .../persistence/model/OperationDataModel.java | 24 +++++++++++++++++++++ .../tutti/persistence/model/ProgramDataModel.java | 24 +++++++++++++++++++++ .../referential/CouldNotLoadTaxonException.java | 24 +++++++++++++++++++++ .../GenericFormatCheckDataService.java | 24 +++++++++++++++++++++ .../GenericFormatExportActionEngine.java | 24 +++++++++++++++++++++ .../GenericFormatExportConfiguration.java | 24 +++++++++++++++++++++ .../GenericFormatExportCruiseContext.java | 24 +++++++++++++++++++++ .../genericformat/GenericFormatExportRequest.java | 24 +++++++++++++++++++++ .../genericformat/GenericFormatExportResult.java | 24 +++++++++++++++++++++ .../consumer/CsvConsumerForAttachment.java | 24 +++++++++++++++++++++ .../service/genericformat/csv/AttachmentModel.java | 24 +++++++++++++++++++++ .../service/genericformat/csv/AttachmentRow.java | 24 +++++++++++++++++++++ .../exportactions/CheckDataAction.java | 24 +++++++++++++++++++++ .../CreateAccidentalCatchRowsAction.java | 24 +++++++++++++++++++++ .../exportactions/CreateCatchBatchRowsAction.java | 24 +++++++++++++++++++++ .../CreateIndividualObservationRowsAction.java | 24 +++++++++++++++++++++ .../CreateMarineLitterRowsAction.java | 24 +++++++++++++++++++++ .../exportactions/CreateOperationRowsAction.java | 24 +++++++++++++++++++++ .../exportactions/CreateParameterRowsAction.java | 24 +++++++++++++++++++++ .../exportactions/ExportCruiseActionSupport.java | 24 +++++++++++++++++++++ .../ExportFishingOperationActionSupport.java | 24 +++++++++++++++++++++ .../ExportGearCaracteristicAction.java | 24 +++++++++++++++++++++ .../exportactions/ExportProtocolAction.java | 24 +++++++++++++++++++++ .../exportactions/ExportReferentialGearAction.java | 24 +++++++++++++++++++++ .../ExportReferentialPersonAction.java | 24 +++++++++++++++++++++ .../ExportReferentialSpeciesAction.java | 24 +++++++++++++++++++++ .../ExportReferentialVesselAction.java | 24 +++++++++++++++++++++ .../ExportSampleCategoryModelAction.java | 24 +++++++++++++++++++++ .../exportactions/ExportSpeciesUsedAction.java | 24 +++++++++++++++++++++ .../exportactions/ExportSurveyAction.java | 24 +++++++++++++++++++++ .../ExportTechnicalActionSupport.java | 24 +++++++++++++++++++++ .../exportactions/FinalizeExportAction.java | 24 +++++++++++++++++++++ .../exportactions/FlushOperationAction.java | 24 +++++++++++++++++++++ .../exportactions/GenerateExportArchiveAction.java | 24 +++++++++++++++++++++ .../exportactions/LoadDataAction.java | 24 +++++++++++++++++++++ .../importactions/LoadAttachmentsAction.java | 24 +++++++++++++++++++++ .../producer/CsvProducerForAttachment.java | 24 +++++++++++++++++++++ .../genericformat/GenericFormatArchiveTest.java | 24 +++++++++++++++++++++ .../filtered-resources/tutti-help-fr.properties | 23 ++++++++++++++++++++ tutti-ui-swing/src/main/help/fr/config.html | Bin 14500 -> 15560 bytes .../src/main/help/fr/editFishingOperation.html | Bin 131676 -> 135058 bytes tutti-ui-swing/src/main/help/fr/editProtocol.html | Bin 20026 -> 21122 bytes .../src/main/help/fr/editSampleCategory.html | Bin 6430 -> 7262 bytes tutti-ui-swing/src/main/help/fr/faq.html | Bin 28628 -> 29980 bytes .../main/help/fr/manageTemporaryReferential.html | Bin 9702 -> 10688 bytes tutti-ui-swing/src/main/help/fr/report.html | Bin 5298 -> 6128 bytes tutti-ui-swing/src/main/help/fr/selectCruise.html | Bin 15016 -> 16034 bytes .../actions/OpenGenericFormatExportScreen.java | 24 +++++++++++++++++++++ .../GenericFormatExportUIHandler.java | 24 +++++++++++++++++++++ .../genericformat/GenericFormatExportUIModel.java | 24 +++++++++++++++++++++ .../actions/ExportFoldAllDataAction.java | 24 +++++++++++++++++++++ .../actions/ExportSelectAllDataAction.java | 24 +++++++++++++++++++++ .../actions/ExportUnfoldAllDataAction.java | 24 +++++++++++++++++++++ .../actions/ExportUnselectAllDataAction.java | 24 +++++++++++++++++++++ .../actions/GenericFormatExportAction.java | 24 +++++++++++++++++++++ .../actions/ImportFoldAllDataAction.java | 24 +++++++++++++++++++++ .../actions/ImportSelectAllDataAction.java | 24 +++++++++++++++++++++ .../actions/ImportUnfoldAllDataAction.java | 24 +++++++++++++++++++++ .../actions/ImportUnselectAllDataAction.java | 24 +++++++++++++++++++++ .../genericformat/tree/CruiseSelectTreeNode.java | 24 +++++++++++++++++++++ .../genericformat/tree/DataSelectTreeModel.java | 24 +++++++++++++++++++++ .../tree/DataSelectTreeNodeSupport.java | 24 +++++++++++++++++++++ .../tree/ExportDataSelectTreeCellRenderer.java | 24 +++++++++++++++++++++ .../tree/ImportDataSelectTreeCellRenderer.java | 24 +++++++++++++++++++++ .../tree/OperationSelectTreeNode.java | 24 +++++++++++++++++++++ .../genericformat/tree/ProgramSelectTreeNode.java | 24 +++++++++++++++++++++ 68 files changed, 1439 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 9c3f1bd3fae02eae11ca9acd1835648f4d576920 Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 2 18:02:51 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index a92d417..640d74c 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.14.3</version> + <version>3.15-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 3dba7d6..da19820 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.14.3</version> + <version>3.15-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 2f7c9ba..22d9a02 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.14.3</version> + <version>3.15-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index b0f8cf6..44417b4 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>3.14.3</version> + <version>3.15-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index c95fc33..130c27a 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.14.3</version> + <version>3.15-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 0193155..448289e 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>3.14.3</version> + <version>3.15-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 9f68d9d..3345023 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.14.3</version> + <version>3.15-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