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 0cfe75ed637b009c0d25694dcf8bbfca087f69f2 Merge: ae9eff7 3902db3 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 12 17:16:55 2015 +0200 Merge branch 'feature/7553_2' into develop (refs #7553) .../java/fr/ird/observe/ui/DecoratorService.java | 2 +- .../ird/observe/ui/content/ContentUIManager.java | 19 ++++++------ .../impl/longline/ActivityLonglinesUIHandler.java | 4 +-- .../ird/observe/ui/tree/ActivityLonglineNode.java | 2 +- .../observe/ui/tree/FloatingObjectSeineNode.java | 9 +----- .../loadors/ActivityLonglinesNodeChildLoador.java | 15 ++++----- .../loadors/ProgramLonglineNodeChildLoador.java | 2 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 2 +- .../observe-application-swing_fr_FR.properties | 2 +- .../ActivityLonglineServiceController.java | 4 +-- .../v1/seine/FloatingObjectServiceController.java | 6 ++++ .../service/longline/ActivityLonglineService.java | 3 +- .../service/seine/FloatingObjectService.java | 4 +++ .../longline/ActivityLonglineServiceTopia.java | 36 ++++++++-------------- .../service/seine/ActivitySeineServiceTopia.java | 2 +- .../service/seine/FloatingObjectServiceTopia.java | 10 ++++++ 16 files changed, 62 insertions(+), 60 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.