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 7b0afb861c1199c9cce15e717f04d9168c6bcba4 Merge: bd6b92f 1be23f3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 10 17:05:20 2015 +0200 fixes #6914: Amélioration des temps d'ouverture de l'arbre de navigation Merge branch 'feature/6914' into develop .../src/main/java/fr/ird/observe/DataService.java | 202 ++++++++++++++++++++- .../ird/observe/db/model/DataSelectionModel.java | 3 +- .../ird/observe/entities/constants/GearType.java | 11 ++ .../entities/longline/ActivityLonglineDAOImpl.java | 63 +++++-- .../entities/longline/TripLonglineDAOImpl.java | 58 +++++- .../entities/referentiel/ProgramDAOImpl.java | 101 +++++++++++ .../entities/seine/ActivitySeineDAOImpl.java | 61 +++++-- .../entities/seine/FloatingObjectDAOImpl.java | 58 ++++-- .../ird/observe/entities/seine/RouteDAOImpl.java | 57 ++++-- .../observe/entities/seine/TripSeineDAOImpl.java | 62 +++++-- .../ird/observe/ui/tree/ActivityLonglineNode.java | 2 +- .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 2 +- .../observe/ui/tree/FloatingObjectSeineNode.java | 2 +- .../ird/observe/ui/tree/ProgramLonglineNode.java | 2 +- .../fr/ird/observe/ui/tree/ProgramSeineNode.java | 2 +- .../fr/ird/observe/ui/tree/RouteSeineNode.java | 2 +- .../fr/ird/observe/ui/tree/TripLonglineNode.java | 2 +- .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 2 +- .../loadors/ActivityLonglineNodeChildLoador.java | 2 + .../loadors/ActivitySeinesNodeChildLoador.java | 1 - .../loadors/FloatingObjectNodeChildLoador.java | 4 +- .../loadors/ProgramLonglineNodeChildLoador.java | 1 - .../tree/loadors/ProgramSeineNodeChildLoador.java | 1 + .../ui/tree/loadors/RootNodeChildLoador.java | 9 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 3 +- .../tree/loadors/SetLonglineNodeChildLoador.java | 4 +- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 1 + 27 files changed, 625 insertions(+), 93 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.