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 8d697dd28b6b48a3fd2ebb1aecf35e152a134e58 Merge: 55dc897 e106041 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 23 17:37:04 2015 +0200 fixes #6944: Tracer une carte de la marée Merge branch 'feature/6944' into develop .../src/main/java/fr/ird/observe/DataService.java | 39 ++ .../main/java/fr/ird/observe/IObserveConfig.java | 2 + .../entities/longline/TripLonglineDAOImpl.java | 143 +++++ .../observe/entities/seine/TripSeineDAOImpl.java | 106 ++++ .../java/fr/ird/observe/tripMap/TripMapPoint.java | 49 ++ .../fr/ird/observe/tripMap/TripMapPointType.java | 34 ++ .../i18n/observe-entities_en_GB.properties | 12 + .../i18n/observe-entities_es_ES.properties | 12 + .../i18n/observe-entities_fr_FR.properties | 12 + observe-swing/pom.xml | 48 ++ observe-swing/src/license/THIRD-PARTY.properties | 23 +- observe-swing/src/main/assembly/map.xml | 20 + .../src/main/filters/observe-ui.properties | 1 + .../main/java/fr/ird/observe/ObserveConfig.java | 76 +-- .../java/fr/ird/observe/ObserveConfigOption.java | 127 ++++- .../fr/ird/observe/ObserveResourceManager.java | 28 +- .../main/java/fr/ird/observe/ObserveRunner.java | 12 +- .../ird/observe/ui/actions/ShowConfigAction.java | 32 +- .../observe/ui/content/ContentUIInitializer.java | 4 +- .../content/open/impl/longline/TripLonglineUI.css | 8 + .../content/open/impl/longline/TripLonglineUI.jaxx | 286 +++++----- .../open/impl/longline/TripLonglineUIHandler.java | 52 ++ .../ui/content/open/impl/seine/TripSeineUI.css | 8 + .../ui/content/open/impl/seine/TripSeineUI.jaxx | 322 +++++------ .../open/impl/seine/TripSeineUIHandler.java | 56 +- .../observe/ui/util/tripMap/ObserveMapPane.java | 308 ++++++++++ .../ui/util/tripMap/ObserveMapPaneLegendItem.java | 69 +++ .../util/tripMap/ObserverMapPanLegendDrawer.java | 95 ++++ .../fr/ird/observe/ui/util/tripMap/TripMapUI.css | 12 + .../fr/ird/observe/ui/util/tripMap/TripMapUI.jaxx | 29 + .../observe/ui/util/tripMap/TripMapUIHandler.java | 620 +++++++++++++++++++++ .../map/shapeFiles/borders/WDBII_border_l_L1.dbf | Bin 0 -> 40956 bytes .../map/shapeFiles/borders/WDBII_border_l_L1.prj | 1 + .../map/shapeFiles/borders/WDBII_border_l_L1.shp | Bin 0 -> 139420 bytes .../map/shapeFiles/borders/WDBII_border_l_L1.shx | Bin 0 -> 3692 bytes .../main/map/shapeFiles/continents/GSHHS_l_L1.dbf | Bin 0 -> 1227230 bytes .../main/map/shapeFiles/continents/GSHHS_l_L1.prj | 1 + .../main/map/shapeFiles/continents/GSHHS_l_L1.shp | Bin 0 -> 1221404 bytes .../main/map/shapeFiles/continents/GSHHS_l_L1.shx | Bin 0 -> 45756 bytes .../main/map/shapeFiles/continents/GSHHS_l_L6.dbf | Bin 0 -> 20435 bytes .../main/map/shapeFiles/continents/GSHHS_l_L6.prj | 1 + .../main/map/shapeFiles/continents/GSHHS_l_L6.shp | Bin 0 -> 48740 bytes .../main/map/shapeFiles/continents/GSHHS_l_L6.shx | Bin 0 -> 852 bytes .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.dbf | Bin 0 -> 939130 bytes .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.prj | 1 + .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp | Bin 0 -> 721340 bytes .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shx | Bin 0 -> 35036 bytes .../main/map/shapeFiles/zee/World_EEZ_v8_2014.dbf | Bin 0 -> 177553 bytes .../main/map/shapeFiles/zee/World_EEZ_v8_2014.prj | 1 + .../main/map/shapeFiles/zee/World_EEZ_v8_2014.sbn | Bin 0 -> 2852 bytes .../main/map/shapeFiles/zee/World_EEZ_v8_2014.sbx | Bin 0 -> 372 bytes .../main/map/shapeFiles/zee/World_EEZ_v8_2014.shp | Bin 0 -> 5091908 bytes .../map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml | 147 +++++ .../main/map/shapeFiles/zee/World_EEZ_v8_2014.shx | Bin 0 -> 2092 bytes observe-swing/src/main/map/style.xml | 317 +++++++++++ .../resources/i18n/observe-swing_en_GB.properties | 48 ++ .../resources/i18n/observe-swing_es_ES.properties | 48 ++ .../resources/i18n/observe-swing_fr_FR.properties | 39 ++ .../src/main/resources/icons/action-center.png | Bin 0 -> 797 bytes observe-swing/src/main/resources/log4j.properties | 2 + pom.xml | 75 ++- 61 files changed, 2956 insertions(+), 370 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.