- Observe-commits - mailman.cloud.codelutin.com

branch master updated (9973bd8 -> a725e55)
by codelutin.com scm 23 Apr '15

23 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch master in repository observe. See http://git.codelutin.com/observe.git from 9973bd8 Merge branch 'release/4.0-RC3' adds 0d1bcfa [jgitflow-maven-plugin]updating poms for 4.0-RC4-SNAPSHOT development adds d0f8f52 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 6a676be Merge branch 'master' into develop adds f3882e2 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds c2d0267 refs #7006 use new topia tag value to generate deterministice foreign key names adds 9afba5d fixes #7006: Nommer les clef étrangères Merge branch 'feature/7006' into develop adds e7fe3f1 voir des zero à la place d'une chaine vide sur les composants d'une coordonnée nulle (refs #7007) adds 98f86a2 utilisation jaxx en snapshot (refs #7007) adds 345cf56 amélioration de la façon d'initialiser l'éditeur des coordonnées sur l'écran Activityseine (refs #7007) adds 7aae4d0 amélioration de la façon d'initialiser l'éditeur des coordonnées sur l'écran ActivityLongline (refs #7007) adds 3765f2f fixes #7007: Améliorer l'affichage des coordonnées Merge branch 'feature/7007' into develop adds 4cbda29 faire refonctionner jmx sur hibernate adds eb0c996 permettre l'utilisation de la scrollbar sur des ecran vérouillé (refs #7009) adds 1ffebb9 fixes #7009 Pouvoir utiliser la scrollbar même lorsque l'écran est vérouillé Merge branch 'feature/7009' into develop adds f03b2ea utilisation du dernier pom + mise à jour d'un plugin de report adds 59b905b ajout de place pour le tableau des mises en oeuvre de caractéristiques d'un équipement (refs #7010) adds 15967ef fixes #7010: [ObServePS] Avoir plus de place pour saisir les mises en oeuvre d'un équipement Merge branch 'feature/7010' into develop adds 7724404 ajout de la suppression d'une mise en oeuvre de caractéristique (refs #7012) adds a7b954b fixes #7012: [ObServePS] Pouvoir supprimer une mise en oeuvre de caractéristique d'un équipement Merge branch 'feature/7012' into develop adds 60d9ba6 Écoute de la sélection sur le tableau des mises en oeuvre (refs #7011) adds 571a41e fixes #7011: [ObServePS] Impossible de rajouter des mises en oeuvre de caractéristique à un équipement Merge branch 'feature/7011' into develop adds ad69dc5 ajout de la persistence pour les équipements sur modèle LL + ajout d'un ordre sur les équipements d'une marée seine (refs #7013) adds f68723b ajout de la validation pour les équipements du modèle LL + correction de clefs i18n (refs #7013) adds 5a47fbe ajout de l'écran d'édition des équipements du modèle LL (refs #7013) adds 5a6de36 ajout de la méthode de récupération des caractértistiques pour le modèle LL (refs #7013) adds af793a4 fixes #7013: [ObServeLL] Ajout de l'écran des équipements Merge branch 'feature/7013' into develop adds 85cb8ed on rejoue deux migrations de la 4.0-RC3 (refs #7014) adds 1f6ca1d fixes #7014: 2 migrations of 4.0-RC3 ne sont pas jouées Merge branch 'feature/7014' into develop adds b41c02a adapatation du test pour verifier la replication des equipements sur le modele LL (refs #7015) adds 84c3c44 ajout d'un test de replication aussi pour le modèle seine (refs #7015) adds 8c9934f fixes #7015: [ObServePS] Les équipements ne sont pas synchonisés Merge branch 'feature/7015' into develop adds 55dc897 utilisation jaxx 2.24 adds 8bf60a0 add compute trip for map adds b274065 add shape file and options map in config adds 17ea514 add map in trip seine UI adds 81c2490 mouse Translation adds 359c028 fix show config adds 66db93d add french translation fr i18n adds cf8ec92 rename functions adds a4708e9 add point and fix style adds e44444d add Date on map adds fefdf5a use style file for map adds 37c7ac8 zoom (or un-zoom) on pointer adds f1866ba add layers adds f5ab898 fix zoom adds a96d031 refs #6944 Déplacement des resources pour en faire un zip à intégrer dans le class-path adds 8638603 refs #6944 creation de la resources sur la partie catographie dans le build adds e76b828 refs #6944 copie des resources de cartographie adds 408d5ec fix zoom NPE adds 6ca2e47 add scale mpa and creat jaxx file for map adds 09f5a0a fix default values map options adds 5234784 move scale in map and add compass adds 706ff1e fix code, hide actions buttons, tab name adds 057d0c1 add map in trip long line ui adds 4b0a2bf change trip map point type values, add style for longline, adds 5486969 permettre d'interagir avec la carte même sur une marée clôturée (refs #6944) adds 2559ebd add export map into png, fix zoomIt in launch adds 77880e6 accepter la carte par son type plutot que par son nome dans le bloqueur + passage a jaxx en snapshot (refs #6944) adds 1c9d89c add legend adds d12d960 compute trip only if trip has change adds e155b2b fix API + update i18n adds e106041 add some icons to popup menu + add NPG in filter (refs #6944) adds 8d697dd fixes #6944: Tracer une carte de la marée Merge branch 'feature/6944' into develop adds 6d853ed fix replicate test adds f3d5761 add license header adds 487128b optimize dependencies adds 7d7be03 add license headers adds 2c3ed45 optimize dependencies adds 2e94d4d [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC4' with non-snapshot versions adds a725e55 Merge branch 'release/4.0-RC4' No new revisions were added by this update. Summary of changes: 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} | 26 +- .../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 ++ .../rename-unknown-longliner-H2.sql | 0 .../rename-unknown-longliner-PG.sql | 0 .../update-senne-gear-usedInTrip-H2.sql | 0 .../update-senne-gear-usedInTrip-PG.sql | 0 .../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 +- .../src/main/assembly/map.xml | 40 +- .../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} | 45 +- .../GearUseFeaturesLonglineUI.css} | 26 +- .../impl/longline/GearUseFeaturesLonglineUI.jaxx | 154 +++++ .../GearUseFeaturesLonglineUIHandler.java} | 218 +++++-- .../longline/GearUseFeaturesLonglineUIModel.java | 125 ++++ ...UseFeaturesMeasurementLonglinesTableModel.java} | 24 +- .../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 ++++ .../FpaZoneUI.css => util/tripMap/TripMapUI.css} | 23 +- .../ConfirmUI.jaxx => util/tripMap/TripMapUI.jaxx} | 43 +- .../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, 4572 insertions(+), 914 deletions(-) delete mode 100644 observe-business/src/test/java/fr/ird/observe/its/replication/H2LonglineReplicateDataTest.java create mode 100644 observe-business/src/test/java/fr/ird/observe/its/replication/H2ReplicateDataTest.java delete mode 100644 observe-business/src/test/resources/db/3.16/ANO-6611.sql.gz create mode 100644 observe-business/src/test/resources/db/4.0-RC4/referentiel.sql.gz create mode 100644 observe-business/src/test/resources/db/replication/data.sql.gz copy observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/{DataSourceMigrationForVersion_3_15.java => DataSourceMigrationForVersion_4_0_RC4.java} (74%) create mode 100644 observe-entities/src/main/java/fr/ird/observe/tripMap/TripMapPoint.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/tripMap/TripMapPointType.java create mode 100644 observe-entities/src/main/resources/db/4.0-RC4/add-gear-data-H2.sql create mode 100644 observe-entities/src/main/resources/db/4.0-RC4/add-gear-data-PG.sql copy observe-entities/src/main/resources/db/{4.0-RC3 => 4.0-RC4}/rename-unknown-longliner-H2.sql (100%) copy observe-entities/src/main/resources/db/{4.0-RC3 => 4.0-RC4}/rename-unknown-longliner-PG.sql (100%) copy observe-entities/src/main/resources/db/{4.0-RC3 => 4.0-RC4}/update-senne-gear-usedInTrip-H2.sql (100%) copy observe-entities/src/main/resources/db/{4.0-RC3 => 4.0-RC4}/update-senne-gear-usedInTrip-PG.sql (100%) copy observe-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-encounter-error-validation.xml => observe-swing/src/main/assembly/map.xml (51%) copy observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/{seine/GearUseFeaturesSeineTableModel.java => longline/GearUseFeaturesLonglineTableModel.java} (63%) copy observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/{seine/GearUseFeaturesSeineUI.css => longline/GearUseFeaturesLonglineUI.css} (73%) create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx copy observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/{seine/GearUseFeaturesSeineUIHandler.java => longline/GearUseFeaturesLonglineUIHandler.java} (59%) create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIModel.java copy observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/{seine/GearUseFeaturesMeasurementSeinesTableModel.java => longline/GearUseFeaturesMeasurementLonglinesTableModel.java} (74%) create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/ObserveMapPane.java create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/ObserveMapPaneLegendItem.java create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/ObserverMapPanLegendDrawer.java copy observe-swing/src/main/java/fr/ird/observe/ui/{content/ref/impl/FpaZoneUI.css => util/tripMap/TripMapUI.css} (70%) copy observe-swing/src/main/java/fr/ird/observe/ui/{storage/tabs/ConfirmUI.jaxx => util/tripMap/TripMapUI.jaxx} (50%) create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java create mode 100644 observe-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.dbf create mode 100644 observe-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.prj create mode 100644 observe-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.shp create mode 100644 observe-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.shx create mode 100644 observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.dbf create mode 100644 observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.prj create mode 100644 observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.shp create mode 100644 observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.shx create mode 100644 observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.dbf create mode 100644 observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.prj create mode 100644 observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.shp create mode 100644 observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.shx create mode 100644 observe-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.dbf create mode 100644 observe-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.prj create mode 100644 observe-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp create mode 100644 observe-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shx create mode 100644 observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.dbf create mode 100644 observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.prj create mode 100644 observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbn create mode 100644 observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbx create mode 100644 observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp create mode 100644 observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml create mode 100644 observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shx create mode 100644 observe-swing/src/main/map/style.xml create mode 100644 observe-swing/src/main/resources/icons/action-center.png copy observe-validation/src/main/resources/fr/ird/observe/entities/{seine/GearUseFeaturesSeine-n1-update-error-validation.xml => longline/GearUseFeaturesLongline-n1-update-error-validation.xml} (84%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

[ANN] - ObServe 4.0-RC4 released
by codelutin.com Release Notification 23 Apr '15

23 Apr '15

The ObServe team is pleased to announce the observe-4.0-RC4 release! Projet ObServe Documentation of the project can be found here: https://observe.codelutin.com Changes ------- Changes in this version include: New features: o Tracer une carte de la marée Issue: 6944. Thanks to Tony Chemit. Resolved by sbavencoff. o Nommer les clef étrangères Issue: 7006. Thanks to Tony Chemit. Resolved by tchemit. o Améliorer l'affichage des coordonnées Issue: 7007. Thanks to Tony Chemit. Resolved by tchemit. o Pouvoir utiliser la scrollbar même lorsque l'écran est vérouillé Issue: 7009. Thanks to Tony Chemit. Resolved by tchemit. o [ObServePS] Avoir plus de place pour saisir les mises en oeuvre d'un équipement Issue: 7010. Thanks to Tony Chemit. Resolved by tchemit. o [ObServePS] Pouvoir supprimer une mise en oeuvre de caractéristique d'un équipement Issue: 7012. Thanks to Tony Chemit. Resolved by tchemit. o [ObServeLL] Ajout de l'écran des équipements Issue: 7013. Thanks to Tony Chemit. Resolved by tchemit. Fixed Bugs: o [ObServePS] Impossible de rajouter des mises en oeuvre de caractéristique à un équipement Issue: 7011. Thanks to Tony Chemit. Resolved by tchemit. o 2 migrations of 4.0-RC3 ne sont pas jouées Issue: 7014. Thanks to Tony Chemit. Resolved by tchemit. o [ObServePS] Les équipements ne sont pas synchonisés Issue: 7015. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- No release file deployed. (all files are deployed in the maven repository) Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -ObServe team

1 0

branch release/4.0-RC4 updated (7d7be03 -> 2c3ed45)
by codelutin.com scm 23 Apr '15

23 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-RC4 in repository observe. See http://git.codelutin.com/observe.git from 7d7be03 add license headers new 2c3ed45 optimize dependencies The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 2c3ed455d5f2676db940dd2f1b9ebcd6d8250fb8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 23 19:53:39 2015 +0200 optimize dependencies Summary of changes: pom.xml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch release/4.0-RC4 updated (487128b -> 7d7be03)
by codelutin.com scm 23 Apr '15

23 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-RC4 in repository observe. See http://git.codelutin.com/observe.git from 487128b optimize dependencies new 7d7be03 add license headers The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 7d7be03071e335ad30f47303b4ab7b81bc1b0415 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Apr 23 17:42:20 2015 +0000 add license headers Summary of changes: .../DataSourceMigrationForVersion_4_0_RC4.java | 22 ++++++++++++++++++++++ .../java/fr/ird/observe/tripMap/TripMapPoint.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/tripMap/TripMapPointType.java | 22 ++++++++++++++++++++++ .../main/resources/db/4.0-RC4/add-gear-data-H2.sql | 21 +++++++++++++++++++++ .../main/resources/db/4.0-RC4/add-gear-data-PG.sql | 21 +++++++++++++++++++++ observe-swing/src/main/assembly/map.xml | 21 +++++++++++++++++++++ .../observe/ui/util/tripMap/ObserveMapPane.java | 22 ++++++++++++++++++++++ .../ui/util/tripMap/ObserveMapPaneLegendItem.java | 22 ++++++++++++++++++++++ .../util/tripMap/ObserverMapPanLegendDrawer.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/ui/util/tripMap/TripMapUI.css | 21 +++++++++++++++++++++ .../fr/ird/observe/ui/util/tripMap/TripMapUI.jaxx | 21 +++++++++++++++++++++ .../observe/ui/util/tripMap/TripMapUIHandler.java | 22 ++++++++++++++++++++++ .../map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml | 21 +++++++++++++++++++++ observe-swing/src/main/map/style.xml | 21 +++++++++++++++++++++ ...FeaturesLongline-n1-update-error-validation.xml | 22 ++++++++++++++++++++++ 15 files changed, 323 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch release/4.0-RC4 updated (f3d5761 -> 487128b)
by codelutin.com scm 23 Apr '15

23 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-RC4 in repository observe. See http://git.codelutin.com/observe.git from f3d5761 add license header new 487128b optimize dependencies The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 487128b55703c8f56c6be2a42214ffcc51345391 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 23 19:32:55 2015 +0200 optimize dependencies Summary of changes: observe-swing/pom.xml | 18 ++++++++++++++---- pom.xml | 47 ++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 56 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch release/4.0-RC4 updated (8d697dd -> f3d5761)
by codelutin.com scm 23 Apr '15

23 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-RC4 in repository observe. See http://git.codelutin.com/observe.git from 8d697dd fixes #6944: Tracer une carte de la marée Merge branch 'feature/6944' into develop new 6d853ed fix replicate test new f3d5761 add license header The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit f3d5761ffde9d6c690252c8c1c535e8405298ee6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 23 18:15:20 2015 +0200 add license header commit 6d853edc1fc2806be7bb13a65f10c079748abbeb Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 23 18:15:11 2015 +0200 fix replicate test Summary of changes: .../its/replication/AbstractReplicateDataTest.java | 2 ++ .../its/replication/H2ReplicateDataTest.java | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 2

branch release/4.0-RC4 created (now 8d697dd)
by codelutin.com scm 23 Apr '15

23 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-RC4 in repository observe. See http://git.codelutin.com/observe.git at 8d697dd fixes #6944: Tracer une carte de la marée Merge branch 'feature/6944' into develop No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch develop updated (8d697dd -> 25ac3bb)
by codelutin.com scm 23 Apr '15

23 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 8d697dd fixes #6944: Tracer une carte de la marée Merge branch 'feature/6944' into develop new 25ac3bb [jgitflow-maven-plugin]updating poms for 4.0-RC5-SNAPSHOT development The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 25ac3bbbc44a69afbadda25d38e6b0fe5f61abaf Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Apr 23 15:52:14 2015 +0000 [jgitflow-maven-plugin]updating poms for 4.0-RC5-SNAPSHOT development Summary of changes: observe-business/pom.xml | 2 +- observe-entities/pom.xml | 2 +- observe-swing/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch develop updated (55dc897 -> 8d697dd)
by codelutin.com scm 23 Apr '15

23 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 55dc897 utilisation jaxx 2.24 new 8bf60a0 add compute trip for map new b274065 add shape file and options map in config new 17ea514 add map in trip seine UI new 81c2490 mouse Translation new 359c028 fix show config new 66db93d add french translation fr i18n new cf8ec92 rename functions new a4708e9 add point and fix style new e44444d add Date on map new fefdf5a use style file for map new 37c7ac8 zoom (or un-zoom) on pointer new f1866ba add layers new f5ab898 fix zoom new a96d031 refs #6944 Déplacement des resources pour en faire un zip à intégrer dans le class-path new 8638603 refs #6944 creation de la resources sur la partie catographie dans le build new e76b828 refs #6944 copie des resources de cartographie new 408d5ec fix zoom NPE new 6ca2e47 add scale mpa and creat jaxx file for map new 09f5a0a fix default values map options new 5234784 move scale in map and add compass new 706ff1e fix code, hide actions buttons, tab name new 057d0c1 add map in trip long line ui new 4b0a2bf change trip map point type values, add style for longline, new 5486969 permettre d'interagir avec la carte même sur une marée clôturée (refs #6944) new 2559ebd add export map into png, fix zoomIt in launch new 77880e6 accepter la carte par son type plutot que par son nome dans le bloqueur + passage a jaxx en snapshot (refs #6944) new 1c9d89c add legend new d12d960 compute trip only if trip has change new e155b2b fix API + update i18n new e106041 add some icons to popup menu + add NPG in filter (refs #6944) new 8d697dd fixes #6944: Tracer une carte de la marée Merge branch 'feature/6944' into develop The 31 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 8d697dd28b6b48a3fd2ebb1aecf35e152a134e58 Merge: 55dc897 e106041 Author: Tony CHEMIT <chemit(a)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 commit e10604196f027d38e4f62f707498a4575fd86028 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 23 17:34:59 2015 +0200 add some icons to popup menu + add NPG in filter (refs #6944) commit e155b2b116c5f76303f19c0e0de25a64e593f30f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 23 16:09:58 2015 +0200 fix API + update i18n commit d12d9609197e84435830b661956b56ea5cc9d092 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Apr 23 14:31:45 2015 +0200 compute trip only if trip has change commit 1c9d89caed761cd189a2e2f3d9d4d4888bf67910 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Apr 23 14:06:55 2015 +0200 add legend commit 77880e6a816382656bbc47016fab19c18f38b8e5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 22 18:46:37 2015 +0200 accepter la carte par son type plutot que par son nome dans le bloqueur + passage a jaxx en snapshot (refs #6944) commit 2559ebd0b0b5da17932f9045cb4f4efd0a5d7dd3 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Apr 22 17:35:56 2015 +0200 add export map into png, fix zoomIt in launch commit 5486969b64b7000acd78c26b603583db1cb8310a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 22 16:34:04 2015 +0200 permettre d'interagir avec la carte même sur une marée clôturée (refs #6944) commit 4b0a2bfc28050d3f0ea3afa4615ec87d35debb0c Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Apr 22 15:36:38 2015 +0200 change trip map point type values, add style for longline, commit 057d0c1b1c99810b5688aa050c776477268509e5 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Apr 22 14:13:33 2015 +0200 add map in trip long line ui commit 706ff1e49847a069662a1035501899c6a5957e2e Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Apr 21 18:05:42 2015 +0200 fix code, hide actions buttons, tab name commit 52347840205301005a3727a66ab10f7390de4269 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Apr 21 16:18:29 2015 +0200 move scale in map and add compass commit 09f5a0abc67c879f320fefb961cdd6c6b8d3fe56 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Apr 21 10:33:51 2015 +0200 fix default values map options commit 6ca2e47cefc96c9bc2aae13d328396760d659f5b Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Apr 21 10:20:21 2015 +0200 add scale mpa and creat jaxx file for map commit 408d5ece1ef652b23dec9726b21816466dc8dc5d Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Apr 20 10:33:20 2015 +0200 fix zoom NPE commit e76b828e333cd18178348462ec6090e39b80efbd Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 20 19:49:39 2015 +0200 refs #6944 copie des resources de cartographie commit 8638603181f685262a59fb99a633705567e238ae Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 20 19:42:46 2015 +0200 refs #6944 creation de la resources sur la partie catographie dans le build commit a96d03177f14ea4ddf5fbf97fd77f5dc8ee8b58d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 20 19:41:54 2015 +0200 refs #6944 Déplacement des resources pour en faire un zip à intégrer dans le class-path commit f5ab898697a3ad37907ae4e9d2e5f43ae5c3cd09 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Apr 17 17:35:08 2015 +0200 fix zoom commit f1866ba606dbafefa364086647ebb33cb2b92fc4 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Apr 17 17:31:40 2015 +0200 add layers commit 37c7ac8019237246ae537bc8d93e5e9e599c0602 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Apr 17 16:08:47 2015 +0200 zoom (or un-zoom) on pointer commit fefdf5a5ac3e318b6e0aa17ca560022b56414b6d Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Apr 17 15:16:05 2015 +0200 use style file for map commit e44444d950d4af380d0bbeb915cd63d73581f369 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Apr 16 17:52:10 2015 +0200 add Date on map commit a4708e9b8dff945409d88167fc98e2db06b287a3 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Apr 16 16:09:54 2015 +0200 add point and fix style commit cf8ec923072d4621b596da768e55a58045026e29 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Apr 16 15:52:51 2015 +0200 rename functions commit 66db93d60c9fbecb33da89ca3c2f659b92c9fb68 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Apr 16 11:17:32 2015 +0200 add french translation fr i18n commit 359c028843fbc3e4ce9dad244fc0b0b5b1f527ee Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Apr 16 11:06:37 2015 +0200 fix show config commit 81c2490d90066d8abadd30e73342c2984ab53bc3 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Apr 16 10:55:22 2015 +0200 mouse Translation commit 17ea5148801ad9627c460e9a8f8d68610cbdc8f5 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Apr 16 08:58:08 2015 +0200 add map in trip seine UI commit b2740651068b527d34a09e6423d53139bf37a3b0 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Apr 16 08:56:52 2015 +0200 add shape file and options map in config commit 8bf60a023df873422bedf6003ce44c6c37e09707 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Apr 16 08:42:39 2015 +0200 add compute trip for map Summary of changes: .../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(-) create mode 100644 observe-entities/src/main/java/fr/ird/observe/tripMap/TripMapPoint.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/tripMap/TripMapPointType.java create mode 100644 observe-swing/src/main/assembly/map.xml create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/ObserveMapPane.java create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/ObserveMapPaneLegendItem.java create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/ObserverMapPanLegendDrawer.java create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUI.css create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUI.jaxx create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java create mode 100644 observe-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.dbf create mode 100644 observe-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.prj create mode 100644 observe-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.shp create mode 100644 observe-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.shx create mode 100644 observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.dbf create mode 100644 observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.prj create mode 100644 observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.shp create mode 100644 observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.shx create mode 100644 observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.dbf create mode 100644 observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.prj create mode 100644 observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.shp create mode 100644 observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.shx create mode 100644 observe-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.dbf create mode 100644 observe-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.prj create mode 100644 observe-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp create mode 100644 observe-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shx create mode 100644 observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.dbf create mode 100644 observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.prj create mode 100644 observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbn create mode 100644 observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbx create mode 100644 observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp create mode 100644 observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml create mode 100644 observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shx create mode 100644 observe-swing/src/main/map/style.xml create mode 100644 observe-swing/src/main/resources/icons/action-center.png -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 30

01/31: add compute trip for map
by codelutin.com scm 23 Apr '15

23 Apr '15

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 8bf60a023df873422bedf6003ce44c6c37e09707 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Apr 16 08:42:39 2015 +0200 add compute trip for map --- .../src/main/java/fr/ird/observe/DataService.java | 25 ++++++ .../observe/entities/seine/TripSeineDAOImpl.java | 90 ++++++++++++++++++++++ .../java/fr/ird/observe/tripMap/TripMapPoint.java | 51 ++++++++++++ 3 files changed, 166 insertions(+) diff --git a/observe-business/src/main/java/fr/ird/observe/DataService.java b/observe-business/src/main/java/fr/ird/observe/DataService.java index af7bcbf..2f36d50 100644 --- a/observe-business/src/main/java/fr/ird/observe/DataService.java +++ b/observe-business/src/main/java/fr/ird/observe/DataService.java @@ -89,6 +89,7 @@ import fr.ird.observe.entities.seine.TargetLength; import fr.ird.observe.entities.seine.TargetSample; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.entities.seine.TripSeineDAO; +import fr.ird.observe.tripMap.TripMapPoint; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -1711,6 +1712,30 @@ public class DataService { } } + public List<TripMapPoint> loadTrip(DataSource source, String id) throws DataSourceException { + if (!source.canReadData()) { + if (log.isDebugEnabled()) { + log.debug("Can not read data!"); + } + return null; + } + + String txName = "loadTrip"; + TopiaContext tx = beginTransaction(source, txName); + + try { + TripSeineDAO dao = (TripSeineDAO) source.getDAO(tx, TripSeine.class); + List<TripMapPoint> tripMapPoints = dao.extractTripMap(id); + return tripMapPoints; + + } catch (Exception e) { + throw new DataSourceException(e, txName); + } finally { + closeTransaction(source, tx, txName); + } + } + + // ------------------------------------------------------------------------ // -- Méthodes de chargement de données // ------------------------------------------------------------------------ diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java index bb185d6..21215d9 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java @@ -21,11 +21,15 @@ */ package fr.ird.observe.entities.seine; +import com.google.common.collect.Lists; import fr.ird.observe.entities.constants.ReferenceLocale; +import fr.ird.observe.entities.constants.seine.SchoolType; +import fr.ird.observe.entities.referentiel.Harbour; import fr.ird.observe.entities.referentiel.Person; import fr.ird.observe.entities.referentiel.PersonImpl; import fr.ird.observe.entities.referentiel.Vessel; import fr.ird.observe.entities.referentiel.VesselImpl; +import fr.ird.observe.tripMap.TripMapPoint; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.framework.TopiaSQLQuery; @@ -34,6 +38,8 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; +import java.sql.Time; +import java.util.Calendar; import java.util.List; /** @@ -72,6 +78,90 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< } + public List<TripMapPoint> extractTripMap(String tripId) throws TopiaException { + + TripSeine tripSeine = findByTopiaId(tripId); + + List<TripMapPoint> tripMapPoints = Lists.newLinkedList(); + + // add departure harbours + Harbour departureHarbour = tripSeine.getDepartureHarbour(); + if (departureHarbour != null) { + TripMapPoint departurePoint = new TripMapPoint(); + departurePoint.setTime(tripSeine.getStartDate()); + departurePoint.setLatitude(departureHarbour.getLatitude()); + departurePoint.setLongitude(departureHarbour.getLongitude()); + tripMapPoints.add(departurePoint); + } + + // Add Activities + TripMapPointQuery tripMapPointQuery = new TripMapPointQuery(tripId); + tripMapPoints.addAll(tripMapPointQuery.findMultipleResult(context)); + + // add landing harbours + Harbour landingHarbour = tripSeine.getLandingHarbour(); + if (landingHarbour != null) { + TripMapPoint landingPoint = new TripMapPoint(); + landingPoint.setTime(tripSeine.getEndDate()); + landingPoint.setLatitude(landingHarbour.getLatitude()); + landingPoint.setLongitude(landingHarbour.getLongitude()); + tripMapPoints.add(landingPoint); + } + + return tripMapPoints; + } + + private static class TripMapPointQuery extends TopiaSQLQuery<TripMapPoint> { + + private static String SQL = "SELECT" + + " r.date, " + + " a.time, " + + " a.latitude," + + " a.longitude," + + " s.schoolType" + + " FROM observe_seine.route r" + + " INNER JOIN observe_seine.activity a" + + " ON a.route = r.topiaId" + + " LEFT OUTER JOIN observe_seine.set s" + + " ON s.topiaId = a.set" + + " WHERE r.trip = ?" + + " ORDER BY r.date, a.time"; + + protected String tripId; + + public TripMapPointQuery(String tripId) { + this.tripId = tripId; + } + + @Override + protected PreparedStatement prepareQuery(Connection connection) throws SQLException { + PreparedStatement preparedStatement = connection.prepareStatement(SQL); + preparedStatement.setString(1, tripId); + return preparedStatement; + } + + @Override + protected TripMapPoint prepareResult(ResultSet resultSet) throws SQLException { + + TripMapPoint point = new TripMapPoint(); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(resultSet.getDate(1)); + Time time = resultSet.getTime(2); + calendar.set(Calendar.HOUR_OF_DAY, time.getHours()); + calendar.set(Calendar.MINUTE, time.getMinutes()); + calendar.set(Calendar.SECOND, time.getSeconds()); + point.setTime(calendar.getTime()); + point.setLatitude(resultSet.getFloat(3)); + point.setLongitude(resultSet.getFloat(4)); + if (resultSet.getString(5) != null) { + point.setSchoolType(SchoolType.values()[resultSet.getInt(5)]); + } + + return point; + } + } + + private static class StubSqlQuery<E extends TripSeine> extends TopiaSQLQuery<E> { private final String sql; diff --git a/observe-entities/src/main/java/fr/ird/observe/tripMap/TripMapPoint.java b/observe-entities/src/main/java/fr/ird/observe/tripMap/TripMapPoint.java new file mode 100644 index 0000000..247240a --- /dev/null +++ b/observe-entities/src/main/java/fr/ird/observe/tripMap/TripMapPoint.java @@ -0,0 +1,51 @@ +package fr.ird.observe.tripMap; + +import fr.ird.observe.entities.constants.seine.SchoolType; + +import java.util.Date; + +/** + * @author Sylvain Bavencoff - bavencoff(a)codelutin.com + */ +public class TripMapPoint { + + protected Date time; + + protected float latitude; + + protected float longitude; + + protected SchoolType schoolType; + + public Date getTime() { + return time; + } + + public void setTime(Date time) { + this.time = time; + } + + public float getLatitude() { + return latitude; + } + + public void setLatitude(float latitude) { + this.latitude = latitude; + } + + public float getLongitude() { + return longitude; + } + + public void setLongitude(float longitude) { + this.longitude = longitude; + } + + public SchoolType getSchoolType() { + return schoolType; + } + + public void setSchoolType(SchoolType schoolType) { + this.schoolType = schoolType; + } +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0