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 fb11637125c6cd11fc44d9e9f81ba8966168a60c Merge: 63416d7 a3bfa37 Author: Kevin Morin <morin@codelutin.com> Date: Wed Nov 18 12:55:04 2015 +0100 fixes #7623 [PS] Ajout de nouvelles fonctionnalités sur la liste des activités .../src/main/filters/observe-ui.properties | 2 + .../observe/ObserveSwingApplicationContext.java | 2 + .../actions/shared/MoveActivitySeinesUIAction.java | 225 +++++++++++++++++++++ .../ui/actions/shared/MoveRoutesUIAction.java | 78 ++++--- .../ui/actions/shared/MoveTripsUIAction.java | 84 ++++++-- .../content/list/impl/seine/ActivitySeinesUI.css | 6 + .../content/list/impl/seine/ActivitySeinesUI.jaxx | 2 + .../tree/ObserveNavigationTreeShowPopupAction.java | 153 +++----------- .../java/fr/ird/observe/ui/tree/ObserveNode.java | 12 +- ...java => ChangeActivityRouteActionListener.java} | 49 +++-- .../actions/ChangeRouteTripActionListener.java | 14 +- .../actions/ChangeTripProgramActionListener.java | 4 +- .../ui/tree/actions/NodeChangeActionListener.java | 13 +- .../ui/tree/menu/MoveActivitySeineNodeData.java | 65 ++++++ .../fr/ird/observe/ui/tree/menu/MoveNodeData.java | 37 ++++ .../observe/ui/tree/menu/MoveRouteNodeData.java | 66 ++++++ .../ird/observe/ui/tree/menu/MoveTripNodeData.java | 75 +++++++ .../observe-application-swing_en_GB.properties | 10 + .../observe-application-swing_es_ES.properties | 10 + .../observe-application-swing_fr_FR.properties | 8 + ...-move-routes.png => action-move-activities.png} | Bin .../main/resources/icons/action-move-routes.png | Bin 953 -> 943 bytes .../v1/seine/ActivitySeineServiceController.java | 11 + .../service/seine/ActivitySeineService.java | 9 + .../service/seine/ActivitySeineServiceTopia.java | 34 ++++ .../services/service/seine/RouteServiceTopia.java | 4 + 26 files changed, 754 insertions(+), 219 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.