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 ec862843e6e1afa22aedfa0712e6aab0b2a07c9f Merge: 8bc5347 cf05752 Author: Maven Release <maven-release@codelutin.com> Date: Sun Apr 5 06:52:23 2015 +0000 Merge branch 'release/4.0-RC1' pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- .../tutti/ichtyometer/IchtyometerClient.java | 192 ++++---------------- .../tutti/ichtyometer/RemoteDevicesFinder.java | 159 +++++++++++++++++ .../tutti/ichtyometer/ServiceRecordsFinder.java | 144 +++++++++++++++ .../tutti/ichtyometer/tool/FeedReaderTool.java | 2 +- .../tutti/ichtyometer/tool/SendCommandTool.java | 2 +- .../java/fr/ifremer/tutti/ichtyometer/BigFins.java | 10 +- .../tutti/ichtyometer/IchtyometerClientTest.java | 2 +- .../tutti/ichtyometer/feed/FeedReaderTest.java | 2 +- .../ichtyometer/interactive/CommandEngineTest.java | 2 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 9 + .../fr/ifremer/tutti/TuttiConfigurationOption.java | 15 +- .../tutti/persistence/TuttiPersistence.java | 2 + .../tutti/persistence/TuttiPersistenceImpl.java | 48 +++-- .../persistence/TuttiPersistenceNoDbImpl.java | 9 +- .../tutti/persistence/entities/data/Cruises.java | 15 ++ .../entities/data/FishingOperations.java | 38 ++++ .../entities/data/SpeciesAbleBatchs.java | 11 ++ .../persistence/entities/referential/Speciess.java | 7 + .../tutti/persistence/model/ProgramDataModel.java | 12 +- .../service/BenthosBatchPersistenceService.java | 2 +- .../BenthosBatchPersistenceServiceImpl.java | 169 +----------------- .../MarineLitterBatchPersistenceServiceImpl.java | 15 +- .../service/SpeciesBatchPersistenceService.java | 2 +- .../SpeciesBatchPersistenceServiceImpl.java | 196 +-------------------- .../service/util/BatchPersistenceHelper.java | 71 +++++--- .../i18n/tutti-persistence_en_GB.properties | 3 + .../i18n/tutti-persistence_fr_FR.properties | 4 +- .../BenthosBatchPersistenceServiceWriteTest.java | 2 +- .../SpeciesBatchPersistenceServiceWriteTest.java | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PersistenceService.java | 13 +- .../tutti/service/bigfin/BigfinImportService.java | 2 +- .../catches/multipost/MultiPostImportService.java | 4 +- .../genericformat/GenericFormatContextSupport.java | 30 +++- .../genericformat/GenericFormatExportService.java | 62 ------- .../GenericFormatImportConfiguration.java | 13 -- .../GenericFormatImportCruiseContext.java | 16 ++ .../GenericFormatImportCruiseResult.java | 10 +- .../GenericFormatImportOperationContext.java | 19 ++ .../GenericFormatImportOperationResult.java | 42 +---- .../genericformat/GenericFormatImportRequest.java | 4 - .../genericformat/GenericFormatImportResult.java | 2 +- .../GenericFormatReferentialImportResult.java | 5 + .../genericformat/GenericFormatResultSupport.java | 9 +- .../GenericFormatValidateFileContext.java | 4 +- .../GenericFormatValidateFileResult.java | 7 + .../GenericformatImportPersistenceHelper.java | 4 +- .../consumer/CsvConsumerForCatch.java | 2 + .../consumer/CsvConsumerForSurvey.java | 6 +- .../service/genericformat/csv/CatchModel.java | 4 +- .../importactions/DoCheckWeightAction.java | 1 + .../importactions/ImportCatchAction.java | 3 +- .../importactions/RestoreAfterValidateAction.java | 132 ++++++++++++-- .../service/psionimport/PsionImportService.java | 10 +- .../service/pupitri/PupitriImportService.java | 6 +- .../service/report/ReportGenerationService.java | 29 ++- .../resources/ftl/genericFormatImportReport_fr.ftl | 165 ++++++++++------- .../ftl/genericFormatValidateReport_fr.ftl | 86 +++++++-- .../ifremer/tutti/service/ServiceDbResource.java | 17 +- .../service/bigfin/BigfinImportService2Test.java | 2 +- .../GenericFormatExportServiceAno5804Test.java | 14 +- .../GenericFormatExportServiceTest.java | 27 ++- .../GenericFormatImportServiceTest.java | 104 +---------- .../GenericFormatImportServiceValidTest.java | 13 ++ tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 15 ++ .../actions/AbstractChangeScreenAction.java | 36 ++++ .../content/actions/ConnectIchtyometerAction.java | 10 +- .../EditCatchesForSelectedCruiseAction.java | 1 + .../content/actions/EditSelectedCruiseAction.java | 4 + .../content/actions/EditSelectedProgramAction.java | 3 + .../actions/OpenGenericFormatExportScreen.java | 21 +-- .../actions/OpenGenericFormatImportScreen.java | 21 +-- .../content/actions/OpenReportScreenAction.java | 12 +- .../OpenTemporaryReferentialScreenAction.java | 1 + .../swing/content/config/TuttiConfigUIHandler.java | 7 + .../swing/content/db/actions/ReimportDbAction.java | 75 +++++--- .../content/db/actions/ReinstallDbAction.java | 73 +++++--- .../GenericFormatExportUIHandler.java | 5 + .../genericformat/GenericFormatImportUI.css | 7 - .../genericformat/GenericFormatImportUI.jaxx | 9 - .../GenericFormatImportUIHandler.java | 7 +- .../genericformat/GenericFormatImportUIModel.java | 20 +-- .../actions/GenericFormatImportAction.java | 40 ++++- .../genericformat/tree/CruiseSelectTreeNode.java | 19 +- .../genericformat/tree/DataSelectTreeModel.java | 11 +- .../tree/ExportDataSelectTreeCellRenderer.java | 21 ++- .../tree/ImportDataSelectTreeCellRenderer.java | 29 +-- .../genericformat/tree/ProgramSelectTreeNode.java | 12 ++ .../tutti/ui/swing/content/home/SelectCruiseUI.css | 10 +- .../ui/swing/content/home/SelectCruiseUI.jaxx | 17 +- .../swing/content/home/SelectCruiseUIHandler.java | 106 +---------- .../content/home/actions/DeleteProtocolAction.java | 11 +- .../content/home/actions/EditCruiseAction.java | 1 + .../content/home/actions/EditProgramAction.java | 1 + .../content/home/actions/ExportProtocolAction.java | 5 +- .../content/home/actions/NewCruiseAction.java | 1 + .../content/home/actions/NewProgramAction.java | 1 + .../catches/benthos/BenthosBatchUIHandler.java | 2 +- .../catches/species/SpeciesBatchUIHandler.java | 2 +- .../referential/ManageTemporaryReferentialUI.css | 12 +- .../referential/ManageTemporaryReferentialUI.jaxx | 23 +-- .../ManageTemporaryReferentialUIHandler.java | 112 ------------ .../actions/ExportExistingTemporaryGearAction.java | 6 +- .../ExportExistingTemporaryPersonAction.java | 6 +- .../ExportExistingTemporarySpeciesAction.java | 4 +- .../ExportExistingTemporaryVesselAction.java | 4 +- .../actions/ImportTemporaryGearAction.java | 2 +- .../actions/ImportTemporaryPersonAction.java | 2 +- .../actions/ImportTemporarySpeciesAction.java | 2 +- .../actions/ImportTemporaryVesselAction.java | 2 +- .../actions/OpenReplaceTemporaryGearUIAction.java | 8 +- .../OpenReplaceTemporaryPersonUIAction.java | 8 +- .../OpenReplaceTemporarySpeciesUIAction.java | 8 +- .../OpenReplaceTemporaryVesselUIAction.java | 8 +- .../ui/swing/util/AbstractTuttiUIHandler.java | 94 ++++++++++ .../util/actions/ShowComboBoxPopupActions.java | 25 ++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 20 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 30 ++-- 124 files changed, 1626 insertions(+), 1394 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.