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 2ccfb5195f6602980ef0f3f58a87be516fdec750 Merge: 677db7b 0b850cd Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 11 09:30:51 2015 +0200 fixes #6938: [ObServeLL] Revue de la fonctionnalité d'export de marée Merge branch 'feature/6938' into develop .../src/main/java/fr/ird/observe/DataService.java | 44 ++++++ .../ird/observe/db/model/DataSelectionModel.java | 2 + .../entities/longline/TripLonglineDAOImpl.java | 38 +---- .../observe/entities/seine/TripSeineDAOImpl.java | 38 +---- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 123 ++++++---------- .../ird/observe/ui/admin/export/ExportModel.java | 76 +++++++--- .../observe/ui/admin/export/ExportUIHandler.java | 164 +++++---------------- .../fr/ird/observe/ui/admin/export/TripEntry.java | 49 +----- .../ui/admin/export/TripToExportTableModel.java | 28 +--- .../resources/i18n/observe-swing_fr_FR.properties | 2 +- 10 files changed, 201 insertions(+), 363 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.