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 5fd814f403cc91252225efd3dacadf4726f9da7d Merge: 213846e 2fed573 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 23 16:15:34 2015 +0200 fixes #7132: [LL] Caractéristiques de la carte LL fixes #7133: [PS] Petites améliorations souhaitées sur la carte PS Merge branch 'feature/7133' into develop .../entities/longline/TripLonglineDAOImpl.java | 53 ++- .../observe/entities/seine/TripSeineDAOImpl.java | 22 +- .../fr/ird/observe/tripMap/TripMapPointType.java | 10 +- .../i18n/observe-entities_en_GB.properties | 4 + .../i18n/observe-entities_es_ES.properties | 4 + .../i18n/observe-entities_fr_FR.properties | 6 +- .../ui/util/tripMap/TripMapContentBuilder.java | 435 +++++++++++++++++++++ .../observe/ui/util/tripMap/TripMapUIHandler.java | 357 ++--------------- observe-swing/src/main/map/style.xml | 163 +++++++- .../resources/i18n/observe-swing_en_GB.properties | 2 + .../resources/i18n/observe-swing_es_ES.properties | 2 + .../resources/i18n/observe-swing_fr_FR.properties | 2 + 12 files changed, 697 insertions(+), 363 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.