January 2016 - Tutti-commits - mailman.cloud.codelutin.com

branch feature/7926 updated (28c073f -> 9c9f795)
by codelutin.com scm Jan. 19, 2016

Jan. 19, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7926 in repository tutti. See http://git.codelutin.com/tutti.git from 28c073f Uniformisation des tailles des boutons dans les autres écrans (See #7926) adds 9c9f795 grossissements de boutons (refs #7926) No new revisions were added by this update. Summary of changes: .../tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.jaxx | 3 ++- .../swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx | 3 ++- .../catches/individualobservation/IndividualObservationBatchUI.jaxx | 3 ++- .../content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx | 4 +++- .../java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jcss | 4 ---- .../ifremer/tutti/ui/swing/content/validation/ValidateCruiseUI.jaxx | 4 +++- 6 files changed, 12 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7926 updated (17d524f -> 28c073f)
by codelutin.com scm Jan. 19, 2016

Jan. 19, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7926 in repository tutti. See http://git.codelutin.com/tutti.git from 17d524f Uniformisation des tailles des boutons dans les onglets (See #7926) adds 28c073f Uniformisation des tailles des boutons dans les autres écrans (See #7926) No new revisions were added by this update. Summary of changes: .../tutti/ui/swing/content/category/EditSampleCategoryModelUI.jaxx | 2 +- .../java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx | 2 +- .../java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx | 2 +- .../java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx | 2 +- .../main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/6115_ajout_RTP updated (96b1fb7 -> 8cc4b09)
by codelutin.com scm Jan. 19, 2016

Jan. 19, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/6115_ajout_RTP in repository tutti. See http://git.codelutin.com/tutti.git from 96b1fb7 ajout des actions pour naviguer dans le tableau (refs #6115) new 8cc4b09 conversion entre index de vue et de modele (refs #6115) The 1 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 8cc4b090d6a43cd7d9ce3b29b4a5ebf895b616d8 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Jan 19 14:39:26 2016 +0100 conversion entre index de vue et de modele (refs #6115) Summary of changes: .../ui/swing/content/protocol/rtp/RtpButton.java | 5 +++-- .../swing/content/protocol/rtp/RtpCellEditor.java | 25 +++++++++++----------- .../content/protocol/rtp/RtpCellRenderer.java | 3 ++- .../ui/swing/content/protocol/rtp/RtpEditorUI.jaxx | 5 ++++- .../content/protocol/rtp/RtpEditorUIHandler.java | 6 +++--- .../content/protocol/rtp/RtpEditorUIModel.java | 14 +++++++----- 6 files changed, 34 insertions(+), 24 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/7926 created (now 17d524f)
by codelutin.com scm Jan. 19, 2016

Jan. 19, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7926 in repository tutti. See http://git.codelutin.com/tutti.git at 17d524f Uniformisation des tailles des boutons dans les onglets (See #7926) This branch includes the following new commits: new 17d524f Uniformisation des tailles des boutons dans les onglets (See #7926) The 1 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 17d524f74a2895037c77af5bdd8a379bfcad66bb Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Jan 19 14:28:37 2016 +0100 Uniformisation des tailles des boutons dans les onglets (See #7926) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/6115_ajout_RTP updated (d24f9e0 -> 96b1fb7)
by codelutin.com scm Jan. 19, 2016

Jan. 19, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/6115_ajout_RTP in repository tutti. See http://git.codelutin.com/tutti.git from d24f9e0 nouvelle extension des fichiers css + libellés (refs #6115) new 9be8532 correction renderer (refs #6115) new 96b1fb7 ajout des actions pour naviguer dans le tableau (refs #6115) The 2 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 96b1fb73f157d289c45a9653282c4e001c61f470 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Jan 19 12:32:42 2016 +0100 ajout des actions pour naviguer dans le tableau (refs #6115) commit 9be85329479f9cb2f4f744d258b6f527ff7f3194 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Jan 19 11:51:31 2016 +0100 correction renderer (refs #6115) Summary of changes: .../swing/content/protocol/rtp/RtpCellEditor.java | 3 -- .../content/protocol/rtp/RtpCellRenderer.java | 21 +++++--- .../ui/swing/content/protocol/rtp/RtpEditorUI.jaxx | 5 ++ .../ui/swing/content/protocol/rtp/RtpEditorUI.jcss | 20 +++++++ .../content/protocol/rtp/RtpEditorUIHandler.java | 47 +++++++++-------- .../content/protocol/rtp/RtpEditorUIModel.java | 58 +++++++++++++++++++-- .../protocol/rtp/actions/EditNextRowAction.java | 24 +++++++++ .../rtp/actions/EditPreviousRowAction.java | 24 +++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 3 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 ++ .../src/main/resources/icons/action-next.png | Bin 0 -> 349 bytes .../src/main/resources/icons/action-previous.png | Bin 0 -> 345 bytes 12 files changed, 171 insertions(+), 37 deletions(-) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/EditNextRowAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/EditPreviousRowAction.java create mode 100644 tutti-ui-swing/src/main/resources/icons/action-next.png create mode 100644 tutti-ui-swing/src/main/resources/icons/action-previous.png -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch feature/6115_ajout_RTP updated (863af8b -> d24f9e0)
by codelutin.com scm Jan. 19, 2016

Jan. 19, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/6115_ajout_RTP in repository tutti. See http://git.codelutin.com/tutti.git discards 863af8b On sauve seulement (on en ferme pas) quand on clique sur le bouton Enregistrer (refs #6115) discards 688fb26 reset le formulaire quand on quitte sans sauvegarder (refs #6115) discards 31522f4 ajout du validateur + passage du tablemodel dans l'editor (refs #6115) discards 05e8fca ajout du validateur + passage du tablemodel dans le model de l'editor (refs #6115) discards 21a465e Début de l'éditeur des relations RTP, mais tout ne fonctionne pas encore.. (See #6115) discards ba442f6 Ajout du model de RTP sur SpeciesProtocol (See #6115) adds c3afc48 Utiliser un comparateur de date pour le tri de la liste des opérations (See #7874) adds 20d63c1 Suppression constante inutile adds a205fc9 Merge branch 'feature/7874_tri_sur_les_traits_par_date' into 'develop' adds 8d70e7d Renommage des css en jcss adds 8eedb54 Changement du niveau de log adds 5c9c674 Ajout de méthodes sur la persistence pour récupérer des objets obsolètes (See #7909) adds 7d9a05a Pouvoir lors de l'import générique utiliser des objets obsolètes (partie service) (See #7909) adds 1e1adbb Pouvoir lors de l'import générique utiliser des objets obsolètes (partie ui) (See #7909) adds feda4a0 Mise à jour des tests d'import générique adds 912ce8c Les bases de tests ont été mises à jour, plus besoin d'utiliser l'ancien mécanisme pour récupérer les utilisateurs adds 3fc6609 Utilisation d'une base vide pour les tests d'import générique adds bccde35 Ajout d'un test pour la validation d'import générique avec des données obsolètes (See #7909) adds 9b20e27 Test d'import de données obsolètes pour les engins, strates adds 5f644ac Permettre de récupérer des référentiels obsolètes (See #7909) adds 8139a51 Suppresion d'un service obsolète adds fa6349e Correction de la requete pour récupérer les navires obsolètes adds 31acffd Correction de la requete pour récupérer les navires obsolètes adds 69fac2b Fixes #7909 Merge branch 'feature/7909_import_generique_id_obsoletes' into develop adds c96516d Nettoyage de la javadoc (See #7898) adds cb6308c Merge branch 'feature/7898' into develop adds fbebf9d Mise à jour des librairies lutins adds d3f73ef Mise à jour des librairies lutins adds 677e889 [jgitflow-maven-plugin]updating poms for 4.4-SNAPSHOT development adds cbbe213 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds b81f1a2 Add missing file headers adds 1b39774 [jgitflow-maven-plugin]updating poms for branch'release/4.3' with non-snapshot versions adds de8efb0 [jgitflow-maven-plugin]merging 'release/4.3' into 'master' adds 49ebb38 [jgitflow-maven-plugin]merging 'master' into 'develop' adds eab4ab7 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 3a178e1 upgrade jaxx verison (fixes #7924) adds 1bdf452 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 8caea2d [jgitflow-maven-plugin]updating poms for 4.3.1 branch with snapshot versions adds 419d3b2 [jgitflow-maven-plugin]updating poms for branch'release/4.3.1' with non-snapshot versions adds 15285f0 [jgitflow-maven-plugin]merging 'release/4.3.1' into 'master' adds bbbaefa [jgitflow-maven-plugin]merging 'master' into 'develop' adds 97d8cec [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 6b0f8d5 Ajout du model de RTP sur SpeciesProtocol (See #6115) new dcea62f Début de l'éditeur des relations RTP, mais tout ne fonctionne pas encore.. (See #6115) new 67e11e1 ajout du validateur + passage du tablemodel dans le model de l'editor (refs #6115) new 59845da ajout du validateur + passage du tablemodel dans l'editor (refs #6115) new 392b446 reset le formulaire quand on quitte sans sauvegarder (refs #6115) new 9b27d5b On sauve seulement (on en ferme pas) quand on clique sur le bouton Enregistrer (refs #6115) new d24f9e0 nouvelle extension des fichiers css + libellés (refs #6115) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (863af8b) \ N -- N -- N refs/heads/feature/6115_ajout_RTP (d24f9e0) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 7 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 d24f9e0634c6a5ad7ed54fef53a55ce8af047fd7 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Jan 19 11:23:02 2016 +0100 nouvelle extension des fichiers css + libellés (refs #6115) commit 9b27d5b332f195fa47b9052f0169eb4967fe50c5 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Jan 19 10:42:51 2016 +0100 On sauve seulement (on en ferme pas) quand on clique sur le bouton Enregistrer (refs #6115) commit 392b4461c87d5e18099afff3cfcb8185d17b5758 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Jan 18 13:43:05 2016 +0100 reset le formulaire quand on quitte sans sauvegarder (refs #6115) commit 59845dacac83f15e731c51deaf2639e554fe0fae Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Jan 18 11:38:54 2016 +0100 ajout du validateur + passage du tablemodel dans l'editor (refs #6115) commit 67e11e15de1c2a971c46306e4fcebfb631aea45a Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Jan 18 11:37:29 2016 +0100 ajout du validateur + passage du tablemodel dans le model de l'editor (refs #6115) commit dcea62faaaa9613d84376e1e109836f302c52e41 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Jan 14 22:57:42 2016 +0100 Début de l'éditeur des relations RTP, mais tout ne fonctionne pas encore.. (See #6115) commit 6b0f8d5d7c2ecad974877ef14a6f2009d7eb561d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Jan 14 21:50:35 2016 +0100 Ajout du model de RTP sur SpeciesProtocol (See #6115) Summary of changes: pom.xml | 10 +- tutti-ichtyometer/pom.xml | 2 +- .../tutti/ichtyometer/IchtyometerClient.java | 4 +- .../ichtyometer/LocalDeviceNotFoundException.java | 4 +- .../tutti/ichtyometer/RemoteDeviceChooser.java | 2 +- .../ichtyometer/RemoteDeviceNotFoundException.java | 4 +- .../RemoteDeviceServiceNotFoundException.java | 4 +- .../ifremer/tutti/ichtyometer/feed/FeedReader.java | 4 +- .../ichtyometer/feed/event/FeedReaderEvent.java | 2 +- .../ichtyometer/feed/event/FeedReaderListener.java | 4 +- .../tutti/ichtyometer/interactive/Command.java | 2 +- .../ichtyometer/interactive/CommandEngine.java | 4 +- .../interactive/IchtyometerCommandException.java | 2 +- .../tutti/ichtyometer/tool/FeedReaderTool.java | 2 +- .../tutti/ichtyometer/tool/SendCommandTool.java | 2 +- .../tutti/ichtyometer/IchtyometerClientTest.java | 4 +- .../tutti/ichtyometer/feed/FeedReaderTest.java | 2 +- .../ichtyometer/interactive/CommandEngineTest.java | 2 +- tutti-persistence/pom.xml | 2 +- .../src/main/java/fr/ifremer/tutti/LabelAware.java | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 2 +- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 4 +- .../ifremer/tutti/TuttiConfigurationProvider.java | 2 +- .../persistence/InvalidBatchModelException.java | 2 +- .../tutti/persistence/ProgressionModel.java | 2 +- .../tutti/persistence/RessourceClassLoader.java | 2 +- .../tutti/persistence/TuttiPersistence.java | 2 +- .../tutti/persistence/TuttiPersistenceImpl.java | 49 +- .../persistence/TuttiPersistenceNoDbImpl.java | 42 +- .../TuttiPersistenceServiceImplementor.java | 2 +- .../dao/GearPhysicalFeaturesDaoImplTutti.java | 5 +- .../dao/GearPhysicalFeaturesDaoTutti.java | 2 +- .../tutti/persistence/dao/TaxonNameDaoTutti.java | 19 +- .../persistence/dao/TaxonNameDaoTuttiImpl.java | 109 ++ .../persistence/entities/CaracteristicMap.java | 2 +- .../tutti/persistence/entities/TuttiEntities.java | 2 +- .../tutti/persistence/entities/TuttiEntity.java | 2 +- .../persistence/entities/TuttiEntityBean.java | 2 +- .../persistence/entities/TuttiEnumerable.java | 2 +- .../persistence/entities/data/BatchContainer.java | 2 +- .../persistence/entities/data/SampleCategory.java | 2 +- .../entities/data/SampleCategoryModel.java | 2 +- .../data/SampleCategoryModelConverter.java | 4 +- .../entities/data/SampleCategoryModelEntry.java | 4 +- .../protocol/CaracteristicMappingRows.java | 24 + .../entities/protocol/CaracteristicType.java | 2 +- .../entities/protocol/SpeciesProtocols.java | 24 + .../entities/protocol/TuttiProtocols.java | 2 +- .../entities/protocol/v1/SpeciesProtocol1.java | 2 +- .../entities/protocol/v1/SpeciesProtocolBean1.java | 2 +- .../entities/protocol/v1/TuttiProtocol1.java | 2 +- .../entities/protocol/v1/TuttiProtocolBean1.java | 2 +- .../service/AbstractPersistenceService.java | 8 +- .../service/AccidentalBatchPersistenceService.java | 2 +- .../AccidentalBatchPersistenceServiceImpl.java | 2 +- .../service/AttachmentPersistenceService.java | 2 +- .../service/AttachmentPersistenceServiceImpl.java | 2 +- .../service/BenthosBatchPersistenceService.java | 6 +- .../BenthosBatchPersistenceServiceImpl.java | 2 +- .../service/CruisePersistenceService.java | 2 +- .../service/CruisePersistenceServiceImpl.java | 2 +- .../FishingOperationPersistenceService.java | 2 +- .../FishingOperationPersistenceServiceImpl.java | 11 +- ...dividualObservationBatchPersistenceService.java | 2 +- ...dualObservationBatchPersistenceServiceImpl.java | 2 +- .../MarineLitterBatchPersistenceService.java | 4 +- .../MarineLitterBatchPersistenceServiceImpl.java | 2 +- .../service/ProgramPersistenceService.java | 7 +- .../service/ProgramPersistenceServiceImpl.java | 2 +- .../service/ProtocolPersistenceService.java | 2 +- .../service/ProtocolPersistenceServiceImpl.java | 2 +- .../service/ReferentialPersistenceService.java | 495 ------- .../service/ReferentialPersistenceServiceImpl.java | 1423 -------------------- .../service/SpeciesBatchPersistenceService.java | 6 +- .../SpeciesBatchPersistenceServiceImpl.java | 2 +- .../service/TechnicalPersistenceService.java | 6 +- .../service/TechnicalPersistenceServiceImpl.java | 2 +- .../service/TuttiPersistenceServiceLocator.java | 2 +- .../service/batch/TuttiCatchBatchValidator.java | 2 +- .../referential/GearPersistenceService.java | 16 +- .../referential/GearPersistenceServiceImpl.java | 42 +- .../referential/LocationPersistenceService.java | 18 +- .../LocationPersistenceServiceImpl.java | 129 +- .../referential/PersonPersistenceService.java | 15 +- .../referential/PersonPersistenceServiceImpl.java | 32 +- .../ReferentialPersistenceServiceSupport.java | 24 +- .../referential/SpeciesPersistenceService.java | 16 +- .../referential/SpeciesPersistenceServiceImpl.java | 41 +- .../referential/VesselPersistenceService.java | 14 +- .../referential/VesselPersistenceServiceImpl.java | 134 +- .../referential/synchro/ReferentialUpdateTask.java | 7 +- .../TuttiReferentialSynchroServiceImpl.java | 9 +- .../service/util/BatchPersistenceHelper.java | 4 +- .../persistence/service/util/BatchTreeHelper.java | 4 +- .../service/util/MeasurementPersistenceHelper.java | 2 +- .../service/util/SamplePersistenceHelper.java | 2 +- .../service/util/SynchronizationStatusHelper.java | 4 +- .../VesselPersonFeaturesPersistenceHelper.java | 2 +- .../tutti/persistence/test/DatabaseFixtures.java | 2 +- .../tutti/persistence/test/DatabaseResource.java | 13 +- .../tutti/persistence/test/TuttiRunListener.java | 2 +- .../tutti/persistence/test/TuttiRunner.java | 5 +- .../ifremer/tutti/type/CoordinateEditorType.java | 4 +- .../java/fr/ifremer/tutti/type/WeightUnit.java | 4 +- .../main/java/fr/ifremer/tutti/util/Weights.java | 2 +- .../resources/applicationContext-service-tutti.xml | 32 +- .../src/main/resources/queries-failsafe.hbm.xml | 187 ++- .../ReferentialSynchroTableMetadataTest.java | 2 +- .../config/TuttiPersistenceConfigTest.java | 2 +- .../entities/protocol/TuttiProtocolsTest.java | 2 +- .../AccidentalBatchPersistenceServiceReadTest.java | 2 +- ...AccidentalBatchPersistenceServiceWriteTest.java | 2 +- .../AttachmentPersistenceServiceWriteTest.java | 2 +- .../BenthosBatchPersistenceServiceReadTest.java | 2 +- .../BenthosBatchPersistenceServiceWriteTest.java | 2 +- .../CatchBatchPersistenceServiceReadTest.java | 2 +- .../CatchBatchPersistenceServiceWriteTest.java | 2 +- .../service/CruisePersistenceServiceReadTest.java | 2 +- .../service/CruisePersistenceServiceWriteTest.java | 2 +- ...hingOperationPersistenceServiceAno4995Test.java | 4 +- ...FishingOperationPersistenceServiceReadTest.java | 2 +- ...ishingOperationPersistenceServiceWriteTest.java | 2 +- ...bservationBatchPersistenceServiceWriteTest.java | 2 +- ...arineLitterBatchPersistenceServiceReadTest.java | 2 +- ...rineLitterBatchPersistenceServiceWriteTest.java | 2 +- .../service/ProgramPersistenceServiceReadTest.java | 2 +- .../ProgramPersistenceServiceWriteTest.java | 2 +- .../ProtocolPersistenceServiceReadTest.java | 2 +- .../ProtocolPersistenceServiceWriteTest.java | 2 +- .../ReferentialPersistenceServiceWriteTest.java | 2 +- .../SpeciesBatchPersistenceServiceReadTest.java | 2 +- .../SpeciesBatchPersistenceServiceWriteTest.java | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../tutti/service/AbstractTuttiService.java | 6 +- .../tutti/service/ClosedPersistenceService.java | 2 +- .../fr/ifremer/tutti/service/DecoratorService.java | 57 +- .../ifremer/tutti/service/PersistenceService.java | 42 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 12 +- .../fr/ifremer/tutti/service/TuttiDecorator.java | 4 +- .../fr/ifremer/tutti/service/TuttiService.java | 8 +- .../ifremer/tutti/service/TuttiServiceContext.java | 4 +- .../tutti/service/TuttiValidationDataContext.java | 2 +- .../service/TuttiValidationDataContextSupport.java | 10 +- .../ifremer/tutti/service/ValidationService.java | 2 +- .../tutti/service/bigfin/BigfinImportResult.java | 2 +- .../catches/TuttiWeightComputingException.java | 2 +- .../catches/ValidateCruiseOperationsService.java | 2 +- .../service/catches/WeightCleaningService.java | 8 +- .../service/catches/WeightComputingService.java | 2 +- .../multipost/AbstractFishingOperationRow.java | 2 +- .../AbstractFishingOperationRowModel.java | 2 +- .../catches/multipost/AccidentalCatchRow.java | 2 +- .../catches/multipost/AccidentalCatchRowModel.java | 2 +- .../service/catches/multipost/AttachmentRow.java | 2 +- .../catches/multipost/AttachmentRowModel.java | 2 +- .../catches/multipost/CaracteristicRow.java | 2 +- .../catches/multipost/CaracteristicRowModel.java | 2 +- .../catches/multipost/CatchFrequencyRow.java | 2 +- .../catches/multipost/CatchFrequencyRowModel.java | 2 +- .../tutti/service/catches/multipost/CatchRow.java | 2 +- .../service/catches/multipost/CatchRowModel.java | 2 +- .../service/catches/multipost/CatchWeightsRow.java | 2 +- .../catches/multipost/CatchWeightsRowModel.java | 2 +- .../catches/multipost/FishingOperationRow.java | 2 +- .../multipost/FishingOperationRowModel.java | 2 +- .../multipost/IndividualObservationRow.java | 2 +- .../multipost/IndividualObservationRowModel.java | 2 +- .../service/catches/multipost/MarineLitterRow.java | 2 +- .../catches/multipost/MarineLitterRowModel.java | 2 +- .../catches/multipost/MarineLitterWeightRow.java | 2 +- .../multipost/MarineLitterWeightRowModel.java | 2 +- .../catches/multipost/MultiPostExportService.java | 4 +- .../catches/multipost/MultiPostImportService.java | 2 +- .../service/csv/CaracteristicParserFormatter.java | 5 + .../service/csv/EntityParserFormatterSupport.java | 15 +- .../FishingOperationLocationParserFormatter.java | 5 + .../csv/FishingOperationStrataParserFormatter.java | 5 + .../FishingOperationSubStrataParserFormatter.java | 5 + .../service/csv/ForeignKeyListParserFormatter.java | 2 +- .../service/csv/ForeignKeyParserFormatter.java | 2 +- .../tutti/service/csv/GearParserFormatter.java | 5 + .../tutti/service/csv/HarbourParserFormatter.java | 5 + .../tutti/service/csv/PersonParserFormatter.java | 5 + .../tutti/service/csv/ProgramParserFormatter.java | 5 + .../tutti/service/csv/SpeciesParserFormatter.java | 5 + .../fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 2 +- .../tutti/service/csv/VesselParserFormatter.java | 5 + .../tutti/service/export/ExportCatchContext.java | 4 +- .../export/pdf/CatchesPdfExportService.java | 2 +- .../tutti/service/export/sumatra/CatchRow.java | 2 +- .../service/export/sumatra/CatchRowModel.java | 2 +- .../sumatra/CatchesSumatraExportService.java | 2 +- .../export/sumatra/SumatraExportResult.java | 2 +- .../genericformat/GenericFormatExportService.java | 4 +- .../GenericFormatImportConfiguration.java | 10 + .../GenericFormatImportEntityParserFactory.java | 17 +- .../genericformat/GenericFormatImportRequest.java | 4 + .../genericformat/csv/AccidentalCatchModel.java | 2 +- .../genericformat/csv/AccidentalCatchRow.java | 2 +- .../service/genericformat/csv/CatchModel.java | 2 +- .../tutti/service/genericformat/csv/CatchRow.java | 2 +- .../genericformat/csv/ExportSampleCategory.java | 2 +- .../genericformat/csv/GearCaracteristicModel.java | 2 +- .../genericformat/csv/GearCaracteristicRow.java | 2 +- .../csv/IndividualObservationModel.java | 2 +- .../csv/IndividualObservationRow.java | 2 +- .../genericformat/csv/MarineLitterModel.java | 2 +- .../service/genericformat/csv/MarineLitterRow.java | 2 +- .../service/genericformat/csv/OperationModel.java | 2 +- .../service/genericformat/csv/OperationRow.java | 2 +- .../service/genericformat/csv/ParameterModel.java | 2 +- .../service/genericformat/csv/ParameterRow.java | 2 +- .../genericformat/csv/SpeciesExportModel.java | 2 +- .../genericformat/csv/SpeciesExportRow.java | 2 +- .../service/genericformat/csv/SurveyModel.java | 2 +- .../tutti/service/genericformat/csv/SurveyRow.java | 2 +- .../tutti/service/protocol/CaracteristicRow.java | 2 +- .../service/protocol/CaracteristicRowModel.java | 2 +- .../protocol/ProtocolImportExportService.java | 2 +- .../ifremer/tutti/service/protocol/SpeciesRow.java | 2 +- .../tutti/service/protocol/SpeciesRowModel.java | 2 +- .../service/psionimport/PsionImportBatchModel.java | 2 +- .../service/psionimport/PsionImportModel.java | 2 +- .../service/psionimport/PsionImportResult.java | 2 +- .../service/psionimport/PsionImportService.java | 8 +- .../ifremer/tutti/service/pupitri/Directions.java | 2 +- .../tutti/service/pupitri/PupitriImportResult.java | 4 +- .../service/pupitri/PupitriImportService.java | 2 +- .../service/pupitri/PupitriSpeciesContext.java | 2 +- .../fr/ifremer/tutti/service/pupitri/Signs.java | 2 +- .../tutti/service/pupitri/csv/CarrouselRow.java | 2 +- .../service/pupitri/csv/CarrouselRowModel.java | 2 +- .../tutti/service/pupitri/csv/SpeciesRow.java | 2 +- .../tutti/service/pupitri/csv/SpeciesRowModel.java | 2 +- .../tutti/service/pupitri/csv/TrunkRow.java | 2 +- .../tutti/service/pupitri/csv/TrunkRowModel.java | 2 +- .../TuttiReferentialSynchronizeService.java | 2 +- .../tutti/service/referential/csv/GearModel.java | 2 +- .../tutti/service/referential/csv/PersonModel.java | 2 +- .../service/referential/csv/SpeciesModel.java | 2 +- .../tutti/service/referential/csv/VesselModel.java | 2 +- .../ifremer/tutti/service/AbstractServiceTest.java | 2 +- .../tutti/service/BeanValidatorDetectorTest.java | 2 +- .../tutti/service/DecoratorServiceTest.java | 2 +- .../ifremer/tutti/service/ServiceDbResource.java | 22 +- .../tutti/service/ValidationServiceTest.java | 2 +- .../service/bigfin/BigfinImportService2Test.java | 1 - .../catches/WeightComputingServiceTest.java | 2 +- .../multipost/MultiPostExportServiceTest.java | 2 +- .../export/pdf/CatchesPdfExportServiceTest.java | 2 +- .../sumatra/CatchesSumatraExportServiceTest.java | 2 +- .../GenericFormatExportServiceTest.java | 2 +- .../GenericFormatImportServiceTest.java | 3 +- .../GenericFormatImportServiceValidTest.java | 40 +- .../protocol/ProtocolImportExportServiceTest.java | 2 +- .../psionimport/PsionImportServiceTest.java | 2 +- .../pupitri/PupitriImportServiceAno3898Test.java | 2 +- .../pupitri/PupitriImportServiceAno5032Test.java | 2 +- .../pupitri/PupitriImportServiceAno5079Test.java | 2 +- .../pupitri/PupitriImportServiceEvo5060Test.java | 2 +- .../pupitri/PupitriImportServiceEvo5062Test.java | 2 +- .../service/pupitri/PupitriImportServiceTest.java | 2 +- .../ReferentialTemporaryExportServiceTest.java | 2 +- .../test/resources/genericFormat/catch/catch.csv | 866 ++++++------ .../test/resources/genericFormat/default/catch.csv | 866 ++++++------ .../resources/genericFormat/default/operation.csv | 6 +- .../resources/genericFormat/default/survey.csv | 4 +- .../test/resources/genericFormat/empty/catch.csv | 2 +- .../resources/genericFormat/empty/operation.csv | 2 +- .../test/resources/genericFormat/empty/survey.csv | 2 +- .../genericFormat/marineLitter/marineLitter.csv | 8 +- .../genericFormat/operation/operation.csv | 6 +- .../referentials/temporarySpecies.csv | 18 +- .../test/resources/genericFormat/survey/survey.csv | 4 +- .../genericFormat/withObsoletes/catch.csv | 16 + .../{empty => withObsoletes}/operation.csv | 3 +- .../withObsoletes/protocol.tuttiProtocol} | 29 +- .../genericFormat/withObsoletes/sampleCategory.csv | 9 + .../genericFormat/withObsoletes/survey.csv | 2 + .../genericFormat/withObsoletes/temporaryGears.csv | 1 + .../withObsoletes/temporaryPersons.csv | 1 + .../withObsoletes/temporarySpecies.csv | 11 + .../withObsoletes/temporaryVessels.csv | 1 + tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 5 +- .../filtered-resources/tutti-help-fr.properties | 5 +- .../java/fr/ifremer/tutti/ui/swing/RunTutti.java | 2 +- .../ifremer/tutti/ui/swing/TuttiActionFactory.java | 2 +- .../fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java | 2 +- .../fr/ifremer/tutti/ui/swing/TuttiScreen.java | 2 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 2 +- .../ui/swing/content/{Common.css => Common.jcss} | 0 .../ui/swing/content/{MainUI.css => MainUI.jcss} | 0 .../tutti/ui/swing/content/MainUIHandler.java | 2 +- .../actions/AbstractChangeLocaleAction.java | 2 +- .../actions/AbstractChangeScreenAction.java | 50 +- .../content/actions/AbstractMainUITuttiAction.java | 2 +- .../content/actions/ChangeToLocaleFRAction.java | 2 +- .../content/actions/ChangeToLocaleUKAction.java | 2 +- .../content/actions/CloseApplicationAction.java | 2 +- .../content/actions/ConnectIchtyometerAction.java | 4 +- .../actions/DisconnectIchtyometerAction.java | 4 +- .../EditCatchesForSelectedCruiseAction.java | 2 +- .../content/actions/EditSelectedCruiseAction.java | 2 +- .../content/actions/EditSelectedProgramAction.java | 2 +- .../actions/EditSelectedProtocolAction.java | 2 +- .../content/actions/GoToPreviousScreenAction.java | 2 +- .../swing/content/actions/OpenDbScreenAction.java | 2 +- .../actions/OpenGenericFormatImportScreen.java | 2 +- .../content/actions/OpenHomeScreenAction.java | 2 +- .../content/actions/OpenReportScreenAction.java | 2 +- .../OpenSampleCategoryModelScreenAction.java | 2 +- .../OpenTemporaryReferentialScreenAction.java | 2 +- .../ui/swing/content/actions/ShowAboutAction.java | 2 +- .../ui/swing/content/actions/ShowConfigAction.java | 2 +- .../ui/swing/content/actions/StartAction.java | 4 +- .../actions/ValidateSelectedCruiseAction.java | 2 +- .../EditSampleCategoryModelTableModel.java | 2 +- ...yModelUI.css => EditSampleCategoryModelUI.jcss} | 0 .../category/EditSampleCategoryModelUIHandler.java | 2 +- .../category/EditSampleCategoryModelUIModel.java | 2 +- .../actions/SaveSampleCategoryModelAction.java | 2 +- .../{TuttiConfigUI.css => TuttiConfigUI.jcss} | 0 .../swing/content/config/TuttiConfigUIHandler.java | 2 +- .../content/config/actions/ReloadTuttiAction.java | 2 +- .../cruise/{EditCruiseUI.css => EditCruiseUI.jcss} | 0 .../swing/content/cruise/EditCruiseUIHandler.java | 2 +- .../ui/swing/content/cruise/EditCruiseUIModel.java | 2 +- .../cruise/GearCaracteristicsEditorRowModel.java | 2 +- .../cruise/GearCaracteristicsEditorTableModel.java | 2 +- ...ditorUI.css => GearCaracteristicsEditorUI.jcss} | 0 .../cruise/GearCaracteristicsEditorUIHandler.java | 2 +- .../cruise/GearCaracteristicsEditorUIModel.java | 2 +- .../ui/swing/content/cruise/VesselTypeEnum.java | 2 +- .../actions/EditGearCaracteristicsAction.java | 2 +- .../content/cruise/actions/SaveCruiseAction.java | 2 +- .../actions/ViewGearCaracteristicsAction.java | 2 +- .../db/{DbManagerUI.css => DbManagerUI.jcss} | 0 .../ui/swing/content/db/DbManagerUIHandler.java | 2 +- .../ui/swing/content/db/actions/CloseDbAction.java | 2 +- .../content/db/actions/ExportAndCleanDbAction.java | 2 +- .../swing/content/db/actions/ExportDbAction.java | 2 +- .../swing/content/db/actions/ImportDbAction.java | 2 +- .../db/actions/ImportOrReimportDbAction.java | 2 +- .../swing/content/db/actions/InstallDbAction.java | 2 +- .../db/actions/InstallOrReinstallDbAction.java | 2 +- .../ui/swing/content/db/actions/OpenDbAction.java | 2 +- .../swing/content/db/actions/ReimportDbAction.java | 2 +- .../content/db/actions/ReinstallDbAction.java | 2 +- .../swing/content/db/actions/UpdateDbAction.java | 2 +- ...rmatExportUI.css => GenericFormatExportUI.jcss} | 0 .../genericformat/GenericFormatImportUI.jaxx | 5 + ...rmatImportUI.css => GenericFormatImportUI.jcss} | 7 + .../GenericFormatImportUIHandler.java | 14 +- .../genericformat/GenericFormatImportUIModel.java | 16 + .../{SelectCruiseUI.css => SelectCruiseUI.jcss} | 0 .../swing/content/home/SelectCruiseUIHandler.java | 2 +- .../ui/swing/content/home/SelectCruiseUIModel.java | 2 +- .../content/home/actions/CloneProtocolAction.java | 2 +- .../content/home/actions/DeleteProtocolAction.java | 2 +- .../content/home/actions/EditCatchesAction.java | 2 +- .../content/home/actions/EditCruiseAction.java | 2 +- .../content/home/actions/EditProgramAction.java | 2 +- .../content/home/actions/EditProtocolAction.java | 2 +- .../home/actions/ExportCruiseForSumatraAction.java | 2 +- .../content/home/actions/ExportProtocolAction.java | 2 +- .../content/home/actions/ImportProtocolAction.java | 2 +- .../content/home/actions/NewCruiseAction.java | 2 +- .../content/home/actions/NewProgramAction.java | 2 +- .../content/home/actions/NewProtocolAction.java | 2 +- .../home/actions/SendCruiseReportAction.java | 2 +- .../SpeciesToConfirmReportForCruiseAction.java | 2 +- .../home/actions/ValidateCatchesAction.java | 2 +- ...OperationUI.css => EditFishingOperationUI.jcss} | 0 .../operation/EditFishingOperationUIHandler.java | 2 +- .../operation/EditFishingOperationUIModel.java | 2 +- ...ngOperationsUI.css => FishingOperationsUI.jcss} | 0 .../operation/FishingOperationsUIHandler.java | 2 +- .../operation/FishingOperationsUIModel.java | 12 +- .../content/operation/SecondaryVesselTypeEnum.java | 2 +- .../catches/AbstractTuttiBatchTableUIHandler.java | 4 +- .../catches/AbstractTuttiBatchUIModel.java | 2 +- .../{EditCatchesUI.css => EditCatchesUI.jcss} | 0 .../operation/catches/EditCatchesUIHandler.java | 2 +- .../operation/catches/EditCatchesUIModel.java | 6 +- .../catches/FrequencyConfigurationMode.java | 2 +- ...LogDialog.css => MultiPostImportLogDialog.jcss} | 0 .../operation/catches/SampleCategoryAble.java | 2 +- .../catches/SampleCategoryColumnIdentifier.java | 2 +- .../operation/catches/SampleCategoryComponent.java | 6 +- .../operation/catches/SelectedCategoryAble.java | 2 +- .../catches/SpeciesAbleBatchRowHelper.java | 2 +- .../operation/catches/SpeciesBatchDecorator.java | 2 +- .../catches/SpeciesBatchDecoratorComparator.java | 6 +- .../content/operation/catches/SpeciesSortMode.java | 2 +- .../operation/catches/SpeciesSortableRowModel.java | 2 +- .../content/operation/catches/TableViewMode.java | 2 +- .../accidental/AccidentalBatchRowModel.java | 2 +- .../accidental/AccidentalBatchTableModel.java | 2 +- ...ccidentalBatchUI.css => AccidentalBatchUI.jcss} | 0 .../accidental/AccidentalBatchUIHandler.java | 2 +- .../catches/accidental/AccidentalBatchUIModel.java | 2 +- .../actions/ExportMultiPostAccidentalAction.java | 2 +- .../actions/ImportMultiPostAccidentalAction.java | 2 +- .../actions/RemoveAccidentalBatchAction.java | 2 +- ...talBatchUI.css => CreateAccidentalBatchUI.jcss} | 0 .../create/CreateAccidentalBatchUIHandler.java | 2 +- .../create/CreateAccidentalBatchUIModel.java | 2 +- .../actions/CancelEditCatchBatchAction.java | 2 +- .../catches/actions/CleanBatchWeightsAction.java | 4 +- .../catches/actions/ComputeBatchWeightsAction.java | 2 +- .../ExportFishingOperationForSumatraAction.java | 2 +- .../ExportFishingOperationReportAction.java | 2 +- .../actions/ExportMultiPostActionSupport.java | 2 +- .../actions/ImportMultiPostActionSupport.java | 2 +- .../catches/actions/SaveCatchBatchAction.java | 2 +- .../catches/benthos/BenthosBatchRowModel.java | 2 +- .../catches/benthos/BenthosBatchTableModel.java | 2 +- .../{BenthosBatchUI.css => BenthosBatchUI.jcss} | 0 .../catches/benthos/BenthosBatchUIHandler.java | 2 +- .../catches/benthos/BenthosBatchUIModel.java | 2 +- .../benthos/actions/CreateBenthosMelagAction.java | 2 +- .../actions/ExportMultiPostBenthosAction.java | 2 +- .../actions/ImportMultiPostBenthosAction.java | 2 +- .../benthos/actions/RemoveBenthosBatchAction.java | 2 +- .../actions/RemoveBenthosSubBatchAction.java | 2 +- .../benthos/actions/RenameBenthosBatchAction.java | 2 +- ...enthosBatchUI.css => CreateBenthosBatchUI.jcss} | 0 .../create/CreateBenthosBatchUIHandler.java | 2 +- .../benthos/create/CreateBenthosBatchUIModel.java | 2 +- .../SelectSpeciesForBenthosBatchAction.java | 2 +- .../frequency/BenthosFrequencyCellComponent.java | 2 +- .../frequency/BenthosFrequencyRowModel.java | 2 +- .../frequency/BenthosFrequencyTableModel.java | 2 +- ...thosFrequencyUI.css => BenthosFrequencyUI.jcss} | 0 .../frequency/BenthosFrequencyUIHandler.java | 2 +- .../benthos/frequency/BenthosFrequencyUIModel.java | 2 +- .../benthos/split/SplitBenthosBatchRowModel.java | 2 +- .../benthos/split/SplitBenthosBatchTableModel.java | 2 +- ...BenthosBatchUI.css => SplitBenthosBatchUI.jcss} | 0 .../benthos/split/SplitBenthosBatchUIHandler.java | 2 +- .../benthos/split/SplitBenthosBatchUIModel.java | 2 +- .../IndividualObservationBatchRowModel.java | 2 +- .../IndividualObservationBatchTableModel.java | 2 +- ...tchUI.css => IndividualObservationBatchUI.jcss} | 0 .../IndividualObservationBatchUIHandler.java | 2 +- .../IndividualObservationBatchUIModel.java | 2 +- ...ExportMultiPostIndividualObservationAction.java | 2 +- ...ImportMultiPostIndividualObservationAction.java | 2 +- .../RemoveAllIndividualObservationBatchAction.java | 2 +- .../RemoveIndividualObservationBatchAction.java | 2 +- ...SpeciesForIndividualObservationBatchAction.java | 2 +- ...css => CreateIndividualObservationBatchUI.jcss} | 0 .../CreateIndividualObservationBatchUIHandler.java | 2 +- .../CreateIndividualObservationBatchUIModel.java | 4 +- .../marinelitter/MarineLitterBatchRowModel.java | 2 +- .../marinelitter/MarineLitterBatchTableModel.java | 2 +- ...eLitterBatchUI.css => MarineLitterBatchUI.jcss} | 0 .../marinelitter/MarineLitterBatchUIHandler.java | 2 +- .../marinelitter/MarineLitterBatchUIModel.java | 2 +- .../actions/ExportMultiPostMarineLitterAction.java | 2 +- .../actions/ImportMultiPostMarineLitterAction.java | 2 +- .../actions/RemoveMarineLitterBatchAction.java | 2 +- ...rBatchUI.css => CreateMarineLitterBatchUI.jcss} | 0 .../create/CreateMarineLitterBatchUIHandler.java | 2 +- .../create/CreateMarineLitterBatchUIModel.java | 2 +- ...UI.css => ImportPupitriMelagWeightPopupUI.jcss} | 0 .../ImportPupitriMelagWeightPopupUIHandler.java | 2 +- .../ImportPupitriMelagWeightPopupUIModel.java | 24 + ...upitriPopupUI.css => ImportPupitriPopupUI.jcss} | 0 .../species/ImportPupitriPopupUIHandler.java | 4 +- .../catches/species/ImportPupitriPopupUIModel.java | 24 + .../catches/species/SpeciesBatchRowModel.java | 2 +- .../catches/species/SpeciesBatchTableModel.java | 2 +- .../{SpeciesBatchUI.css => SpeciesBatchUI.jcss} | 0 .../catches/species/SpeciesBatchUIHandler.java | 2 +- .../catches/species/SpeciesBatchUIModel.java | 2 +- .../species/actions/CreateSpeciesMelagAction.java | 2 +- .../actions/ExportMultiPostSpeciesAction.java | 2 +- .../species/actions/ImportBigfinAction.java | 2 +- .../actions/ImportMultiPostSpeciesAction.java | 2 +- .../catches/species/actions/ImportPsionAction.java | 2 +- .../species/actions/ImportPupitriAction.java | 2 +- ...mportPupitriMelagWeightPopupValidateAction.java | 24 + .../species/actions/RemoveSpeciesBatchAction.java | 2 +- .../actions/RemoveSpeciesSubBatchAction.java | 2 +- .../species/actions/RenameSpeciesBatchAction.java | 2 +- ...peciesBatchUI.css => CreateSpeciesBatchUI.jcss} | 0 .../create/CreateSpeciesBatchUIHandler.java | 2 +- .../species/create/CreateSpeciesBatchUIModel.java | 2 +- .../SelectSpeciesForSpeciesBatchAction.java | 2 +- .../frequency/SpeciesFrequencyCellComponent.java | 2 +- .../frequency/SpeciesFrequencyRowModel.java | 2 +- .../frequency/SpeciesFrequencyTableModel.java | 2 +- ...ciesFrequencyUI.css => SpeciesFrequencyUI.jcss} | 0 .../frequency/SpeciesFrequencyUIHandler.java | 2 +- .../species/frequency/SpeciesFrequencyUIModel.java | 2 +- .../species/split/SplitSpeciesBatchRowModel.java | 2 +- .../species/split/SplitSpeciesBatchTableModel.java | 2 +- ...SpeciesBatchUI.css => SplitSpeciesBatchUI.jcss} | 0 .../species/split/SplitSpeciesBatchUIHandler.java | 2 +- .../species/split/SplitSpeciesBatchUIModel.java | 2 +- .../fishing/AbstractCaracteristicRowModel.java | 2 +- .../fishing/AbstractCaracteristicTabUIHandler.java | 2 +- .../fishing/AbstractCaracteristicTabUIModel.java | 2 +- .../operation/fishing/GearUseFeatureRowModel.java | 2 +- ...seFeatureTabUI.css => GearUseFeatureTabUI.jcss} | 0 .../fishing/VesselUseFeatureRowModel.java | 2 +- ...FeatureTabUI.css => VesselUseFeatureTabUI.jcss} | 0 .../actions/CancelEditFishingOperationAction.java | 2 +- .../actions/DeleteFishingOperationAction.java | 2 +- .../actions/EditFishingOperationAction.java | 6 +- .../fishing/actions/NewFishingOperationAction.java | 2 +- .../actions/SaveFishingOperationAction.java | 2 +- .../{EditProgramUI.css => EditProgramUI.jcss} | 0 .../content/program/EditProgramUIHandler.java | 2 +- .../swing/content/program/EditProgramUIModel.java | 2 +- .../content/program/actions/SaveProgramAction.java | 4 +- .../{EditProtocolUI.css => EditProtocolUI.jcss} | 0 .../content/protocol/EditProtocolUIHandler.java | 2 +- .../content/protocol/EditProtocolUIModel.java | 2 +- .../MandatorySampleCategoryColumnIdentifier.java | 2 +- .../protocol/actions/AddBenthosProtocolAction.java | 2 +- .../actions/AddCaracteristicMappingAction.java | 2 +- .../protocol/actions/AddSpeciesProtocolAction.java | 2 +- .../actions/ExportAllCaracteristicAction.java | 2 +- .../actions/ExportProtocolBenthosAction.java | 2 +- .../actions/ExportProtocolCaracteristicAction.java | 2 +- .../actions/ExportProtocolSpeciesAction.java | 2 +- .../protocol/actions/ExportPupitriAction.java | 2 +- .../actions/ImportProtocolBenthosAction.java | 2 +- .../actions/ImportProtocolCaracteristicAction.java | 2 +- .../actions/ImportProtocolSpeciesAction.java | 2 +- .../actions/RemoveBenthosProtocolAction.java | 2 +- .../actions/RemoveSpeciesProtocolAction.java | 2 +- .../protocol/actions/SaveProtocolAction.java | 2 +- .../protocol/actions/SelectOtherBenthosAction.java | 2 +- .../protocol/actions/SelectOtherSpeciesAction.java | 2 +- .../rtp/{RtpEditorUI.css => RtpEditorUI.jcss} | 0 ...ialUI.css => ManageTemporaryReferentialUI.jcss} | 0 .../ManageTemporaryReferentialUIHandler.java | 2 +- .../actions/ExportExistingTemporaryGearAction.java | 2 +- .../ExportExistingTemporaryPersonAction.java | 2 +- .../ExportExistingTemporarySpeciesAction.java | 2 +- .../ExportExistingTemporaryVesselAction.java | 2 +- .../actions/ExportTemporaryGearExampleAction.java | 2 +- .../ExportTemporaryPersonExampleAction.java | 2 +- .../ExportTemporarySpeciesExampleAction.java | 2 +- .../ExportTemporaryVesselExampleAction.java | 2 +- .../actions/ImportTemporaryGearAction.java | 2 +- .../actions/ImportTemporaryPersonAction.java | 2 +- .../actions/ImportTemporarySpeciesAction.java | 2 +- .../actions/ImportTemporaryVesselAction.java | 2 +- ...oraryUI.css => AbstractReplaceTemporaryUI.jcss} | 0 ...oraryGearUI.css => ReplaceTemporaryGearUI.jcss} | 0 ...yPersonUI.css => ReplaceTemporaryPersonUI.jcss} | 0 ...peciesUI.css => ReplaceTemporarySpeciesUI.jcss} | 0 ...yVesselUI.css => ReplaceTemporaryVesselUI.jcss} | 0 .../content/report/{ReportUI.css => ReportUI.jcss} | 0 .../ui/swing/content/report/ReportUIHandler.java | 2 +- .../ui/swing/content/report/ReportUIModel.java | 2 +- .../report/actions/GenerateReportAction.java | 2 +- ...{ValidateCruiseUI.css => ValidateCruiseUI.jcss} | 0 .../validation/ValidateCruiseUIHandler.java | 2 +- .../content/validation/ValidateCruiseUIModel.java | 2 +- .../actions/EditCruiseInValidationUIAction.java | 2 +- .../EditFishingOperationInValidationUIAction.java | 4 +- .../ExportCruiseValidationMessagesAction.java | 2 +- .../ExportOperationValidationMessagesAction.java | 2 +- .../actions/SaveCruiseToReadyToSynchAction.java | 2 +- .../ui/swing/update/TuttiDbUpdaterCallBack.java | 2 +- .../update/actions/UpdateApplicationAction.java | 2 +- .../swing/update/actions/UpdateReportAction.java | 2 +- .../ui/swing/util/AbstractTuttiBeanUIModel.java | 2 +- .../util/AbstractTuttiTabContainerUIHandler.java | 2 +- .../ui/swing/util/AbstractTuttiUIHandler.java | 2 +- .../util/RemoveablePropertyChangeListener.java | 4 +- .../tutti/ui/swing/util/TuttiBeanMonitor.java | 2 +- .../tutti/ui/swing/util/TuttiExceptionHandler.java | 6 +- .../fr/ifremer/tutti/ui/swing/util/TuttiUI.java | 2 +- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 2 +- .../tutti/ui/swing/util/UIMessageNotifier.java | 2 +- .../ui/swing/util/actions/LongActionSupport.java | 2 +- .../util/attachment/AttachmentCellEditor.java | 4 +- .../util/attachment/AttachmentCellRenderer.java | 4 +- ...achmentEditorUI.css => AttachmentEditorUI.jcss} | 0 .../util/attachment/AttachmentEditorUIHandler.java | 4 +- .../{AttachmentItem.css => AttachmentItem.jcss} | 0 .../util/attachment/AttachmentModelAware.java | 2 +- .../ui/swing/util/attachment/ButtonAttachment.java | 2 +- .../attachment/actions/SaveAttachmentAction.java | 2 +- .../ui/swing/util/auth/AuthenticationInfo.java | 2 +- .../swing/util/auth/{LoginUI.css => LoginUI.jcss} | 0 .../tutti/ui/swing/util/auth/LoginUIHandler.java | 2 +- .../CaracteristicMapCellComponent.java | 2 +- .../CaracteristicMapColumnRowModel.java | 2 +- .../CaracteristicMapColumnUIHandler.java | 2 +- .../CaracteristicMapEditorRowModel.java | 2 +- .../CaracteristicMapEditorTableModel.java | 2 +- ...pEditorUI.css => CaracteristicMapEditorUI.jcss} | 0 .../CaracteristicMapEditorUIHandler.java | 2 +- .../CaracteristicMapEditorUIModel.java | 2 +- .../caracteristics/CaracteristicValueEditor.java | 2 +- .../caracteristics/CaracteristicValueRenderer.java | 2 +- .../GearCaracteristicListCellRenderer.java | 2 +- .../{EnterWeightUI.css => EnterWeightUI.jcss} | 0 .../swing/util/catches/EnterWeightUIHandler.java | 2 +- .../tutti/ui/swing/util/comment/ButtonComment.java | 2 +- .../ui/swing/util/comment/CommentCellEditor.java | 2 +- .../ui/swing/util/comment/CommentCellRenderer.java | 2 +- .../{CommentEditorUI.css => CommentEditorUI.jcss} | 0 .../swing/util/comment/CommentEditorUIHandler.java | 2 +- .../ui/swing/util/computable/ComputableData.java | 2 +- .../computable/ComputableDataEditorHandler.java | 2 +- .../util/computable/ComputableDataTableCell.java | 2 +- .../swing/util/editor/TuttiLocationTableCell.java | 2 +- .../ui/swing/util/editor/VesselTableCell.java | 2 +- ...erMelagWeightUI.css => EnterMelagWeightUI.jcss} | 0 .../util/species/EnterMelagWeightUIHandler.java | 2 +- .../{SelectSpeciesUI.css => SelectSpeciesUI.jcss} | 0 .../swing/util/species/SelectSpeciesUIHandler.java | 2 +- .../swing/util/species/SelectSpeciesUIModel.java | 2 +- .../util/table/AbstractTuttiTableUIHandler.java | 4 +- .../util/table/AbstractTuttiTableUIModel.java | 2 +- .../util/table/CaracteristicColumnIdentifier.java | 2 +- .../ui/swing/util/table/CaracteristicRow.java | 2 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 6 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 10 +- .../tutti/ui/swing/BeanValidatorDetectorTest.java | 2 +- .../frequency/SpeciesFrequencyRowModelTest.java | 2 +- 631 files changed, 2779 insertions(+), 3645 deletions(-) copy tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileFishingOperationNotFoundException.java => tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/dao/TaxonNameDaoTutti.java (65%) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/dao/TaxonNameDaoTuttiImpl.java delete mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java delete mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java create mode 100644 tutti-service/src/test/resources/genericFormat/withObsoletes/catch.csv copy tutti-service/src/test/resources/genericFormat/{empty => withObsoletes}/operation.csv (71%) copy tutti-service/src/test/resources/{pupitri/evo-6116.tuttiProtocol => genericFormat/withObsoletes/protocol.tuttiProtocol} (87%) create mode 100644 tutti-service/src/test/resources/genericFormat/withObsoletes/sampleCategory.csv create mode 100644 tutti-service/src/test/resources/genericFormat/withObsoletes/survey.csv create mode 100644 tutti-service/src/test/resources/genericFormat/withObsoletes/temporaryGears.csv create mode 100644 tutti-service/src/test/resources/genericFormat/withObsoletes/temporaryPersons.csv create mode 100644 tutti-service/src/test/resources/genericFormat/withObsoletes/temporarySpecies.csv create mode 100644 tutti-service/src/test/resources/genericFormat/withObsoletes/temporaryVessels.csv rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{Common.css => Common.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{MainUI.css => MainUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/{EditSampleCategoryModelUI.css => EditSampleCategoryModelUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/{TuttiConfigUI.css => TuttiConfigUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/{EditCruiseUI.css => EditCruiseUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/{GearCaracteristicsEditorUI.css => GearCaracteristicsEditorUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/{DbManagerUI.css => DbManagerUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/{GenericFormatExportUI.css => GenericFormatExportUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/{GenericFormatImportUI.css => GenericFormatImportUI.jcss} (96%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/{SelectCruiseUI.css => SelectCruiseUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/{EditFishingOperationUI.css => EditFishingOperationUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/{FishingOperationsUI.css => FishingOperationsUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{EditCatchesUI.css => EditCatchesUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{MultiPostImportLogDialog.css => MultiPostImportLogDialog.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/{AccidentalBatchUI.css => AccidentalBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/{CreateAccidentalBatchUI.css => CreateAccidentalBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/{BenthosBatchUI.css => BenthosBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/{CreateBenthosBatchUI.css => CreateBenthosBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/{BenthosFrequencyUI.css => BenthosFrequencyUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/{SplitBenthosBatchUI.css => SplitBenthosBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/{IndividualObservationBatchUI.css => IndividualObservationBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/{CreateIndividualObservationBatchUI.css => CreateIndividualObservationBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/{MarineLitterBatchUI.css => MarineLitterBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/{CreateMarineLitterBatchUI.css => CreateMarineLitterBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ImportPupitriMelagWeightPopupUI.css => ImportPupitriMelagWeightPopupUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ImportPupitriPopupUI.css => ImportPupitriPopupUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{SpeciesBatchUI.css => SpeciesBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/{CreateSpeciesBatchUI.css => CreateSpeciesBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/{SpeciesFrequencyUI.css => SpeciesFrequencyUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/{SplitSpeciesBatchUI.css => SplitSpeciesBatchUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/{GearUseFeatureTabUI.css => GearUseFeatureTabUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/{VesselUseFeatureTabUI.css => VesselUseFeatureTabUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/{EditProgramUI.css => EditProgramUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/{EditProtocolUI.css => EditProtocolUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/{RtpEditorUI.css => RtpEditorUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/{ManageTemporaryReferentialUI.css => ManageTemporaryReferentialUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/{AbstractReplaceTemporaryUI.css => AbstractReplaceTemporaryUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/{ReplaceTemporaryGearUI.css => ReplaceTemporaryGearUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/{ReplaceTemporaryPersonUI.css => ReplaceTemporaryPersonUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/{ReplaceTemporarySpeciesUI.css => ReplaceTemporarySpeciesUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/{ReplaceTemporaryVesselUI.css => ReplaceTemporaryVesselUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/{ReportUI.css => ReportUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/{ValidateCruiseUI.css => ValidateCruiseUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/{AttachmentEditorUI.css => AttachmentEditorUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/{AttachmentItem.css => AttachmentItem.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/{LoginUI.css => LoginUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/{CaracteristicMapEditorUI.css => CaracteristicMapEditorUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/catches/{EnterWeightUI.css => EnterWeightUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/{CommentEditorUI.css => CommentEditorUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/{EnterMelagWeightUI.css => EnterMelagWeightUI.jcss} (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/{SelectSpeciesUI.css => SelectSpeciesUI.jcss} (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 7

branch feature/6115_ajout_RTP updated (21a465e -> 863af8b)
by codelutin.com scm Jan. 19, 2016

Jan. 19, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/6115_ajout_RTP in repository tutti. See http://git.codelutin.com/tutti.git from 21a465e Début de l'éditeur des relations RTP, mais tout ne fonctionne pas encore.. (See #6115) new 05e8fca ajout du validateur + passage du tablemodel dans le model de l'editor (refs #6115) new 31522f4 ajout du validateur + passage du tablemodel dans l'editor (refs #6115) new 688fb26 reset le formulaire quand on quitte sans sauvegarder (refs #6115) new 863af8b On sauve seulement (on en ferme pas) quand on clique sur le bouton Enregistrer (refs #6115) The 4 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 863af8bd3706e558cac9f0994b1d7ca15e159888 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Jan 19 10:42:51 2016 +0100 On sauve seulement (on en ferme pas) quand on clique sur le bouton Enregistrer (refs #6115) commit 688fb26481f99b81a77e8003e35d3821b3c35795 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Jan 18 13:43:05 2016 +0100 reset le formulaire quand on quitte sans sauvegarder (refs #6115) commit 31522f4ee809628eda7cf44cd890464d27d48513 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Jan 18 11:38:54 2016 +0100 ajout du validateur + passage du tablemodel dans l'editor (refs #6115) commit 05e8fcab078fa28063c1c62ec00249fcc5bc89ba Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Jan 18 11:37:29 2016 +0100 ajout du validateur + passage du tablemodel dans le model de l'editor (refs #6115) Summary of changes: .../ui/swing/content/protocol/rtp/RtpButton.java | 6 +- .../swing/content/protocol/rtp/RtpCellEditor.java | 2 +- .../ui/swing/content/protocol/rtp/RtpEditorUI.css | 26 +++---- .../ui/swing/content/protocol/rtp/RtpEditorUI.jaxx | 6 +- .../content/protocol/rtp/RtpEditorUIHandler.java | 83 +++++++++++++++++++--- .../content/protocol/rtp/RtpEditorUIModel.java | 27 +++++-- .../{CancelRtpAction.java => CloseRtpAction.java} | 7 +- .../protocol/rtp/actions/SaveRtpAction.java | 2 +- .../rtp/RtpEditorUIModel-error-validation.xml | 51 +++++++------ .../resources/i18n/tutti-ui-swing_en_GB.properties | 11 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 14 +++- 11 files changed, 176 insertions(+), 59 deletions(-) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/{CancelRtpAction.java => CloseRtpAction.java} (73%) copy tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/IndividualObservationBatch-edit-error-validation.xml => tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIModel-error-validation.xml (56%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch release/4.3.1 deleted (was 419d3b2)
by codelutin.com scm Jan. 18, 2016

Jan. 18, 2016

This is an automated email from the git hooks/post-receive script. New change to branch release/4.3.1 in repository tutti. See http://git.codelutin.com/tutti.git was 419d3b2 [jgitflow-maven-plugin]updating poms for branch'release/4.3.1' with non-snapshot versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (3a178e1 -> 97d8cec)
by codelutin.com scm Jan. 18, 2016

Jan. 18, 2016

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 3a178e1 upgrade jaxx verison (fixes #7924) new 1bdf452 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 8caea2d [jgitflow-maven-plugin]updating poms for 4.3.1 branch with snapshot versions new 419d3b2 [jgitflow-maven-plugin]updating poms for branch'release/4.3.1' with non-snapshot versions new 15285f0 [jgitflow-maven-plugin]merging 'release/4.3.1' into 'master' new bbbaefa [jgitflow-maven-plugin]merging 'master' into 'develop' new 97d8cec [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 97d8cec5c2e8982fb8198879ef470e41b7125b60 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jan 18 17:57:06 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit bbbaefaa2b87c0602874d2c6e5e2f58fa1874715 Merge: 1bdf452 15285f0 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jan 18 17:57:05 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 1bdf45237467eb56d9a9d177dca179f9839c771f Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jan 18 17:57:05 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 15285f020174cb9039d1ad7e33a4fe25253ffb14 Merge: de8efb0 419d3b2 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jan 18 17:56:56 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.3.1' into 'master' commit 419d3b2d203a6a3a327be6f36c07d0bdc821a7ce Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jan 18 17:54:09 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.3.1' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

annotated tag tutti-4.3.1 created (now 634bd6d)
by codelutin.com scm Jan. 18, 2016

Jan. 18, 2016

This is an automated email from the git hooks/post-receive script. New change to annotated tag tutti-4.3.1 in repository tutti. See http://git.codelutin.com/tutti.git at 634bd6d (tag) tagging 15285f020174cb9039d1ad7e33a4fe25253ffb14 (commit) replaces tutti-4.3 tagged by Maven Release on Mon Jan 18 17:56:58 2016 +0100 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.3.1 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0