This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 7cd954c [UI][PS][LL] Widget des positions DMD par défaut (fixes #8394) Merge branch 'feature/8394' into develop new cd3c3c3 Arrondi à 4 décimales du poids de capture ciblé (persistence) new 428c3a5 Arrondi à 4 décimales du poids de capture ciblé (UI) new f07bef0 Amélioration taille colonnes tableaux new e77e66e [UI] Masque de saisie sur les formulaires captures (et surtout) rejets de thonidés (Fixes #8395) Merge branch 'feature/8395' into develop new 35c679d introduce node package new de88bd5 introduce renderer package new 2691002 Nettoyage de code new 7640d6f Onb remonte le programme dans les marées sur les stubs new 1b633a4 Chargement des toutes les marées (sinon on ne peut pas en connaitre le nombre par programme) new 6568734 Remonté du nombre de routes par marée new dd1b9ea Récupération du bon nœud de Marée new d1ae1f0 Chargement dans l'arbre du nombre de route par marée new 85d7849 On doit toujours recharger le nœud de la marée dès que le nombre de routes change new a001a2c Ajouter le nombre de marées par programme et le nombre de routes par marée new 38d7a6d Petites améliorations ergonomiques dans l'arbre (Fixes #8576) Merge branch 'feature/8576' into develop new 6cce00a [LL] état appâts au filage doit être un champ non obligatoire (Fixes #7885) new 8cb1ed6 [LL] taille hameçon doit être un champ non obligatoire (fixes #7884) new 29cafc3 Move to snpashot of jaxx new a7b26cc Ajout directive pour remplir avec des zéros les coordonnées non nulles new a097cdd Use last stable of jaxx new 3c6e833 [LL] défaut d'affichage coord DMD (Fixes #7891) Merge branch 'feature/7891' into develop The 21 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 3c6e83323197c1afb465499b1d52b2bde05dfecf Merge: 8cb1ed6 a097cdd Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 19:59:15 2016 +0200 [LL] défaut d'affichage coord DMD (Fixes #7891) Merge branch 'feature/7891' into develop commit a097cdd859ee7e5a7c5f181e381fe3bef3e8ebea Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 19:59:11 2016 +0200 Use last stable of jaxx commit a7b26cc24583e2b1fa87a26c22e54769a2c82f8e Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 19:06:53 2016 +0200 Ajout directive pour remplir avec des zéros les coordonnées non nulles commit 29cafc303fee76d2d0ffbe9089f6e15f21a9cfe3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 19:06:29 2016 +0200 Move to snpashot of jaxx commit 8cb1ed6ce077e8a0c9138d765c82d3d12da2bd50 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 18:17:22 2016 +0200 [LL] taille hameçon doit être un champ non obligatoire (fixes #7884) commit 6cce00a917a00c5ff9bdbb320c2f020acdc72feb Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 18:08:12 2016 +0200 [LL] état appâts au filage doit être un champ non obligatoire (Fixes #7885) commit 38d7a6d9d7565474eaaabf0471c3a0e35027e5be Merge: e77e66e a001a2c Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 17:56:27 2016 +0200 Petites améliorations ergonomiques dans l'arbre (Fixes #8576) Merge branch 'feature/8576' into develop commit a001a2c6e37b059a1ba4f9d0cc0014ae51207fa7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 17:56:21 2016 +0200 Ajouter le nombre de marées par programme et le nombre de routes par marée commit 85d7849d9ef5fdc10207fceea6318f8b016b3a67 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 17:54:14 2016 +0200 On doit toujours recharger le nœud de la marée dès que le nombre de routes change commit d1ae1f09b3ea8960639d50ef86a887183d689b4c Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 17:51:39 2016 +0200 Chargement dans l'arbre du nombre de route par marée commit dd1b9ea08644af1375c68a21fe4c1b0a04785990 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 17:50:58 2016 +0200 Récupération du bon nœud de Marée commit 65687342106a7d0141330798db833484c6b53c3b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 17:50:12 2016 +0200 Remonté du nombre de routes par marée commit 1b633a425f4ff406834e23885a7dddce8735b62a Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 16:12:07 2016 +0200 Chargement des toutes les marées (sinon on ne peut pas en connaitre le nombre par programme) commit 7640d6fc078b62b64f44d2b517843d4ee715a268 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 16:11:06 2016 +0200 Onb remonte le programme dans les marées sur les stubs commit 2691002df832b2a2bb0efb970a0e029499d25983 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 15:00:56 2016 +0200 Nettoyage de code commit de88bd529d8501d259896c86a384c2f646486e03 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 14:33:10 2016 +0200 introduce renderer package commit 35c679db691c8438eb137495ff162102300fe6b8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 14:29:48 2016 +0200 introduce node package commit e77e66e3644a4d2e4e5ee4119b20962f8472a0d3 Merge: 7cd954c f07bef0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 14:22:12 2016 +0200 [UI] Masque de saisie sur les formulaires captures (et surtout) rejets de thonidés (Fixes #8395) Merge branch 'feature/8395' into develop commit f07bef08c8e3d2d471d3fe24c252e49c30ad7867 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 14:21:42 2016 +0200 Amélioration taille colonnes tableaux commit 428c3a54c333291c9f139e628f10e4c383438131 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 14:21:29 2016 +0200 Arrondi à 4 décimales du poids de capture ciblé (UI) commit cd3c3c385200e83484e8b25484fe26fa4b48b835 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 14:20:58 2016 +0200 Arrondi à 4 décimales du poids de capture ciblé (persistence) Summary of changes: ...tsCompositionDto-ui-update-error-validation.xml | 5 -- ...ksCompositionDto-ui-update-error-validation.xml | 7 +-- .../application-swing-validation_en_GB.properties | 2 - .../application-swing-validation_es_ES.properties | 2 - .../application-swing-validation_fr_FR.properties | 2 - .../application/swing/ui/ObserveCommon.jcss | 1 + .../application/swing/ui/ObserveMainUI.jaxx | 2 +- .../application/swing/ui/ObserveMainUIHandler.java | 2 +- .../ird/observe/application/swing/ui/UIHelper.java | 7 +++ .../swing/ui/actions/shared/AbstractUIAction.java | 2 +- .../ui/actions/shared/CancelCreateUIAction.java | 2 +- .../swing/ui/actions/shared/CloseOpenUIAction.java | 2 +- .../swing/ui/actions/shared/GoDownUIAction.java | 4 +- .../swing/ui/actions/shared/GoUpUIAction.java | 4 +- .../shared/MoveActivityLonglinesUIAction.java | 4 +- .../actions/shared/MoveActivitySeinesUIAction.java | 4 +- .../ui/actions/shared/MoveRoutesUIAction.java | 4 +- .../swing/ui/actions/shared/MoveTripsUIAction.java | 2 +- .../swing/ui/actions/shared/ReOpenUIAction.java | 2 +- .../ui/actions/shared/SelectNodeUIAction.java | 2 +- .../swing/ui/admin/config/SelectDataUI.jaxx | 2 +- .../data/DataSynchroSelectionTreeCellRenderer.java | 6 +- .../ui/admin/synchronize/data/DataSynchroUI.jaxx | 2 +- .../swing/ui/content/ContentUIHandler.java | 4 +- .../swing/ui/content/ContentUIManager.java | 2 +- .../impl/longline/SetLonglineUIHandler.java | 2 +- .../impl/seine/FloatingObjectUIHandler.java | 2 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 2 +- .../ui/content/list/ContentListUIHandler.java | 4 +- .../ui/content/open/ContentOpenableUIHandler.java | 13 +++-- .../ui/content/open/impl/seine/RouteUIHandler.java | 14 +++-- .../ui/content/table/ContentTableUIHandler.java | 2 +- .../ui/content/table/impl/seine/TargetCatchUI.jcss | 2 +- .../table/impl/seine/TargetCatchUIHandler.java | 2 +- .../table/impl/seine/TargetDiscardCatchUI.jcss | 2 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 4 +- .../swing/ui/storage/tabs/SelectDataUI.jaxx | 2 +- .../ui/tree/DataSelectionTreeSelectionModel.java | 3 + .../tree/ObserveNavigationTreeShowPopupAction.java | 1 + .../swing/ui/tree/ObserveTreeBridge.java | 1 + .../swing/ui/tree/ObserveTreeHelper.java | 63 +++++++++++++++++++++ .../actions/ChangeActivityRouteActionListener.java | 2 +- .../actions/ChangeActivityTripActionListener.java | 2 +- .../actions/ChangeRouteTripActionListener.java | 2 +- .../actions/ChangeTripProgramActionListener.java | 2 +- .../ui/tree/actions/NodeChangeActionListener.java | 2 +- .../ui/tree/loadors/AbstractNodeChildLoador.java | 2 +- .../loadors/ActivityLonglineNodeChildLoador.java | 6 +- .../loadors/ActivityLonglinesNodeChildLoador.java | 4 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 8 +-- .../loadors/ActivitySeinesNodeChildLoador.java | 4 +- .../loadors/FloatingObjectNodeChildLoador.java | 2 +- .../loadors/ProgramLonglineNodeChildLoador.java | 17 +++--- .../tree/loadors/ProgramSeineNodeChildLoador.java | 17 +++--- .../ui/tree/loadors/ReferenceNodeChildLoador.java | 2 +- .../swing/ui/tree/loadors/RootNodeChildLoador.java | 6 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 4 +- .../tree/loadors/SetLonglineNodeChildLoador.java | 2 +- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 2 +- .../MoveActivityLonglineNodeMenuPopulator.java | 4 +- .../menu/MoveActivitySeineNodeMenuPopulator.java | 4 +- .../swing/ui/tree/menu/MoveNodeMenuPopulator.java | 2 +- .../ui/tree/menu/MoveRouteNodeMenuPopulator.java | 4 +- .../ui/tree/menu/MoveTripNodeMenuPopulator.java | 6 +- .../{ => node}/AbstrctReferenceNodeSupport.java | 3 +- .../ui/tree/{ => node}/ActivityLonglineNode.java | 3 +- .../ui/tree/{ => node}/ActivitySeineNode.java | 3 +- .../tree/{ => node}/DataReferenceNodeSupport.java | 3 +- .../tree/{ => node}/FloatingObjectSeineNode.java | 3 +- .../swing/ui/tree/{ => node}/ObserveNode.java | 2 +- .../ui/tree/{ => node}/ProgramLonglineNode.java | 19 ++++++- .../swing/ui/tree/{ => node}/ProgramSeineNode.java | 18 +++++- .../ReferentialReferenceNodeSupport.java | 3 +- .../swing/ui/tree/{ => node}/RouteSeineNode.java | 2 +- .../swing/ui/tree/{ => node}/SetLonglineNode.java | 3 +- .../swing/ui/tree/{ => node}/SetSeineNode.java | 3 +- .../swing/ui/tree/{ => node}/TripLonglineNode.java | 2 +- .../swing/ui/tree/{ => node}/TripSeineNode.java | 14 ++++- .../AbstractObserveTreeCellRenderer.java | 40 +++++++------ .../DataSelectionTreeCellRenderer.java | 4 +- .../{ => renderer}/NavigationTreeCellRenderer.java | 4 +- .../swing/ui/util/DecoratedNodeEntity.java | 2 +- .../entities/longline/TripLonglineTopiaDao.java | 22 +++++-- .../observe/entities/seine/TargetCatchImpl.java | 4 +- .../ird/observe/entities/seine/TripSeineImpl.java | 10 ++++ .../observe/entities/seine/TripSeineTopiaDao.java | 32 ++++++++--- entities/src/main/xmi/observe-seine.zargo | Bin 83234 -> 83418 bytes pom.xml | 2 +- .../dto/reference/DataReferenceSetDefinitions.java | 19 ++++--- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59520 -> 59611 bytes .../topia/binder/data/TripLonglineBinder.java | 2 + .../topia/binder/data/TripSeineBinder.java | 4 ++ .../topia/service/seine/TripSeineServiceTopia.java | 9 +-- 93 files changed, 357 insertions(+), 181 deletions(-) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/AbstrctReferenceNodeSupport.java (96%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/ActivityLonglineNode.java (93%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/ActivitySeineNode.java (93%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/DataReferenceNodeSupport.java (96%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/FloatingObjectSeineNode.java (93%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/ObserveNode.java (98%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/ProgramLonglineNode.java (72%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/ProgramSeineNode.java (71%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/ReferentialReferenceNodeSupport.java (95%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/RouteSeineNode.java (96%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/SetLonglineNode.java (93%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/SetSeineNode.java (93%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/TripLonglineNode.java (96%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/TripSeineNode.java (80%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => renderer}/AbstractObserveTreeCellRenderer.java (90%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => renderer}/DataSelectionTreeCellRenderer.java (95%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => renderer}/NavigationTreeCellRenderer.java (96%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.