This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git 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 .../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(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.