branch develop updated (7cd954c -> 3c6e833)
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>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git 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) --- .../src/main/java/fr/ird/observe/entities/seine/TargetCatchImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/TargetCatchImpl.java b/entities/src/main/java/fr/ird/observe/entities/seine/TargetCatchImpl.java index dd2db1f..1988549 100644 --- a/entities/src/main/java/fr/ird/observe/entities/seine/TargetCatchImpl.java +++ b/entities/src/main/java/fr/ird/observe/entities/seine/TargetCatchImpl.java @@ -45,8 +45,8 @@ public class TargetCatchImpl extends TargetCatchAbstract { public void setCatchWeight(Float catchWeight) { if (catchWeight != null) { - // on arrondit à 3 décimales - catchWeight = NumberUtil.roundThreeDigits(catchWeight); + // on arrondit à 4 décimales + catchWeight = NumberUtil.roundFourDigits(catchWeight); } super.setCatchWeight(catchWeight); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git 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) --- .../main/java/fr/ird/observe/application/swing/ui/UIHelper.java | 7 +++++++ .../swing/ui/content/table/impl/seine/TargetCatchUI.jcss | 2 +- .../swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jcss | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java index 4ccf4ef..a9ab74e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java @@ -129,6 +129,13 @@ public class UIHelper extends SwingUtil { * @since 2.3 */ public static final String DECIMAL3_PATTERN = "\\d{0,6}|\\d{1,6}.\\d{0,3}"; + /** + * Pattern to use for decimal numeric values with 4 decimal digits in + * editors. + * + * @since 5.0.3 + */ + public static final String DECIMAL4_PATTERN = "\\d{0,6}|\\d{1,6}.\\d{0,4}"; /** * Components which must NOT be blocked by any layer in ui. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jcss index 7416750..25905db 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jcss @@ -57,7 +57,7 @@ property:{TargetCatchDto.PROPERTY_CATCH_WEIGHT}; model:{tableEditBean.getCatchWeight()}; useFloat:true; - numberPattern:{fr.ird.observe.application.swing.ui.UIHelper.DECIMAL3_PATTERN}; + numberPattern:{fr.ird.observe.application.swing.ui.UIHelper.DECIMAL4_PATTERN}; } #wellLabel { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jcss index 8a04f03..9aabfc8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jcss @@ -69,7 +69,7 @@ property:{TargetCatchDto.PROPERTY_CATCH_WEIGHT}; model:{tableEditBean.getCatchWeight()}; useFloat:true; - numberPattern:{fr.ird.observe.application.swing.ui.UIHelper.DECIMAL3_PATTERN}; + numberPattern:{fr.ird.observe.application.swing.ui.UIHelper.DECIMAL4_PATTERN}; } #broughtOnDeckInformation { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit f07bef08c8e3d2d471d3fe24c252e49c30ad7867 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 14:21:42 2016 +0200 Amélioration taille colonnes tableaux --- .../swing/ui/content/table/impl/seine/TargetCatchUIHandler.java | 2 +- .../ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java index c62aedf..7361090 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java @@ -225,7 +225,7 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa JTable table = getUi().getTable(); UIHelper.fixTableColumnWidth(table, 2, 100); - UIHelper.fixTableColumnWidth(table, 3, 50); + UIHelper.fixTableColumnWidth(table, 3, 100); UIHelper.fixTableColumnWidth(table, 4, 50); UIHelper.setI18nTableHeaderRenderer( diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java index c8371da..31415da 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java @@ -294,7 +294,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT protected void initTableUI(DefaultTableCellRenderer renderer) { JTable table = getUi().getTable(); UIHelper.fixTableColumnWidth(table, 3, 75); - UIHelper.fixTableColumnWidth(table, 4, 20); + UIHelper.fixTableColumnWidth(table, 4, 30); UIHelper.fixTableColumnWidth(table, 5, 50); UIHelper.setI18nTableHeaderRenderer( @@ -316,7 +316,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT UIHelper.setTableColumnRenderer(table, 1, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, WeightCategoryDto.class)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, ReasonForDiscardDto.class)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); - UIHelper.setTableColumnRenderer(table, 4, UIHelper.newStringTableCellRenderer(renderer, 20, false)); + UIHelper.setTableColumnRenderer(table, 4, UIHelper.newBooleanTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 5, UIHelper.newStringTableCellRenderer(renderer, 10, true)); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git 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 .../main/java/fr/ird/observe/application/swing/ui/UIHelper.java | 7 +++++++ .../swing/ui/content/table/impl/seine/TargetCatchUI.jcss | 2 +- .../swing/ui/content/table/impl/seine/TargetCatchUIHandler.java | 2 +- .../swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jcss | 2 +- .../ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java | 4 ++-- .../main/java/fr/ird/observe/entities/seine/TargetCatchImpl.java | 4 ++-- 6 files changed, 14 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 35c679db691c8438eb137495ff162102300fe6b8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 14:29:48 2016 +0200 introduce node package --- .../fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java | 2 +- .../application/swing/ui/actions/shared/AbstractUIAction.java | 2 +- .../application/swing/ui/actions/shared/CancelCreateUIAction.java | 2 +- .../application/swing/ui/actions/shared/CloseOpenUIAction.java | 2 +- .../application/swing/ui/actions/shared/GoDownUIAction.java | 2 +- .../observe/application/swing/ui/actions/shared/GoUpUIAction.java | 2 +- .../swing/ui/actions/shared/MoveActivityLonglinesUIAction.java | 4 ++-- .../swing/ui/actions/shared/MoveActivitySeinesUIAction.java | 4 ++-- .../application/swing/ui/actions/shared/MoveRoutesUIAction.java | 4 ++-- .../application/swing/ui/actions/shared/MoveTripsUIAction.java | 2 +- .../application/swing/ui/actions/shared/ReOpenUIAction.java | 2 +- .../application/swing/ui/actions/shared/SelectNodeUIAction.java | 2 +- .../synchronize/data/DataSynchroSelectionTreeCellRenderer.java | 4 ++-- .../observe/application/swing/ui/content/ContentUIHandler.java | 2 +- .../observe/application/swing/ui/content/ContentUIManager.java | 2 +- .../swing/ui/content/impl/longline/SetLonglineUIHandler.java | 2 +- .../swing/ui/content/impl/seine/FloatingObjectUIHandler.java | 2 +- .../swing/ui/content/impl/seine/SetSeineUIHandler.java | 2 +- .../application/swing/ui/content/list/ContentListUIHandler.java | 2 +- .../swing/ui/content/open/ContentOpenableUIHandler.java | 2 +- .../swing/ui/content/open/impl/seine/RouteUIHandler.java | 2 +- .../application/swing/ui/content/table/ContentTableUIHandler.java | 2 +- .../swing/ui/tree/AbstractObserveTreeCellRenderer.java | 5 +++++ .../application/swing/ui/tree/DataSelectionTreeCellRenderer.java | 2 ++ .../swing/ui/tree/DataSelectionTreeSelectionModel.java | 2 ++ .../application/swing/ui/tree/NavigationTreeCellRenderer.java | 2 ++ .../swing/ui/tree/ObserveNavigationTreeShowPopupAction.java | 1 + .../ird/observe/application/swing/ui/tree/ObserveTreeBridge.java | 1 + .../ird/observe/application/swing/ui/tree/ObserveTreeHelper.java | 2 ++ .../swing/ui/tree/actions/ChangeActivityRouteActionListener.java | 2 +- .../swing/ui/tree/actions/ChangeActivityTripActionListener.java | 2 +- .../swing/ui/tree/actions/ChangeRouteTripActionListener.java | 2 +- .../swing/ui/tree/actions/ChangeTripProgramActionListener.java | 2 +- .../swing/ui/tree/actions/NodeChangeActionListener.java | 2 +- .../swing/ui/tree/loadors/AbstractNodeChildLoador.java | 2 +- .../swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java | 6 +++--- .../swing/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java | 4 ++-- .../swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java | 8 ++++---- .../swing/ui/tree/loadors/ActivitySeinesNodeChildLoador.java | 4 ++-- .../swing/ui/tree/loadors/FloatingObjectNodeChildLoador.java | 2 +- .../swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java | 4 ++-- .../swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java | 4 ++-- .../swing/ui/tree/loadors/ReferenceNodeChildLoador.java | 2 +- .../application/swing/ui/tree/loadors/RootNodeChildLoador.java | 6 +++--- .../application/swing/ui/tree/loadors/RoutesNodeChildLoador.java | 4 ++-- .../swing/ui/tree/loadors/SetLonglineNodeChildLoador.java | 2 +- .../swing/ui/tree/loadors/SetSeineNodeChildLoador.java | 2 +- .../swing/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java | 4 ++-- .../swing/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java | 4 ++-- .../application/swing/ui/tree/menu/MoveNodeMenuPopulator.java | 2 +- .../swing/ui/tree/menu/MoveRouteNodeMenuPopulator.java | 4 ++-- .../application/swing/ui/tree/menu/MoveTripNodeMenuPopulator.java | 6 +++--- .../swing/ui/tree/{ => node}/AbstrctReferenceNodeSupport.java | 3 ++- .../swing/ui/tree/{ => node}/ActivityLonglineNode.java | 3 ++- .../application/swing/ui/tree/{ => node}/ActivitySeineNode.java | 3 ++- .../swing/ui/tree/{ => node}/DataReferenceNodeSupport.java | 3 ++- .../swing/ui/tree/{ => node}/FloatingObjectSeineNode.java | 3 ++- .../observe/application/swing/ui/tree/{ => node}/ObserveNode.java | 2 +- .../application/swing/ui/tree/{ => node}/ProgramLonglineNode.java | 3 ++- .../application/swing/ui/tree/{ => node}/ProgramSeineNode.java | 3 ++- .../swing/ui/tree/{ => node}/ReferentialReferenceNodeSupport.java | 3 ++- .../application/swing/ui/tree/{ => node}/RouteSeineNode.java | 2 +- .../application/swing/ui/tree/{ => node}/SetLonglineNode.java | 3 ++- .../application/swing/ui/tree/{ => node}/SetSeineNode.java | 3 ++- .../application/swing/ui/tree/{ => node}/TripLonglineNode.java | 2 +- .../application/swing/ui/tree/{ => node}/TripSeineNode.java | 2 +- .../observe/application/swing/ui/util/DecoratedNodeEntity.java | 2 +- 67 files changed, 106 insertions(+), 81 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java index a230f45..c0fcea6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java @@ -35,7 +35,7 @@ import fr.ird.observe.application.swing.ui.content.ContentUIManager; import fr.ird.observe.application.swing.ui.content.ContentUIModel; import fr.ird.observe.application.swing.ui.content.ObserveContentUI; import fr.ird.observe.application.swing.ui.tree.ObserveNavigationTreeShowPopupAction; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.application.swing.ui.util.ObserveSwingValidatorMessageTableModel; import fr.ird.observe.application.swing.ui.util.ObserveValidatorMessageTableRenderer; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/AbstractUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/AbstractUIAction.java index 82b4b80..ee76b5d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/AbstractUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/AbstractUIAction.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.actions.shared; import fr.ird.observe.application.swing.db.DataContext; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ObserveContentUI; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import jaxx.runtime.SwingUtil; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/CancelCreateUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/CancelCreateUIAction.java index c992400..6161134 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/CancelCreateUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/CancelCreateUIAction.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.actions.shared; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import javax.swing.JComponent; import javax.swing.SwingUtilities; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/CloseOpenUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/CloseOpenUIAction.java index c9fb7c5..ae3cc0c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/CloseOpenUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/CloseOpenUIAction.java @@ -31,7 +31,7 @@ import fr.ird.observe.application.swing.ui.content.list.impl.seine.ActivitySeine import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUI; import fr.ird.observe.application.swing.ui.content.open.impl.longline.ActivityLonglineUI; import fr.ird.observe.application.swing.ui.content.open.impl.seine.ActivitySeineUI; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import javax.swing.JComponent; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoDownUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoDownUIAction.java index eecf4b7..26aa472 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoDownUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoDownUIAction.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.actions.shared; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ObserveContentUI; import fr.ird.observe.application.swing.ui.tree.AbstractObserveTreeCellRenderer; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import javax.swing.AbstractButton; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoUpUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoUpUIAction.java index fae8c89..bc967e3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoUpUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoUpUIAction.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.actions.shared; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ObserveContentUI; import fr.ird.observe.application.swing.ui.tree.AbstractObserveTreeCellRenderer; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import javax.swing.AbstractButton; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivityLonglinesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivityLonglinesUIAction.java index 2f6e480..d746b1b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivityLonglinesUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivityLonglinesUIAction.java @@ -28,9 +28,9 @@ import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecor import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.list.impl.longline.ActivityLonglinesUI; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; -import fr.ird.observe.application.swing.ui.tree.TripLonglineNode; +import fr.ird.observe.application.swing.ui.tree.node.TripLonglineNode; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivitySeinesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivitySeinesUIAction.java index 0aceb91..eb54dce 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivitySeinesUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivitySeinesUIAction.java @@ -29,9 +29,9 @@ import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.list.impl.seine.ActivitySeinesUI; import fr.ird.observe.application.swing.ui.content.list.impl.seine.ActivitySeinesUIModel; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; -import fr.ird.observe.application.swing.ui.tree.RouteSeineNode; +import fr.ird.observe.application.swing.ui.tree.node.RouteSeineNode; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.ActivitySeineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveRoutesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveRoutesUIAction.java index 23e0556..467920f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveRoutesUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveRoutesUIAction.java @@ -28,9 +28,9 @@ import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecor import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.list.impl.seine.RoutesUI; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; -import fr.ird.observe.application.swing.ui.tree.TripSeineNode; +import fr.ird.observe.application.swing.ui.tree.node.TripSeineNode; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.RouteDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripsUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripsUIAction.java index 54b87fc..c601df4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripsUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveTripsUIAction.java @@ -29,7 +29,7 @@ import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.list.ContentListUIModel; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.application.swing.ui.tree.menu.MoveTripNodeMenuPopulator; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/ReOpenUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/ReOpenUIAction.java index b7b4c4a..8e185c6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/ReOpenUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/ReOpenUIAction.java @@ -27,7 +27,7 @@ import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.list.ContentListUI; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUI; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import javax.swing.JComponent; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/SelectNodeUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/SelectNodeUIAction.java index 81049e5..0fc6e3e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/SelectNodeUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/SelectNodeUIAction.java @@ -22,7 +22,7 @@ package fr.ird.observe.application.swing.ui.actions.shared; import fr.ird.observe.application.swing.ui.ObserveMainUI; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import javax.swing.JComponent; import java.awt.event.ActionEvent; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroSelectionTreeCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroSelectionTreeCellRenderer.java index 1a9bb4d..b7c62aa 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroSelectionTreeCellRenderer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroSelectionTreeCellRenderer.java @@ -25,8 +25,8 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.data; import com.google.common.collect.ImmutableSet; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.tree.DataSelectionTreeCellRenderer; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; -import fr.ird.observe.application.swing.ui.tree.ReferentialReferenceNodeSupport; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ReferentialReferenceNodeSupport; import javax.swing.Icon; import javax.swing.JTree; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java index 176c605..15e7120 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java @@ -38,7 +38,7 @@ import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.actions.shared.AbstractUIAction; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; import fr.ird.observe.application.swing.ui.tree.AbstractObserveTreeCellRenderer; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.application.swing.ui.util.SpringUtilities; import fr.ird.observe.application.swing.validation.ValidationContext; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java index f327cb6..c3d73c3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java @@ -59,7 +59,7 @@ import fr.ird.observe.application.swing.ui.content.table.impl.seine.TargetCatchU import fr.ird.observe.application.swing.ui.content.table.impl.seine.TargetDiscardCatchUI; import fr.ird.observe.application.swing.ui.content.table.impl.seine.TargetSampleCaptureUI; import fr.ird.observe.application.swing.ui.content.table.impl.seine.TargetSampleRejeteUI; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.CatchLonglineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java index 2473d56..be720b5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java @@ -29,7 +29,7 @@ import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import fr.ird.observe.application.swing.ui.content.ContentUIModel; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.Form; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java index 3928984..632387d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -35,7 +35,7 @@ import fr.ird.observe.services.service.seine.FloatingObjectService; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import fr.ird.observe.application.swing.ui.content.ContentUIModel; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java index 9f2bce1..7c4ee3b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java @@ -28,7 +28,7 @@ import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import fr.ird.observe.application.swing.ui.content.ContentUIModel; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.application.swing.I18nEnumHelper; import fr.ird.observe.services.dto.DataReference; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java index cce0607..f3e2911 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java @@ -27,7 +27,7 @@ import fr.ird.observe.application.swing.ui.actions.shared.SelectNodeUIAction; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import fr.ird.observe.application.swing.ui.tree.AbstractObserveTreeCellRenderer; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.DataDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIHandler.java index a19cb34..667b396 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIHandler.java @@ -30,7 +30,7 @@ import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.application.swing.validation.ValidationContext; import org.apache.commons.logging.Log; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java index 437425c..6f88843 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java @@ -28,7 +28,7 @@ import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIHandler; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.referential.ReferentialReference; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java index 6d8f9eb..30210a2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java @@ -37,7 +37,7 @@ import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import fr.ird.observe.application.swing.ui.content.ContentUIModel; import fr.ird.observe.application.swing.ui.content.table.impl.longline.WeightMeasuresTableModel; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.util.table.EditableTableModelSupport; import fr.ird.observe.application.swing.ui.util.table.InlineTableAutotSelectRowAndShowPopupAction; import org.apache.commons.logging.Log; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstractObserveTreeCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstractObserveTreeCellRenderer.java index b00bf46..aa0ceb2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstractObserveTreeCellRenderer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstractObserveTreeCellRenderer.java @@ -33,6 +33,11 @@ import fr.ird.observe.application.swing.ui.content.open.impl.longline.TripLongli import fr.ird.observe.application.swing.ui.content.open.impl.seine.ActivitySeineUI; import fr.ird.observe.application.swing.ui.content.open.impl.seine.RouteUI; import fr.ird.observe.application.swing.ui.content.open.impl.seine.TripSeineUI; +import fr.ird.observe.application.swing.ui.tree.node.DataReferenceNodeSupport; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ReferentialReferenceNodeSupport; +import fr.ird.observe.application.swing.ui.tree.node.SetLonglineNode; +import fr.ird.observe.application.swing.ui.tree.node.SetSeineNode; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.OpenableDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeCellRenderer.java index c9af230..e04bb61 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeCellRenderer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeCellRenderer.java @@ -21,6 +21,8 @@ */ package fr.ird.observe.application.swing.ui.tree; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.TripSeineNode; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.TripSeineDto; import org.apache.commons.logging.Log; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeSelectionModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeSelectionModel.java index c44831e..f558b0e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeSelectionModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeSelectionModel.java @@ -22,6 +22,8 @@ package fr.ird.observe.application.swing.ui.tree; import com.google.common.collect.Sets; +import fr.ird.observe.application.swing.ui.tree.node.AbstrctReferenceNodeSupport; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/NavigationTreeCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/NavigationTreeCellRenderer.java index bc1ec1c..b79d4af 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/NavigationTreeCellRenderer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/NavigationTreeCellRenderer.java @@ -21,6 +21,8 @@ */ package fr.ird.observe.application.swing.ui.tree; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; + import javax.swing.JComponent; import javax.swing.JTree; import javax.swing.tree.DefaultTreeModel; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java index f58ec32..fdd8901 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java @@ -35,6 +35,7 @@ import fr.ird.observe.application.swing.ui.tree.menu.MoveActivitySeineNodeMenuPo import fr.ird.observe.application.swing.ui.tree.menu.MoveNodeMenuPopulator; import fr.ird.observe.application.swing.ui.tree.menu.MoveRouteNodeMenuPopulator; import fr.ird.observe.application.swing.ui.tree.menu.MoveTripNodeMenuPopulator; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeBridge.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeBridge.java index 33cbc70..1a5f526 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeBridge.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeBridge.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.application.swing.ui.tree; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import jaxx.runtime.swing.nav.tree.NavTreeBridge; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java index 40a5953..ede5dd3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java @@ -36,6 +36,8 @@ import fr.ird.observe.application.swing.ui.tree.loadors.ProgramLonglineNodeChild import fr.ird.observe.application.swing.ui.tree.loadors.ProgramSeineNodeChildLoador; import fr.ird.observe.application.swing.ui.tree.loadors.RootNodeChildLoador; import fr.ird.observe.application.swing.ui.tree.loadors.RoutesNodeChildLoador; +import fr.ird.observe.application.swing.ui.tree.node.AbstrctReferenceNodeSupport; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java index f7d103e..8a5907b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java @@ -27,7 +27,7 @@ import fr.ird.observe.application.swing.ObserveOpenDataManager; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.service.seine.ActivitySeineService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java index 9b9c6c6..03142c9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java @@ -27,7 +27,7 @@ import fr.ird.observe.application.swing.ObserveOpenDataManager; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.service.longline.ActivityLonglineService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java index 70f390d..c876ac6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java @@ -27,7 +27,7 @@ import fr.ird.observe.application.swing.ObserveOpenDataManager; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.service.seine.RouteService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeTripProgramActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeTripProgramActionListener.java index 9bb6457..85e330f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeTripProgramActionListener.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeTripProgramActionListener.java @@ -30,7 +30,7 @@ import fr.ird.observe.services.ObserveServicesProvider; import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.service.longline.TripLonglineService; import fr.ird.observe.services.service.seine.TripSeineService; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/NodeChangeActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/NodeChangeActionListener.java index f1d593e..53b22ad 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/NodeChangeActionListener.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/NodeChangeActionListener.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.tree.actions; */ -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/AbstractNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/AbstractNodeChildLoador.java index 7bb246d..89d6322 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/AbstractNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/AbstractNodeChildLoador.java @@ -25,7 +25,7 @@ import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel; import fr.ird.observe.application.swing.ui.tree.ObserveDataProvider; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java index 0987095..8d99fc7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java @@ -23,9 +23,9 @@ package fr.ird.observe.application.swing.ui.tree.loadors; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.application.swing.ui.tree.ActivityLonglineNode; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; -import fr.ird.observe.application.swing.ui.tree.SetLonglineNode; +import fr.ird.observe.application.swing.ui.tree.node.ActivityLonglineNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.SetLonglineNode; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.EncounterDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java index 9903ca5..5642597 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.swing.ui.tree.loadors; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; -import fr.ird.observe.application.swing.ui.tree.ActivityLonglineNode; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ActivityLonglineNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java index 1da0070..b778d83 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java @@ -22,10 +22,10 @@ package fr.ird.observe.application.swing.ui.tree.loadors; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; -import fr.ird.observe.application.swing.ui.tree.ActivitySeineNode; -import fr.ird.observe.application.swing.ui.tree.FloatingObjectSeineNode; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; -import fr.ird.observe.application.swing.ui.tree.SetSeineNode; +import fr.ird.observe.application.swing.ui.tree.node.ActivitySeineNode; +import fr.ird.observe.application.swing.ui.tree.node.FloatingObjectSeineNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.SetSeineNode; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.referential.seine.ObservedSystemDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeinesNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeinesNodeChildLoador.java index a0edadd..25c7545 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeinesNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeinesNodeChildLoador.java @@ -22,8 +22,8 @@ package fr.ird.observe.application.swing.ui.tree.loadors; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; -import fr.ird.observe.application.swing.ui.tree.ActivitySeineNode; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ActivitySeineNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.seine.ActivitySeineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/FloatingObjectNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/FloatingObjectNodeChildLoador.java index bca68de..823bb4e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/FloatingObjectNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/FloatingObjectNodeChildLoador.java @@ -22,7 +22,7 @@ package fr.ird.observe.application.swing.ui.tree.loadors; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java index 8854627..b882687 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java @@ -24,8 +24,8 @@ package fr.ird.observe.application.swing.ui.tree.loadors; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; -import fr.ird.observe.application.swing.ui.tree.TripLonglineNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.TripLonglineNode; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java index 0848478..7bfac0d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.swing.ui.tree.loadors; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; -import fr.ird.observe.application.swing.ui.tree.TripSeineNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.TripSeineNode; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceNodeChildLoador.java index fd1060e..4efc4b8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceNodeChildLoador.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.tree.loadors; import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.services.dto.referential.ReferentialHelper; import jaxx.runtime.swing.nav.NavDataProvider; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RootNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RootNodeChildLoador.java index b1cacee..e4c33f5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RootNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RootNodeChildLoador.java @@ -22,10 +22,10 @@ package fr.ird.observe.application.swing.ui.tree.loadors; import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; -import fr.ird.observe.application.swing.ui.tree.ProgramLonglineNode; -import fr.ird.observe.application.swing.ui.tree.ProgramSeineNode; +import fr.ird.observe.application.swing.ui.tree.node.ProgramLonglineNode; +import fr.ird.observe.application.swing.ui.tree.node.ProgramSeineNode; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RoutesNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RoutesNodeChildLoador.java index 46f6a6b..328a705 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RoutesNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RoutesNodeChildLoador.java @@ -22,8 +22,8 @@ package fr.ird.observe.application.swing.ui.tree.loadors; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; -import fr.ird.observe.application.swing.ui.tree.RouteSeineNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.RouteSeineNode; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.seine.ActivitySeineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetLonglineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetLonglineNodeChildLoador.java index acc43ed..3d609c0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetLonglineNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetLonglineNodeChildLoador.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.tree.loadors; import com.google.common.collect.Sets; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetSeineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetSeineNodeChildLoador.java index ddeac90..9bc8775 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetSeineNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetSeineNodeChildLoador.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.tree.loadors; import com.google.common.collect.Sets; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.services.dto.seine.DiscardedTargetCatchDto; import fr.ird.observe.services.dto.seine.DiscardedTargetSampleDto; import fr.ird.observe.services.dto.seine.KeptTargetCatchDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java index ac35ffe..595cba2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivityLonglineNodeMenuPopulator.java @@ -26,9 +26,9 @@ import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.application.swing.decoration.DecoratorService; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; -import fr.ird.observe.application.swing.ui.tree.TripLonglineNode; +import fr.ird.observe.application.swing.ui.tree.node.TripLonglineNode; import fr.ird.observe.application.swing.ui.tree.actions.ChangeActivityTripActionListener; import fr.ird.observe.application.swing.ui.tree.actions.NodeChangeActionListener; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java index 4baab6b..b86d554 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveActivitySeineNodeMenuPopulator.java @@ -26,9 +26,9 @@ import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.application.swing.decoration.DecoratorService; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; -import fr.ird.observe.application.swing.ui.tree.RouteSeineNode; +import fr.ird.observe.application.swing.ui.tree.node.RouteSeineNode; import fr.ird.observe.application.swing.ui.tree.actions.ChangeActivityRouteActionListener; import fr.ird.observe.application.swing.ui.tree.actions.NodeChangeActionListener; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveNodeMenuPopulator.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveNodeMenuPopulator.java index 9db1c7c..7bede09 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveNodeMenuPopulator.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveNodeMenuPopulator.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.tree.menu; */ import fr.ird.observe.application.swing.db.ObserveSwingDataSource; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.application.swing.ui.tree.actions.NodeChangeActionListener; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveRouteNodeMenuPopulator.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveRouteNodeMenuPopulator.java index 09cf29c..6c528a1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveRouteNodeMenuPopulator.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveRouteNodeMenuPopulator.java @@ -26,9 +26,9 @@ import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.application.swing.decoration.DecoratorService; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; -import fr.ird.observe.application.swing.ui.tree.TripSeineNode; +import fr.ird.observe.application.swing.ui.tree.node.TripSeineNode; import fr.ird.observe.application.swing.ui.tree.actions.ChangeRouteTripActionListener; import fr.ird.observe.application.swing.ui.tree.actions.NodeChangeActionListener; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripNodeMenuPopulator.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripNodeMenuPopulator.java index 5edf126..01abc5d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripNodeMenuPopulator.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripNodeMenuPopulator.java @@ -27,10 +27,10 @@ import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.application.swing.ui.tree.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; -import fr.ird.observe.application.swing.ui.tree.ProgramLonglineNode; -import fr.ird.observe.application.swing.ui.tree.ProgramSeineNode; +import fr.ird.observe.application.swing.ui.tree.node.ProgramLonglineNode; +import fr.ird.observe.application.swing.ui.tree.node.ProgramSeineNode; import fr.ird.observe.application.swing.ui.tree.actions.ChangeTripProgramActionListener; import fr.ird.observe.application.swing.ui.tree.actions.NodeChangeActionListener; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstrctReferenceNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/AbstrctReferenceNodeSupport.java similarity index 96% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstrctReferenceNodeSupport.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/AbstrctReferenceNodeSupport.java index e580171..2e391c2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstrctReferenceNodeSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/AbstrctReferenceNodeSupport.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.node; /* * #%L @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.tree; * #L% */ +import fr.ird.observe.application.swing.ui.tree.ObserveDataProvider; import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.application.swing.ui.tree.loadors.AbstractNodeChildLoador; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ActivityLonglineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ActivityLonglineNode.java similarity index 93% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ActivityLonglineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ActivityLonglineNode.java index ff0a73c..f9ca28f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ActivityLonglineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ActivityLonglineNode.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.node; /* * #%L @@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.tree; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.service.longline.ActivityLonglineService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ActivitySeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ActivitySeineNode.java similarity index 93% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ActivitySeineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ActivitySeineNode.java index 3dfed91..0d16aa4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ActivitySeineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ActivitySeineNode.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.node; /* * #%L @@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.tree; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.service.seine.ActivitySeineService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataReferenceNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/DataReferenceNodeSupport.java similarity index 96% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataReferenceNodeSupport.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/DataReferenceNodeSupport.java index a757d65..acb70c2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataReferenceNodeSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/DataReferenceNodeSupport.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.node; /* * #%L @@ -24,6 +24,7 @@ package fr.ird.observe.application.swing.ui.tree; import fr.ird.observe.application.swing.ObserveOpenDataManager; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ui.tree.ObserveDataProvider; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.OpenableDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/FloatingObjectSeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/FloatingObjectSeineNode.java similarity index 93% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/FloatingObjectSeineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/FloatingObjectSeineNode.java index e6ed23e..b81aefe 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/FloatingObjectSeineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/FloatingObjectSeineNode.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.node; /* * #%L @@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.tree; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.service.seine.FloatingObjectService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ObserveNode.java similarity index 98% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ObserveNode.java index e66ae53..d855c57 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ObserveNode.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.node; import fr.ird.observe.services.dto.OpenableDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ProgramLonglineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramLonglineNode.java similarity index 94% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ProgramLonglineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramLonglineNode.java index 05b0e2e..48d8266 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ProgramLonglineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramLonglineNode.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.node; /* * #%L @@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.tree; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ProgramSeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramSeineNode.java similarity index 94% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ProgramSeineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramSeineNode.java index 6d0d1cf..49d9e0a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ProgramSeineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramSeineNode.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.node; /* * #%L @@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.tree; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ReferentialReferenceNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ReferentialReferenceNodeSupport.java similarity index 95% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ReferentialReferenceNodeSupport.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ReferentialReferenceNodeSupport.java index dc999e1..b1d4c59 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ReferentialReferenceNodeSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ReferentialReferenceNodeSupport.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.node; /* * #%L @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.tree; * #L% */ +import fr.ird.observe.application.swing.ui.tree.ObserveDataProvider; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.application.swing.ui.tree.loadors.AbstractNodeChildLoador; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/RouteSeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/RouteSeineNode.java similarity index 96% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/RouteSeineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/RouteSeineNode.java index e3be2b8..714d856 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/RouteSeineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/RouteSeineNode.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.node; /* * #%L diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/SetLonglineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/SetLonglineNode.java similarity index 93% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/SetLonglineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/SetLonglineNode.java index 3757916..7b1dbeb 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/SetLonglineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/SetLonglineNode.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.node; /* * #%L @@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.tree; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.service.longline.SetLonglineService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/SetSeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/SetSeineNode.java similarity index 93% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/SetSeineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/SetSeineNode.java index 614535f..cc977f4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/SetSeineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/SetSeineNode.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.node; /* * #%L @@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.tree; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.service.seine.SetSeineService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/TripLonglineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/TripLonglineNode.java similarity index 96% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/TripLonglineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/TripLonglineNode.java index fe3ec9f..cc0663d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/TripLonglineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/TripLonglineNode.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.node; /* * #%L diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/TripSeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/TripSeineNode.java similarity index 96% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/TripSeineNode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/TripSeineNode.java index b5b2b23..b716579 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/TripSeineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/TripSeineNode.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.node; /* * #%L diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/DecoratedNodeEntity.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/DecoratedNodeEntity.java index 274abf4..9aee659 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/DecoratedNodeEntity.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/DecoratedNodeEntity.java @@ -22,7 +22,7 @@ package fr.ird.observe.application.swing.ui.util; * #L% */ -import fr.ird.observe.application.swing.ui.tree.AbstrctReferenceNodeSupport; +import fr.ird.observe.application.swing.ui.tree.node.AbstrctReferenceNodeSupport; import fr.ird.observe.services.dto.IdDto; import org.nuiton.decorator.Decorator; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit de88bd529d8501d259896c86a384c2f646486e03 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 14:33:10 2016 +0200 introduce renderer package --- .../main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx | 2 +- .../observe/application/swing/ui/actions/shared/GoDownUIAction.java | 2 +- .../observe/application/swing/ui/actions/shared/GoUpUIAction.java | 2 +- .../ird/observe/application/swing/ui/admin/config/SelectDataUI.jaxx | 2 +- .../admin/synchronize/data/DataSynchroSelectionTreeCellRenderer.java | 2 +- .../application/swing/ui/admin/synchronize/data/DataSynchroUI.jaxx | 2 +- .../ird/observe/application/swing/ui/content/ContentUIHandler.java | 2 +- .../application/swing/ui/content/list/ContentListUIHandler.java | 2 +- .../ird/observe/application/swing/ui/storage/tabs/SelectDataUI.jaxx | 2 +- .../application/swing/ui/tree/DataSelectionTreeSelectionModel.java | 1 + .../fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java | 1 + .../ui/tree/{ => renderer}/AbstractObserveTreeCellRenderer.java | 5 +++-- .../swing/ui/tree/{ => renderer}/DataSelectionTreeCellRenderer.java | 2 +- .../swing/ui/tree/{ => renderer}/NavigationTreeCellRenderer.java | 2 +- 14 files changed, 16 insertions(+), 13 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx index 93b669b..3d3adfd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx @@ -45,7 +45,7 @@ fr.ird.observe.application.swing.ui.actions.ShowStorageInfoAction fr.ird.observe.application.swing.ui.content.ContentUIManager fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper - fr.ird.observe.application.swing.ui.tree.NavigationTreeCellRenderer + fr.ird.observe.application.swing.ui.tree.renderer.NavigationTreeCellRenderer fr.ird.observe.application.swing.ui.util.tree.BeanTreeHeader jaxx.runtime.swing.CardLayout2 diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoDownUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoDownUIAction.java index 26aa472..6852337 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoDownUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoDownUIAction.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.actions.shared; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ObserveContentUI; -import fr.ird.observe.application.swing.ui.tree.AbstractObserveTreeCellRenderer; +import fr.ird.observe.application.swing.ui.tree.renderer.AbstractObserveTreeCellRenderer; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoUpUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoUpUIAction.java index bc967e3..4f73e86 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoUpUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/GoUpUIAction.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.actions.shared; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ObserveContentUI; -import fr.ird.observe.application.swing.ui.tree.AbstractObserveTreeCellRenderer; +import fr.ird.observe.application.swing.ui.tree.renderer.AbstractObserveTreeCellRenderer; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataUI.jaxx index 4d65cdc..e762290 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataUI.jaxx @@ -31,7 +31,7 @@ fr.ird.observe.application.swing.ui.admin.AdminUI fr.ird.observe.application.swing.ui.admin.AdminStep fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper - fr.ird.observe.application.swing.ui.tree.DataSelectionTreeCellRenderer + fr.ird.observe.application.swing.ui.tree.renderer.DataSelectionTreeCellRenderer fr.ird.observe.application.swing.ui.tree.DataSelectionTreeSelectionModel fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroSelectionTreeCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroSelectionTreeCellRenderer.java index b7c62aa..09c60f2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroSelectionTreeCellRenderer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroSelectionTreeCellRenderer.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.data; import com.google.common.collect.ImmutableSet; import fr.ird.observe.application.swing.ui.UIHelper; -import fr.ird.observe.application.swing.ui.tree.DataSelectionTreeCellRenderer; +import fr.ird.observe.application.swing.ui.tree.renderer.DataSelectionTreeCellRenderer; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.node.ReferentialReferenceNodeSupport; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUI.jaxx index 86eb01f..1327803 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUI.jaxx @@ -29,7 +29,7 @@ fr.ird.observe.application.swing.ui.admin.AdminUI fr.ird.observe.application.swing.ui.admin.AdminStep fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper - fr.ird.observe.application.swing.ui.tree.DataSelectionTreeCellRenderer + fr.ird.observe.application.swing.ui.tree.renderer.DataSelectionTreeCellRenderer fr.ird.observe.application.swing.ui.tree.DataSelectionTreeSelectionModel fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel fr.ird.observe.application.swing.ui.util.tree.BeanTreeHeader diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java index 15e7120..624f997 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java @@ -37,7 +37,7 @@ import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferen import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.actions.shared.AbstractUIAction; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; -import fr.ird.observe.application.swing.ui.tree.AbstractObserveTreeCellRenderer; +import fr.ird.observe.application.swing.ui.tree.renderer.AbstractObserveTreeCellRenderer; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.application.swing.ui.util.SpringUtilities; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java index f3e2911..1593a80 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java @@ -26,7 +26,7 @@ import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.application.swing.ui.actions.shared.SelectNodeUIAction; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; -import fr.ird.observe.application.swing.ui.tree.AbstractObserveTreeCellRenderer; +import fr.ird.observe.application.swing.ui.tree.renderer.AbstractObserveTreeCellRenderer; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.AbstractReference; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SelectDataUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SelectDataUI.jaxx index 9ddfb80..2a6abec 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SelectDataUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SelectDataUI.jaxx @@ -30,7 +30,7 @@ fr.ird.observe.application.swing.db.ObserveSwingDataSource fr.ird.observe.application.swing.ui.storage.StorageStep fr.ird.observe.application.swing.ui.tree.DataSelectionTreeSelectionModel - fr.ird.observe.application.swing.ui.tree.DataSelectionTreeCellRenderer + fr.ird.observe.application.swing.ui.tree.renderer.DataSelectionTreeCellRenderer fr.ird.observe.application.swing.ui.util.tree.BeanTreeHeader </import> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeSelectionModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeSelectionModel.java index f558b0e..17c3ec7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeSelectionModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeSelectionModel.java @@ -24,6 +24,7 @@ package fr.ird.observe.application.swing.ui.tree; import com.google.common.collect.Sets; import fr.ird.observe.application.swing.ui.tree.node.AbstrctReferenceNodeSupport; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.renderer.AbstractObserveTreeCellRenderer; import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java index ede5dd3..5adfc9b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java @@ -38,6 +38,7 @@ import fr.ird.observe.application.swing.ui.tree.loadors.RootNodeChildLoador; import fr.ird.observe.application.swing.ui.tree.loadors.RoutesNodeChildLoador; import fr.ird.observe.application.swing.ui.tree.node.AbstrctReferenceNodeSupport; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.renderer.AbstractObserveTreeCellRenderer; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstractObserveTreeCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/AbstractObserveTreeCellRenderer.java similarity index 98% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstractObserveTreeCellRenderer.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/AbstractObserveTreeCellRenderer.java index aa0ceb2..ea51ba6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstractObserveTreeCellRenderer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/AbstractObserveTreeCellRenderer.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.renderer; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.DataContext; @@ -33,6 +33,7 @@ import fr.ird.observe.application.swing.ui.content.open.impl.longline.TripLongli import fr.ird.observe.application.swing.ui.content.open.impl.seine.ActivitySeineUI; import fr.ird.observe.application.swing.ui.content.open.impl.seine.RouteUI; import fr.ird.observe.application.swing.ui.content.open.impl.seine.TripSeineUI; +import fr.ird.observe.application.swing.ui.tree.ObserveDataProvider; import fr.ird.observe.application.swing.ui.tree.node.DataReferenceNodeSupport; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.node.ReferentialReferenceNodeSupport; @@ -404,7 +405,7 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel * @return the cast {@link ObserveNode}, or {@code null} if * value is null. */ - static ObserveNode getNode(Object value) { + public static ObserveNode getNode(Object value) { ObserveNode node = null; if (value instanceof ObserveNode) { node = (ObserveNode) value; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/DataSelectionTreeCellRenderer.java similarity index 98% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeCellRenderer.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/DataSelectionTreeCellRenderer.java index e04bb61..ba9f8f2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/DataSelectionTreeCellRenderer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/DataSelectionTreeCellRenderer.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.renderer; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.node.TripSeineNode; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/NavigationTreeCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/NavigationTreeCellRenderer.java similarity index 98% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/NavigationTreeCellRenderer.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/NavigationTreeCellRenderer.java index b79d4af..a8d38a4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/NavigationTreeCellRenderer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/NavigationTreeCellRenderer.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.application.swing.ui.tree; +package fr.ird.observe.application.swing.ui.tree.renderer; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 2691002df832b2a2bb0efb970a0e029499d25983 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 15:00:56 2016 +0200 Nettoyage de code --- .../swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java | 7 ------- .../swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java | 7 ------- 2 files changed, 14 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java index b882687..93a1516 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java @@ -112,12 +112,5 @@ public class ProgramLonglineNodeChildLoador extends AbstractNodeChildLoador<Data } - public boolean isAddChilds() { - return addChilds; - } - - public void setAddChilds(boolean addChilds) { - this.addChilds = addChilds; - } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java index 7bfac0d..dde953e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java @@ -106,11 +106,4 @@ public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<DataRef } - public boolean isAddChilds() { - return addChilds; - } - - public void setAddChilds(boolean addChilds) { - this.addChilds = addChilds; - } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git 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 --- .../entities/longline/TripLonglineTopiaDao.java | 22 ++++++++++++++++------ .../observe/entities/seine/TripSeineTopiaDao.java | 22 ++++++++++++++++------ .../dto/reference/DataReferenceSetDefinitions.java | 18 ++++++++++-------- .../topia/binder/data/TripLonglineBinder.java | 2 ++ .../topia/binder/data/TripSeineBinder.java | 2 ++ 5 files changed, 46 insertions(+), 20 deletions(-) diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java index 5e04ca8..86f875f 100644 --- a/entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java +++ b/entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java @@ -29,6 +29,8 @@ import fr.ird.observe.entities.referentiel.Harbour; import fr.ird.observe.entities.referentiel.I18nReferenceEntities; import fr.ird.observe.entities.referentiel.Person; import fr.ird.observe.entities.referentiel.PersonImpl; +import fr.ird.observe.entities.referentiel.Program; +import fr.ird.observe.entities.referentiel.ProgramImpl; import fr.ird.observe.entities.referentiel.Vessel; import fr.ird.observe.entities.referentiel.VesselImpl; import org.nuiton.topia.persistence.support.TopiaSqlQuery; @@ -248,13 +250,15 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl " t.topiaId," + " t.startDate," + " t.endDate," + + " pr.topiaId," + " p.lastName," + " p.firstName," + " v.topiaId," + " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + - " FROM observe_longline.trip t, observe_common.person p, observe_common.vessel v" + + " FROM observe_longline.trip t, observe_common.person p, observe_common.vessel v, observe_common.program pr" + " WHERE " + " t.program = ?" + + " AND t.program = pr.topiaId" + " AND t.observer = p.topiaId" + " AND t.vessel = v.topiaId" + " ORDER BY t.endDate"; @@ -270,13 +274,15 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl " t.topiaId," + " t.startDate," + " t.endDate," + + " pr.topiaId," + " p.lastName," + " p.firstName," + " v.topiaId," + " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + - " FROM observe_longline.trip t, observe_common.person p, observe_common.vessel v" + + " FROM observe_longline.trip t, observe_common.person p, observe_common.vessel v, observe_common.program pr" + " WHERE " + " t.topiaId = ?" + + " AND t.program = pr.topiaId" + " AND t.observer = p.topiaId" + " AND t.vessel = v.topiaId" + " ORDER BY t.endDate"; @@ -301,17 +307,21 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl trip.setStartDate(set.getTimestamp(2)); trip.setEndDate(set.getTimestamp(3)); - String observerLastName = set.getString(4); - String observerFirstName = set.getString(5); + Program program = new ProgramImpl(); + program.setTopiaId(set.getString(4)); + trip.setProgram(program); + + String observerLastName = set.getString(5); + String observerFirstName = set.getString(6); Person observer = new PersonImpl(); observer.setFirstName(observerFirstName); observer.setLastName(observerLastName); trip.setObserver(observer); Vessel vessel = new VesselImpl(); - String vesselId = set.getString(6); + String vesselId = set.getString(7); vessel.setTopiaId(vesselId); - String label = set.getString(7); + String label = set.getString(8); I18nReferenceEntities.setLabel(referenceLocale, vessel, label); trip.setVessel(vessel); diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java index 8299e27..114fc08 100644 --- a/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java +++ b/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java @@ -28,6 +28,8 @@ import fr.ird.observe.entities.referentiel.Harbour; import fr.ird.observe.entities.referentiel.I18nReferenceEntities; import fr.ird.observe.entities.referentiel.Person; import fr.ird.observe.entities.referentiel.PersonImpl; +import fr.ird.observe.entities.referentiel.Program; +import fr.ird.observe.entities.referentiel.ProgramImpl; import fr.ird.observe.entities.referentiel.Vessel; import fr.ird.observe.entities.referentiel.VesselImpl; import org.nuiton.topia.persistence.support.TopiaSqlQuery; @@ -190,13 +192,15 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { " t.topiaId," + " t.startDate," + " t.endDate," + + " pr.topiaId," + " p.lastName," + " p.firstName," + " v.topiaId, " + " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + - " FROM observe_seine.trip t, observe_common.person p, observe_common.vessel v" + + " FROM observe_seine.trip t, observe_common.person p, observe_common.vessel v,observe_common.program pr " + " WHERE " + " t.program = ?" + + " AND t.program = pr.topiaId" + " AND t.observer = p.topiaId" + " AND t.vessel = v.topiaId" + " ORDER BY t.endDate"; @@ -212,13 +216,15 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { " t.topiaId," + " t.startDate," + " t.endDate," + + " pr.topiaId," + " p.lastName," + " p.firstName," + " v.topiaId," + " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + - " FROM observe_seine.trip t, observe_common.person p, observe_common.vessel v" + + " FROM observe_seine.trip t, observe_common.person p, observe_common.vessel v, observe_common.program pr" + " WHERE " + " t.topiaId = ?" + + " AND t.program = pr.topiaId" + " AND t.observer = p.topiaId" + " AND t.vessel = v.topiaId" + " ORDER BY t.endDate"; @@ -250,17 +256,21 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { trip.setStartDate(set.getDate(2)); trip.setEndDate(set.getDate(3)); - String observerLastName = set.getString(4); - String observerFirstName = set.getString(5); + Program program = new ProgramImpl(); + program.setTopiaId(set.getString(4)); + trip.setProgram(program); + + String observerLastName = set.getString(5); + String observerFirstName = set.getString(6); Person observer = new PersonImpl(); observer.setFirstName(observerFirstName); observer.setLastName(observerLastName); trip.setObserver(observer); Vessel vessel = new VesselImpl(); - String vesselId = set.getString(6); + String vesselId = set.getString(7); vessel.setTopiaId(vesselId); - String label = set.getString(7); + String label = set.getString(8); I18nReferenceEntities.setLabel(referenceLocale, vessel, label); trip.setVessel(vessel); diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java index 3a336e1..1960c2e 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java @@ -69,6 +69,7 @@ public enum DataReferenceSetDefinitions { TRIP_SEINE(newDefinitionBuilder(TripSeineDto.class) .addProperty(Date.class, TripSeineDto.PROPERTY_START_DATE) .addProperty(Date.class, TripSeineDto.PROPERTY_END_DATE) + .addProperty(String.class, TripSeineDto.PROPERTY_PROGRAM + "Id") .addProperty(String.class, TripSeineDto.PROPERTY_VESSEL) .addProperty(String.class, TripSeineDto.PROPERTY_OBSERVER)), @@ -125,6 +126,7 @@ public enum DataReferenceSetDefinitions { TRIP_LONGLINE(newDefinitionBuilder(TripLonglineDto.class) .addProperty(Date.class, TripLonglineDto.PROPERTY_START_DATE) .addProperty(Date.class, TripLonglineDto.PROPERTY_END_DATE) + .addProperty(String.class, TripLonglineDto.PROPERTY_PROGRAM + "Id") .addProperty(String.class, TripLonglineDto.PROPERTY_VESSEL) .addProperty(String.class, TripLonglineDto.PROPERTY_OBSERVER)), @@ -154,20 +156,20 @@ public enum DataReferenceSetDefinitions { .addProperty(Integer.class, BranchlineDto.PROPERTY_SETTING_IDENTIFIER)), BASKET_WITH_SECTION(newDefinitionBuilder(BasketWithSectionIdDto.class) - .addProperty(Integer.class, BasketWithSectionIdDto.PROPERTY_HAULING_IDENTIFIER) - .addProperty(Integer.class, BasketWithSectionIdDto.PROPERTY_SETTING_IDENTIFIER) - .addProperty(String.class, BasketWithSectionIdDto.PROPERTY_SECTION_ID)), + .addProperty(Integer.class, BasketWithSectionIdDto.PROPERTY_HAULING_IDENTIFIER) + .addProperty(Integer.class, BasketWithSectionIdDto.PROPERTY_SETTING_IDENTIFIER) + .addProperty(String.class, BasketWithSectionIdDto.PROPERTY_SECTION_ID)), BRANCHLINE_WITH_BASKET(newDefinitionBuilder(BranchlineWithBasketIdDto.class) - .addProperty(Integer.class, BranchlineWithBasketIdDto.PROPERTY_HAULING_IDENTIFIER) - .addProperty(Integer.class, BranchlineWithBasketIdDto.PROPERTY_SETTING_IDENTIFIER) - .addProperty(String.class, BranchlineWithBasketIdDto.PROPERTY_BASKET_ID)), + .addProperty(Integer.class, BranchlineWithBasketIdDto.PROPERTY_HAULING_IDENTIFIER) + .addProperty(Integer.class, BranchlineWithBasketIdDto.PROPERTY_SETTING_IDENTIFIER) + .addProperty(String.class, BranchlineWithBasketIdDto.PROPERTY_BASKET_ID)), TDR(newDefinitionBuilder(TdrDto.class) - .addProperty(String.class, TdrDto.PROPERTY_HOME_ID)), + .addProperty(String.class, TdrDto.PROPERTY_HOME_ID)), SENSOR_USED(newDefinitionBuilder(SensorUsedDto.class) - .addProperty(String.class, SensorUsedDto.PROPERTY_SENSOR_TYPE)); + .addProperty(String.class, SensorUsedDto.PROPERTY_SENSOR_TYPE)); public static final Map<String, ReferenceSetDefinition> MAPPING = new TreeMap<>(); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineBinder.java index a69e022..7e216da 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineBinder.java @@ -103,6 +103,7 @@ public class TripLonglineBinder extends DataBinderSupport<TripLongline, TripLong return toDataReference(entity, entity.getStartDate(), entity.getEndDate(), + entity.getProgram().getTopiaId(), getLabel(referentialLocale, entity.getVessel()), entity.getObserverLabel()); @@ -114,6 +115,7 @@ public class TripLonglineBinder extends DataBinderSupport<TripLongline, TripLong return toDataReference(dto, dto.getStartDate(), dto.getEndDate(), + dto.getProgram().getId(), getLabel(referentialLocale, dto.getVessel()), PersonHelper.getNames(dto.getObserver())); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineBinder.java index b861ce6..aad134c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineBinder.java @@ -104,6 +104,7 @@ public class TripSeineBinder extends DataBinderSupport<TripSeine, TripSeineDto> return toDataReference(entity, entity.getStartDate(), entity.getEndDate(), + entity.getProgram().getTopiaId(), getLabel(referentialLocale, entity.getVessel()), entity.getObserverLabel()); @@ -115,6 +116,7 @@ public class TripSeineBinder extends DataBinderSupport<TripSeine, TripSeineDto> return toDataReference(dto, dto.getStartDate(), dto.getEndDate(), + dto.getProgram().getId(), getLabel(referentialLocale, dto.getVessel()), PersonHelper.getNames(dto.getObserver())); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git 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) --- .../swing/ui/tree/ObserveTreeHelper.java | 48 ++++++++++++++++++++++ .../loadors/ProgramLonglineNodeChildLoador.java | 10 +++++ .../tree/loadors/ProgramSeineNodeChildLoador.java | 10 +++++ .../swing/ui/tree/node/ProgramLonglineNode.java | 16 +++++++- .../swing/ui/tree/node/ProgramSeineNode.java | 15 ++++++- 5 files changed, 97 insertions(+), 2 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java index 5adfc9b..4487406 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java @@ -21,7 +21,11 @@ */ package fr.ird.observe.application.swing.ui.tree; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableListMultimap; +import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; +import com.google.common.collect.Multimaps; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.DataContext; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; @@ -38,6 +42,8 @@ import fr.ird.observe.application.swing.ui.tree.loadors.RootNodeChildLoador; import fr.ird.observe.application.swing.ui.tree.loadors.RoutesNodeChildLoador; import fr.ird.observe.application.swing.ui.tree.node.AbstrctReferenceNodeSupport; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ProgramLonglineNode; +import fr.ird.observe.application.swing.ui.tree.node.ProgramSeineNode; import fr.ird.observe.application.swing.ui.tree.renderer.AbstractObserveTreeCellRenderer; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.IdDto; @@ -68,6 +74,7 @@ import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; import java.util.Arrays; +import java.util.Enumeration; import java.util.List; import java.util.Objects; import java.util.Set; @@ -135,6 +142,47 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { DefaultTreeModel model = createModel(node); node.populateChilds(getBridge(), provider); + + if (source.canReadData()) { + // on va charger en une seule fois tous les nœuds des marées + ImmutableSet<DataReference<TripSeineDto>> tripsSeine = source.newTripSeineService().getAllTripSeine().getReferences(); + if (log.isInfoEnabled()) { + log.info("[PS] Loaded " + tripsSeine.size() + " trip(s)."); + } + ImmutableSet<DataReference<TripLonglineDto>> tripsLongline = source.newTripLonglineService().getAllTripLongline().getReferences(); + if (log.isInfoEnabled()) { + log.info("[LL] Loaded " + tripsLongline.size() + " trip(s)."); + } + ImmutableListMultimap<String, DataReference<TripSeineDto>> tripsSeineByProgramId = Multimaps.index(tripsSeine, r -> (String) r.getPropertyValue(TripSeineDto.PROPERTY_PROGRAM + "Id")); + ImmutableListMultimap<String, DataReference<TripLonglineDto>> tripsLonglineByProgramId = Multimaps.index(tripsLongline, r -> (String) r.getPropertyValue(TripSeineDto.PROPERTY_PROGRAM + "Id")); + + Enumeration<ObserveNode> children = node.children(); + while (children.hasMoreElements()) { + ObserveNode observeNode = children.nextElement(); + if (observeNode instanceof ProgramSeineNode) { + ProgramSeineNode programNode = (ProgramSeineNode) observeNode; + String programId = programNode.getEntity().getId(); + ImmutableList<DataReference<TripSeineDto>> trips = tripsSeineByProgramId.get(programId); + if (CollectionUtils.isNotEmpty(trips)) { + if (log.isInfoEnabled()) { + log.info("[PS] Add " + trips.size() + " trips to " + programNode); + } + programNode.populateChilds(trips, getBridge(), provider); + } + } + if (observeNode instanceof ProgramLonglineNode) { + ProgramLonglineNode programNode = (ProgramLonglineNode) observeNode; + String programId = programNode.getEntity().getId(); + ImmutableList<DataReference<TripLonglineDto>> trips = tripsLonglineByProgramId.get(programId); + if (CollectionUtils.isNotEmpty(trips)) { + if (log.isInfoEnabled()) { + log.info("[LL] Add " + trips.size() + " trips to " + programNode); + } + programNode.populateChilds(trips, getBridge(), provider); + } + } + } + } return model; } finally { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java index 93a1516..8febb26 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.tree.loadors; * #L% */ +import com.google.common.collect.ImmutableList; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; @@ -51,6 +52,7 @@ public class ProgramLonglineNodeChildLoador extends AbstractNodeChildLoador<Data private static final long serialVersionUID = 1L; private boolean addChilds; + private ImmutableList<DataReference<TripLonglineDto>> trips; public ProgramLonglineNodeChildLoador() { super(TripLonglineDto.class); @@ -83,6 +85,10 @@ public class ProgramLonglineNodeChildLoador extends AbstractNodeChildLoador<Data result = new ArrayList<>((Collection) selectionModel.getDatas(parentId)); + } else if (trips != null) { + + result = new ArrayList<>(trips); + } else { TripLonglineService tripLonglineService = ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newTripLonglineService(); @@ -112,5 +118,9 @@ public class ProgramLonglineNodeChildLoador extends AbstractNodeChildLoador<Data } + public void setTrips(ImmutableList<DataReference<TripLonglineDto>> trips) { + this.trips = trips; + } + } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java index dde953e..c4d178f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.application.swing.ui.tree.loadors; +import com.google.common.collect.ImmutableList; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; @@ -50,6 +51,7 @@ public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<DataRef private static final long serialVersionUID = 1L; private boolean addChilds; + private ImmutableList<DataReference<TripSeineDto>> trips; public ProgramSeineNodeChildLoador() { super(TripSeineDto.class); @@ -78,6 +80,10 @@ public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<DataRef result = new ArrayList<>((Collection) selectionModel.getDatas(parentId)); + } else if (trips != null) { + + result = new ArrayList<>(trips); + } else { TripSeineService tripSeineService = ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newTripSeineService(); @@ -106,4 +112,8 @@ public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<DataRef } + public void setTrips(ImmutableList<DataReference<TripSeineDto>> trips) { + this.trips = trips; + } + } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramLonglineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramLonglineNode.java index 48d8266..97300f8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramLonglineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramLonglineNode.java @@ -22,13 +22,18 @@ package fr.ird.observe.application.swing.ui.tree.node; * #L% */ +import com.google.common.collect.ImmutableList; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ui.tree.ObserveDataProvider; +import fr.ird.observe.application.swing.ui.tree.ObserveTreeBridge; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; +import fr.ird.observe.application.swing.ui.tree.loadors.ProgramLonglineNodeChildLoador; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.GearType; +import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.service.ReferentialService; -import fr.ird.observe.application.swing.ui.tree.loadors.ProgramLonglineNodeChildLoador; /** * Created on 4/9/15. @@ -54,4 +59,13 @@ public class ProgramLonglineNode extends ReferentialReferenceNodeSupport<Program ReferentialService service = ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newReferentialService(); return service.loadReference(ProgramDto.class, getId()); } + + public void populateChilds(ImmutableList<DataReference<TripLonglineDto>> trips, ObserveTreeBridge bridge, ObserveDataProvider provider) { + ((ProgramLonglineNodeChildLoador) childLoador).setTrips(trips); + try { + populateChilds(bridge, provider); + } finally { + ((ProgramLonglineNodeChildLoador) childLoador).setTrips(null); + } + } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramSeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramSeineNode.java index 49d9e0a..ab13cd2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramSeineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramSeineNode.java @@ -22,13 +22,18 @@ package fr.ird.observe.application.swing.ui.tree.node; * #L% */ +import com.google.common.collect.ImmutableList; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ui.tree.ObserveDataProvider; +import fr.ird.observe.application.swing.ui.tree.ObserveTreeBridge; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; +import fr.ird.observe.application.swing.ui.tree.loadors.ProgramSeineNodeChildLoador; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.ReferentialService; -import fr.ird.observe.application.swing.ui.tree.loadors.ProgramSeineNodeChildLoador; /** * Created on 4/9/15. @@ -53,4 +58,12 @@ public class ProgramSeineNode extends ReferentialReferenceNodeSupport<ProgramDto return service.loadReference(ProgramDto.class, getId()); } + public void populateChilds(ImmutableList<DataReference<TripSeineDto>> trips, ObserveTreeBridge bridge, ObserveDataProvider provider) { + ((ProgramSeineNodeChildLoador) childLoador).setTrips(trips); + try { + populateChilds(bridge, provider); + } finally { + ((ProgramSeineNodeChildLoador) childLoador).setTrips(null); + } + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git 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 --- .../ird/observe/entities/seine/TripSeineImpl.java | 10 ++++++++++ .../observe/entities/seine/TripSeineTopiaDao.java | 10 +++++++--- entities/src/main/xmi/observe-seine.zargo | Bin 83234 -> 83418 bytes .../dto/reference/DataReferenceSetDefinitions.java | 1 + .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59520 -> 59611 bytes .../services/topia/binder/data/TripSeineBinder.java | 2 ++ .../topia/service/seine/TripSeineServiceTopia.java | 9 +++++---- 7 files changed, 25 insertions(+), 7 deletions(-) diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java b/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java index c1984ba..064a66d 100644 --- a/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java +++ b/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java @@ -28,10 +28,20 @@ package fr.ird.observe.entities.seine; public class TripSeineImpl extends TripSeineAbstract { private static final long serialVersionUID = 1L; + private int routeCount; @Override public String getObserverLabel() { return observer == null ? "" : observer.getLastName() + " " + observer.getFirstName(); } + @Override + public int getRouteCount() { + return routeCount; + } + + @Override + public void setRouteCount(int routeCount) { + this.routeCount = routeCount; + } } diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java index 114fc08..b6df52e 100644 --- a/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java +++ b/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java @@ -196,7 +196,8 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { " p.lastName," + " p.firstName," + " v.topiaId, " + - " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + + " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + "," + + " select count(*) from observe_seine.route r where r.trip = t.topiaId" + " FROM observe_seine.trip t, observe_common.person p, observe_common.vessel v,observe_common.program pr " + " WHERE " + " t.program = ?" + @@ -220,7 +221,8 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { " p.lastName," + " p.firstName," + " v.topiaId," + - " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + + " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + "," + + " select count(*) from observe_seine.route r where r.trip = t.topiaId" + " FROM observe_seine.trip t, observe_common.person p, observe_common.vessel v, observe_common.program pr" + " WHERE " + " t.topiaId = ?" + @@ -250,7 +252,7 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { @Override public TripSeine prepareResult(ResultSet set) throws SQLException { - TripSeine trip = new TripSeineImpl(); + TripSeineImpl trip = new TripSeineImpl(); trip.setTopiaId(set.getString(1)); trip.setStartDate(set.getDate(2)); @@ -273,6 +275,8 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { String label = set.getString(8); I18nReferenceEntities.setLabel(referenceLocale, vessel, label); trip.setVessel(vessel); + trip.setRouteCount(set.getInt(9)); + return trip; diff --git a/entities/src/main/xmi/observe-seine.zargo b/entities/src/main/xmi/observe-seine.zargo index 5fddab0..1184998 100644 Binary files a/entities/src/main/xmi/observe-seine.zargo and b/entities/src/main/xmi/observe-seine.zargo differ diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java index 1960c2e..4b29461 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java @@ -70,6 +70,7 @@ public enum DataReferenceSetDefinitions { .addProperty(Date.class, TripSeineDto.PROPERTY_START_DATE) .addProperty(Date.class, TripSeineDto.PROPERTY_END_DATE) .addProperty(String.class, TripSeineDto.PROPERTY_PROGRAM + "Id") + .addProperty(String.class, TripSeineDto.PROPERTY_ROUTE_COUNT) .addProperty(String.class, TripSeineDto.PROPERTY_VESSEL) .addProperty(String.class, TripSeineDto.PROPERTY_OBSERVER)), diff --git a/services-dto/src/main/xmi/observe-services-dto-seine.zargo b/services-dto/src/main/xmi/observe-services-dto-seine.zargo index cc6e08c..d40705f 100644 Binary files a/services-dto/src/main/xmi/observe-services-dto-seine.zargo and b/services-dto/src/main/xmi/observe-services-dto-seine.zargo differ diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineBinder.java index aad134c..232c670 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineBinder.java @@ -105,6 +105,7 @@ public class TripSeineBinder extends DataBinderSupport<TripSeine, TripSeineDto> entity.getStartDate(), entity.getEndDate(), entity.getProgram().getTopiaId(), + entity.getRouteCount(), getLabel(referentialLocale, entity.getVessel()), entity.getObserverLabel()); @@ -117,6 +118,7 @@ public class TripSeineBinder extends DataBinderSupport<TripSeine, TripSeineDto> dto.getStartDate(), dto.getEndDate(), dto.getProgram().getId(), + dto.getRouteCount(), getLabel(referentialLocale, dto.getVessel()), PersonHelper.getNames(dto.getObserver())); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TripSeineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TripSeineServiceTopia.java index 5d78fc5..bf77b50 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TripSeineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TripSeineServiceTopia.java @@ -32,9 +32,6 @@ import fr.ird.observe.entities.referentiel.Species2; import fr.ird.observe.entities.referentiel.SpeciesList; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.entities.seine.TripSeineTopiaDao; -import fr.ird.observe.services.service.seine.TripSeineService; -import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.Form; @@ -47,6 +44,9 @@ import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.service.seine.TripSeineService; +import fr.ird.observe.services.topia.ObserveServiceTopia; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.topia.entity.TripMapDtoFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -77,6 +77,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe List<TripSeine> tripSeines = loadEntities(TripSeine.class); + tripSeines.forEach(t -> t.setRouteCount(t.sizeRoute())); return toDataReferenceSet(TripSeineDto.class, tripSeines); } @@ -157,7 +158,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe } TripSeine tripSeine = loadEntity(TripSeineDto.class, tripSeineId); - + tripSeine.setRouteCount(tripSeine.sizeRoute()); return toReference(tripSeine); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git 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 --- .../swing/ui/content/open/ContentOpenableUIHandler.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIHandler.java index 667b396..3be7f7e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIHandler.java @@ -24,15 +24,17 @@ package fr.ird.observe.application.swing.ui.content.open; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.db.constants.DataContextType; -import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; -import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ProgramLonglineNode; +import fr.ird.observe.application.swing.ui.tree.node.ProgramSeineNode; import fr.ird.observe.application.swing.validation.ValidationContext; +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; @@ -325,6 +327,9 @@ public abstract class ContentOpenableUIHandler<E extends IdDto> extends ContentU ObserveTreeHelper treeHelper = getTreeHelper(getUi()); ObserveNode tripNode = treeHelper.getSelectedNode().getParent().getParent(); + if (tripNode instanceof ProgramSeineNode || tripNode instanceof ProgramLonglineNode) { + tripNode = treeHelper.getSelectedNode().getParent(); + } if (log.isInfoEnabled()) { log.info("Refresh trip node : " + tripNode); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git 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 --- .../observe/application/swing/ui/tree/ObserveTreeHelper.java | 12 ++++++++++++ .../application/swing/ui/tree/node/TripSeineNode.java | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java index 4487406..a29372a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java @@ -23,8 +23,10 @@ package fr.ird.observe.application.swing.ui.tree; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.google.common.collect.Multimaps; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.DataContext; @@ -44,6 +46,7 @@ import fr.ird.observe.application.swing.ui.tree.node.AbstrctReferenceNodeSupport import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.node.ProgramLonglineNode; import fr.ird.observe.application.swing.ui.tree.node.ProgramSeineNode; +import fr.ird.observe.application.swing.ui.tree.node.TripSeineNode; import fr.ird.observe.application.swing.ui.tree.renderer.AbstractObserveTreeCellRenderer; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.IdDto; @@ -163,11 +166,20 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { ProgramSeineNode programNode = (ProgramSeineNode) observeNode; String programId = programNode.getEntity().getId(); ImmutableList<DataReference<TripSeineDto>> trips = tripsSeineByProgramId.get(programId); + ImmutableMap<String, DataReference<TripSeineDto>> tripsById = Maps.uniqueIndex(trips, DataReference::getId); if (CollectionUtils.isNotEmpty(trips)) { if (log.isInfoEnabled()) { log.info("[PS] Add " + trips.size() + " trips to " + programNode); } programNode.populateChilds(trips, getBridge(), provider); + Enumeration<ObserveNode> tripNodes = programNode.children(); + while (tripNodes.hasMoreElements()) { + TripSeineNode tripNode = (TripSeineNode) tripNodes.nextElement(); + String tripId = tripNode.getEntity().getId(); + DataReference<TripSeineDto> tripDto = tripsById.get(tripId); + int routeCount = (int) tripDto.getPropertyValue(TripSeineDto.PROPERTY_ROUTE_COUNT); + tripNode.setInitialRouteCount(routeCount); + } } } if (observeNode instanceof ProgramLonglineNode) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/TripSeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/TripSeineNode.java index b716579..2d40dde 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/TripSeineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/TripSeineNode.java @@ -41,10 +41,22 @@ public class TripSeineNode extends DataReferenceNodeSupport<TripSeineDto> { super(TripSeineDto.class, entity); } + private int initialRouteCount; @Override protected DataReference<TripSeineDto> fetchEntity() { TripSeineService tripSeineService = ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newTripSeineService(); return tripSeineService.loadReferenceToRead(getId()); } + + public void setInitialRouteCount(int initialRouteCount) { + this.initialRouteCount = initialRouteCount; + } + + public int getRouteCount() { + if (entity == null) { + return initialRouteCount; + } + return (int) entity.getPropertyValue(TripSeineDto.PROPERTY_ROUTE_COUNT); + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git 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 --- .../swing/ui/content/open/impl/seine/RouteUIHandler.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java index 6f88843..c67fa78 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java @@ -45,6 +45,7 @@ import org.nuiton.util.DateUtil; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JOptionPane; +import javax.swing.SwingUtilities; import java.util.Date; import static org.nuiton.i18n.I18n.n; @@ -213,7 +214,8 @@ class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { TripChildSaveResultDto saveResult = getRouteService().save(tripId, bean); saveResult.toDto(bean); - setUpdateMareeNodeTag(saveResult.isTripEndDateUpdated()); + // on doit toujours recharger le nœud de la marée puisque le nombre de routes a changé + setUpdateMareeNodeTag(true); obtainChildPosition(bean); @@ -253,14 +255,15 @@ class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { } String tripId = getSelectedParentId(); - boolean wasEndDateUpdated = getRouteService().delete(tripId, bean.getId()); + getRouteService().delete(tripId, bean.getId()); getOpenDataManager().closeRoute(getSelectedId()); if (log.isInfoEnabled()) { log.info("Delete done for Route " + bean.getId()); } - setUpdateMareeNodeTag(wasEndDateUpdated); + // on doit toujours recharger le nœud de la marée puisque le nombre de routes a changé + setUpdateMareeNodeTag(true); return true; } @@ -293,8 +296,7 @@ class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { if (mustAddFinVeille) { - // on indique à l'observer qu'il doit créer une activité de type - // 16 + // on indique à l'observer qu'il doit créer une activité de type 16 int reponse = UIHelper.askUser( getUi(), -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git 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 --- .../renderer/AbstractObserveTreeCellRenderer.java | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/AbstractObserveTreeCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/AbstractObserveTreeCellRenderer.java index ea51ba6..6fd8a1c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/AbstractObserveTreeCellRenderer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/AbstractObserveTreeCellRenderer.java @@ -36,9 +36,12 @@ import fr.ird.observe.application.swing.ui.content.open.impl.seine.TripSeineUI; import fr.ird.observe.application.swing.ui.tree.ObserveDataProvider; import fr.ird.observe.application.swing.ui.tree.node.DataReferenceNodeSupport; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ProgramLonglineNode; +import fr.ird.observe.application.swing.ui.tree.node.ProgramSeineNode; import fr.ird.observe.application.swing.ui.tree.node.ReferentialReferenceNodeSupport; import fr.ird.observe.application.swing.ui.tree.node.SetLonglineNode; import fr.ird.observe.application.swing.ui.tree.node.SetSeineNode; +import fr.ird.observe.application.swing.ui.tree.node.TripSeineNode; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.OpenableDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; @@ -116,8 +119,6 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel @Override public ObserveDataProvider getDataProvider() { ObserveDataProvider provider = (ObserveDataProvider) super.getDataProvider(); -// Objects.requireNonNull(provider); -// //FIXME ? why if (provider == null) { ObserveSwingDataSource source = ObserveSwingApplicationContext.get().getDataSourcesManager().getMainDataSource(); if (source != null) { @@ -223,12 +224,7 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel } else if (RouteDto.class.equals(containerClass)) { // remonte sur une route : donc activitys path = ActivitySeineDto.class.getName(); - } -// else if (ActivitySeine.class.equals(containerClass)) { -// // remonte sur une activity : donc observedSystem -// path = ObservedSystemDto.class.getName(); -// } - else { + } else { // dans le cas d'un sub, il n'y a pas de suffixe possible suffix = ""; path = containerClass.getName() + ".sub"; @@ -285,12 +281,10 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel if (node instanceof SetLonglineNode) { return t(ObserveI18nDecoratorHelper.getTypeI18nKey(((SetLonglineNode) node).getEntity().getType())); -// return t("observe.tree.setLongline"); } if (node instanceof SetSeineNode) { return t(ObserveI18nDecoratorHelper.getTypeI18nKey(((SetSeineNode) node).getEntity().getType())); -// return t("observe.tree.setSeine"); } if (node instanceof DataReferenceNodeSupport) { @@ -302,7 +296,11 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel Decorator<?> decorator = getDecoratorService().getDataReferenceDecorator((Class) beanType); - return decorator.toString(entity); + String result = decorator.toString(entity); + if (node instanceof TripSeineNode) { + result += " (" + ((TripSeineNode) node).getRouteCount() + ")"; + } + return result; } if (node instanceof ReferentialReferenceNodeSupport) { @@ -314,7 +312,11 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel Decorator<?> decorator = getDecoratorService().getReferentialReferenceDecorator((Class) beanType); - return decorator.toString(entity); + String result = decorator.toString(entity); + if (node instanceof ProgramSeineNode || node instanceof ProgramLonglineNode) { + result += " (" + node.getChildCount() + ")"; + } + return result; } throw new IllegalStateException("Don't know how to render node: " + node); @@ -388,9 +390,7 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel ObserveNode openableNode; openableNode = getFirstOpenableNode(node); if (log.isDebugEnabled()) { - log.debug("openable node " + - Arrays.toString(openableNode.getPath()) + " for " + - Arrays.toString(node.getPath())); + log.debug("openable node " + openableNode + " for " + Arrays.toString(node.getPath())); } if (openableNode != null) { Boolean open = openableNode.isOpen(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git 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 .../application/swing/ui/ObserveMainUI.jaxx | 2 +- .../application/swing/ui/ObserveMainUIHandler.java | 2 +- .../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 +- .../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 +++++-- .../ird/observe/entities/seine/TripSeineImpl.java | 10 ++++ .../observe/entities/seine/TripSeineTopiaDao.java | 32 ++++++++--- entities/src/main/xmi/observe-seine.zargo | Bin 83234 -> 83418 bytes .../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 +-- 80 files changed, 340 insertions(+), 156 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git 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) --- .../dto/longline/BaitsCompositionDto-ui-update-error-validation.xml | 5 ----- .../resources/i18n/application-swing-validation_en_GB.properties | 1 - .../resources/i18n/application-swing-validation_es_ES.properties | 1 - .../resources/i18n/application-swing-validation_fr_FR.properties | 1 - 4 files changed, 8 deletions(-) diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BaitsCompositionDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BaitsCompositionDto-ui-update-error-validation.xml index 6af8779..062c23c 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BaitsCompositionDto-ui-update-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BaitsCompositionDto-ui-update-error-validation.xml @@ -43,11 +43,6 @@ <field name="baitSettingStatus"> - <!-- pas de baitSettingStatus selectionnee --> - <field-validator type="required" short-circuit="true"> - <message>validator.ui.baitsComposition.required.baitSettingStatus</message> - </field-validator> - <!-- baitSettingStatus desactive --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties index 7196b01..64b7d91 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties @@ -243,7 +243,6 @@ validator.ui.baitsComposition.bound.individualWeight=Weight must be bound betwee validator.ui.baitsComposition.bound.proportion=Proportion must be bound between %s and %s. validator.ui.baitsComposition.desactivated.baitSettingStatus=Bait setting status is disabled. validator.ui.baitsComposition.desactivated.baitType=Bait type is disabled. -validator.ui.baitsComposition.required.baitSettingStatus=Bait setting status is required. validator.ui.baitsComposition.required.baitType=Bait type is required. validator.ui.baitsComposition.required.proportion=Proportion is required. validator.ui.basket.bound.floatline1Length=Floatline 1 length must be bound between %s and %s. diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties index e7525ed..bbe39e2 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties @@ -243,7 +243,6 @@ validator.ui.baitsComposition.bound.individualWeight=El peso debe ser entre %s y validator.ui.baitsComposition.bound.proportion=La proporción debe ser entre %s y %s. validator.ui.baitsComposition.desactivated.baitSettingStatus=El tipo de estado seleccionado está desactivado. validator.ui.baitsComposition.desactivated.baitType=El tipo de cebo seleccionado está desactivado. -validator.ui.baitsComposition.required.baitSettingStatus=La selección de un estado es mandatorio. validator.ui.baitsComposition.required.baitType=La selección de un tipo es mandatorio. validator.ui.baitsComposition.required.proportion=La proporción está vacía. validator.ui.basket.bound.floatline1Length=La longitud del orinque 1 debe ser entre %1$s y %2$s. diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties index 7e6fbec..a9e521f 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties @@ -243,7 +243,6 @@ validator.ui.baitsComposition.bound.individualWeight=Le poids doit être compris validator.ui.baitsComposition.bound.proportion=La proportion doit être comprise entre %s et %s. validator.ui.baitsComposition.desactivated.baitSettingStatus=Le type d'état sélectionné est désactivée. validator.ui.baitsComposition.desactivated.baitType=Le type d'appât sélectionné est désactivée. -validator.ui.baitsComposition.required.baitSettingStatus=La sélection d'un état est obligatoire. validator.ui.baitsComposition.required.baitType=La sélection d'un type est obligatoire. validator.ui.baitsComposition.required.proportion=Proportion non renseignée. validator.ui.basket.bound.floatline1Length=La longueur d'orin 1 être comprise entre %1$s et %2$s. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git 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) --- .../longline/HooksCompositionDto-ui-update-error-validation.xml | 7 +------ .../resources/i18n/application-swing-validation_en_GB.properties | 1 - .../resources/i18n/application-swing-validation_es_ES.properties | 1 - .../resources/i18n/application-swing-validation_fr_FR.properties | 1 - 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/HooksCompositionDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/HooksCompositionDto-ui-update-error-validation.xml index b8d4ed6..2004d3c 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/HooksCompositionDto-ui-update-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/HooksCompositionDto-ui-update-error-validation.xml @@ -43,15 +43,10 @@ <field name="hookSize"> - <!-- pas de hookSize selectionnee --> - <field-validator type="required" short-circuit="true"> - <message>validator.ui.hooksComposition.required.hookSize</message> - </field-validator> - <!-- hookSize desactive --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ hookSize.enabled ]]> + <![CDATA[ hookSize == null || hookSize.enabled ]]> </param> <message>validator.ui.hooksComposition.desactivated.hookSize</message> </field-validator> diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties index 64b7d91..342d9ea 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties @@ -328,7 +328,6 @@ validator.ui.hooksComposition.bound.hookOffset=Hook offset must be between %1$s validator.ui.hooksComposition.bound.proportion=Proportion must be between %1$s and %2$s. validator.ui.hooksComposition.desactivated.hookSize=Selected hook size is disabled. validator.ui.hooksComposition.desactivated.hookType=Selected hook type is disabled. -validator.ui.hooksComposition.required.hookSize=Hook size must be filled. validator.ui.hooksComposition.required.hookType=Hook type must be filled. validator.ui.hooksComposition.required.proportion=Proportion must be filled. validator.ui.lengthWeightParameter.invalid.lengthWeightFormula=Formula is not valid. diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties index bbe39e2..c2b032d 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties @@ -328,7 +328,6 @@ validator.ui.hooksComposition.bound.hookOffset=El offset debe ser entre %s y %s. validator.ui.hooksComposition.bound.proportion=La proporción debe ser entre %s y %s. validator.ui.hooksComposition.desactivated.hookSize=El tamaño de avanzuelo seleccionado está desactivado. validator.ui.hooksComposition.desactivated.hookType=El tipo de avanzuelo seleccionado está desactivado. -validator.ui.hooksComposition.required.hookSize=La selección de un tamaño de avanzuelo es mandatoria. validator.ui.hooksComposition.required.hookType=La selección de un tipo de avanzuelo es mandatoria. validator.ui.hooksComposition.required.proportion=La proporción está vacía. validator.ui.lengthWeightParameter.invalid.lengthWeightFormula=Relación de peso introducida no es coherente. diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties index a9e521f..8deaffe 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties @@ -328,7 +328,6 @@ validator.ui.hooksComposition.bound.hookOffset=L'offset doit être compris entre validator.ui.hooksComposition.bound.proportion=La proportion doit être comprise entre %s et %s. validator.ui.hooksComposition.desactivated.hookSize=La taille d'hameçon sélectionné est désactivée. validator.ui.hooksComposition.desactivated.hookType=Le type d'hameçon sélectionné est désactivée. -validator.ui.hooksComposition.required.hookSize=La sélection d'une taille d'hameçon est obligatoire. validator.ui.hooksComposition.required.hookType=La sélection d'un type d'hameçon est obligatoire. validator.ui.hooksComposition.required.proportion=Proportion non renseignée. validator.ui.lengthWeightParameter.invalid.lengthWeightFormula=La relation poids saisie n'est pas cohérente. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 29cafc303fee76d2d0ffbe9089f6e15f21a9cfe3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 19:06:29 2016 +0200 Move to snpashot of jaxx --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7c78b02..bf5b122 100644 --- a/pom.xml +++ b/pom.xml @@ -162,7 +162,7 @@ <processorPluginVersion>1.3</processorPluginVersion> <topiaVersion>3.1.3.2</topiaVersion> - <jaxxVersion>2.33.1</jaxxVersion> + <jaxxVersion>2.34-SNAPSHOT</jaxxVersion> <nuitonI18nVersion>3.6.2</nuitonI18nVersion> <nuitonValidatorVersion>3.0.1</nuitonValidatorVersion> <nuitonUtilsVersion>3.0-rc-15</nuitonUtilsVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git 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 --- .../src/main/java/fr/ird/observe/application/swing/ui/ObserveCommon.jcss | 1 + 1 file changed, 1 insertion(+) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveCommon.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveCommon.jcss index 6f6d345..9806a39 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveCommon.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveCommon.jcss @@ -54,6 +54,7 @@ NumberEditor { CoordinatesEditor { format: {org.nuiton.jaxx.widgets.gis.CoordinateFormat.dms}; displayZeroWhenNull: false; + fillWithZero: true; } FilterableDoubleList { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit a097cdd859ee7e5a7c5f181e381fe3bef3e8ebea Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 19:59:11 2016 +0200 Use last stable of jaxx --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bf5b122..430e4c1 100644 --- a/pom.xml +++ b/pom.xml @@ -162,7 +162,7 @@ <processorPluginVersion>1.3</processorPluginVersion> <topiaVersion>3.1.3.2</topiaVersion> - <jaxxVersion>2.34-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.34</jaxxVersion> <nuitonI18nVersion>3.6.2</nuitonI18nVersion> <nuitonValidatorVersion>3.0.1</nuitonValidatorVersion> <nuitonUtilsVersion>3.0-rc-15</nuitonUtilsVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git 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 .../main/java/fr/ird/observe/application/swing/ui/ObserveCommon.jcss | 1 + pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm