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@list.forge.codelutin.com>.