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 837d7ac2ccb939c3e9badb86642d296cfac6df03 Merge: 754637f bcde433 Author: Kevin Morin <morin@codelutin.com> Date: Tue Nov 10 16:53:57 2015 +0100 fixes #7621 Ajout de nouvelles fonctionnalités sur la liste des marées .../src/main/filters/observe-ui.properties | 1 + .../observe/ObserveSwingApplicationContext.java | 7 + .../fr/ird/observe/business/db/DataContext.java | 6 + .../main/java/fr/ird/observe/ui/ObserveMainUI.css | 20 ++ .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 5 + .../actions/shared/MoveTripLonglinesUIAction.java | 69 +++++++ .../ui/actions/shared/MoveTripSeinesUIAction.java | 69 +++++++ .../ui/actions/shared/MoveTripsUIAction.java | 227 +++++++++++++++++++++ .../content/list/impl/longline/TripLonglinesUI.css | 12 ++ .../list/impl/longline/TripLonglinesUI.jaxx | 23 +++ .../list/impl/longline/TripLonglinesUIModel.java | 33 +++ .../ui/content/list/impl/seine/TripSeinesUI.css | 9 + .../ui/content/list/impl/seine/TripSeinesUI.jaxx | 23 +++ .../content/list/impl/seine/TripSeinesUIModel.java | 33 +++ .../tree/ObserveNavigationTreeShowPopupAction.java | 131 ++++++++---- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 3 +- .../actions/ChangeTripProgramActionListener.java | 51 +++-- .../observe-application-swing_en_GB.properties | 12 ++ .../observe-application-swing_es_ES.properties | 12 ++ .../observe-application-swing_fr_FR.properties | 8 + .../src/main/resources/icons/action-move-trips.png | Bin 0 -> 1036 bytes .../ActivityLonglineServiceController.java | 10 +- .../v1/longline/SetLonglineServiceController.java | 9 +- .../v1/longline/TripLonglineServiceController.java | 16 +- .../v1/seine/ActivitySeineServiceController.java | 9 +- .../v1/seine/FloatingObjectServiceController.java | 9 +- .../v1/seine/RouteServiceController.java | 9 +- .../v1/seine/SetSeineServiceController.java | 9 +- .../v1/seine/TripSeineServiceController.java | 16 +- .../observe/ObserveTopiaPersistenceContext.java | 4 + .../service/longline/ActivityLonglineService.java | 5 +- .../service/longline/SetLonglineService.java | 5 +- .../service/longline/TripLonglineService.java | 17 +- .../service/seine/ActivitySeineService.java | 5 +- .../service/seine/FloatingObjectService.java | 5 +- .../services/service/seine/RouteService.java | 5 +- .../services/service/seine/SetSeineService.java | 5 +- .../services/service/seine/TripSeineService.java | 16 +- .../services/dto/referential/ProgramDtos.java | 5 + .../longline/ActivityLonglineServiceTopia.java | 9 +- .../service/longline/SetLonglineServiceTopia.java | 10 +- .../service/longline/TripLonglineServiceTopia.java | 41 +++- .../service/seine/ActivitySeineServiceTopia.java | 9 +- .../service/seine/FloatingObjectServiceTopia.java | 9 +- .../services/service/seine/RouteServiceTopia.java | 9 +- .../service/seine/SetSeineServiceTopia.java | 9 +- .../service/seine/TripSeineServiceTopia.java | 36 +++- 47 files changed, 899 insertions(+), 146 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.