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 a725e55f56f947207f115de5f1b653f150b5b888 Merge: 9973bd8 2e94d4d Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 23 18:06:25 2015 +0000 Merge branch 'release/4.0-RC4' observe-business/pom.xml | 2 +- .../src/main/java/fr/ird/observe/DataService.java | 90 +++ .../main/java/fr/ird/observe/IObserveConfig.java | 2 + .../fr/ird/observe/db/impl/AbstractDataSource.java | 31 +- .../its/replication/AbstractReplicateDataTest.java | 2 + .../replication/H2LonglineReplicateDataTest.java | 200 ------- .../its/replication/H2ReplicateDataTest.java | 370 ++++++++++++ .../src/test/resources/db/3.16/ANO-6611.sql.gz | Bin 172354 -> 0 bytes .../test/resources/db/4.0-RC4/referentiel.sql.gz | Bin 0 -> 138256 bytes .../src/test/resources/db/replication/data.sql.gz | Bin 0 -> 176610 bytes observe-entities/pom.xml | 2 +- .../java/fr/ird/observe/entities/Entities.java | 56 +- .../entities/longline/ActivityLonglineImpl.java | 6 +- .../entities/longline/TripLonglineDAOImpl.java | 143 +++++ .../migration/AbstractDataSourceMigration.java | 4 +- .../DataSourceMigrationForVersion_4_0_RC4.java | 80 +++ .../observe/entities/seine/ActivitySeineImpl.java | 15 +- .../observe/entities/seine/TripSeineDAOImpl.java | 106 ++++ .../java/fr/ird/observe/tripMap/TripMapPoint.java | 71 +++ .../fr/ird/observe/tripMap/TripMapPointType.java | 56 ++ .../main/resources/db/4.0-RC4/add-gear-data-H2.sql | 39 ++ .../main/resources/db/4.0-RC4/add-gear-data-PG.sql | 40 ++ .../db/4.0-RC4/rename-unknown-longliner-H2.sql | 22 + .../db/4.0-RC4/rename-unknown-longliner-PG.sql | 22 + .../db/4.0-RC4/update-senne-gear-usedInTrip-H2.sql | 22 + .../db/4.0-RC4/update-senne-gear-usedInTrip-PG.sql | 22 + .../i18n/observe-entities_en_GB.properties | 12 + .../i18n/observe-entities_es_ES.properties | 12 + .../i18n/observe-entities_fr_FR.properties | 12 + .../src/main/xmi/observe-common.properties | 3 +- .../src/main/xmi/observe-longline.properties | 11 +- .../src/main/xmi/observe-longline.zargo | Bin 93860 -> 96409 bytes .../src/main/xmi/observe-seine.properties | 5 +- observe-entities/src/main/xmi/observe-seine.zargo | Bin 85905 -> 85905 bytes observe-swing/pom.xml | 60 +- observe-swing/src/license/THIRD-PARTY.properties | 23 +- observe-swing/src/main/assembly/map.xml | 41 ++ .../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 +- .../main/java/fr/ird/observe/ui/ObserveCommon.css | 4 + .../ird/observe/ui/actions/ShowConfigAction.java | 32 +- .../main/java/fr/ird/observe/ui/content/Common.css | 1 + .../observe/ui/content/ContentUIInitializer.java | 4 +- .../ird/observe/ui/content/ContentUIManager.java | 2 + .../open/impl/longline/ActivityLonglineUI.css | 3 - .../impl/longline/ActivityLonglineUIHandler.java | 29 +- .../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/ActivitySeineUI.css | 3 - .../open/impl/seine/ActivitySeineUIHandler.java | 32 +- .../ui/content/open/impl/seine/TripSeineUI.css | 8 + .../ui/content/open/impl/seine/TripSeineUI.jaxx | 322 ++++++----- .../open/impl/seine/TripSeineUIHandler.java | 56 +- .../GearUseFeaturesLonglineTableModel.java | 150 +++++ .../GearUseFeaturesLonglineUI.css} | 26 +- .../impl/longline/GearUseFeaturesLonglineUI.jaxx | 154 +++++ .../GearUseFeaturesLonglineUIHandler.java} | 218 +++++-- .../longline/GearUseFeaturesLonglineUIModel.java | 125 ++++ ...rUseFeaturesMeasurementLonglinesTableModel.java | 124 ++++ .../table/impl/seine/GearUseFeaturesSeineUI.css | 6 + .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 88 +-- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 93 +++ .../loadors/ProgramLonglineNodeChildLoador.java | 24 +- .../observe/ui/util/tripMap/ObserveMapPane.java | 330 +++++++++++ .../ui/util/tripMap/ObserveMapPaneLegendItem.java | 91 +++ .../util/tripMap/ObserverMapPanLegendDrawer.java | 117 ++++ .../fr/ird/observe/ui/util/tripMap/TripMapUI.css | 33 ++ .../fr/ird/observe/ui/util/tripMap/TripMapUI.jaxx | 50 ++ .../observe/ui/util/tripMap/TripMapUIHandler.java | 642 +++++++++++++++++++++ .../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 | 168 ++++++ .../main/map/shapeFiles/zee/World_EEZ_v8_2014.shx | Bin 0 -> 2092 bytes observe-swing/src/main/map/style.xml | 338 +++++++++++ .../resources/i18n/observe-swing_en_GB.properties | 99 +++- .../resources/i18n/observe-swing_es_ES.properties | 75 +++ .../resources/i18n/observe-swing_fr_FR.properties | 66 +++ .../src/main/resources/icons/action-center.png | Bin 0 -> 797 bytes observe-swing/src/main/resources/log4j.properties | 2 + observe-validation/pom.xml | 2 +- ...eaturesLongline-n1-update-error-validation.xml} | 13 +- ...UseFeaturesSeine-n1-update-error-validation.xml | 6 +- .../i18n/observe-validation_en_GB.properties | 6 +- .../i18n/observe-validation_es_ES.properties | 6 +- .../i18n/observe-validation_fr_FR.properties | 6 +- .../validation/BeanValidatorDetectorTest.java | 4 +- pom.xml | 116 +++- 110 files changed, 5034 insertions(+), 817 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.