This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from cc4e981 refs #7620 Il reste encore le pb des traductions à revoir Merge branch 'feature/7620' into develop new 86136c5 chargement des programmes dans l'arbre (refs #7553) new f522812 chargement des tripseine dans l'arbre (refs #7553) new ed1a0de remplacement des anciens datasources par les nouveaux new d7839fa chargement des noeuds des routes (refs #7553) new bc488fd affichage des icones des noeuds (refs #7553) new 3c66711 fix id (refs #7553) new b005fd5 chargement des objets flottants (refs #7553) new b82e3cd fecthEntity sur les noeuds (refs #7553) new b2c4b49 rebase sur develop new 4cd024e fix error new a5cbe0c fix error new f052d03 - rustine sur le DataContextType pour la sélection du parentId dans l'arbre - fix bug de decorator (refs #7553) new 282ac9f remove fixme new 3636751 Correction du code suite au merge sur les Openable new 2107f8a Début de la mise en place de l'arbre de navigation Merge branch 'feature/7553' into develop The 15 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 2107f8a20e3bdd6f0f73e9547cd9299731369ab0 Merge: cc4e981 3636751 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 5 16:54:11 2015 +0200 Début de la mise en place de l'arbre de navigation Merge branch 'feature/7553' into develop commit 3636751335b51bcac643b79530dd02e2686ef3b4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 5 16:53:17 2015 +0200 Correction du code suite au merge sur les Openable commit 282ac9f37e0cc97cb3b23af77c32c2d139b558f8 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 5 15:30:25 2015 +0200 remove fixme commit f052d03c8f200a20657fa702bb8e26381af1ced9 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 5 15:14:41 2015 +0200 - rustine sur le DataContextType pour la sélection du parentId dans l'arbre - fix bug de decorator (refs #7553) commit a5cbe0c691a58de3154d0c5fae93225ecce61bc6 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 5 12:28:21 2015 +0200 fix error commit 4cd024ed605b0eafd405441a857d2100e2d52687 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 5 12:18:23 2015 +0200 fix error commit b2c4b4947f1e665a6a9e71f506fc33e82045f3e4 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 5 12:14:31 2015 +0200 rebase sur develop commit b82e3cdb114caff7063e883d22c463789336a762 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 5 11:32:19 2015 +0200 fecthEntity sur les noeuds (refs #7553) commit b005fd5f6d623b939e5983b54e45fa865a0889f7 Author: Kevin Morin <morin@codelutin.com> Date: Fri Oct 2 11:47:19 2015 +0200 chargement des objets flottants (refs #7553) commit 3c6671172be2fb979357d613ef59910564ad6f0e Author: Kevin Morin <morin@codelutin.com> Date: Thu Oct 1 18:10:27 2015 +0200 fix id (refs #7553) commit bc488fdc02ceab48b1f18fe6c716649411128221 Author: Kevin Morin <morin@codelutin.com> Date: Thu Oct 1 15:25:50 2015 +0200 affichage des icones des noeuds (refs #7553) commit d7839fa8a937efee9fb5244878c5db8ff1f42c85 Author: Kevin Morin <morin@codelutin.com> Date: Thu Oct 1 11:36:57 2015 +0200 chargement des noeuds des routes (refs #7553) commit ed1a0de97546db0a438e4fa0078fbff01fb0b717 Author: Kevin Morin <morin@codelutin.com> Date: Wed Sep 30 16:37:41 2015 +0200 remplacement des anciens datasources par les nouveaux commit f5228128f058c6a2707619c29a8d31322ab8ea91 Author: Kevin Morin <morin@codelutin.com> Date: Wed Sep 30 15:50:48 2015 +0200 chargement des tripseine dans l'arbre (refs #7553) commit 86136c5f67aa441729294cd5052d0f852a26485c Author: Kevin Morin <morin@codelutin.com> Date: Wed Sep 30 11:32:02 2015 +0200 chargement des programmes dans l'arbre (refs #7553) Summary of changes: .../src/main/filters/observe-ui.properties | 72 +-- .../observe/ObserveSwingApplicationContext.java | 17 +- .../business/ObserveApplicationContext.java | 13 +- .../fr/ird/observe/business/db/DataSource.java | 225 ---------- .../ird/observe/business/db/DataSourceConfig.java | 219 ---------- .../observe/business/db/DataSourceConfigParam.java | 43 -- .../observe/business/db/DataSourceException.java | 55 --- .../ird/observe/business/db/DataSourceFactory.java | 457 ------------------- .../observe/business/db/DataSourceProvider.java | 72 --- .../db/constants/CommonDataSourceConfigParam.java | 128 ------ .../business/db/constants/DataContextType.java | 5 +- .../business/db/model/DataSelectionModel.java | 482 +++++++++++++++++++++ .../business/report/model/ReportExecute.java | 9 +- .../business/validation/ObserveValidator.java | 5 +- .../business/validation/ValidationContext.java | 13 +- .../java/fr/ird/observe/ui/DecoratorService.java | 169 ++++---- .../ird/observe/ui/actions/ShowConfigAction.java | 20 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 28 +- .../ui/admin/validate/ValidateUIHandler.java | 2 +- .../java/fr/ird/observe/ui/content/ContentUI.jaxx | 6 +- .../ird/observe/ui/content/ContentUIHandler.java | 18 +- .../observe/ui/content/ContentUIInitializer.java | 2 +- .../ird/observe/ui/content/ContentUIManager.java | 3 + .../fr/ird/observe/ui/content/ContentUIModel.java | 9 + .../ird/observe/ui/content/ObserveContentUI.java | 5 +- .../content/impl/longline/BranchlineUIHandler.java | 6 +- .../LonglineDetailCompositionUIHandler.java | 6 +- .../LonglineGlobalCompositionUIHandler.java | 6 +- .../impl/longline/SetLonglineUIHandler.java | 7 +- .../ActivitySeineObservedSystemUIHandler.java | 4 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 4 +- .../impl/seine/FloatingObjectUIHandler.java | 7 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 7 +- .../ui/content/list/ContentListUIHandler.java | 14 +- .../impl/longline/ActivityLonglinesUIHandler.java | 1 + .../list/impl/longline/TripLonglinesUIHandler.java | 1 + .../list/impl/seine/ActivitySeinesUIHandler.java | 7 +- .../content/list/impl/seine/RoutesUIHandler.java | 3 +- .../list/impl/seine/TripSeinesUIHandler.java | 5 +- .../observe/ui/content/open/ContentOpenableUI.jaxx | 4 +- .../ui/content/open/ContentOpenableUIHandler.java | 14 +- .../ui/content/open/ContentOpenableUIModel.java | 4 +- .../impl/longline/ActivityLonglineUIHandler.java | 1 + .../open/impl/longline/TripLonglineUIHandler.java | 1 + .../open/impl/seine/ActivitySeineUIHandler.java | 29 +- .../open/impl/seine/ActivitySeineUIModel.java | 11 +- .../open/impl/seine/TripSeineUIHandler.java | 4 + .../ui/content/ref/ContentReferenceUIHandler.java | 27 +- .../ui/content/ref/ReferenceHomeUIHandler.java | 6 +- .../ui/content/table/ContentTableUIHandler.java | 10 +- .../CatchLonglineContentTableUIInitializer.java | 2 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 2 +- .../impl/longline/HooksCompositionUIHandler.java | 1 + .../content/table/impl/longline/TdrUIHandler.java | 10 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 2 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 2 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 8 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 2 +- .../table/impl/seine/TargetCatchUIHandler.java | 5 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 5 +- .../table/impl/seine/TargetSampleUIHandler.java | 10 +- .../ird/observe/ui/storage/StorageUIHandler.java | 28 +- .../ui/storage/tabs/StorageTabUIHandler.java | 4 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 15 +- .../ird/observe/ui/tree/ActivityLonglineNode.java | 25 +- .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 25 +- .../fr/ird/observe/ui/tree/DtoNodeSupport.java | 31 +- .../observe/ui/tree/FloatingObjectSeineNode.java | 25 +- .../ird/observe/ui/tree/ObserveDataProvider.java | 24 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 80 ++-- .../ird/observe/ui/tree/ProgramLonglineNode.java | 34 +- .../fr/ird/observe/ui/tree/ProgramSeineNode.java | 35 +- .../fr/ird/observe/ui/tree/RouteSeineNode.java | 24 +- .../fr/ird/observe/ui/tree/SetLonglineNode.java | 25 +- .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 23 +- .../fr/ird/observe/ui/tree/TripLonglineNode.java | 30 +- .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 31 +- .../actions/ChangeTripProgramActionListener.java | 7 +- .../ui/tree/loadors/AbstractNodeChildLoador.java | 30 +- .../loadors/AbstractReferenceDtoChildLoador.java | 15 + .../loadors/ActivityLonglineNodeChildLoador.java | 9 +- .../loadors/ActivityLonglinesNodeChildLoador.java | 7 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 29 +- .../loadors/ActivitySeinesNodeChildLoador.java | 23 +- .../loadors/FloatingObjectNodeChildLoador.java | 23 +- .../loadors/ProgramLonglineNodeChildLoador.java | 7 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 31 +- .../loadors/ReferenceCommonNodeChildLoador.java | 7 +- .../loadors/ReferenceLonglineNodeChildLoador.java | 8 +- .../loadors/ReferenceSeineNodeChildLoador.java | 10 +- .../ui/tree/loadors/RootNodeChildLoador.java | 43 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 30 +- .../tree/loadors/SetLonglineNodeChildLoador.java | 9 +- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 7 +- .../ui/util/decorator/ReferenceDecorator.java | 56 +-- .../decorator/ReferenceReferentialDecorator.java | 33 -- .../observe-application-swing_fr_FR.properties | 2 +- .../v1/seine/ActivitySeineServiceController.java | 5 +- .../v1/seine/FloatingObjectServiceController.java | 8 +- .../v1/seine/RouteServiceController.java | 3 +- .../v1/seine/TripSeineServiceController.java | 3 +- .../entities/longline/TripLonglineTopiaDao.java | 5 +- .../observe/entities/seine/TripSeineTopiaDao.java | 6 +- .../service/seine/ActivitySeineService.java | 3 +- .../service/seine/FloatingObjectService.java | 6 +- .../services/service/seine/RouteService.java | 3 +- .../services/service/seine/TripSeineService.java | 3 +- .../service/seine/TripSeineServiceRestTest.java | 44 +- .../service/longline/TripLonglineServiceTopia.java | 2 +- .../service/seine/ActivitySeineServiceTopia.java | 37 +- .../service/seine/FloatingObjectServiceTopia.java | 29 +- .../services/service/seine/RouteServiceTopia.java | 20 +- .../service/seine/TripSeineServiceTopia.java | 36 +- .../service/seine/TripSeineServiceTopiaTest.java | 29 +- 114 files changed, 1434 insertions(+), 1968 deletions(-) delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSource.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceConfig.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceConfigParam.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceException.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceFactory.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceProvider.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/CommonDataSourceConfigParam.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/model/DataSelectionModel.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractReferenceDtoChildLoador.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/ReferenceReferentialDecorator.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.