This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See http://git.codelutin.com/tutti.git from 8bc5347 Merge branch 'release/3.14.3' adds b05a6ba [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 24dcf52 Merge branch 'master' into develop adds 9c3f1bd [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 4009b38 refs #6891: [TECH] erreur à la réouverture de l'écran d'import adds 8370139 fixes #6891: [TECH] erreur à la réouverture de l'écran d'import Merge branch 'feature/6891' into develop adds 68186cd suppression des référentiels temporaires importés pendant la validation de l'import adds f707a8c fixes #6894: [IMPORT GENERIQUE] Laisser la base propre après validation des données Merge branch 'feature/6894' into develop adds 0b53b62 tri des campagnes et traits adds a6faeb2 suppression des methodes de creations de configuration d'export adds 3f5d777 fixes #6897: [IMPORT EXPORT GENERIQUE] Utiliser un ordre sur les traits Merge branch 'feature/6897' into develop adds 0d540e1 amélioration du rapport de validation adds 4170313 fixes #6893: [IMPORT GENERIQUE] Revoir le rapport de validation Merge branch 'feature/6893' into develop adds 2952a24 amélioration du rapport d'import adds 0aa0a5b fixes #6896: [IMPORT GENERIQUE] Revoir le rapport d'import Merge branch 'feature/6896' into develop adds daf094b il manque un test sur un fichier d'import adds aae410e fixes #6900: [IMPORT GENERIQUE] Changement cinématique de la vérification des poids Merge branch 'feature/6900' into develop adds 08e721b revoir la cinématique de confirmation d'écrasement des données à l'import adds 4213fb5 fixes #6895: [IMPORT GENERIQUE] Revoir la cinématique d'écrasement des données Merge branch 'feature/6895' into develop adds 593481d changer l'API de persistence pour pouvoir utiliser le rankOrder fournit ou bien continuer a le calculer adds a4903de fixes #6899: [IMPORT GENERIQUE] Tous les lots catégorisés ne sont pas enregistrés Merge branch 'feature/6899' into develop adds b6c5af7 refs #6899: suppression d'un log adds 3262af7 réusinage des listes d'actions adds 6e9e8f9 fixes #6901: [TECH] Uniformisation du comportement des listes d'actions Merge branch 'feature/6901' into develop adds 8b7bf60 ajout de l'option qui permet de ne pas faire une sauvegarde avant d'importer ou installer une base adds b8eac0f ajout aussi d'un drapeau pour fermer sauvagemment la base adds 3f02507 fixes #6902: [TECH] Ajouter une option pour pouvoir ne pas effectuer une sauvegarde avant chaque import de base Merge branch 'feature/6902' into develop adds ddf29c0 amélioration des textes de l'arbre de sélection adds 5977ed7 amélioration du code de démarrage de client ichtyomètre adds b3782c7 ajout d'une option dans la configuration pour pouvoir retenter des connexions à l'ichtyomètre adds 5fc0241 fixes Anomalie #6533: [BIGFIN] impossible de connecter une des règles Merge branch 'feature/6533' into develop adds 4ea6c96 [jgitflow-maven-plugin]updating poms for branch '4.0-RC1' with snapshot versions adds 33b14a5 add license headers adds cf05752 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC1' with non-snapshot versions adds ec86284 Merge branch 'release/4.0-RC1' No new revisions were added by this update. Summary of changes: 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(-) create mode 100644 tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDevicesFinder.java create mode 100644 tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/ServiceRecordsFinder.java copy tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatValidateFileResult.java => tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/actions/ShowComboBoxPopupActions.java (65%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.