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 da843583bdeea253ee427a0a54c00f2bc2fc309f Merge: 0b35bd6 5abebb3 Author: Maven Release <maven-release@codelutin.com> Date: Sat May 23 14:35:49 2015 +0000 [jgitflow-maven-plugin]merging 'release/4.0-RC6' into 'master' README.txt | 8 +- observe-business/pom.xml | 2 +- .../src/main/filters/observe-reports.properties | 124 +++++- .../src/main/java/fr/ird/observe/DataService.java | 55 +++ .../fr/ird/observe/ObserveApplicationContext.java | 12 +- .../java/fr/ird/observe/report/ReportBuilder.java | 8 +- .../java/fr/ird/observe/report/model/Report.java | 12 +- .../fr/ird/observe/report/model/ReportExecute.java | 18 +- .../ird/observe/report/model/ReportOperation.java | 2 +- .../fr/ird/observe/report/model/ReportRequest.java | 10 +- .../report/model/operations/ExecuteRequests.java | 2 +- .../report/model/operations/GroupByLength.java | 109 +++++ .../observe/report/model/operations/SumColumn.java | 2 +- .../report/model/operations/SumIntColumn.java | 2 +- .../observe/report/model/operations/SumIntRow.java | 2 +- .../observe/report/model/operations/SumRow.java | 2 +- .../fr.ird.observe.report.model.ReportOperation | 3 +- .../ird/observe/its/report/AbstractReportIT.java | 4 +- .../its/report/accessoryCatch/Report2IT.java | 2 +- .../its/report/accessoryCatch/ReportIT.java | 2 +- .../report/accessoryCatchByGroup/Report2IT.java | 2 +- .../its/report/accessoryCatchByGroup/ReportIT.java | 2 +- .../test/resources/db/4.0-RC6/referentiel.sql.gz | Bin 0 -> 138231 bytes observe-entities/pom.xml | 2 +- .../main/java/fr/ird/observe/entities/Trip.java | 4 - .../entities/longline/TripLonglineDAOImpl.java | 142 ++++++- .../entities/longline/TripLonglineImpl.java | 85 ++-- .../migration/AbstractDataSourceMigration.java | 4 +- .../DataSourceMigrationForVersion_4_0_RC6.java | 72 ++++ .../referentiel/LengthWeightParemeterHelper.java | 19 +- .../ird/observe/entities/seine/RouteDAOImpl.java | 47 +++ .../fr/ird/observe/entities/seine/RouteImpl.java | 33 +- .../observe/entities/seine/TripSeineDAOImpl.java | 112 ++++- .../ird/observe/entities/seine/TripSeineImpl.java | 74 ++-- .../fr/ird/observe/tripMap/TripMapPointType.java | 10 +- .../db/4.0-RC6/fix-gearUseFeatures-topiaIds-H2.sql | 26 ++ .../db/4.0-RC6/fix-gearUseFeatures-topiaIds-PG.sql | 26 ++ .../i18n/observe-entities_en_GB.properties | 4 + .../i18n/observe-entities_es_ES.properties | 4 + .../i18n/observe-entities_fr_FR.properties | 6 +- .../src/main/xmi/observe-common.properties | 2 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-seine.properties | 3 +- .../src/test/java/fr/ird/observe/ScriptTest.java | 2 +- observe-swing/pom.xml | 2 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 48 +-- .../ird/observe/ui/admin/export/ExportModel.java | 4 +- .../ird/observe/ui/admin/report/ReportModel.java | 6 +- .../observe/ui/admin/report/ReportUIHandler.java | 12 +- .../impl/longline/ActivityLonglineUIHandler.java | 72 +++- .../open/impl/longline/TripLonglineUIHandler.java | 5 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 64 +-- .../open/impl/seine/TripSeineUIHandler.java | 5 +- .../ui/util/tripMap/TripMapContentBuilder.java | 457 +++++++++++++++++++++ .../fr/ird/observe/ui/util/tripMap/TripMapUI.css | 1 + .../observe/ui/util/tripMap/TripMapUIHandler.java | 357 ++-------------- observe-swing/src/main/map/style.xml | 163 +++++++- .../resources/i18n/observe-swing_en_GB.properties | 4 +- .../resources/i18n/observe-swing_es_ES.properties | 2 + .../resources/i18n/observe-swing_fr_FR.properties | 4 +- observe-validation/pom.xml | 2 +- pom.xml | 6 +- 62 files changed, 1638 insertions(+), 640 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.