This is an automated email from the git hooks/post-receive script. New change to branch feature/7553 in repository observe. See http://git.codelutin.com/observe.git from cf10568 chargement des programmes dans l'arbre (refs #7553) new 45fa95f chargement des tripseine dans l'arbre (refs #7553) new 58ba04b remplacement des anciens datasources par les nouveaux new 747f827 chargement des noeuds des routes (refs #7553) new 53e2380 affichage des icones des noeuds (refs #7553) The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 53e2380e107c76d5e045cd24f37a7ad3d8fe7879 Author: Kevin Morin <morin@codelutin.com> Date: Thu Oct 1 15:25:50 2015 +0200 affichage des icones des noeuds (refs #7553) commit 747f82772531f39baa75bebabfef8bf6d2ff32f0 Author: Kevin Morin <morin@codelutin.com> Date: Thu Oct 1 11:36:57 2015 +0200 chargement des noeuds des routes (refs #7553) commit 58ba04bb5242a55f8c7432cf1a4089efa208c148 Author: Kevin Morin <morin@codelutin.com> Date: Wed Sep 30 16:37:41 2015 +0200 remplacement des anciens datasources par les nouveaux commit 45fa95f54d80616717ffc91a634cc3f1796736c8 Author: Kevin Morin <morin@codelutin.com> Date: Wed Sep 30 15:50:48 2015 +0200 chargement des tripseine dans l'arbre (refs #7553) Summary of changes: .../src/main/filters/observe-ui.properties | 72 +-- .../observe/ObserveSwingApplicationContext.java | 15 +- .../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/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 | 147 ++++--- .../ird/observe/ui/actions/ShowConfigAction.java | 20 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 24 +- .../ui/admin/validate/ValidateUIHandler.java | 2 +- .../java/fr/ird/observe/ui/content/ContentUI.jaxx | 6 +- .../observe/ui/content/ContentUIInitializer.java | 2 +- .../ird/observe/ui/content/ObserveContentUI.java | 5 +- .../impl/longline/ActivityLonglinesUIHandler.java | 2 +- .../list/impl/longline/TripLonglinesUIHandler.java | 2 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 4 +- .../ui/content/open/ContentOpenableUIHandler.java | 2 +- .../impl/longline/ActivityLonglineUIHandler.java | 4 +- .../open/impl/longline/TripLonglineUIHandler.java | 2 +- .../open/impl/seine/ActivitySeineUIHandler.java | 4 +- .../ui/content/table/ContentTableUIHandler.java | 2 +- .../longline/BranchlinesCompositionUIHandler.java | 2 +- .../CatchLonglineContentTableUIInitializer.java | 2 +- .../impl/longline/CatchLonglineUIHandler.java | 2 +- .../longline/FloatlinesCompositionUIHandler.java | 2 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 2 +- .../impl/longline/HooksCompositionUIHandler.java | 2 +- .../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 | 6 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 6 +- .../table/impl/seine/TargetSampleUIHandler.java | 10 +- .../ird/observe/ui/storage/ObstunaAdminAction.java | 2 +- .../ird/observe/ui/storage/StorageUIHandler.java | 37 +- .../ui/storage/tabs/DataSelectionModel.java | 3 +- .../ui/storage/tabs/StorageTabUIHandler.java | 4 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 12 +- .../ird/observe/ui/tree/ActivityLonglineNode.java | 2 +- .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 2 +- .../fr/ird/observe/ui/tree/DtoNodeSupport.java | 13 +- .../observe/ui/tree/FloatingObjectSeineNode.java | 2 +- .../ird/observe/ui/tree/ObserveDataProvider.java | 24 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 13 +- .../ird/observe/ui/tree/ProgramLonglineNode.java | 25 +- .../fr/ird/observe/ui/tree/RouteSeineNode.java | 21 +- .../fr/ird/observe/ui/tree/SetLonglineNode.java | 2 +- .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 2 +- .../fr/ird/observe/ui/tree/TripLonglineNode.java | 2 +- .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 28 +- .../actions/ChangeTripProgramActionListener.java | 7 +- .../ui/tree/loadors/AbstractNodeChildLoador.java | 29 +- .../loadors/AbstractReferenceDtoChildLoador.java | 15 + .../loadors/ActivityLonglineNodeChildLoador.java | 14 +- .../loadors/ActivityLonglinesNodeChildLoador.java | 2 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 2 +- .../loadors/ActivitySeinesNodeChildLoador.java | 18 +- .../loadors/FloatingObjectNodeChildLoador.java | 21 +- .../loadors/ProgramLonglineNodeChildLoador.java | 2 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 26 +- .../loadors/ReferenceCommonNodeChildLoador.java | 46 +- .../loadors/ReferenceLonglineNodeChildLoador.java | 29 +- .../loadors/ReferenceSeineNodeChildLoador.java | 30 +- .../ui/tree/loadors/RootNodeChildLoador.java | 2 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 25 +- .../tree/loadors/SetLonglineNodeChildLoador.java | 16 +- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 20 +- .../observe/ui/util/tripMap/TripMapUIHandler.java | 5 +- .../v1/seine/ActivitySeineServiceController.java | 9 +- .../v1/seine/RouteServiceController.java | 6 +- .../v1/seine/TripSeineServiceController.java | 6 +- .../service/seine/ActivitySeineService.java | 6 +- .../services/service/seine/RouteService.java | 6 +- .../services/service/seine/TripSeineService.java | 6 +- .../service/seine/TripSeineServiceRestTest.java | 51 +-- .../service/seine/ActivitySeineServiceTopia.java | 30 +- .../services/service/seine/RouteServiceTopia.java | 24 +- .../service/seine/TripSeineServiceTopia.java | 29 +- .../service/seine/TripSeineServiceTopiaTest.java | 41 +- 89 files changed, 1078 insertions(+), 1733 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 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.