branch develop updated (0fcfebc -> 48e8416)
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 0fcfebc finish #6818: [IMPORT GENERIQUE] Améliorer les performances d'import Merge branch 'feature/6818' into develop new 17ee604 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds e4cf410 [jgitflow-maven-plugin]updating poms for branch '3.14.2' with snapshot versions new 6c74b02 add license headers new 98c5150 [jgitflow-maven-plugin]updating poms for branch'release/3.14.2' with non-snapshot versions new d6c044c Merge branch 'release/3.14.2' new 25ae879 Merge branch 'master' into develop new 48e8416 [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 48e84168fbf9c82a528f22386f2894ecede211d0 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 26 10:42:04 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 25ae879cd473371edcde15cfdfc9bc66c8ffe5fd Merge: 17ee604 d6c044c Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 26 10:42:03 2015 +0000 Merge branch 'master' into develop commit 17ee60474a192d6c273377d3087ecaad1a8cd0c7 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 26 10:42:03 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit d6c044c9de1dd9e510dedc0d7050e83e89d8d4da Merge: 1a18860 98c5150 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 26 10:42:00 2015 +0000 Merge branch 'release/3.14.2' commit 98c515082f17ed157a964f0400944969ca1808c7 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 26 10:37:27 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.14.2' with non-snapshot versions commit 6c74b028cbd16a91d89ec8172005a921044dd64e Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 26 10:37:04 2015 +0000 add license headers Summary of changes: tutti-report-generator/src/main/assembly/bin.xml | 23 ++++++++++++++++++ .../java/fr/ifremer/tutti/report/ReportConfig.java | 24 +++++++++++++++++++ .../java/fr/ifremer/tutti/report/ReportEngine.java | 24 +++++++++++++++++++ .../java/fr/ifremer/tutti/report/RunReport.java | 24 +++++++++++++++++++ .../importactions/RestoreAfterImportAction.java | 24 +++++++++++++++++++ .../importactions/RestoreAfterValidateAction.java | 24 +++++++++++++++++++ .../service/report/ReportGenerationContext.java | 24 +++++++++++++++++++ .../service/report/ReportGenerationRequest.java | 24 +++++++++++++++++++ .../service/report/ReportGenerationResult.java | 24 +++++++++++++++++++ .../service/report/ReportGenerationService.java | 24 +++++++++++++++++++ .../service/bigfin/BigfinImportService2Test.java | 24 +++++++++++++++++++ .../report/ReportGenerationServiceTest.java | 24 +++++++++++++++++++ .../2014.12.08/allegro-tutti/common/css/common.css | 27 ++++++++++++++++++++-- .../2014.12.08/allegro-tutti/common/js/common.js | 25 +++++++++++++++++++- .../2014.12.08/allegro-tutti/common/js/messages.js | 23 ++++++++++++++++++ .../2014.12.08/allegro-tutti/common/js/util.js | 23 ++++++++++++++++++ .../allegro-tutti/common/nls/common.properties | 23 ++++++++++++++++++ .../report/allegro-tutti/common/css/common.css | 27 ++++++++++++++++++++-- .../report/allegro-tutti/common/js/common.js | 23 ++++++++++++++++++ .../report/allegro-tutti/common/js/messages.js | 23 ++++++++++++++++++ .../report/allegro-tutti/common/js/util.js | 23 ++++++++++++++++++ .../allegro-tutti/common/nls/common.properties | 23 ++++++++++++++++++ .../ui/swing/content/actions/GotoSiteAction.java | 24 +++++++++++++++++++ .../ui/swing/content/actions/ShowHelpAction.java | 24 +++++++++++++++++++ .../actions/AddSampleCategoryRowAction.java | 24 +++++++++++++++++++ .../actions/MoveDownSampleCategoryRowAction.java | 24 +++++++++++++++++++ .../actions/MoveUpSampleCategoryRowAction.java | 24 +++++++++++++++++++ .../actions/RemoveSampleCategoryRowAction.java | 24 +++++++++++++++++++ .../actions/GearCaracteristicAddRowAction.java | 24 +++++++++++++++++++ .../actions/GearCaracteristicCancelAction.java | 24 +++++++++++++++++++ .../actions/GearCaracteristicRemoveRowAction.java | 24 +++++++++++++++++++ .../actions/GearCaracteristicSaveAction.java | 24 +++++++++++++++++++ .../cruise/actions/GenerateCampaignNameAction.java | 24 +++++++++++++++++++ .../content/operation/catches/CatchCustomTab.java | 24 +++++++++++++++++++ .../actions/OpenCreateAccidentalBatchUIAction.java | 24 +++++++++++++++++++ .../CreateAccidentalBatchAndCloseAction.java | 24 +++++++++++++++++++ .../CreateAccidentalBatchAndContinueAction.java | 24 +++++++++++++++++++ .../actions/CreateAccidentalBatchCancelAction.java | 24 +++++++++++++++++++ .../ChangeBenthosBatchSampleCategoryAction.java | 24 +++++++++++++++++++ .../OpenAddBenthosBatchSampleCategoryUIAction.java | 24 +++++++++++++++++++ .../actions/OpenCreateBenthosBatchUIAction.java | 24 +++++++++++++++++++ .../OpenEditBenthosBatchFrequencyUIAction.java | 24 +++++++++++++++++++ .../actions/OpenSplitBenthosBatchUIAction.java | 24 +++++++++++++++++++ .../actions/CreateBenthosBatchAndCloseAction.java | 24 +++++++++++++++++++ .../CreateBenthosBatchAndContinueAction.java | 24 +++++++++++++++++++ .../actions/CreateBenthosBatchCancelAction.java | 24 +++++++++++++++++++ .../actions/SplitBenthosBatchCancelAction.java | 24 +++++++++++++++++++ .../split/actions/SplitBenthosBatchSaveAction.java | 24 +++++++++++++++++++ ...enCreateIndividualObservationBatchUIAction.java | 24 +++++++++++++++++++ ...teIndividualObservationBatchAndCloseAction.java | 24 +++++++++++++++++++ ...ndividualObservationBatchAndContinueAction.java | 24 +++++++++++++++++++ ...eateIndividualObservationBatchCancelAction.java | 24 +++++++++++++++++++ .../OpenCreateMarineLitterBatchUIAction.java | 24 +++++++++++++++++++ ...CreateMarineLitterBatchBatchAndCloseAction.java | 24 +++++++++++++++++++ ...ateMarineLitterBatchBatchAndContinueAction.java | 24 +++++++++++++++++++ .../CreateMarineLitterBatchBatchCancelAction.java | 24 +++++++++++++++++++ .../ChangeSpeciesBatchSampleCategoryAction.java | 24 +++++++++++++++++++ .../actions/ImportPupitriPopupCancelAction.java | 24 +++++++++++++++++++ .../actions/ImportPupitriPopupValidateAction.java | 24 +++++++++++++++++++ .../MultiPostImportLogCloseDialogAction.java | 24 +++++++++++++++++++ .../OpenAddSpeciesBatchSampleCategoryUIAction.java | 24 +++++++++++++++++++ .../actions/OpenCreateSpeciesBatchUIAction.java | 24 +++++++++++++++++++ .../OpenEditSpeciesBatchFrequencyUIAction.java | 24 +++++++++++++++++++ .../actions/OpenSplitSpeciesBatchUIAction.java | 24 +++++++++++++++++++ .../actions/CreateSpeciesBatchAndCloseAction.java | 24 +++++++++++++++++++ .../CreateSpeciesBatchAndContinueAction.java | 24 +++++++++++++++++++ .../actions/CreateSpeciesBatchCancelAction.java | 24 +++++++++++++++++++ .../actions/SplitSpeciesBatchCancelAction.java | 24 +++++++++++++++++++ .../split/actions/SplitSpeciesBatchSaveAction.java | 24 +++++++++++++++++++ .../actions/GearUseFeatureAddRowAction.java | 24 +++++++++++++++++++ .../actions/GearUseFeatureRemoveRowAction.java | 24 +++++++++++++++++++ .../actions/VesselUseFeatureAddRowAction.java | 24 +++++++++++++++++++ .../actions/VesselUseFeatureRemoveRowAction.java | 24 +++++++++++++++++++ .../actions/ImportTemporaryActionSupport.java | 24 +++++++++++++++++++ .../replace/actions/CloseReplaceUIAction.java | 24 +++++++++++++++++++ .../content/report/actions/OpenReportAction.java | 24 +++++++++++++++++++ .../content/report/actions/SaveReportAction.java | 24 +++++++++++++++++++ .../ui/swing/util/actions/SimpleActionSupport.java | 24 +++++++++++++++++++ .../util/attachment/AttachmentItemHandler.java | 24 +++++++++++++++++++ .../swing/util/attachment/AttachmentItemModel.java | 24 +++++++++++++++++++ .../attachment/actions/AddAttachmentAction.java | 24 +++++++++++++++++++ .../attachment/actions/HideAttachmentUIAction.java | 24 +++++++++++++++++++ .../attachment/actions/OpenAttachmentAction.java | 24 +++++++++++++++++++ .../attachment/actions/RemoveAttachmentAction.java | 24 +++++++++++++++++++ .../attachment/actions/ShowAttachmentUIAction.java | 24 +++++++++++++++++++ .../swing/util/auth/actions/LoginAcceptAction.java | 24 +++++++++++++++++++ .../swing/util/auth/actions/LoginCancelAction.java | 24 +++++++++++++++++++ .../actions/CaracteristicEditorAddRowAction.java | 24 +++++++++++++++++++ .../actions/CaracteristicEditorCancelAction.java | 24 +++++++++++++++++++ .../CaracteristicEditorRemoveRowAction.java | 24 +++++++++++++++++++ .../actions/CaracteristicEditorSaveAction.java | 24 +++++++++++++++++++ .../catches/actions/EnterWeightCancelAction.java | 24 +++++++++++++++++++ .../catches/actions/EnterWeightValidateAction.java | 24 +++++++++++++++++++ .../actions/EnterMelagWeightCancelAction.java | 24 +++++++++++++++++++ .../actions/EnterMelagWeightValidateAction.java | 24 +++++++++++++++++++ .../species/actions/SelectSpeciesCancelAction.java | 24 +++++++++++++++++++ .../actions/SelectSpeciesValidateAction.java | 24 +++++++++++++++++++ 97 files changed, 2322 insertions(+), 5 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 6c74b028cbd16a91d89ec8172005a921044dd64e Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 26 10:37:04 2015 +0000 add license headers --- tutti-report-generator/src/main/assembly/bin.xml | 23 ++++++++++++++++++ .../java/fr/ifremer/tutti/report/ReportConfig.java | 24 +++++++++++++++++++ .../java/fr/ifremer/tutti/report/ReportEngine.java | 24 +++++++++++++++++++ .../java/fr/ifremer/tutti/report/RunReport.java | 24 +++++++++++++++++++ .../importactions/RestoreAfterImportAction.java | 24 +++++++++++++++++++ .../importactions/RestoreAfterValidateAction.java | 24 +++++++++++++++++++ .../service/report/ReportGenerationContext.java | 24 +++++++++++++++++++ .../service/report/ReportGenerationRequest.java | 24 +++++++++++++++++++ .../service/report/ReportGenerationResult.java | 24 +++++++++++++++++++ .../service/report/ReportGenerationService.java | 24 +++++++++++++++++++ .../service/bigfin/BigfinImportService2Test.java | 24 +++++++++++++++++++ .../report/ReportGenerationServiceTest.java | 24 +++++++++++++++++++ .../2014.12.08/allegro-tutti/common/css/common.css | 27 ++++++++++++++++++++-- .../2014.12.08/allegro-tutti/common/js/common.js | 25 +++++++++++++++++++- .../2014.12.08/allegro-tutti/common/js/messages.js | 23 ++++++++++++++++++ .../2014.12.08/allegro-tutti/common/js/util.js | 23 ++++++++++++++++++ .../allegro-tutti/common/nls/common.properties | 23 ++++++++++++++++++ .../report/allegro-tutti/common/css/common.css | 27 ++++++++++++++++++++-- .../report/allegro-tutti/common/js/common.js | 23 ++++++++++++++++++ .../report/allegro-tutti/common/js/messages.js | 23 ++++++++++++++++++ .../report/allegro-tutti/common/js/util.js | 23 ++++++++++++++++++ .../allegro-tutti/common/nls/common.properties | 23 ++++++++++++++++++ .../ui/swing/content/actions/GotoSiteAction.java | 24 +++++++++++++++++++ .../ui/swing/content/actions/ShowHelpAction.java | 24 +++++++++++++++++++ .../actions/AddSampleCategoryRowAction.java | 24 +++++++++++++++++++ .../actions/MoveDownSampleCategoryRowAction.java | 24 +++++++++++++++++++ .../actions/MoveUpSampleCategoryRowAction.java | 24 +++++++++++++++++++ .../actions/RemoveSampleCategoryRowAction.java | 24 +++++++++++++++++++ .../actions/GearCaracteristicAddRowAction.java | 24 +++++++++++++++++++ .../actions/GearCaracteristicCancelAction.java | 24 +++++++++++++++++++ .../actions/GearCaracteristicRemoveRowAction.java | 24 +++++++++++++++++++ .../actions/GearCaracteristicSaveAction.java | 24 +++++++++++++++++++ .../cruise/actions/GenerateCampaignNameAction.java | 24 +++++++++++++++++++ .../content/operation/catches/CatchCustomTab.java | 24 +++++++++++++++++++ .../actions/OpenCreateAccidentalBatchUIAction.java | 24 +++++++++++++++++++ .../CreateAccidentalBatchAndCloseAction.java | 24 +++++++++++++++++++ .../CreateAccidentalBatchAndContinueAction.java | 24 +++++++++++++++++++ .../actions/CreateAccidentalBatchCancelAction.java | 24 +++++++++++++++++++ .../ChangeBenthosBatchSampleCategoryAction.java | 24 +++++++++++++++++++ .../OpenAddBenthosBatchSampleCategoryUIAction.java | 24 +++++++++++++++++++ .../actions/OpenCreateBenthosBatchUIAction.java | 24 +++++++++++++++++++ .../OpenEditBenthosBatchFrequencyUIAction.java | 24 +++++++++++++++++++ .../actions/OpenSplitBenthosBatchUIAction.java | 24 +++++++++++++++++++ .../actions/CreateBenthosBatchAndCloseAction.java | 24 +++++++++++++++++++ .../CreateBenthosBatchAndContinueAction.java | 24 +++++++++++++++++++ .../actions/CreateBenthosBatchCancelAction.java | 24 +++++++++++++++++++ .../actions/SplitBenthosBatchCancelAction.java | 24 +++++++++++++++++++ .../split/actions/SplitBenthosBatchSaveAction.java | 24 +++++++++++++++++++ ...enCreateIndividualObservationBatchUIAction.java | 24 +++++++++++++++++++ ...teIndividualObservationBatchAndCloseAction.java | 24 +++++++++++++++++++ ...ndividualObservationBatchAndContinueAction.java | 24 +++++++++++++++++++ ...eateIndividualObservationBatchCancelAction.java | 24 +++++++++++++++++++ .../OpenCreateMarineLitterBatchUIAction.java | 24 +++++++++++++++++++ ...CreateMarineLitterBatchBatchAndCloseAction.java | 24 +++++++++++++++++++ ...ateMarineLitterBatchBatchAndContinueAction.java | 24 +++++++++++++++++++ .../CreateMarineLitterBatchBatchCancelAction.java | 24 +++++++++++++++++++ .../ChangeSpeciesBatchSampleCategoryAction.java | 24 +++++++++++++++++++ .../actions/ImportPupitriPopupCancelAction.java | 24 +++++++++++++++++++ .../actions/ImportPupitriPopupValidateAction.java | 24 +++++++++++++++++++ .../MultiPostImportLogCloseDialogAction.java | 24 +++++++++++++++++++ .../OpenAddSpeciesBatchSampleCategoryUIAction.java | 24 +++++++++++++++++++ .../actions/OpenCreateSpeciesBatchUIAction.java | 24 +++++++++++++++++++ .../OpenEditSpeciesBatchFrequencyUIAction.java | 24 +++++++++++++++++++ .../actions/OpenSplitSpeciesBatchUIAction.java | 24 +++++++++++++++++++ .../actions/CreateSpeciesBatchAndCloseAction.java | 24 +++++++++++++++++++ .../CreateSpeciesBatchAndContinueAction.java | 24 +++++++++++++++++++ .../actions/CreateSpeciesBatchCancelAction.java | 24 +++++++++++++++++++ .../actions/SplitSpeciesBatchCancelAction.java | 24 +++++++++++++++++++ .../split/actions/SplitSpeciesBatchSaveAction.java | 24 +++++++++++++++++++ .../actions/GearUseFeatureAddRowAction.java | 24 +++++++++++++++++++ .../actions/GearUseFeatureRemoveRowAction.java | 24 +++++++++++++++++++ .../actions/VesselUseFeatureAddRowAction.java | 24 +++++++++++++++++++ .../actions/VesselUseFeatureRemoveRowAction.java | 24 +++++++++++++++++++ .../actions/ImportTemporaryActionSupport.java | 24 +++++++++++++++++++ .../replace/actions/CloseReplaceUIAction.java | 24 +++++++++++++++++++ .../content/report/actions/OpenReportAction.java | 24 +++++++++++++++++++ .../content/report/actions/SaveReportAction.java | 24 +++++++++++++++++++ .../ui/swing/util/actions/SimpleActionSupport.java | 24 +++++++++++++++++++ .../util/attachment/AttachmentItemHandler.java | 24 +++++++++++++++++++ .../swing/util/attachment/AttachmentItemModel.java | 24 +++++++++++++++++++ .../attachment/actions/AddAttachmentAction.java | 24 +++++++++++++++++++ .../attachment/actions/HideAttachmentUIAction.java | 24 +++++++++++++++++++ .../attachment/actions/OpenAttachmentAction.java | 24 +++++++++++++++++++ .../attachment/actions/RemoveAttachmentAction.java | 24 +++++++++++++++++++ .../attachment/actions/ShowAttachmentUIAction.java | 24 +++++++++++++++++++ .../swing/util/auth/actions/LoginAcceptAction.java | 24 +++++++++++++++++++ .../swing/util/auth/actions/LoginCancelAction.java | 24 +++++++++++++++++++ .../actions/CaracteristicEditorAddRowAction.java | 24 +++++++++++++++++++ .../actions/CaracteristicEditorCancelAction.java | 24 +++++++++++++++++++ .../CaracteristicEditorRemoveRowAction.java | 24 +++++++++++++++++++ .../actions/CaracteristicEditorSaveAction.java | 24 +++++++++++++++++++ .../catches/actions/EnterWeightCancelAction.java | 24 +++++++++++++++++++ .../catches/actions/EnterWeightValidateAction.java | 24 +++++++++++++++++++ .../actions/EnterMelagWeightCancelAction.java | 24 +++++++++++++++++++ .../actions/EnterMelagWeightValidateAction.java | 24 +++++++++++++++++++ .../species/actions/SelectSpeciesCancelAction.java | 24 +++++++++++++++++++ .../actions/SelectSpeciesValidateAction.java | 24 +++++++++++++++++++ 97 files changed, 2322 insertions(+), 5 deletions(-) diff --git a/tutti-report-generator/src/main/assembly/bin.xml b/tutti-report-generator/src/main/assembly/bin.xml index 3828df6..8a25c59 100644 --- a/tutti-report-generator/src/main/assembly/bin.xml +++ b/tutti-report-generator/src/main/assembly/bin.xml @@ -1,3 +1,26 @@ +<!-- + #%L + Tutti :: Report Generator + $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% + --> <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> diff --git a/tutti-report-generator/src/main/java/fr/ifremer/tutti/report/ReportConfig.java b/tutti-report-generator/src/main/java/fr/ifremer/tutti/report/ReportConfig.java index 2e3261b..54d79ba 100644 --- a/tutti-report-generator/src/main/java/fr/ifremer/tutti/report/ReportConfig.java +++ b/tutti-report-generator/src/main/java/fr/ifremer/tutti/report/ReportConfig.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.report; +/* + * #%L + * Tutti :: Report Generator + * $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.File; /** diff --git a/tutti-report-generator/src/main/java/fr/ifremer/tutti/report/ReportEngine.java b/tutti-report-generator/src/main/java/fr/ifremer/tutti/report/ReportEngine.java index ae028bf..02c3042 100644 --- a/tutti-report-generator/src/main/java/fr/ifremer/tutti/report/ReportEngine.java +++ b/tutti-report-generator/src/main/java/fr/ifremer/tutti/report/ReportEngine.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.report; +/* + * #%L + * Tutti :: Report Generator + * $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.eclipse.birt.core.exception.BirtException; import org.eclipse.birt.core.framework.Platform; import org.eclipse.birt.report.engine.api.EngineConfig; diff --git a/tutti-report-generator/src/main/java/fr/ifremer/tutti/report/RunReport.java b/tutti-report-generator/src/main/java/fr/ifremer/tutti/report/RunReport.java index 4b00979..906013b 100644 --- a/tutti-report-generator/src/main/java/fr/ifremer/tutti/report/RunReport.java +++ b/tutti-report-generator/src/main/java/fr/ifremer/tutti/report/RunReport.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.report; +/* + * #%L + * Tutti :: Report Generator + * $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.File; /** diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/RestoreAfterImportAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/RestoreAfterImportAction.java index dbb076b..8cbf95c 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/RestoreAfterImportAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/RestoreAfterImportAction.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 fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.service.PersistenceService; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/RestoreAfterValidateAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/RestoreAfterValidateAction.java index f4c11d6..c62d051 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/RestoreAfterValidateAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/RestoreAfterValidateAction.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 fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.service.PersistenceService; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationContext.java index 56921e1..846861e 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationContext.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.report; +/* + * #%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.FishingOperation; import java.io.File; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationRequest.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationRequest.java index 3916416..f9e42ea 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationRequest.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationRequest.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.report; +/* + * #%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.File; import java.io.Serializable; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationResult.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationResult.java index ccebd0f..0da3bee 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationResult.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationResult.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.report; +/* + * #%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.File; import java.io.Serializable; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationService.java index 1e9a5c9..e29bdc7 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationService.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.report; +/* + * #%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 com.google.common.collect.Lists; import fr.ifremer.tutti.TuttiConfiguration; diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportService2Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportService2Test.java index 830708b..b764a0a 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportService2Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportService2Test.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.bigfin; +/* + * #%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.Charsets; import com.google.common.base.Predicate; import com.google.common.collect.Lists; diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportGenerationServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportGenerationServiceTest.java index 5dd9ce3..f5846f5 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportGenerationServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportGenerationServiceTest.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.report; +/* + * #%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.TuttiConfiguration; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; diff --git a/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/css/common.css b/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/css/common.css index 7d61a6b..13d5b94 100644 --- a/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/css/common.css +++ b/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/css/common.css @@ -1,3 +1,26 @@ +/* + * #%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% + */ /** * ================================================= * GENERAL @@ -148,7 +171,7 @@ /** * ------------------------------------------------- - * Styles particuliers (� appliquer de mani�re explicite dans le rapport) + * Styles particuliers (� appliquer de mani�re explicite dans le rapport) * ------------------------------------------------- */ .grid-contacts { @@ -236,7 +259,7 @@ /** * ------------------------------------------------- - * Styles particuliers (� appliquer de mani�re explicite dans le rapport) + * Styles particuliers (� appliquer de mani�re explicite dans le rapport) * ------------------------------------------------- */ diff --git a/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/js/common.js b/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/js/common.js index 0c488b1..dc6fef0 100644 --- a/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/js/common.js +++ b/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/js/common.js @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* =================================================================== * common.js * ------------------------------------------------------------------- @@ -28,5 +51,5 @@ var LIST_SPECIES = new Array(); /** numero de la premiere colonne de la categorisation du lot dans le fichier catch.csv **/ var startCateg=12; -/** nom de la premi�re colonne apr�s les colonnes de cat�gorisations des lots **/ +/** nom de la premi�re colonne apr�s les colonnes de cat�gorisations des lots **/ var columnNameNotCateg="Code_Longueur"; \ No newline at end of file diff --git a/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/js/messages.js b/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/js/messages.js index 46edb0a..3b11dcb 100644 --- a/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/js/messages.js +++ b/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/js/messages.js @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* =================================================================== * message.js * ------------------------------------------------------------------- diff --git a/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/js/util.js b/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/js/util.js index 3d46710..96cae42 100644 --- a/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/js/util.js +++ b/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/js/util.js @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* =================================================================== * util.js * ------------------------------------------------------------------- diff --git a/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/nls/common.properties b/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/nls/common.properties index 5b1f511..3abeb9d 100644 --- a/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/nls/common.properties +++ b/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/nls/common.properties @@ -1,3 +1,26 @@ +### +# #%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% +### annee = Ann\u00E9e : diff --git a/tutti-ui-swing/src/main/assembly/report/allegro-tutti/common/css/common.css b/tutti-ui-swing/src/main/assembly/report/allegro-tutti/common/css/common.css index 7d61a6b..cb51ef0 100644 --- a/tutti-ui-swing/src/main/assembly/report/allegro-tutti/common/css/common.css +++ b/tutti-ui-swing/src/main/assembly/report/allegro-tutti/common/css/common.css @@ -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% + */ /** * ================================================= * GENERAL @@ -148,7 +171,7 @@ /** * ------------------------------------------------- - * Styles particuliers (� appliquer de mani�re explicite dans le rapport) + * Styles particuliers (� appliquer de mani�re explicite dans le rapport) * ------------------------------------------------- */ .grid-contacts { @@ -236,7 +259,7 @@ /** * ------------------------------------------------- - * Styles particuliers (� appliquer de mani�re explicite dans le rapport) + * Styles particuliers (� appliquer de mani�re explicite dans le rapport) * ------------------------------------------------- */ diff --git a/tutti-ui-swing/src/main/assembly/report/allegro-tutti/common/js/common.js b/tutti-ui-swing/src/main/assembly/report/allegro-tutti/common/js/common.js index 2c58872..edd0309 100644 --- a/tutti-ui-swing/src/main/assembly/report/allegro-tutti/common/js/common.js +++ b/tutti-ui-swing/src/main/assembly/report/allegro-tutti/common/js/common.js @@ -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% + */ /* =================================================================== * common.js * ------------------------------------------------------------------- diff --git a/tutti-ui-swing/src/main/assembly/report/allegro-tutti/common/js/messages.js b/tutti-ui-swing/src/main/assembly/report/allegro-tutti/common/js/messages.js index 46edb0a..207b73a 100644 --- a/tutti-ui-swing/src/main/assembly/report/allegro-tutti/common/js/messages.js +++ b/tutti-ui-swing/src/main/assembly/report/allegro-tutti/common/js/messages.js @@ -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% + */ /* =================================================================== * message.js * ------------------------------------------------------------------- diff --git a/tutti-ui-swing/src/main/assembly/report/allegro-tutti/common/js/util.js b/tutti-ui-swing/src/main/assembly/report/allegro-tutti/common/js/util.js index 3d46710..fb7ae17 100644 --- a/tutti-ui-swing/src/main/assembly/report/allegro-tutti/common/js/util.js +++ b/tutti-ui-swing/src/main/assembly/report/allegro-tutti/common/js/util.js @@ -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% + */ /* =================================================================== * util.js * ------------------------------------------------------------------- diff --git a/tutti-ui-swing/src/main/assembly/report/allegro-tutti/common/nls/common.properties b/tutti-ui-swing/src/main/assembly/report/allegro-tutti/common/nls/common.properties index 5b1f511..8f1931a 100644 --- a/tutti-ui-swing/src/main/assembly/report/allegro-tutti/common/nls/common.properties +++ b/tutti-ui-swing/src/main/assembly/report/allegro-tutti/common/nls/common.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% +### annee = Ann\u00E9e : diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/GotoSiteAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/GotoSiteAction.java index 2f6ac3f..d684078 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/GotoSiteAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/GotoSiteAction.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.TuttiConfiguration; import fr.ifremer.tutti.ui.swing.content.MainUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ShowHelpAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ShowHelpAction.java index eeacf71..0c05b5e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ShowHelpAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ShowHelpAction.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.content.MainUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/actions/AddSampleCategoryRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/actions/AddSampleCategoryRowAction.java index 5e95260..4251478 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/actions/AddSampleCategoryRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/actions/AddSampleCategoryRowAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.category.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.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.content.category.EditSampleCategoryModelRowModel; import fr.ifremer.tutti.ui.swing.content.category.EditSampleCategoryModelTableModel; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/actions/MoveDownSampleCategoryRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/actions/MoveDownSampleCategoryRowAction.java index d9bd716..5f210e0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/actions/MoveDownSampleCategoryRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/actions/MoveDownSampleCategoryRowAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.category.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.Preconditions; import fr.ifremer.tutti.ui.swing.content.category.EditSampleCategoryModelUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/actions/MoveUpSampleCategoryRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/actions/MoveUpSampleCategoryRowAction.java index 4ddff65..51dc8a7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/actions/MoveUpSampleCategoryRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/actions/MoveUpSampleCategoryRowAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.category.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.Preconditions; import fr.ifremer.tutti.ui.swing.content.category.EditSampleCategoryModelUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/actions/RemoveSampleCategoryRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/actions/RemoveSampleCategoryRowAction.java index cc68886..af76e01 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/actions/RemoveSampleCategoryRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/actions/RemoveSampleCategoryRowAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.category.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.Preconditions; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.content.category.EditSampleCategoryModelRowModel; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/GearCaracteristicAddRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/GearCaracteristicAddRowAction.java index f298e35..0dc487d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/GearCaracteristicAddRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/GearCaracteristicAddRowAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.cruise.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.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.content.cruise.GearCaracteristicsEditorRowModel; import fr.ifremer.tutti.ui.swing.content.cruise.GearCaracteristicsEditorTableModel; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/GearCaracteristicCancelAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/GearCaracteristicCancelAction.java index 21c7481..f9299c3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/GearCaracteristicCancelAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/GearCaracteristicCancelAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.cruise.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.cruise.GearCaracteristicsEditorUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; import org.apache.commons.logging.Log; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/GearCaracteristicRemoveRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/GearCaracteristicRemoveRowAction.java index e1fe162..59e77dc 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/GearCaracteristicRemoveRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/GearCaracteristicRemoveRowAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.cruise.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.Preconditions; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/GearCaracteristicSaveAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/GearCaracteristicSaveAction.java index d8f3778..8c88227 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/GearCaracteristicSaveAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/GearCaracteristicSaveAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.cruise.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.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.ui.swing.content.cruise.GearCaracteristicsEditorUI; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/GenerateCampaignNameAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/GenerateCampaignNameAction.java index 71c5b3d..e70f71a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/GenerateCampaignNameAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/GenerateCampaignNameAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.cruise.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.cruise.EditCruiseUI; import fr.ifremer.tutti.ui.swing.content.cruise.EditCruiseUIModel; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CatchCustomTab.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CatchCustomTab.java index 20a76ea..cf9e459 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CatchCustomTab.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CatchCustomTab.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.jaxx.application.swing.tab.CustomTab; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/actions/OpenCreateAccidentalBatchUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/actions/OpenCreateAccidentalBatchUIAction.java index a06c2d1..c081bf4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/actions/OpenCreateAccidentalBatchUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/actions/OpenCreateAccidentalBatchUIAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.accidental.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.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.accidental.AccidentalBatchUI; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/actions/CreateAccidentalBatchAndCloseAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/actions/CreateAccidentalBatchAndCloseAction.java index a8e9567..343db89 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/actions/CreateAccidentalBatchAndCloseAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/actions/CreateAccidentalBatchAndCloseAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.accidental.create.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.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.accidental.create.CreateAccidentalBatchUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/actions/CreateAccidentalBatchAndContinueAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/actions/CreateAccidentalBatchAndContinueAction.java index f9f04dd..dfa6071 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/actions/CreateAccidentalBatchAndContinueAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/actions/CreateAccidentalBatchAndContinueAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.accidental.create.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.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.accidental.AccidentalBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.accidental.create.CreateAccidentalBatchUI; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/actions/CreateAccidentalBatchCancelAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/actions/CreateAccidentalBatchCancelAction.java index 22cd8b1..5a0d296 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/actions/CreateAccidentalBatchCancelAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/actions/CreateAccidentalBatchCancelAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.accidental.create.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.operation.catches.accidental.create.CreateAccidentalBatchUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/ChangeBenthosBatchSampleCategoryAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/ChangeBenthosBatchSampleCategoryAction.java index f0357b3..d43f6ec 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/ChangeBenthosBatchSampleCategoryAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/ChangeBenthosBatchSampleCategoryAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.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.collect.Lists; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenAddBenthosBatchSampleCategoryUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenAddBenthosBatchSampleCategoryUIAction.java index 73fd5cd..655f9cc 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenAddBenthosBatchSampleCategoryUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenAddBenthosBatchSampleCategoryUIAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.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.Preconditions; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenCreateBenthosBatchUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenCreateBenthosBatchUIAction.java index a9f4db7..3c3f37c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenCreateBenthosBatchUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenCreateBenthosBatchUIAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.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.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUI; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenEditBenthosBatchFrequencyUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenEditBenthosBatchFrequencyUIAction.java index 8ccf412..d5acb9d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenEditBenthosBatchFrequencyUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenEditBenthosBatchFrequencyUIAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.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.operation.catches.benthos.BenthosBatchTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyCellComponent; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenSplitBenthosBatchUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenSplitBenthosBatchUIAction.java index 23559e0..c607127 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenSplitBenthosBatchUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenSplitBenthosBatchUIAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.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.Preconditions; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/CreateBenthosBatchAndCloseAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/CreateBenthosBatchAndCloseAction.java index 2da5d20..2a1f292 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/CreateBenthosBatchAndCloseAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/CreateBenthosBatchAndCloseAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.create.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.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.create.CreateBenthosBatchUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/CreateBenthosBatchAndContinueAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/CreateBenthosBatchAndContinueAction.java index 8429206..c1d8203 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/CreateBenthosBatchAndContinueAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/CreateBenthosBatchAndContinueAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.create.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.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.create.CreateBenthosBatchUI; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/CreateBenthosBatchCancelAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/CreateBenthosBatchCancelAction.java index f67e32d..1973839 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/CreateBenthosBatchCancelAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/CreateBenthosBatchCancelAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.create.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.operation.catches.benthos.create.CreateBenthosBatchUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; import org.apache.commons.logging.Log; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/actions/SplitBenthosBatchCancelAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/actions/SplitBenthosBatchCancelAction.java index b36a54b..8b8f8c4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/actions/SplitBenthosBatchCancelAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/actions/SplitBenthosBatchCancelAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.split.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.operation.catches.benthos.split.SplitBenthosBatchUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; import org.apache.commons.logging.Log; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/actions/SplitBenthosBatchSaveAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/actions/SplitBenthosBatchSaveAction.java index 1a85f66..25e4c16 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/actions/SplitBenthosBatchSaveAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/actions/SplitBenthosBatchSaveAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.split.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.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.split.SplitBenthosBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.split.SplitBenthosBatchUIModel; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/OpenCreateIndividualObservationBatchUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/OpenCreateIndividualObservationBatchUIAction.java index dd319cf..94ed130 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/OpenCreateIndividualObservationBatchUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/OpenCreateIndividualObservationBatchUIAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.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.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.IndividualObservationBatchUI; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/actions/CreateIndividualObservationBatchAndCloseAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/actions/CreateIndividualObservationBatchAndCloseAction.java index bbc3374..d4aabf0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/actions/CreateIndividualObservationBatchAndCloseAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/actions/CreateIndividualObservationBatchAndCloseAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.create.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.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.create.CreateIndividualObservationBatchUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/actions/CreateIndividualObservationBatchAndContinueAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/actions/CreateIndividualObservationBatchAndContinueAction.java index 13b3f16..5a05426 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/actions/CreateIndividualObservationBatchAndContinueAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/actions/CreateIndividualObservationBatchAndContinueAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.create.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.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.IndividualObservationBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.create.CreateIndividualObservationBatchUI; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/actions/CreateIndividualObservationBatchCancelAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/actions/CreateIndividualObservationBatchCancelAction.java index eecb61a..0a36c62 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/actions/CreateIndividualObservationBatchCancelAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/actions/CreateIndividualObservationBatchCancelAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.create.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.operation.catches.individualobservation.create.CreateIndividualObservationBatchUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; import org.apache.commons.logging.Log; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/actions/OpenCreateMarineLitterBatchUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/actions/OpenCreateMarineLitterBatchUIAction.java index 88604a5..6e5b0b4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/actions/OpenCreateMarineLitterBatchUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/actions/OpenCreateMarineLitterBatchUIAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.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.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.MarineLitterBatchUI; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/actions/CreateMarineLitterBatchBatchAndCloseAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/actions/CreateMarineLitterBatchBatchAndCloseAction.java index 95c6af2..08d6562 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/actions/CreateMarineLitterBatchBatchAndCloseAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/actions/CreateMarineLitterBatchBatchAndCloseAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.create.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.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.create.CreateMarineLitterBatchUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/actions/CreateMarineLitterBatchBatchAndContinueAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/actions/CreateMarineLitterBatchBatchAndContinueAction.java index 0fe6cf2..f0c7287 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/actions/CreateMarineLitterBatchBatchAndContinueAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/actions/CreateMarineLitterBatchBatchAndContinueAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.create.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.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.MarineLitterBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.create.CreateMarineLitterBatchUI; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/actions/CreateMarineLitterBatchBatchCancelAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/actions/CreateMarineLitterBatchBatchCancelAction.java index ad26679..4d8e2cf 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/actions/CreateMarineLitterBatchBatchCancelAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/actions/CreateMarineLitterBatchBatchCancelAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.create.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.operation.catches.marinelitter.create.CreateMarineLitterBatchUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; import org.apache.commons.logging.Log; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ChangeSpeciesBatchSampleCategoryAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ChangeSpeciesBatchSampleCategoryAction.java index 5b862ba..ab2e9c2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ChangeSpeciesBatchSampleCategoryAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ChangeSpeciesBatchSampleCategoryAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.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.collect.Lists; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriPopupCancelAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriPopupCancelAction.java index 4aef8ba..70281e4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriPopupCancelAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriPopupCancelAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.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.operation.catches.species.ImportPupitriPopupUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriPopupValidateAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriPopupValidateAction.java index 3404580..3350206 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriPopupValidateAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriPopupValidateAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.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.operation.catches.species.ImportPupitriPopupUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/MultiPostImportLogCloseDialogAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/MultiPostImportLogCloseDialogAction.java index 61ef6b9..62f71f6 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/MultiPostImportLogCloseDialogAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/MultiPostImportLogCloseDialogAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.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.operation.catches.MultiPostImportLogDialog; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenAddSpeciesBatchSampleCategoryUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenAddSpeciesBatchSampleCategoryUIAction.java index 85f4c36..1cc85a4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenAddSpeciesBatchSampleCategoryUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenAddSpeciesBatchSampleCategoryUIAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.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.Preconditions; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenCreateSpeciesBatchUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenCreateSpeciesBatchUIAction.java index 9e16c2c..28e192f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenCreateSpeciesBatchUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenCreateSpeciesBatchUIAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.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.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenEditSpeciesBatchFrequencyUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenEditSpeciesBatchFrequencyUIAction.java index e225313..112289d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenEditSpeciesBatchFrequencyUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenEditSpeciesBatchFrequencyUIAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.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.operation.catches.species.SpeciesBatchTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyCellComponent; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenSplitSpeciesBatchUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenSplitSpeciesBatchUIAction.java index 6b721ba..d41b7cf 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenSplitSpeciesBatchUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenSplitSpeciesBatchUIAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.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.Preconditions; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/actions/CreateSpeciesBatchAndCloseAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/actions/CreateSpeciesBatchAndCloseAction.java index 34cdaac..6257aa5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/actions/CreateSpeciesBatchAndCloseAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/actions/CreateSpeciesBatchAndCloseAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.create.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.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.create.CreateSpeciesBatchUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/actions/CreateSpeciesBatchAndContinueAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/actions/CreateSpeciesBatchAndContinueAction.java index cb91f76..b12e3da 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/actions/CreateSpeciesBatchAndContinueAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/actions/CreateSpeciesBatchAndContinueAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.create.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.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.create.CreateSpeciesBatchUI; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/actions/CreateSpeciesBatchCancelAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/actions/CreateSpeciesBatchCancelAction.java index eec69e8..4535b08 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/actions/CreateSpeciesBatchCancelAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/actions/CreateSpeciesBatchCancelAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.create.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.operation.catches.species.create.CreateSpeciesBatchUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; import org.apache.commons.logging.Log; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/actions/SplitSpeciesBatchCancelAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/actions/SplitSpeciesBatchCancelAction.java index 69b174f..a2a0628 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/actions/SplitSpeciesBatchCancelAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/actions/SplitSpeciesBatchCancelAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.split.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.operation.catches.species.split.SplitSpeciesBatchUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; import org.apache.commons.logging.Log; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/actions/SplitSpeciesBatchSaveAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/actions/SplitSpeciesBatchSaveAction.java index d923563..a0fca7e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/actions/SplitSpeciesBatchSaveAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/actions/SplitSpeciesBatchSaveAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.split.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.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.split.SplitSpeciesBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.split.SplitSpeciesBatchUIModel; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/GearUseFeatureAddRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/GearUseFeatureAddRowAction.java index c0abdd9..d9f0ab0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/GearUseFeatureAddRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/GearUseFeatureAddRowAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.fishing.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.operation.fishing.GearUseFeatureTabUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/GearUseFeatureRemoveRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/GearUseFeatureRemoveRowAction.java index 69ecfb5..74df99a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/GearUseFeatureRemoveRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/GearUseFeatureRemoveRowAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.fishing.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.operation.fishing.GearUseFeatureTabUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/VesselUseFeatureAddRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/VesselUseFeatureAddRowAction.java index 67495d0..58713f2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/VesselUseFeatureAddRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/VesselUseFeatureAddRowAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.fishing.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.operation.fishing.VesselUseFeatureTabUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/VesselUseFeatureRemoveRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/VesselUseFeatureRemoveRowAction.java index 59bcf88..6a8f25e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/VesselUseFeatureRemoveRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/VesselUseFeatureRemoveRowAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.fishing.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.operation.fishing.VesselUseFeatureTabUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryActionSupport.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryActionSupport.java index e80c0eb..31de02b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryActionSupport.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryActionSupport.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.referential.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.Preconditions; import fr.ifremer.tutti.persistence.entities.referential.TuttiReferentialEntity; import fr.ifremer.tutti.service.referential.ReferentialImportResult; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/CloseReplaceUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/CloseReplaceUIAction.java index ff9e20d..e1d70e3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/CloseReplaceUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/CloseReplaceUIAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.referential.replace.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.referential.replace.AbstractReplaceTemporaryUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/actions/OpenReportAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/actions/OpenReportAction.java index b62572f..3f969a7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/actions/OpenReportAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/actions/OpenReportAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.report.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.report.ReportUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/actions/SaveReportAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/actions/SaveReportAction.java index d22b999..2f7de1e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/actions/SaveReportAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/actions/SaveReportAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.report.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.Preconditions; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.ui.swing.content.report.ReportUI; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/actions/SimpleActionSupport.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/actions/SimpleActionSupport.java index fd7dce3..88f7e10 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/actions/SimpleActionSupport.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/actions/SimpleActionSupport.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.util.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 jaxx.runtime.JAXXObject; import javax.swing.AbstractAction; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItemHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItemHandler.java index 4b1692f..509d02f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItemHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItemHandler.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.util.attachment; +/* + * #%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.util.AbstractTuttiUIHandler; import jaxx.runtime.validator.swing.SwingValidator; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItemModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItemModel.java index a3a60af..8ab8f83 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItemModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItemModel.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.util.attachment; +/* + * #%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.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.AttachmentBean; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/actions/AddAttachmentAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/actions/AddAttachmentAction.java index 3033821..12a5671 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/actions/AddAttachmentAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/actions/AddAttachmentAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.util.attachment.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.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.Attachments; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/actions/HideAttachmentUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/actions/HideAttachmentUIAction.java index e1c7027..1336cc2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/actions/HideAttachmentUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/actions/HideAttachmentUIAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.util.attachment.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.util.actions.SimpleActionSupport; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentEditorUI; import jaxx.runtime.SwingUtil; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/actions/OpenAttachmentAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/actions/OpenAttachmentAction.java index 4ddfe57..6fde725 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/actions/OpenAttachmentAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/actions/OpenAttachmentAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.util.attachment.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.util.actions.SimpleActionSupport; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentItem; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/actions/RemoveAttachmentAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/actions/RemoveAttachmentAction.java index ef0b826..9c19def 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/actions/RemoveAttachmentAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/actions/RemoveAttachmentAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.util.attachment.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.util.actions.SimpleActionSupport; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentEditorUI; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentItem; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/actions/ShowAttachmentUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/actions/ShowAttachmentUIAction.java index 5325b3c..222249e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/actions/ShowAttachmentUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/actions/ShowAttachmentUIAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.util.attachment.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.util.actions.SimpleActionSupport; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentEditorUI; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/actions/LoginAcceptAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/actions/LoginAcceptAction.java index 6a9347d..fb6197b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/actions/LoginAcceptAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/actions/LoginAcceptAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.util.auth.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.util.actions.SimpleActionSupport; import fr.ifremer.tutti.ui.swing.util.auth.AuthenticationInfo; import fr.ifremer.tutti.ui.swing.util.auth.LoginUI; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/actions/LoginCancelAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/actions/LoginCancelAction.java index 5f6cbbf..56e9eee 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/actions/LoginCancelAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/actions/LoginCancelAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.util.auth.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.util.actions.SimpleActionSupport; import fr.ifremer.tutti.ui.swing.util.auth.LoginUI; import org.apache.commons.logging.Log; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/actions/CaracteristicEditorAddRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/actions/CaracteristicEditorAddRowAction.java index 177415d..e9c3c05 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/actions/CaracteristicEditorAddRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/actions/CaracteristicEditorAddRowAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.util.caracteristics.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.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.content.actions.GotoSiteAction; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/actions/CaracteristicEditorCancelAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/actions/CaracteristicEditorCancelAction.java index 6bc31a8..a74a98c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/actions/CaracteristicEditorCancelAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/actions/CaracteristicEditorCancelAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.util.caracteristics.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.util.actions.SimpleActionSupport; import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapEditorUI; import org.apache.commons.logging.Log; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/actions/CaracteristicEditorRemoveRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/actions/CaracteristicEditorRemoveRowAction.java index 907f90d..3fce8c2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/actions/CaracteristicEditorRemoveRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/actions/CaracteristicEditorRemoveRowAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.util.caracteristics.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.Preconditions; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/actions/CaracteristicEditorSaveAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/actions/CaracteristicEditorSaveAction.java index e5eefdf..abec2c7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/actions/CaracteristicEditorSaveAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/actions/CaracteristicEditorSaveAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.util.caracteristics.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.util.actions.SimpleActionSupport; import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapEditorUI; import org.apache.commons.logging.Log; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/catches/actions/EnterWeightCancelAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/catches/actions/EnterWeightCancelAction.java index 4bb99b7..c350de5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/catches/actions/EnterWeightCancelAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/catches/actions/EnterWeightCancelAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.util.catches.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.util.actions.SimpleActionSupport; import fr.ifremer.tutti.ui.swing.util.catches.EnterWeightUI; import org.apache.commons.logging.Log; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/catches/actions/EnterWeightValidateAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/catches/actions/EnterWeightValidateAction.java index 6418390..4c3dabb 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/catches/actions/EnterWeightValidateAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/catches/actions/EnterWeightValidateAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.util.catches.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.util.actions.SimpleActionSupport; import fr.ifremer.tutti.ui.swing.util.catches.EnterWeightUI; import org.apache.commons.logging.Log; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/actions/EnterMelagWeightCancelAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/actions/EnterMelagWeightCancelAction.java index 0430476..82676ae 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/actions/EnterMelagWeightCancelAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/actions/EnterMelagWeightCancelAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.util.species.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.actions.GotoSiteAction; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; import fr.ifremer.tutti.ui.swing.util.species.EnterMelagWeightUI; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/actions/EnterMelagWeightValidateAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/actions/EnterMelagWeightValidateAction.java index 8943c5c..88b9cc5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/actions/EnterMelagWeightValidateAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/actions/EnterMelagWeightValidateAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.util.species.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.actions.GotoSiteAction; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; import fr.ifremer.tutti.ui.swing.util.species.EnterMelagWeightUI; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/actions/SelectSpeciesCancelAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/actions/SelectSpeciesCancelAction.java index b22474a..57adb92 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/actions/SelectSpeciesCancelAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/actions/SelectSpeciesCancelAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.util.species.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.util.actions.SimpleActionSupport; import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUI; import org.apache.commons.logging.Log; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/actions/SelectSpeciesValidateAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/actions/SelectSpeciesValidateAction.java index e15c534..0ce5045 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/actions/SelectSpeciesValidateAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/actions/SelectSpeciesValidateAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.util.species.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.util.actions.SimpleActionSupport; import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUI; import org.apache.commons.logging.Log; -- 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 98c515082f17ed157a964f0400944969ca1808c7 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 26 10:37:27 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.14.2' with non-snapshot versions --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index ced025e..2604a61 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.14.2-SNAPSHOT</version> + <version>3.14.2</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index a767a92..6301851 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.2-SNAPSHOT</version> + <version>3.14.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 3e1768c..32528c0 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.2-SNAPSHOT</version> + <version>3.14.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 108dda5..582fcc5 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.2-SNAPSHOT</version> + <version>3.14.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 669f94f..5ad73bb 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.2-SNAPSHOT</version> + <version>3.14.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 47f9542..30ad007 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.2-SNAPSHOT</version> + <version>3.14.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 33d2917..b1d0f59 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.2-SNAPSHOT</version> + <version>3.14.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit d6c044c9de1dd9e510dedc0d7050e83e89d8d4da Merge: 1a18860 98c5150 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 26 10:42:00 2015 +0000 Merge branch 'release/3.14.2' README.txt | 4 +- pom.xml | 59 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 110 +- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 8 + .../tutti/persistence/TuttiPersistenceImpl.java | 9 +- .../persistence/TuttiPersistenceNoDbImpl.java | 5 + .../persistence/entities/referential/Persons.java | 8 +- .../service/CruisePersistenceServiceImpl.java | 1 + .../service/ProtocolPersistenceService.java | 3 +- .../service/ProtocolPersistenceServiceImpl.java | 12 + .../referential/GearPersistenceServiceImpl.java | 33 +- .../referential/PersonPersistenceServiceImpl.java | 15 +- .../referential/VesselPersistenceServiceImpl.java | 41 +- .../service/util/SynchronizationStatusHelper.java | 81 +- .../tutti/persistence/test/DatabaseResource.java | 120 +- .../i18n/tutti-persistence_en_GB.properties | 1 + .../i18n/tutti-persistence_fr_FR.properties | 1 + .../resources/tutti-db-enumerations.properties | 6 + .../config/TuttiPersistenceConfigTest.java | 2 +- tutti-report-generator/LICENSE.txt | 674 ++ tutti-report-generator/README.txt | 0 tutti-report-generator/pom.xml | 127 + .../src/license/THIRD-PARTY.properties | 36 + tutti-report-generator/src/main/assembly/bin.xml | 50 + .../java/fr/ifremer/tutti/report/ReportConfig.java | 74 + .../java/fr/ifremer/tutti/report/ReportEngine.java | 142 + .../java/fr/ifremer/tutti/report/RunReport.java | 71 + tutti-service/pom.xml | 57 +- .../ifremer/tutti/service/PersistenceService.java | 11 + .../fr/ifremer/tutti/service/TuttiDataContext.java | 13 +- .../tutti/service/bigfin/BigfinImportContext.java | 40 +- .../tutti/service/bigfin/BigfinImportService.java | 17 +- .../genericformat/GenericFormatArchive.java | 58 +- ...ntext.java => GenericFormatContextSupport.java} | 55 +- .../GenericFormatImportConfiguration.java | 10 + .../genericformat/GenericFormatImportContext.java | 478 +- .../GenericFormatImportEntityParserFactory.java | 4 +- .../genericformat/GenericFormatImportRequest.java | 14 +- .../genericformat/GenericFormatImportService.java | 31 +- .../GenericFormatImportValidationDataContext.java | 4 +- .../GenericFormatImportValidationHelper.java | 8 +- .../genericformat/GenericFormatResultSupport.java | 28 +- .../GenericFormatValidateFileContext.java | 13 +- .../consumer/CsvConsumerForAccidentalCatch.java | 4 +- .../consumer/CsvConsumerForCatch.java | 4 +- .../consumer/CsvConsumerForGearCaracteristic.java | 4 +- .../CsvConsumerForIndividualObservation.java | 4 +- .../consumer/CsvConsumerForMarineLitter.java | 4 +- .../consumer/CsvConsumerForOperation.java | 4 +- .../consumer/CsvConsumerForParameter.java | 4 +- .../consumer/CsvConsumerForSampleCategory.java | 46 +- .../consumer/CsvConsumerForSurvey.java | 4 +- .../genericformat/csv/SampleCategoryRow.java | 4 + .../importactions/ImportActionSupport.java | 6 +- .../importactions/ImportProtocolAction.java | 13 +- .../importactions/ImportReferentialGearAction.java | 4 +- .../ImportReferentialPersonAction.java | 4 +- .../ImportReferentialSpeciesAction.java | 4 +- .../ImportReferentialVesselAction.java | 4 +- ...yAction.java => ImpotSampleCategoryAction.java} | 49 +- .../importactions/RestoreAfterImportAction.java | 111 + .../importactions/RestoreAfterValidateAction.java | 110 + .../ValidateAccidentalCatchAction.java | 4 +- .../importactions/ValidateCatchAction.java | 4 +- .../ValidateGearCaracteristicAction.java | 4 +- .../ValidateIndividualObservationAction.java | 4 +- .../importactions/ValidateMarineLitterAction.java | 4 +- .../importactions/ValidateOperationAction.java | 4 +- .../importactions/ValidateParameterAction.java | 4 +- .../importactions/ValidateSurveyAction.java | 4 +- .../consumer/CsvConsumerForTemporaryPerson.java | 3 +- .../consumer/CsvConsumerForTemporaryVessel.java | 2 +- .../service/report/ReportGenerationContext.java | 91 + ...portModel.java => ReportGenerationRequest.java} | 30 +- ...eportModel.java => ReportGenerationResult.java} | 57 +- .../service/report/ReportGenerationService.java | 198 + .../tutti/service/report/ReportService.java | 274 - .../resources/i18n/tutti-service_en_GB.properties | 2 + .../resources/i18n/tutti-service_fr_FR.properties | 16 +- .../ifremer/tutti/service/ServiceDbResource.java | 24 +- .../service/bigfin/BigfinImportService2Test.java | 215 + .../GenericFormatImportServiceValidTest.java | 55 +- ...eTest.java => ReportGenerationServiceTest.java} | 116 +- .../genericFormat/parameter/parameter.csv | 12 + .../2014.12.08/allegro-tutti/common/css/common.css | 403 + .../allegro-tutti/common/images/logo-ifremer.PNG | Bin 0 -> 4851 bytes .../2014.12.08/allegro-tutti/common/js/common.js | 55 + .../2014.12.08/allegro-tutti/common/js/messages.js | 236 + .../2014.12.08/allegro-tutti/common/js/util.js | 29 +- .../allegro-tutti/common/lib/readfilecatch.jar | Bin 0 -> 6135 bytes .../allegro-tutti/common/nls/common.properties | 161 + .../controle_data_allegro_campagne.rptdesign | 11673 +++++++++++++++++++ .../test/resources/report/2014.12.08/version.appup | 1 + tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 25 +- tutti-ui-swing/src/license/THIRD-PARTY.properties | 6 +- .../src/main/assembly/full-shared-component.xml | 17 + .../report/allegro-tutti/common/css/common.css | 403 + .../allegro-tutti/common/images/logo-ifremer.PNG | Bin 0 -> 4851 bytes .../report/allegro-tutti/common/js/common.js | 55 + .../report/allegro-tutti/common/js/messages.js | 236 + .../report/allegro-tutti/common/js/util.js} | 27 +- .../allegro-tutti/common/lib/readfilecatch.jar | Bin 0 -> 6135 bytes .../allegro-tutti/common/nls/common.properties | 161 + .../controle_data_allegro_campagne.rptdesign | 11673 +++++++++++++++++++ .../src/main/assembly/report/version.appup | 1 + tutti-ui-swing/src/main/assembly/standalone.xml | 8 + .../filtered-resources/tutti-help-fr.properties | 6 +- .../java/fr/ifremer/tutti/ui/swing/RunTutti.java | 6 +- .../ifremer/tutti/ui/swing/TuttiActionFactory.java | 27 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 13 +- .../fr/ifremer/tutti/ui/swing/content/MainUI.css | 49 +- .../fr/ifremer/tutti/ui/swing/content/MainUI.jaxx | 7 +- .../tutti/ui/swing/content/MainUIHandler.java | 65 +- .../actions}/AbstractChangeLocaleAction.java | 18 +- .../actions}/AbstractChangeScreenAction.java | 2 +- .../actions}/AbstractMainUITuttiAction.java | 5 +- .../actions}/ChangeToLocaleFRAction.java | 2 +- .../actions}/ChangeToLocaleUKAction.java | 2 +- .../actions}/CloseApplicationAction.java | 2 +- .../actions}/ConnectIchtyometerAction.java | 2 +- .../actions}/DisconnectIchtyometerAction.java | 2 +- .../EditCatchesForSelectedCruiseAction.java} | 8 +- .../actions}/EditSelectedCruiseAction.java | 2 +- .../actions}/EditSelectedProgramAction.java | 2 +- .../actions}/EditSelectedProtocolAction.java | 2 +- .../actions}/GoToPreviousScreenAction.java | 3 +- .../ui/swing/content/actions/GotoSiteAction.java | 67 + .../actions/OpenDbScreenAction.java} | 6 +- .../actions/OpenHomeScreenAction.java} | 6 +- .../actions/OpenReportScreenAction.java} | 8 +- .../OpenSampleCategoryModelScreenAction.java} | 6 +- .../OpenTemporaryReferentialScreenAction.java} | 6 +- .../actions}/ShowAboutAction.java | 8 +- .../actions}/ShowConfigAction.java | 2 +- .../ShowHelpAction.java} | 33 +- .../{action => content/actions}/StartAction.java | 9 +- .../actions/ValidateSelectedCruiseAction.java} | 8 +- .../content/category/EditSampleCategoryModelUI.css | 7 +- .../category/EditSampleCategoryModelUI.jaxx | 11 +- .../category/EditSampleCategoryModelUIHandler.java | 141 +- .../actions/AddSampleCategoryRowAction.java | 87 + .../actions/ExportSampleCategoryModelAction.java | 6 +- .../actions/MoveDownSampleCategoryRowAction.java | 58 + .../actions/MoveUpSampleCategoryRowAction.java | 59 + .../actions/RemoveSampleCategoryRowAction.java | 75 + .../actions/SaveSampleCategoryModelAction.java | 4 +- .../swing/content/config/TuttiConfigUIHandler.java | 7 +- .../config/actions}/ReloadTuttiAction.java | 3 +- .../tutti/ui/swing/content/cruise/EditCruiseUI.css | 27 +- .../ui/swing/content/cruise/EditCruiseUI.jaxx | 15 +- .../swing/content/cruise/EditCruiseUIHandler.java | 12 +- .../content/cruise/GearCaracteristicsEditorUI.css | 4 + .../content/cruise/GearCaracteristicsEditorUI.jaxx | 9 +- .../cruise/GearCaracteristicsEditorUIHandler.java | 145 +- .../actions}/EditGearCaracteristicsAction.java | 5 +- .../actions/GearCaracteristicAddRowAction.java | 76 + .../actions/GearCaracteristicCancelAction.java | 60 + .../actions/GearCaracteristicRemoveRowAction.java | 87 + .../actions/GearCaracteristicSaveAction.java | 72 + .../actions/GenerateCampaignNameAction.java} | 45 +- .../cruise/actions}/ResetCruiseAction.java | 5 +- .../cruise/actions}/SaveCruiseAction.java | 5 +- .../actions}/ViewGearCaracteristicsAction.java | 5 +- .../tutti/ui/swing/content/db/DbManagerUI.css | 10 +- .../db/actions}/CloseDbAction.java | 3 +- .../db/actions}/ExportAndCleanDbAction.java | 3 +- .../db/actions}/ExportDbAction.java | 3 +- .../db/actions}/ImportDbAction.java | 6 +- .../db/actions}/ImportOrReimportDbAction.java | 3 +- .../db/actions}/InstallDbAction.java | 3 +- .../db/actions}/InstallOrReinstallDbAction.java | 3 +- .../db/actions}/OpenDbAction.java | 3 +- .../db/actions}/ReimportDbAction.java | 3 +- .../db/actions}/ReinstallDbAction.java | 3 +- .../db/actions}/UpdateDbAction.java | 3 +- .../genericformat/GenericFormatImportUI.css | 2 +- .../actions/GenericFormatImportAction.java | 80 +- .../actions/GenericFormatValidateAction.java | 4 +- .../OpenGenericFormatImportReportAction.java | 4 +- .../OpenGenericFormatValidateReportAction.java | 4 +- .../SaveGenericFormatImportReportAction.java | 4 +- .../SaveGenericFormatValidateReportAction.java | 4 +- .../tutti/ui/swing/content/home/SelectCruiseUI.css | 36 +- .../home/actions}/CloneProtocolAction.java | 3 +- .../home/actions}/DeleteProtocolAction.java | 5 +- .../home/actions}/EditCatchesAction.java | 3 +- .../home/actions}/EditCruiseAction.java | 3 +- .../home/actions}/EditProgramAction.java | 3 +- .../home/actions}/EditProtocolAction.java | 3 +- .../actions}/ExportCruiseForSumatraAction.java | 3 +- .../actions}/ExportGenericFormatCruiseAction.java | 5 +- .../ExportGenericFormatProgramCruisesAction.java | 5 +- .../home/actions}/ExportProtocolAction.java | 5 +- .../ImportGenericFormatProgramCruisesAction.java | 5 +- .../home/actions}/ImportProtocolAction.java | 3 +- .../home/actions}/NewCruiseAction.java | 3 +- .../home/actions}/NewProgramAction.java | 3 +- .../home/actions}/NewProtocolAction.java | 3 +- .../actions}/OpenGenericFormatImportScreen.java | 3 +- .../home/actions}/SendCruiseReportAction.java | 3 +- .../SpeciesToConfirmReportForCruiseAction.java | 3 +- .../home/actions}/ValidateCatchesAction.java | 3 +- .../content/operation/EditFishingOperationUI.css | 10 +- .../operation/EditFishingOperationUIHandler.java | 2 +- .../content/operation/FishingOperationsUI.css | 5 +- .../operation/FishingOperationsUIHandler.java | 2 +- .../catches/AbstractTuttiBatchUIModel.java | 32 +- .../content/operation/catches/CatchCustomTab.java | 157 + .../operation/catches/EditCatchesSvgHandler.java | 28 +- .../content/operation/catches/EditCatchesUI.css | 16 +- .../operation/catches/EditCatchesUIHandler.java | 191 +- .../operation/catches/EditCatchesUIModel.java | 45 +- .../operation/catches/MultiPostImportLogDialog.css | 1 + .../catches/MultiPostImportLogDialog.jaxx | 3 +- .../catches/accidental/AccidentalBatchUI.css | 7 +- .../catches/accidental/AccidentalBatchUI.jaxx | 3 +- .../accidental/AccidentalBatchUIHandler.java | 11 - .../catches/accidental/AccidentalBatchUIModel.java | 3 +- .../actions}/ExportMultiPostAccidentalAction.java | 3 +- .../actions}/ImportMultiPostAccidentalAction.java | 3 +- .../actions/OpenCreateAccidentalBatchUIAction.java | 57 + .../actions}/RemoveAccidentalBatchAction.java | 5 +- .../accidental/create/CreateAccidentalBatchUI.css | 3 + .../accidental/create/CreateAccidentalBatchUI.jaxx | 6 +- .../create/CreateAccidentalBatchUIHandler.java | 44 +- .../CreateAccidentalBatchAndCloseAction.java | 64 + .../CreateAccidentalBatchAndContinueAction.java | 66 + .../actions/CreateAccidentalBatchCancelAction.java | 41 +- .../actions}/CancelEditCatchBatchAction.java | 6 +- .../catches/actions}/CleanBatchWeightsAction.java | 5 +- .../actions}/ComputeBatchWeightsAction.java | 5 +- .../ExportFishingOperationForSumatraAction.java | 5 +- .../ExportFishingOperationReportAction.java | 5 +- .../actions}/ExportMultiPostActionSupport.java | 5 +- .../actions}/ExportMultiPostCatchAction.java | 2 +- .../actions}/ImportMultiPostActionSupport.java | 6 +- .../actions}/ImportMultiPostCatchAction.java | 2 +- .../catches/actions}/SaveCatchBatchAction.java | 5 +- .../operation/catches/benthos/BenthosBatchUI.css | 17 +- .../operation/catches/benthos/BenthosBatchUI.jaxx | 15 +- .../catches/benthos/BenthosBatchUIHandler.java | 339 +- .../catches/benthos/BenthosBatchUIModel.java | 3 +- .../ChangeBenthosBatchSampleCategoryAction.java | 205 + .../benthos/actions}/CreateBenthosMelagAction.java | 5 +- .../actions}/ExportMultiPostBenthosAction.java | 3 +- .../actions}/ImportMultiPostBenthosAction.java | 3 +- .../OpenAddBenthosBatchSampleCategoryUIAction.java | 107 + .../actions/OpenCreateBenthosBatchUIAction.java | 57 + .../OpenEditBenthosBatchFrequencyUIAction.java | 75 + .../actions/OpenSplitBenthosBatchUIAction.java | 122 + .../benthos/actions}/RemoveBenthosBatchAction.java | 5 +- .../actions}/RemoveBenthosSubBatchAction.java | 5 +- .../benthos/actions}/RenameBenthosBatchAction.java | 5 +- .../benthos/create/CreateBenthosBatchUI.css | 5 +- .../benthos/create/CreateBenthosBatchUI.jaxx | 6 +- .../create/CreateBenthosBatchUIHandler.java | 48 +- .../actions/CreateBenthosBatchAndCloseAction.java | 64 + .../CreateBenthosBatchAndContinueAction.java | 67 + .../actions/CreateBenthosBatchCancelAction.java | 59 + .../SelectSpeciesForBenthosBatchAction.java | 5 +- .../frequency/BenthosFrequencyTableModel.java | 15 +- .../catches/benthos/split/SplitBenthosBatchUI.css | 2 + .../catches/benthos/split/SplitBenthosBatchUI.jaxx | 4 +- .../benthos/split/SplitBenthosBatchUIHandler.java | 44 +- .../actions/SplitBenthosBatchCancelAction.java | 58 + .../split/actions/SplitBenthosBatchSaveAction.java | 79 + .../IndividualObservationBatchUI.css | 9 +- .../IndividualObservationBatchUI.jaxx | 7 +- .../IndividualObservationBatchUIHandler.java | 11 - .../IndividualObservationBatchUIModel.java | 3 +- ...ExportMultiPostIndividualObservationAction.java | 3 +- ...ImportMultiPostIndividualObservationAction.java | 3 +- ...enCreateIndividualObservationBatchUIAction.java | 62 + .../RemoveAllIndividualObservationBatchAction.java | 5 +- .../RemoveIndividualObservationBatchAction.java | 5 +- ...SpeciesForIndividualObservationBatchAction.java | 5 +- .../create/CreateIndividualObservationBatchUI.css | 5 +- .../create/CreateIndividualObservationBatchUI.jaxx | 6 +- .../CreateIndividualObservationBatchUIHandler.java | 47 +- ...teIndividualObservationBatchAndCloseAction.java | 64 + ...ndividualObservationBatchAndContinueAction.java | 73 + ...eateIndividualObservationBatchCancelAction.java | 59 + .../catches/marinelitter/MarineLitterBatchUI.css | 7 +- .../catches/marinelitter/MarineLitterBatchUI.jaxx | 8 +- .../marinelitter/MarineLitterBatchUIHandler.java | 13 - .../marinelitter/MarineLitterBatchUIModel.java | 3 +- .../ExportMultiPostMarineLitterAction.java | 3 +- .../ImportMultiPostMarineLitterAction.java | 3 +- .../OpenCreateMarineLitterBatchUIAction.java | 62 + .../actions}/RemoveMarineLitterBatchAction.java | 6 +- .../create/CreateMarineLitterBatchUI.css | 3 + .../create/CreateMarineLitterBatchUI.jaxx | 6 +- .../create/CreateMarineLitterBatchUIHandler.java | 43 +- ...CreateMarineLitterBatchBatchAndCloseAction.java | 64 + ...ateMarineLitterBatchBatchAndContinueAction.java | 70 + .../CreateMarineLitterBatchBatchCancelAction.java | 60 + .../catches/species/ImportPupitriPopupUI.css | 2 + .../catches/species/ImportPupitriPopupUI.jaxx | 4 +- .../species/ImportPupitriPopupUIHandler.java | 26 +- .../operation/catches/species/SpeciesBatchUI.css | 23 +- .../operation/catches/species/SpeciesBatchUI.jaxx | 15 +- .../catches/species/SpeciesBatchUIHandler.java | 267 +- .../catches/species/SpeciesBatchUIModel.java | 3 +- .../ChangeSpeciesBatchSampleCategoryAction.java | 202 + .../species/actions}/CreateSpeciesMelagAction.java | 5 +- .../actions}/ExportMultiPostSpeciesAction.java | 3 +- .../species/actions}/ImportBigfinAction.java | 6 +- .../actions}/ImportMultiPostSpeciesAction.java | 3 +- .../species/actions}/ImportPsionAction.java | 6 +- .../species/actions}/ImportPupitriAction.java | 11 +- .../actions/ImportPupitriPopupCancelAction.java | 43 +- .../actions/ImportPupitriPopupValidateAction.java | 69 + .../MultiPostImportLogCloseDialogAction.java | 43 +- .../OpenAddSpeciesBatchSampleCategoryUIAction.java | 106 + .../actions/OpenCreateSpeciesBatchUIAction.java | 62 + .../OpenEditSpeciesBatchFrequencyUIAction.java | 75 + .../actions/OpenSplitSpeciesBatchUIAction.java | 119 + .../species/actions}/RemoveSpeciesBatchAction.java | 5 +- .../actions}/RemoveSpeciesSubBatchAction.java | 5 +- .../species/actions}/RenameSpeciesBatchAction.java | 5 +- .../species/create/CreateSpeciesBatchUI.css | 5 +- .../species/create/CreateSpeciesBatchUI.jaxx | 6 +- .../create/CreateSpeciesBatchUIHandler.java | 49 +- .../actions/CreateSpeciesBatchAndCloseAction.java | 64 + .../CreateSpeciesBatchAndContinueAction.java | 67 + .../actions/CreateSpeciesBatchCancelAction.java | 59 + .../SelectSpeciesForSpeciesBatchAction.java | 5 +- .../frequency/SpeciesFrequencyTableModel.java | 15 +- .../catches/species/split/SplitSpeciesBatchUI.css | 2 + .../catches/species/split/SplitSpeciesBatchUI.jaxx | 4 +- .../species/split/SplitSpeciesBatchUIHandler.java | 44 +- .../actions/SplitSpeciesBatchCancelAction.java | 58 + .../split/actions/SplitSpeciesBatchSaveAction.java | 79 + .../operation/fishing/GearUseFeatureTabUI.css | 2 + .../operation/fishing/GearUseFeatureTabUI.jaxx | 5 +- .../operation/fishing/VesselUseFeatureTabUI.css | 2 + .../operation/fishing/VesselUseFeatureTabUI.jaxx | 5 +- .../actions}/CancelEditFishingOperationAction.java | 5 +- .../actions}/DeleteFishingOperationAction.java | 5 +- .../actions}/EditFishingOperationAction.java | 10 +- .../actions/GearUseFeatureAddRowAction.java | 40 +- .../actions/GearUseFeatureRemoveRowAction.java | 40 +- ...perationCaracteristicsFromColumnFileAction.java | 6 +- .../actions}/NewFishingOperationAction.java | 2 +- .../actions}/SaveFishingOperationAction.java | 5 +- .../actions/VesselUseFeatureAddRowAction.java | 40 +- .../actions/VesselUseFeatureRemoveRowAction.java | 40 +- .../ui/swing/content/program/EditProgramUI.css | 6 +- .../program/actions}/ResetProgramAction.java | 5 +- .../program/actions}/SaveProgramAction.java | 5 +- .../ui/swing/content/protocol/EditProtocolUI.css | 38 +- .../content/protocol/EditProtocolUIHandler.java | 54 +- .../actions}/AddBenthosProtocolAction.java | 5 +- .../actions}/AddCaracteristicMappingAction.java | 5 +- .../actions}/AddSpeciesProtocolAction.java | 5 +- .../actions}/ExportAllCaracteristicAction.java | 5 +- .../actions}/ExportProtocolBenthosAction.java | 5 +- .../ExportProtocolCaracteristicAction.java | 5 +- .../actions}/ExportProtocolSpeciesAction.java | 5 +- .../protocol/actions}/ExportPupitriAction.java | 5 +- .../actions}/ImportProtocolBenthosAction.java | 5 +- .../ImportProtocolCaracteristicAction.java | 5 +- .../actions}/ImportProtocolSpeciesAction.java | 5 +- .../actions}/LoadProtocolImportColumnsAction.java | 5 +- .../actions}/RemoveBenthosProtocolAction.java | 5 +- .../actions}/RemoveCaracteristicMappingAction.java | 5 +- .../actions}/RemoveSpeciesProtocolAction.java | 5 +- .../protocol/actions}/SaveProtocolAction.java | 5 +- .../actions}/SelectOtherBenthosAction.java | 10 +- .../actions}/SelectOtherSpeciesAction.java | 8 +- .../referential/ManageTemporaryReferentialUI.css | 32 +- .../AbstractOpenReplaceTemporaryUIAction.java | 67 +- .../ExportExistingTemporaryGearAction.java | 5 +- .../ExportExistingTemporaryPersonAction.java | 5 +- .../ExportExistingTemporarySpeciesAction.java | 5 +- .../ExportExistingTemporaryVesselAction.java | 5 +- .../actions}/ExportTemporaryGearExampleAction.java | 5 +- .../ExportTemporaryPersonExampleAction.java | 5 +- .../ExportTemporarySpeciesExampleAction.java | 5 +- .../ExportTemporaryVesselExampleAction.java | 5 +- .../actions/ImportTemporaryActionSupport.java} | 75 +- .../actions}/ImportTemporaryGearAction.java | 65 +- .../actions}/ImportTemporaryPersonAction.java | 67 +- .../actions}/ImportTemporarySpeciesAction.java | 63 +- .../actions}/ImportTemporaryVesselAction.java | 63 +- .../actions}/OpenReplaceTemporaryGearUIAction.java | 2 +- .../OpenReplaceTemporaryPersonUIAction.java | 2 +- .../OpenReplaceTemporarySpeciesUIAction.java | 2 +- .../OpenReplaceTemporaryVesselUIAction.java | 2 +- .../replace/AbstractReplaceTemporaryUI.css | 1 + .../replace/AbstractReplaceTemporaryUI.jaxx | 2 +- .../referential/replace/ReplaceTemporaryGearUI.css | 2 +- .../replace/ReplaceTemporaryPersonUI.css | 2 +- .../replace/ReplaceTemporarySpeciesUI.css | 2 +- .../replace/ReplaceTemporaryVesselUI.css | 2 +- .../actions}/AbstractReplaceTemporaryUIAction.java | 18 +- .../replace/actions/CloseReplaceUIAction.java | 42 +- .../actions}/ReplaceTemporaryGearAction.java | 9 +- .../actions}/ReplaceTemporaryPersonAction.java | 9 +- .../actions}/ReplaceTemporarySpeciesAction.java | 8 +- .../actions}/ReplaceTemporaryVesselAction.java | 9 +- .../tutti/ui/swing/content/report/ReportUI.css | 47 +- .../tutti/ui/swing/content/report/ReportUI.jaxx | 29 +- .../ui/swing/content/report/ReportUIHandler.java | 63 +- .../ui/swing/content/report/ReportUIModel.java | 55 +- .../report/actions}/GenerateReportAction.java | 32 +- .../content/report/actions/OpenReportAction.java | 46 +- .../content/report/actions/SaveReportAction.java | 121 + .../swing/content/validation/ValidateCruiseUI.css | 6 +- .../validation/ValidateCruiseUIHandler.java | 4 +- .../actions}/EditCruiseInValidationUIAction.java | 5 +- .../EditFishingOperationInValidationUIAction.java | 5 +- .../ExportCruiseValidationMessagesAction.java | 5 +- .../ExportOperationValidationMessagesAction.java | 5 +- .../actions}/SaveCruiseToReadyToSynchAction.java | 5 +- .../update/TuttiApplicationUpdaterCallBack.java | 4 +- .../ui/swing/update/TuttiDbUpdaterCallBack.java | 4 +- .../swing/update/TuttiReportUpdaterCallBack.java | 4 +- .../swing/update/TuttiUpdaterCallBackSupport.java | 6 +- .../actions}/UpdateApplicationAction.java | 7 +- .../actions}/UpdateReportAction.java | 7 +- .../ui/swing/util/AbstractTuttiUIHandler.java | 60 +- .../tutti/ui/swing/util/TuttiExceptionHandler.java | 26 +- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 14 +- .../actions/LongActionSupport.java} | 6 +- .../ui/swing/util/actions/SimpleActionSupport.java | 44 +- .../swing/util/attachment/AttachmentEditorUI.css | 40 +- .../swing/util/attachment/AttachmentEditorUI.jaxx | 5 +- .../util/attachment/AttachmentEditorUIHandler.java | 143 +- .../ui/swing/util/attachment/AttachmentItem.css | 46 +- .../ui/swing/util/attachment/AttachmentItem.jaxx | 27 +- .../util/attachment/AttachmentItemHandler.java | 69 + .../swing/util/attachment/AttachmentItemModel.java | 95 + .../attachment/actions/AddAttachmentAction.java | 92 + .../attachment/actions/HideAttachmentUIAction.java | 63 + .../attachment/actions/OpenAttachmentAction.java | 74 + .../attachment/actions/RemoveAttachmentAction.java | 90 + .../{ => actions}/SaveAttachmentAction.java | 41 +- .../actions/ShowAttachmentUIAction.java} | 33 +- .../ui/swing/util/auth/AuthenticationInfo.java | 2 +- .../ifremer/tutti/ui/swing/util/auth/LoginUI.css | 42 +- .../ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx | 10 +- .../tutti/ui/swing/util/auth/LoginUIHandler.java | 47 +- .../swing/util/auth/actions/LoginAcceptAction.java | 62 + .../swing/util/auth/actions/LoginCancelAction.java | 48 +- .../caracteristics/CaracteristicMapEditorUI.css | 93 +- .../caracteristics/CaracteristicMapEditorUI.jaxx | 9 +- .../CaracteristicMapEditorUIHandler.java | 142 +- .../actions/CaracteristicEditorAddRowAction.java | 84 + .../actions/CaracteristicEditorCancelAction.java | 59 + .../CaracteristicEditorRemoveRowAction.java | 92 + .../actions/CaracteristicEditorSaveAction.java | 61 + .../tutti/ui/swing/util/catches/EnterWeightUI.css | 2 + .../swing/util/catches/EnterWeightUIHandler.java | 44 +- .../catches/actions/EnterWeightCancelAction.java | 62 + .../catches/actions/EnterWeightValidateAction.java | 59 + .../ui/swing/util/species/EnterMelagWeightUI.css | 2 + .../ui/swing/util/species/EnterMelagWeightUI.jaxx | 4 +- .../ui/swing/util/species/SelectSpeciesUI.css | 51 +- .../ui/swing/util/species/SelectSpeciesUI.jaxx | 4 +- .../actions/EnterMelagWeightCancelAction.java | 61 + .../actions/EnterMelagWeightValidateAction.java | 60 + .../species/actions/SelectSpeciesCancelAction.java | 60 + .../actions/SelectSpeciesValidateAction.java | 59 + .../report/ReportUIModel-error-validation.xml | 6 - .../resources/i18n/tutti-ui-swing_en_GB.properties | 17 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 24 +- 470 files changed, 34842 insertions(+), 4299 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 17ee60474a192d6c273377d3087ecaad1a8cd0c7 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 26 10:42:03 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 101f5b7..2604a61 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.2</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index da19820..6301851 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.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 22d9a02..32528c0 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.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 44417b4..582fcc5 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.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 130c27a..5ad73bb 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.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 448289e..30ad007 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.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 3345023..b1d0f59 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.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 25ae879cd473371edcde15cfdfc9bc66c8ffe5fd Merge: 17ee604 d6c044c Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 26 10:42:03 2015 +0000 Merge branch 'master' into develop tutti-report-generator/src/main/assembly/bin.xml | 23 ++++++++++++++++++ .../java/fr/ifremer/tutti/report/ReportConfig.java | 24 +++++++++++++++++++ .../java/fr/ifremer/tutti/report/ReportEngine.java | 24 +++++++++++++++++++ .../java/fr/ifremer/tutti/report/RunReport.java | 24 +++++++++++++++++++ .../importactions/RestoreAfterImportAction.java | 24 +++++++++++++++++++ .../importactions/RestoreAfterValidateAction.java | 24 +++++++++++++++++++ .../service/report/ReportGenerationContext.java | 24 +++++++++++++++++++ .../service/report/ReportGenerationRequest.java | 24 +++++++++++++++++++ .../service/report/ReportGenerationResult.java | 24 +++++++++++++++++++ .../service/report/ReportGenerationService.java | 24 +++++++++++++++++++ .../service/bigfin/BigfinImportService2Test.java | 24 +++++++++++++++++++ .../report/ReportGenerationServiceTest.java | 24 +++++++++++++++++++ .../2014.12.08/allegro-tutti/common/css/common.css | 27 ++++++++++++++++++++-- .../2014.12.08/allegro-tutti/common/js/common.js | 25 +++++++++++++++++++- .../2014.12.08/allegro-tutti/common/js/messages.js | 23 ++++++++++++++++++ .../2014.12.08/allegro-tutti/common/js/util.js | 23 ++++++++++++++++++ .../allegro-tutti/common/nls/common.properties | 23 ++++++++++++++++++ .../report/allegro-tutti/common/css/common.css | 27 ++++++++++++++++++++-- .../report/allegro-tutti/common/js/common.js | 23 ++++++++++++++++++ .../report/allegro-tutti/common/js/messages.js | 23 ++++++++++++++++++ .../report/allegro-tutti/common/js/util.js | 23 ++++++++++++++++++ .../allegro-tutti/common/nls/common.properties | 23 ++++++++++++++++++ .../ui/swing/content/actions/GotoSiteAction.java | 24 +++++++++++++++++++ .../ui/swing/content/actions/ShowHelpAction.java | 24 +++++++++++++++++++ .../actions/AddSampleCategoryRowAction.java | 24 +++++++++++++++++++ .../actions/MoveDownSampleCategoryRowAction.java | 24 +++++++++++++++++++ .../actions/MoveUpSampleCategoryRowAction.java | 24 +++++++++++++++++++ .../actions/RemoveSampleCategoryRowAction.java | 24 +++++++++++++++++++ .../actions/GearCaracteristicAddRowAction.java | 24 +++++++++++++++++++ .../actions/GearCaracteristicCancelAction.java | 24 +++++++++++++++++++ .../actions/GearCaracteristicRemoveRowAction.java | 24 +++++++++++++++++++ .../actions/GearCaracteristicSaveAction.java | 24 +++++++++++++++++++ .../cruise/actions/GenerateCampaignNameAction.java | 24 +++++++++++++++++++ .../content/operation/catches/CatchCustomTab.java | 24 +++++++++++++++++++ .../actions/OpenCreateAccidentalBatchUIAction.java | 24 +++++++++++++++++++ .../CreateAccidentalBatchAndCloseAction.java | 24 +++++++++++++++++++ .../CreateAccidentalBatchAndContinueAction.java | 24 +++++++++++++++++++ .../actions/CreateAccidentalBatchCancelAction.java | 24 +++++++++++++++++++ .../ChangeBenthosBatchSampleCategoryAction.java | 24 +++++++++++++++++++ .../OpenAddBenthosBatchSampleCategoryUIAction.java | 24 +++++++++++++++++++ .../actions/OpenCreateBenthosBatchUIAction.java | 24 +++++++++++++++++++ .../OpenEditBenthosBatchFrequencyUIAction.java | 24 +++++++++++++++++++ .../actions/OpenSplitBenthosBatchUIAction.java | 24 +++++++++++++++++++ .../actions/CreateBenthosBatchAndCloseAction.java | 24 +++++++++++++++++++ .../CreateBenthosBatchAndContinueAction.java | 24 +++++++++++++++++++ .../actions/CreateBenthosBatchCancelAction.java | 24 +++++++++++++++++++ .../actions/SplitBenthosBatchCancelAction.java | 24 +++++++++++++++++++ .../split/actions/SplitBenthosBatchSaveAction.java | 24 +++++++++++++++++++ ...enCreateIndividualObservationBatchUIAction.java | 24 +++++++++++++++++++ ...teIndividualObservationBatchAndCloseAction.java | 24 +++++++++++++++++++ ...ndividualObservationBatchAndContinueAction.java | 24 +++++++++++++++++++ ...eateIndividualObservationBatchCancelAction.java | 24 +++++++++++++++++++ .../OpenCreateMarineLitterBatchUIAction.java | 24 +++++++++++++++++++ ...CreateMarineLitterBatchBatchAndCloseAction.java | 24 +++++++++++++++++++ ...ateMarineLitterBatchBatchAndContinueAction.java | 24 +++++++++++++++++++ .../CreateMarineLitterBatchBatchCancelAction.java | 24 +++++++++++++++++++ .../ChangeSpeciesBatchSampleCategoryAction.java | 24 +++++++++++++++++++ .../actions/ImportPupitriPopupCancelAction.java | 24 +++++++++++++++++++ .../actions/ImportPupitriPopupValidateAction.java | 24 +++++++++++++++++++ .../MultiPostImportLogCloseDialogAction.java | 24 +++++++++++++++++++ .../OpenAddSpeciesBatchSampleCategoryUIAction.java | 24 +++++++++++++++++++ .../actions/OpenCreateSpeciesBatchUIAction.java | 24 +++++++++++++++++++ .../OpenEditSpeciesBatchFrequencyUIAction.java | 24 +++++++++++++++++++ .../actions/OpenSplitSpeciesBatchUIAction.java | 24 +++++++++++++++++++ .../actions/CreateSpeciesBatchAndCloseAction.java | 24 +++++++++++++++++++ .../CreateSpeciesBatchAndContinueAction.java | 24 +++++++++++++++++++ .../actions/CreateSpeciesBatchCancelAction.java | 24 +++++++++++++++++++ .../actions/SplitSpeciesBatchCancelAction.java | 24 +++++++++++++++++++ .../split/actions/SplitSpeciesBatchSaveAction.java | 24 +++++++++++++++++++ .../actions/GearUseFeatureAddRowAction.java | 24 +++++++++++++++++++ .../actions/GearUseFeatureRemoveRowAction.java | 24 +++++++++++++++++++ .../actions/VesselUseFeatureAddRowAction.java | 24 +++++++++++++++++++ .../actions/VesselUseFeatureRemoveRowAction.java | 24 +++++++++++++++++++ .../actions/ImportTemporaryActionSupport.java | 24 +++++++++++++++++++ .../replace/actions/CloseReplaceUIAction.java | 24 +++++++++++++++++++ .../content/report/actions/OpenReportAction.java | 24 +++++++++++++++++++ .../content/report/actions/SaveReportAction.java | 24 +++++++++++++++++++ .../ui/swing/util/actions/SimpleActionSupport.java | 24 +++++++++++++++++++ .../util/attachment/AttachmentItemHandler.java | 24 +++++++++++++++++++ .../swing/util/attachment/AttachmentItemModel.java | 24 +++++++++++++++++++ .../attachment/actions/AddAttachmentAction.java | 24 +++++++++++++++++++ .../attachment/actions/HideAttachmentUIAction.java | 24 +++++++++++++++++++ .../attachment/actions/OpenAttachmentAction.java | 24 +++++++++++++++++++ .../attachment/actions/RemoveAttachmentAction.java | 24 +++++++++++++++++++ .../attachment/actions/ShowAttachmentUIAction.java | 24 +++++++++++++++++++ .../swing/util/auth/actions/LoginAcceptAction.java | 24 +++++++++++++++++++ .../swing/util/auth/actions/LoginCancelAction.java | 24 +++++++++++++++++++ .../actions/CaracteristicEditorAddRowAction.java | 24 +++++++++++++++++++ .../actions/CaracteristicEditorCancelAction.java | 24 +++++++++++++++++++ .../CaracteristicEditorRemoveRowAction.java | 24 +++++++++++++++++++ .../actions/CaracteristicEditorSaveAction.java | 24 +++++++++++++++++++ .../catches/actions/EnterWeightCancelAction.java | 24 +++++++++++++++++++ .../catches/actions/EnterWeightValidateAction.java | 24 +++++++++++++++++++ .../actions/EnterMelagWeightCancelAction.java | 24 +++++++++++++++++++ .../actions/EnterMelagWeightValidateAction.java | 24 +++++++++++++++++++ .../species/actions/SelectSpeciesCancelAction.java | 24 +++++++++++++++++++ .../actions/SelectSpeciesValidateAction.java | 24 +++++++++++++++++++ 97 files changed, 2322 insertions(+), 5 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 48e84168fbf9c82a528f22386f2894ecede211d0 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 26 10:42:04 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 2604a61..101f5b7 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.14.2</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 6301851..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.2</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 32528c0..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.2</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 582fcc5..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.2</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 5ad73bb..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.2</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 30ad007..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.2</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 b1d0f59..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.2</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