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

branch feature/8151 updated (3143e38 -> c35c0db)
by codelutin.com scm March 22, 2016

March 22, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8151 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git discards 3143e38 on arrondit après le calcul rtp (see #8151) discards bea7da0 ajout d'un renderer de poids qui affiche le bon nombre de decimales (fixes #8151) adds affd875 Remise à plat de l'éditeur de zone qui ne fonctionne pas bien du tout adds b7d7b96 Rethink Protocol zone model adds 58163da Vérifier au chargement du protocole que toutes le contenue des zones est encore correct + ajout method manquante adds e9d169d Rethink protocol zone editor adds 3a436f8 Revue de la définition des zones au niveau du cache des échantillons adds 9085601 retour sur develop (at last!) Merge branch 'feature/reecriture_editeur_de_zones' into develop adds 48adaad Ajout de nouvelles méthodes sur CaracteristicMap adds 537f034 Ajout d'un chargeur de cache + amélioration de l'API de cache sur les échantillons adds c182786 Revue du chargement du cache d'échantillon au niveau de l'ui et des actions d'édition des captures d'une campagne adds e661bc9 Ajout méthode pour récupérer les ids des batchs enfants adds 5462f81 Gestion du nettoyage du cache avant la suppresion de lot ou de trait adds 4136577 Amélioration du cache adds c166fdc Passage en log debug sur le cache adds 9740706 Fix test adds 44d1157 Fix bad merge :( adds e19c54c Retour sur develop, mais y'a encore du taff je pense sur le sujet... Merge branch 'feature/8145-2' into develop adds dfcf76d ajout en rafale dans les obs individiuelles par defaut (fixes #8163) adds 216896a Utilisation du modèle et non pas directement changer les états dans l'ui + ne rien faire si le mode de recopie est null (uniquement utilisé pour bien gérer le repositionnement dans les ui) adds f47a69a Fixes #8163 Merge branch 'feature/8163' into develop adds de01dd6 ajout d'un renderer de poids qui affiche le bon nombre de decimales (fixes #8151) adds cf2c0e6 on arrondit après le calcul rtp (see #8151) adds c35c0db N'ajouter dans le cache des échantillons uniquement ceux qui ont une taille 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 (3143e38) \ N -- N -- N refs/heads/feature/8151 (c35c0db) 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. No new revisions were added by this update. Summary of changes: .../tutti/persistence/TuttiPersistenceImpl.java | 11 + .../persistence/TuttiPersistenceNoDbImpl.java | 11 + .../persistence/entities/CaracteristicMap.java | 24 ++ .../persistence/entities/TuttiEntityBean.java | 9 +- .../persistence/entities/protocol/ZoneBean.java | 17 + .../tutti/persistence/entities/protocol/Zones.java | 22 ++ .../entities/referential/TuttiLocationBean.java | 16 + .../service/BenthosBatchPersistenceService.java | 9 + .../service/ProtocolPersistenceServiceImpl.java | 34 +- .../service/SpeciesBatchPersistenceService.java | 9 + .../SpeciesBatchPersistenceServiceSupport.java | 7 +- .../referential/LocationPersistenceService.java | 10 + .../LocationPersistenceServiceImpl.java | 30 ++ .../src/main/xmi/tutti-persistence.zargo | Bin 59307 -> 59165 bytes .../ifremer/tutti/service/PersistenceService.java | 164 ++++++++- .../fr/ifremer/tutti/service/TuttiDataContext.java | 77 +++-- .../service/samplingCache/CruiseSamplingCache.java | 381 ++++++++++++++++----- .../samplingCache/CruiseSamplingCacheLoader.java | 120 +++++++ .../samplingCache/CruiseSamplingInternalCache.java | 180 +++++----- tutti-service/src/test/data2 | 1 + .../src/main/filtered-resources/log4j.properties | 3 +- .../actions/AbstractChangeScreenAction.java | 10 +- .../EditCatchesForSelectedCruiseAction.java | 55 +-- .../EditCatchesSupportAction.java} | 71 +++- .../content/home/actions/EditCatchesAction.java | 56 +-- .../frequency/IndividualObservationUICache.java | 20 +- .../species/frequency/SpeciesFrequencyUI.jcss | 1 + .../frequency/SpeciesFrequencyUIHandler.java | 12 +- .../species/frequency/SpeciesFrequencyUIModel.java | 2 +- .../content/protocol/EditProtocolUIHandler.java | 257 ++++++++++---- .../content/protocol/EditProtocolUIModel.java | 267 +++++++-------- .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 9 +- .../swing/content/protocol/zones/ZoneEditorUI.jcss | 8 + .../protocol/zones/ZoneEditorUIHandler.java | 274 +-------------- .../protocol/zones/actions/AddStratasAction.java | 115 +++++-- .../protocol/zones/actions/CreateZoneAction.java | 19 +- .../protocol/zones/actions/DeleteZoneAction.java | 35 +- .../zones/actions/RemoveStratasAction.java | 99 +++--- .../protocol/zones/actions/RenameZoneAction.java | 24 +- .../protocol/zones/models/StrataUIModel.java | 249 -------------- .../protocol/zones/models/SubStrataUIModel.java | 146 -------- .../content/protocol/zones/models/ZoneUIModel.java | 228 ------------ .../zones/tree/AbstractZoneEditorTreeModel.java | 43 --- ...ataNode.java => AvailableStratasTreeModel.java} | 19 +- .../protocol/zones/tree/StratasTreeModel.java | 153 --------- .../content/protocol/zones/tree/SubStrataNode.java | 42 --- .../protocol/zones/tree/ZoneEditorNode.java | 70 ---- .../zones/tree/ZoneEditorTreeCellRenderer.java | 16 +- .../zones/tree/ZoneEditorTreeModelSupport.java | 199 +++++++++++ .../content/protocol/zones/tree/ZoneNode.java | 43 --- .../protocol/zones/tree/ZonesTreeModel.java | 187 ++-------- .../protocol/zones/tree/node/StrataNode.java | 69 ++++ .../node/SubStrataNode.java} | 32 +- .../zones/tree/node/ZoneEditorNodeSupport.java | 94 +++++ .../content/protocol/zones/tree/node/ZoneNode.java | 73 ++++ .../EditProtocolUIModel-error-validation.xml | 2 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- .../tutti/ui/swing/BeanValidatorDetectorTest.java | 2 +- 58 files changed, 2031 insertions(+), 2107 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/ZoneBean.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/Zones.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TuttiLocationBean.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/samplingCache/CruiseSamplingCacheLoader.java create mode 120000 tutti-service/src/test/data2 copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{home/actions/EditCatchesAction.java => actions/EditCatchesSupportAction.java} (55%) delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/StrataUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/SubStrataUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/ZoneUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/AbstractZoneEditorTreeModel.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/{StrataNode.java => AvailableStratasTreeModel.java} (61%) delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StratasTreeModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/SubStrataNode.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorTreeModelSupport.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/node/StrataNode.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/{actions/CollapseZonesTreeAction.java => tree/node/SubStrataNode.java} (51%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/node/ZoneEditorNodeSupport.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/node/ZoneNode.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (f47a69a -> 2760bf6)
by codelutin.com scm March 22, 2016

March 22, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from f47a69a Fixes #8163 Merge branch 'feature/8163' into develop adds 7a258bc c'est l'inverse, on divise si on a des millimètres... (fixes #8156) adds 2760bf6 Merge branch 'feature/8156' into 'develop' No new revisions were added by this update. Summary of changes: tutti-persistence/src/main/java/fr/ifremer/tutti/util/Weights.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (e19c54c -> f47a69a)
by codelutin.com scm March 22, 2016

March 22, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from e19c54c Retour sur develop, mais y'a encore du taff je pense sur le sujet... Merge branch 'feature/8145-2' into develop adds dfcf76d ajout en rafale dans les obs individiuelles par defaut (fixes #8163) adds 216896a Utilisation du modèle et non pas directement changer les états dans l'ui + ne rien faire si le mode de recopie est null (uniquement utilisé pour bien gérer le repositionnement dans les ui) new f47a69a Fixes #8163 Merge branch 'feature/8163' into develop 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 f47a69aed99f7abfdf9223eb50f7f1d47bdcb9e0 Merge: e19c54c 216896a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 22 19:10:52 2016 +0100 Fixes #8163 Merge branch 'feature/8163' into develop Summary of changes: .../catches/species/frequency/SpeciesFrequencyUI.jcss | 1 + .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8163 deleted (was 216896a)
by codelutin.com scm March 22, 2016

March 22, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8163 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was 216896a Utilisation du modèle et non pas directement changer les états dans l'ui + ne rien faire si le mode de recopie est null (uniquement utilisé pour bien gérer le repositionnement dans les ui) 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 feature/8163 updated (8b0c385 -> 216896a)
by codelutin.com scm March 22, 2016

March 22, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8163 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git discards 8b0c385 ajout en rafale dans les obs individiuelles par defaut (fixes #8163) adds affd875 Remise à plat de l'éditeur de zone qui ne fonctionne pas bien du tout adds b7d7b96 Rethink Protocol zone model adds 58163da Vérifier au chargement du protocole que toutes le contenue des zones est encore correct + ajout method manquante adds e9d169d Rethink protocol zone editor adds 3a436f8 Revue de la définition des zones au niveau du cache des échantillons adds 9085601 retour sur develop (at last!) Merge branch 'feature/reecriture_editeur_de_zones' into develop adds 48adaad Ajout de nouvelles méthodes sur CaracteristicMap adds 537f034 Ajout d'un chargeur de cache + amélioration de l'API de cache sur les échantillons adds c182786 Revue du chargement du cache d'échantillon au niveau de l'ui et des actions d'édition des captures d'une campagne adds e661bc9 Ajout méthode pour récupérer les ids des batchs enfants adds 5462f81 Gestion du nettoyage du cache avant la suppresion de lot ou de trait adds 4136577 Amélioration du cache adds c166fdc Passage en log debug sur le cache adds 9740706 Fix test adds 44d1157 Fix bad merge :( adds e19c54c Retour sur develop, mais y'a encore du taff je pense sur le sujet... Merge branch 'feature/8145-2' into develop adds dfcf76d ajout en rafale dans les obs individiuelles par defaut (fixes #8163) adds 216896a Utilisation du modèle et non pas directement changer les états dans l'ui + ne rien faire si le mode de recopie est null (uniquement utilisé pour bien gérer le repositionnement dans les ui) 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 (8b0c385) \ N -- N -- N refs/heads/feature/8163 (216896a) 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. No new revisions were added by this update. Summary of changes: .../tutti/persistence/TuttiPersistenceImpl.java | 11 + .../persistence/TuttiPersistenceNoDbImpl.java | 11 + .../persistence/entities/CaracteristicMap.java | 24 ++ .../persistence/entities/TuttiEntityBean.java | 9 +- .../persistence/entities/protocol/ZoneBean.java | 17 + .../tutti/persistence/entities/protocol/Zones.java | 22 ++ .../entities/referential/TuttiLocationBean.java | 16 + .../service/BenthosBatchPersistenceService.java | 9 + .../service/ProtocolPersistenceServiceImpl.java | 34 +- .../service/SpeciesBatchPersistenceService.java | 9 + .../SpeciesBatchPersistenceServiceSupport.java | 7 +- .../referential/LocationPersistenceService.java | 10 + .../LocationPersistenceServiceImpl.java | 30 ++ .../src/main/xmi/tutti-persistence.zargo | Bin 59307 -> 59165 bytes .../ifremer/tutti/service/PersistenceService.java | 164 ++++++++- .../fr/ifremer/tutti/service/TuttiDataContext.java | 78 +++-- .../service/samplingCache/CruiseSamplingCache.java | 381 ++++++++++++++++----- .../samplingCache/CruiseSamplingCacheLoader.java | 120 +++++++ .../samplingCache/CruiseSamplingInternalCache.java | 180 +++++----- tutti-service/src/test/data2 | 1 + .../src/main/filtered-resources/log4j.properties | 3 +- .../actions/AbstractChangeScreenAction.java | 10 +- .../EditCatchesForSelectedCruiseAction.java | 55 +-- .../EditCatchesSupportAction.java} | 71 +++- .../content/home/actions/EditCatchesAction.java | 56 +-- .../frequency/IndividualObservationUICache.java | 20 +- .../species/frequency/SpeciesFrequencyUI.jcss | 1 + .../frequency/SpeciesFrequencyUIHandler.java | 13 +- .../species/frequency/SpeciesFrequencyUIModel.java | 2 +- .../content/protocol/EditProtocolUIHandler.java | 257 ++++++++++---- .../content/protocol/EditProtocolUIModel.java | 267 +++++++-------- .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 9 +- .../swing/content/protocol/zones/ZoneEditorUI.jcss | 8 + .../protocol/zones/ZoneEditorUIHandler.java | 274 +-------------- .../protocol/zones/actions/AddStratasAction.java | 115 +++++-- .../protocol/zones/actions/CreateZoneAction.java | 19 +- .../protocol/zones/actions/DeleteZoneAction.java | 35 +- .../zones/actions/RemoveStratasAction.java | 99 +++--- .../protocol/zones/actions/RenameZoneAction.java | 24 +- .../protocol/zones/models/StrataUIModel.java | 249 -------------- .../protocol/zones/models/SubStrataUIModel.java | 146 -------- .../content/protocol/zones/models/ZoneUIModel.java | 228 ------------ .../zones/tree/AbstractZoneEditorTreeModel.java | 43 --- ...ataNode.java => AvailableStratasTreeModel.java} | 19 +- .../protocol/zones/tree/StratasTreeModel.java | 153 --------- .../content/protocol/zones/tree/SubStrataNode.java | 42 --- .../protocol/zones/tree/ZoneEditorNode.java | 70 ---- .../zones/tree/ZoneEditorTreeCellRenderer.java | 16 +- .../zones/tree/ZoneEditorTreeModelSupport.java | 199 +++++++++++ .../content/protocol/zones/tree/ZoneNode.java | 43 --- .../protocol/zones/tree/ZonesTreeModel.java | 187 ++-------- .../protocol/zones/tree/node/StrataNode.java | 69 ++++ .../node/SubStrataNode.java} | 32 +- .../zones/tree/node/ZoneEditorNodeSupport.java | 94 +++++ .../content/protocol/zones/tree/node/ZoneNode.java | 73 ++++ .../EditProtocolUIModel-error-validation.xml | 2 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- .../tutti/ui/swing/BeanValidatorDetectorTest.java | 2 +- 58 files changed, 2031 insertions(+), 2109 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/ZoneBean.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/Zones.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TuttiLocationBean.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/samplingCache/CruiseSamplingCacheLoader.java create mode 120000 tutti-service/src/test/data2 copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{home/actions/EditCatchesAction.java => actions/EditCatchesSupportAction.java} (55%) delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/StrataUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/SubStrataUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/ZoneUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/AbstractZoneEditorTreeModel.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/{StrataNode.java => AvailableStratasTreeModel.java} (61%) delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StratasTreeModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/SubStrataNode.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorTreeModelSupport.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/node/StrataNode.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/{actions/CollapseZonesTreeAction.java => tree/node/SubStrataNode.java} (51%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/node/ZoneEditorNodeSupport.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/node/ZoneNode.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (8a0f6ba -> e19c54c)
by codelutin.com scm March 22, 2016

March 22, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 8a0f6ba Fixes #8145 Merge branch 'feature/8145' into develop adds affd875 Remise à plat de l'éditeur de zone qui ne fonctionne pas bien du tout adds b7d7b96 Rethink Protocol zone model adds 58163da Vérifier au chargement du protocole que toutes le contenue des zones est encore correct + ajout method manquante adds e9d169d Rethink protocol zone editor adds 3a436f8 Revue de la définition des zones au niveau du cache des échantillons adds 9085601 retour sur develop (at last!) Merge branch 'feature/reecriture_editeur_de_zones' into develop adds 48adaad Ajout de nouvelles méthodes sur CaracteristicMap adds 537f034 Ajout d'un chargeur de cache + amélioration de l'API de cache sur les échantillons adds c182786 Revue du chargement du cache d'échantillon au niveau de l'ui et des actions d'édition des captures d'une campagne adds e661bc9 Ajout méthode pour récupérer les ids des batchs enfants adds 5462f81 Gestion du nettoyage du cache avant la suppresion de lot ou de trait adds 4136577 Amélioration du cache adds c166fdc Passage en log debug sur le cache adds 9740706 Fix test adds 44d1157 Fix bad merge :( new e19c54c Retour sur develop, mais y'a encore du taff je pense sur le sujet... Merge branch 'feature/8145-2' into develop 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 e19c54cb8ad116c18fff025a0d42a5e477d88abd Merge: 9085601 44d1157 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 22 17:19:28 2016 +0100 Retour sur develop, mais y'a encore du taff je pense sur le sujet... Merge branch 'feature/8145-2' into develop Summary of changes: .../tutti/persistence/TuttiPersistenceImpl.java | 11 + .../persistence/TuttiPersistenceNoDbImpl.java | 11 + .../persistence/entities/CaracteristicMap.java | 24 ++ .../persistence/entities/TuttiEntityBean.java | 9 +- .../persistence/entities/protocol/ZoneBean.java | 17 + .../tutti/persistence/entities/protocol/Zones.java | 22 ++ .../entities/referential/TuttiLocationBean.java | 16 + .../service/BenthosBatchPersistenceService.java | 9 + .../service/ProtocolPersistenceServiceImpl.java | 34 +- .../service/SpeciesBatchPersistenceService.java | 9 + .../SpeciesBatchPersistenceServiceSupport.java | 7 +- .../referential/LocationPersistenceService.java | 10 + .../LocationPersistenceServiceImpl.java | 30 ++ .../src/main/xmi/tutti-persistence.zargo | Bin 59307 -> 59165 bytes .../ifremer/tutti/service/PersistenceService.java | 164 ++++++++- .../fr/ifremer/tutti/service/TuttiDataContext.java | 78 +++-- .../service/samplingCache/CruiseSamplingCache.java | 381 ++++++++++++++++----- .../samplingCache/CruiseSamplingCacheLoader.java | 120 +++++++ .../samplingCache/CruiseSamplingInternalCache.java | 180 +++++----- tutti-service/src/test/data2 | 1 + .../src/main/filtered-resources/log4j.properties | 3 +- .../actions/AbstractChangeScreenAction.java | 10 +- .../EditCatchesForSelectedCruiseAction.java | 55 +-- .../EditCatchesSupportAction.java} | 71 +++- .../content/home/actions/EditCatchesAction.java | 56 +-- .../frequency/IndividualObservationUICache.java | 20 +- .../species/frequency/SpeciesFrequencyUIModel.java | 2 +- .../content/protocol/EditProtocolUIHandler.java | 257 ++++++++++---- .../content/protocol/EditProtocolUIModel.java | 267 +++++++-------- .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 9 +- .../swing/content/protocol/zones/ZoneEditorUI.jcss | 8 + .../protocol/zones/ZoneEditorUIHandler.java | 274 +-------------- .../protocol/zones/actions/AddStratasAction.java | 115 +++++-- .../protocol/zones/actions/CreateZoneAction.java | 19 +- .../protocol/zones/actions/DeleteZoneAction.java | 35 +- .../zones/actions/RemoveStratasAction.java | 99 +++--- .../protocol/zones/actions/RenameZoneAction.java | 24 +- .../protocol/zones/models/StrataUIModel.java | 249 -------------- .../protocol/zones/models/SubStrataUIModel.java | 146 -------- .../content/protocol/zones/models/ZoneUIModel.java | 228 ------------ .../zones/tree/AbstractZoneEditorTreeModel.java | 43 --- ...ataNode.java => AvailableStratasTreeModel.java} | 19 +- .../protocol/zones/tree/StratasTreeModel.java | 153 --------- .../content/protocol/zones/tree/SubStrataNode.java | 42 --- .../protocol/zones/tree/ZoneEditorNode.java | 70 ---- .../zones/tree/ZoneEditorTreeCellRenderer.java | 16 +- .../zones/tree/ZoneEditorTreeModelSupport.java | 199 +++++++++++ .../content/protocol/zones/tree/ZoneNode.java | 43 --- .../protocol/zones/tree/ZonesTreeModel.java | 187 ++-------- .../protocol/zones/tree/node/StrataNode.java | 69 ++++ .../node/SubStrataNode.java} | 32 +- .../zones/tree/node/ZoneEditorNodeSupport.java | 94 +++++ .../content/protocol/zones/tree/node/ZoneNode.java | 73 ++++ .../EditProtocolUIModel-error-validation.xml | 2 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- .../tutti/ui/swing/BeanValidatorDetectorTest.java | 2 +- 56 files changed, 2021 insertions(+), 2105 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/ZoneBean.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/Zones.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TuttiLocationBean.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/samplingCache/CruiseSamplingCacheLoader.java create mode 120000 tutti-service/src/test/data2 copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{home/actions/EditCatchesAction.java => actions/EditCatchesSupportAction.java} (55%) delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/StrataUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/SubStrataUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/ZoneUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/AbstractZoneEditorTreeModel.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/{StrataNode.java => AvailableStratasTreeModel.java} (61%) delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StratasTreeModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/SubStrataNode.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorTreeModelSupport.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/node/StrataNode.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/{actions/CollapseZonesTreeAction.java => tree/node/SubStrataNode.java} (51%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/node/ZoneEditorNodeSupport.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/node/ZoneNode.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8145-2 deleted (was 44d1157)
by codelutin.com scm March 22, 2016

March 22, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8145-2 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was 44d1157 Fix bad merge :( 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 feature/8145-2 updated (78784e8 -> 44d1157)
by codelutin.com scm March 22, 2016

March 22, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8145-2 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git discards 78784e8 Passage en log debug sur le cache discards f30734c Amélioration du cache discards 364af86 Gestion du nettoyage du cache avant la suppresion de lot ou de trait discards 68c508a Ajout méthode pour récupérer les ids des batchs enfants discards 5df204e Revue du chargement du cache d'échantillon au niveau de l'ui et des actions d'édition des captures d'une campagne discards 36c52ba Ajout d'un chargeur de cache + amélioration de l'API de cache sur les échantillons discards c9ac004 Ajout de nouvelles méthodes sur CaracteristicMap adds affd875 Remise à plat de l'éditeur de zone qui ne fonctionne pas bien du tout adds b7d7b96 Rethink Protocol zone model adds 58163da Vérifier au chargement du protocole que toutes le contenue des zones est encore correct + ajout method manquante adds e9d169d Rethink protocol zone editor adds 3a436f8 Revue de la définition des zones au niveau du cache des échantillons adds 9085601 retour sur develop (at last!) Merge branch 'feature/reecriture_editeur_de_zones' into develop adds 48adaad Ajout de nouvelles méthodes sur CaracteristicMap adds 537f034 Ajout d'un chargeur de cache + amélioration de l'API de cache sur les échantillons adds c182786 Revue du chargement du cache d'échantillon au niveau de l'ui et des actions d'édition des captures d'une campagne adds e661bc9 Ajout méthode pour récupérer les ids des batchs enfants adds 5462f81 Gestion du nettoyage du cache avant la suppresion de lot ou de trait adds 4136577 Amélioration du cache adds c166fdc Passage en log debug sur le cache adds 9740706 Fix test adds 44d1157 Fix bad merge :( 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 (78784e8) \ N -- N -- N refs/heads/feature/8145-2 (44d1157) 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. No new revisions were added by this update. Summary of changes: .../tutti/persistence/TuttiPersistenceImpl.java | 6 + .../persistence/TuttiPersistenceNoDbImpl.java | 6 + .../persistence/entities/TuttiEntityBean.java | 9 +- .../persistence/entities/protocol/ZoneBean.java | 17 ++ .../tutti/persistence/entities/protocol/Zones.java | 22 ++ .../entities/referential/TuttiLocationBean.java | 16 ++ .../service/ProtocolPersistenceServiceImpl.java | 34 +-- .../referential/LocationPersistenceService.java | 10 + .../LocationPersistenceServiceImpl.java | 30 +++ .../src/main/xmi/tutti-persistence.zargo | Bin 59307 -> 59165 bytes .../ifremer/tutti/service/PersistenceService.java | 42 +++- .../service/samplingCache/CruiseSamplingCache.java | 49 ++-- tutti-service/src/test/data2 | 1 + .../content/protocol/EditProtocolUIHandler.java | 257 ++++++++++++++----- .../content/protocol/EditProtocolUIModel.java | 267 ++++++++++---------- .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 9 +- .../swing/content/protocol/zones/ZoneEditorUI.jcss | 8 + .../protocol/zones/ZoneEditorUIHandler.java | 274 +-------------------- .../protocol/zones/actions/AddStratasAction.java | 115 ++++++--- .../protocol/zones/actions/CreateZoneAction.java | 19 +- .../protocol/zones/actions/DeleteZoneAction.java | 35 ++- .../zones/actions/RemoveStratasAction.java | 99 ++++---- .../protocol/zones/actions/RenameZoneAction.java | 24 +- .../protocol/zones/models/StrataUIModel.java | 249 ------------------- .../protocol/zones/models/SubStrataUIModel.java | 146 ----------- .../content/protocol/zones/models/ZoneUIModel.java | 228 ----------------- .../zones/tree/AbstractZoneEditorTreeModel.java | 43 ---- ...ataNode.java => AvailableStratasTreeModel.java} | 19 +- .../protocol/zones/tree/StratasTreeModel.java | 153 ------------ .../content/protocol/zones/tree/SubStrataNode.java | 42 ---- .../protocol/zones/tree/ZoneEditorNode.java | 70 ------ .../zones/tree/ZoneEditorTreeCellRenderer.java | 16 +- .../zones/tree/ZoneEditorTreeModelSupport.java | 199 +++++++++++++++ .../content/protocol/zones/tree/ZoneNode.java | 43 ---- .../protocol/zones/tree/ZonesTreeModel.java | 187 ++------------ .../protocol/zones/tree/node/StrataNode.java | 69 ++++++ .../node/SubStrataNode.java} | 32 ++- .../zones/tree/node/ZoneEditorNodeSupport.java | 94 +++++++ .../content/protocol/zones/tree/node/ZoneNode.java | 73 ++++++ .../EditProtocolUIModel-error-validation.xml | 2 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- .../tutti/ui/swing/BeanValidatorDetectorTest.java | 2 +- 42 files changed, 1227 insertions(+), 1791 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/ZoneBean.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/Zones.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TuttiLocationBean.java create mode 120000 tutti-service/src/test/data2 delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/StrataUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/SubStrataUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/ZoneUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/AbstractZoneEditorTreeModel.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/{StrataNode.java => AvailableStratasTreeModel.java} (61%) delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StratasTreeModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/SubStrataNode.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorTreeModelSupport.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/node/StrataNode.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/{actions/CollapseZonesTreeAction.java => tree/node/SubStrataNode.java} (51%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/node/ZoneEditorNodeSupport.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/node/ZoneNode.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/reecriture_editeur_de_zones deleted (was 3a436f8)
by codelutin.com scm March 22, 2016

March 22, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/reecriture_editeur_de_zones in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was 3a436f8 Revue de la définition des zones au niveau du cache des échantillons This change permanently discards the following revisions: discards 3a436f8 Revue de la définition des zones au niveau du cache des échantillons discards e9d169d Rethink protocol zone editor discards 58163da Vérifier au chargement du protocole que toutes le contenue des zones est encore correct + ajout method manquante discards b7d7b96 Rethink Protocol zone model discards affd875 Remise à plat de l'éditeur de zone qui ne fonctionne pas bien du tout -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/reecriture_editeur_de_zones updated (affd875 -> 3a436f8)
by codelutin.com scm March 22, 2016

March 22, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/reecriture_editeur_de_zones in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from affd875 Remise à plat de l'éditeur de zone qui ne fonctionne pas bien du tout new b7d7b96 Rethink Protocol zone model new 58163da Vérifier au chargement du protocole que toutes le contenue des zones est encore correct + ajout method manquante new e9d169d Rethink protocol zone editor new 3a436f8 Revue de la définition des zones au niveau du cache des échantillons 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 3a436f896fd09e401bae3023c8b3c708098b4bda Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 22 15:48:31 2016 +0100 Revue de la définition des zones au niveau du cache des échantillons commit e9d169dc3f6f56cd05e526449130f043ca74ee30 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 22 15:44:14 2016 +0100 Rethink protocol zone editor commit 58163daab95c1be8371110001f93c45c985f3dcb Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 22 15:33:28 2016 +0100 Vérifier au chargement du protocole que toutes le contenue des zones est encore correct + ajout method manquante commit b7d7b968838387ada5ecccc65df9312fe102a728 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 22 15:32:33 2016 +0100 Rethink Protocol zone model Summary of changes: .../tutti/persistence/TuttiPersistenceImpl.java | 6 + .../persistence/TuttiPersistenceNoDbImpl.java | 6 + .../persistence/entities/TuttiEntityBean.java | 4 +- .../persistence/entities/protocol/SubStratas.java | 12 - .../persistence/entities/protocol/ZoneBean.java | 17 ++ .../tutti/persistence/entities/protocol/Zones.java | 22 ++ .../service/ProtocolPersistenceServiceImpl.java | 34 +-- .../referential/LocationPersistenceService.java | 10 + .../LocationPersistenceServiceImpl.java | 30 +++ .../src/main/xmi/tutti-persistence.zargo | Bin 59307 -> 59165 bytes .../ifremer/tutti/service/PersistenceService.java | 39 ++- .../service/samplingCache/CruiseSamplingCache.java | 63 +++-- .../content/protocol/EditProtocolUIHandler.java | 221 +++++++++++---- .../content/protocol/EditProtocolUIModel.java | 204 +++++++++----- .../protocol/zones/AvailableStratasTreeModel.java | 114 -------- .../ui/swing/content/protocol/zones/RootNode.java | 41 --- .../swing/content/protocol/zones/StrataNode.java | 44 --- .../protocol/zones/ZoneEditorTreeModelSupport.java | 91 ------- .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 2 +- .../protocol/zones/ZoneEditorUIHandler.java | 52 +--- .../content/protocol/zones/ZonesTreeModel.java | 295 --------------------- .../protocol/zones/actions/AddStratasAction.java | 83 ++---- .../protocol/zones/actions/CreateZoneAction.java | 5 +- .../protocol/zones/actions/DeleteZoneAction.java | 22 +- .../zones/actions/RemoveStratasAction.java | 51 +--- .../protocol/zones/actions/RenameZoneAction.java | 23 +- .../AvailableStratasTreeModel.java} | 24 +- .../{ => tree}/ZoneEditorTreeCellRenderer.java | 18 +- .../zones/tree/ZoneEditorTreeModelSupport.java | 199 ++++++++++++++ .../protocol/zones/tree/ZonesTreeModel.java | 84 ++++++ .../protocol/zones/tree/node/StrataNode.java | 69 +++++ .../zones/{ => tree/node}/SubStrataNode.java | 27 +- .../{ => tree/node}/ZoneEditorNodeSupport.java | 37 ++- .../content/protocol/zones/tree/node/ZoneNode.java | 73 +++++ .../EditProtocolUIModel-error-validation.xml | 2 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- 36 files changed, 1053 insertions(+), 973 deletions(-) delete mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/SubStratas.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/ZoneBean.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/Zones.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/AvailableStratasTreeModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/RootNode.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/StrataNode.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorTreeModelSupport.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZonesTreeModel.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/{ZoneNode.java => tree/AvailableStratasTreeModel.java} (57%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/{ => tree}/ZoneEditorTreeCellRenderer.java (72%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorTreeModelSupport.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZonesTreeModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/node/StrataNode.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/{ => tree/node}/SubStrataNode.java (64%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/{ => tree/node}/ZoneEditorNodeSupport.java (63%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/node/ZoneNode.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4