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 4213fb5 fixes #6895: [IMPORT GENERIQUE] Revoir la cinématique d'écrasement des données Merge branch 'feature/6895' into develop new 593481d changer l'API de persistence pour pouvoir utiliser le rankOrder fournit ou bien continuer a le calculer new a4903de fixes #6899: [IMPORT GENERIQUE] Tous les lots catégorisés ne sont pas enregistrés Merge branch 'feature/6899' into develop new b6c5af7 refs #6899: suppression d'un log new 3262af7 réusinage des listes d'actions new 6e9e8f9 fixes #6901: [TECH] Uniformisation du comportement des listes d'actions Merge branch 'feature/6901' into develop 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 6e9e8f9eb7221a3d0e1b90a6a978bebc173d7a99 Merge: b6c5af7 3262af7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 4 09:37:26 2015 +0200 fixes #6901: [TECH] Uniformisation du comportement des listes d'actions Merge branch 'feature/6901' into develop commit 3262af72f6acef9e14a9fae5facf50c82abbd0d9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 4 09:37:22 2015 +0200 réusinage des listes d'actions commit b6c5af7a18263207e8823d9c710891694e6c5688 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 4 09:13:22 2015 +0200 refs #6899: suppression d'un log commit a4903def6cf853f4cf3dc154b092e1b999c9f6e3 Merge: 4213fb5 593481d Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 4 08:34:06 2015 +0200 fixes #6899: [IMPORT GENERIQUE] Tous les lots catégorisés ne sont pas enregistrés Merge branch 'feature/6899' into develop commit 593481ddec3d3e5dbc729ce18055eacb68429b9d Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 4 08:33:59 2015 +0200 changer l'API de persistence pour pouvoir utiliser le rankOrder fournit ou bien continuer a le calculer Summary of changes: .../tutti/persistence/TuttiPersistenceImpl.java | 8 +- .../persistence/TuttiPersistenceNoDbImpl.java | 4 +- .../service/BenthosBatchPersistenceService.java | 2 +- .../BenthosBatchPersistenceServiceImpl.java | 169 +----------------- .../MarineLitterBatchPersistenceServiceImpl.java | 15 +- .../service/SpeciesBatchPersistenceService.java | 2 +- .../SpeciesBatchPersistenceServiceImpl.java | 196 +-------------------- .../service/util/BatchPersistenceHelper.java | 71 +++++--- .../BenthosBatchPersistenceServiceWriteTest.java | 2 +- .../SpeciesBatchPersistenceServiceWriteTest.java | 2 +- .../ifremer/tutti/service/PersistenceService.java | 8 +- .../tutti/service/bigfin/BigfinImportService.java | 2 +- .../catches/multipost/MultiPostImportService.java | 4 +- .../GenericformatImportPersistenceHelper.java | 4 +- .../consumer/CsvConsumerForCatch.java | 2 + .../service/genericformat/csv/CatchModel.java | 4 +- .../importactions/ImportCatchAction.java | 3 +- .../service/psionimport/PsionImportService.java | 10 +- .../service/pupitri/PupitriImportService.java | 6 +- .../service/bigfin/BigfinImportService2Test.java | 2 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 15 ++ .../tutti/ui/swing/content/home/SelectCruiseUI.css | 9 +- .../ui/swing/content/home/SelectCruiseUI.jaxx | 17 +- .../swing/content/home/SelectCruiseUIHandler.java | 106 +---------- .../content/home/actions/DeleteProtocolAction.java | 11 +- .../content/home/actions/ExportProtocolAction.java | 5 +- .../catches/benthos/BenthosBatchUIHandler.java | 2 +- .../catches/species/SpeciesBatchUIHandler.java | 2 +- .../referential/ManageTemporaryReferentialUI.css | 12 +- .../referential/ManageTemporaryReferentialUI.jaxx | 23 +-- .../ManageTemporaryReferentialUIHandler.java | 110 ------------ .../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 +++ 45 files changed, 311 insertions(+), 696 deletions(-) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/actions/ShowComboBoxPopupActions.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.