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@codelutin.com>.