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 fcb6456 [maven-release-plugin] copy for tag observe-3.15.1 adds f508dcb [maven-release-plugin] prepare for next development iteration adds 643ee6d fixes #6704: LL/PS - Libellé des marées dans l'arbre adds 5e5dc08 add .gitignore adds 4165eb4 passage sous git et utilisation de codelutinpom adds cb365f6 refs #6904 correction de la disposition adds 8946a1d fixes #6904: Mauvais disposition sur l'écran des activités senne Merge branch 'feature/6904' into develop adds dcf8ebd passage sous git et utilisation de codelutinpom adds 55e94f8 refs #6875 correction de la mise en page du formulaire détail avançon adds 3832e63 fixes #6875: Mise en page du formulaireComposition détaillée/Détail avançon Merge branch 'feature/6875' into develop adds 875eee4 refs #6855: add referentials adds ac39262 refs #6855: add seine gear data + remove old seine data adds 991e8cd refs #6855: add seine gear data + remove old seine data adds e563e3b refs #6855: ajout données equipements pour la seine des traductions + correction du la dll adds 5fc039a refs #6855: pas possible d'avoir des not-null sur les relations inverses adds 48b30c8 refs #6855: debut d'interface graphique adds de9e812 ajout d'une validation sur le pays d'un balise adds 6ceee17 correction du warning sur le nombre d'équipements d'une marée seine adds 441cee8 correction du calcul des données dans le contexte adds 38fdbc9 pouvoir decorer les propriétés avec un autre prefixe + passage en méthode statique adds 1847c06 utilisation de clefs i18n specifiques pour les noeuds de l'arbre de navigation adds 3d15ec0 refs #6855 ecran autonome pour les equipements d'une marée seine adds 078d4d5 i18n adds 807da8e ajout validation sur GearUseFeature.number adds e387f56 refs#6855 edition des caracteristics d'un equipeemnt adds 98d1030 ajout d'un order sur les mesures adds 79abd36 fixes #6855: Saisie générique des caractéristiques de l'équipement du bateau & migration senne Merge branch 'feature/6855' into develop adds e0e0a1f refs #6855 fix migration script adds 6e8c562 Add 3.16 test referntial database adds b9b4bbd fix data context adds d69d186 fix entities order to replicate adds 0d9ee4e add fix in ReplicationService to reattach after replication missing tdr association adds 1b9936a add a test adds 8b3211f fixes #6611: [ObserveLL] La sauvegarde d'une marée de type palangre ne conserve pas les Tdr Merge branch 'feature/6611' into develop adds 2f5abad [jgitflow-maven-plugin]updating poms for branch '4.0-RC1' with snapshot versions adds f5a7430 fix tests adds b370ff0 add licenses headers adds 6e2ec35 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC1' with non-snapshot versions adds a723a7c Merge branch 'release/4.0-RC1' No new revisions were added by this update. Summary of changes: .gitignore | 12 + observe-business/pom.xml | 62 +-- .../fr/ird/observe/ConsolidateDataService.java | 4 +- .../src/main/java/fr/ird/observe/DataService.java | 29 +- .../main/java/fr/ird/observe/DecoratorService.java | 40 +- .../main/java/fr/ird/observe/db/DataContext.java | 106 ++++- .../java/fr/ird/observe/db/ReplicationService.java | 114 ++++- .../ird/observe/db/constants/DataContextType.java | 36 +- .../fr/ird/observe/decorator/TripDecorator.java | 2 +- .../ird/observe/decorator/TripSeineDecorator.java | 2 +- .../i18n/observe-business_en_GB.properties | 4 + .../i18n/observe-business_es_ES.properties | 4 + .../i18n/observe-business_fr_FR.properties | 4 + .../its/replication/AbstractReplicateDataTest.java | 220 ++++------ .../replication/H2LonglineReplicateDataTest.java | 200 +++++++++ .../its/replication/ReplicationDataModel.java | 170 ++++++++ .../src/test/resources/db/3.16/ANO-6611.sql.gz | Bin 0 -> 172354 bytes .../src/test/resources/db/3.16/referentiel.sql.gz | Bin 0 -> 138114 bytes observe-entities/pom.xml | 110 +---- .../java/fr/ird/observe/entities/Entities.java | 90 ++-- .../longline/{Sections.java => TripLonglines.java} | 27 +- .../migration/AbstractDataSourceMigration.java | 4 +- .../DataSourceMigrationForVersion_3_16.java | 161 +++++++ .../referentiel/GearCaracteristicTypes.java | 83 ++++ .../main/resources/db/3.16/add-gear-data-H2.sql | 39 ++ .../main/resources/db/3.16/add-gear-data-PG.sql | 39 ++ .../resources/db/3.16/add-gear-referential-H2.sql | 141 ++++++ .../resources/db/3.16/add-gear-referential-PG.sql | 140 ++++++ .../remove-tripSeine-seine-H2.sql} | 4 +- .../remove-tripSeine-seine-PG.sql} | 4 +- .../src/main/xmi/observe-common.properties | 3 +- observe-entities/src/main/xmi/observe-common.zargo | Bin 33078 -> 35711 bytes .../src/main/xmi/observe-longline.properties | 4 +- .../src/main/xmi/observe-seine.properties | 14 +- observe-entities/src/main/xmi/observe-seine.zargo | Bin 82186 -> 85905 bytes observe-swing/pom.xml | 5 +- .../fr/ird/observe/ui/ObserveMainUIHandler.java | 2 +- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 10 +- .../ObsoleteEntityListCellRenderer.java | 2 +- .../ui/admin/synchronize/SynchronizeUIHandler.java | 8 +- .../validate/ValidateEntityListCellRenderer.java | 2 +- .../ui/admin/validate/ValidateUIHandler.java | 6 +- .../ird/observe/ui/content/ContentUIHandler.java | 4 +- .../ird/observe/ui/content/ContentUIManager.java | 18 +- .../ui/content/impl/longline/BranchlineUI.jaxx | 15 +- .../impl/longline/LonglineDetailCompositionUI.jaxx | 9 +- .../LonglineDetailCompositionUIHandler.java | 2 +- .../LonglineDetailCompositionUIInitializer.java | 6 +- .../LonglineGlobalCompositionUIHandler.java | 2 +- .../impl/longline/SetLonglineUIHandler.java | 2 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 6 +- .../ui/content/open/impl/seine/TripSeineUI.css | 48 +-- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 344 +++++++-------- .../open/impl/seine/TripSeineUIHandler.java | 63 +-- .../content/open/impl/seine/TripSeineUIModel.java | 55 --- .../ui/content/ref/ContentReferenceUIHandler.java | 8 +- .../{SexUI.jaxx => GearCaracteristicTypeUI.jaxx} | 26 +- ...odel.java => GearCaracteristicTypeUIModel.java} | 16 +- .../ui/content/ref/impl/GearCaracteristicUI.css | 36 +- .../{OrganismUI.jaxx => GearCaracteristicUI.jaxx} | 62 ++- ...yUIModel.java => GearCaracteristicUIModel.java} | 25 +- .../ref/impl/{SpeciesListUI.css => GearUI.css} | 22 +- .../ref/impl/{SpeciesListUI.jaxx => GearUI.jaxx} | 49 +-- .../{SpeciesUIHandler.java => GearUIHandler.java} | 24 +- .../observe/ui/content/ref/impl/GearUIModel.java | 92 ++++ .../ui/content/table/ContentTableUIHandler.java | 8 +- .../seine/GearUseFeatureMeasurementCellEditor.java | 145 +++++++ .../GearUseFeatureMeasurementCellRenderer.java | 113 +++++ ...earUseFeaturesMeasurementSeinesTableModel.java} | 118 ++--- .../GearUseFeaturesSeineTableModel.java} | 47 +- .../table/impl/seine/GearUseFeaturesSeineUI.css | 91 ++++ .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 148 +++++++ .../impl/seine/GearUseFeaturesSeineUIHandler.java | 473 +++++++++++++++++++++ .../impl/seine/GearUseFeaturesSeineUIModel.java | 122 ++++++ .../ui/tree/AbstractObserveTreeCellRenderer.java | 2 +- .../ui/tree/NavigationTreeCellRenderer.java | 2 + .../fr/ird/observe/ui/tree/ObserveTreeBridge.java | 2 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 31 +- .../loadors/ActivityLonglineNodeChildLoador.java | 19 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 12 +- .../loadors/FloatingObjectNodeChildLoador.java | 18 +- .../loadors/ProgramLonglineNodeChildLoador.java | 13 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 43 +- .../loadors/ReferenceCommonNodeChildLoador.java | 28 +- .../loadors/ReferenceLonglineNodeChildLoador.java | 36 +- .../loadors/ReferenceSeineNodeChildLoador.java | 28 +- .../ui/tree/loadors/RootNodeChildLoador.java | 6 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 13 +- .../tree/loadors/SetLonglineNodeChildLoador.java | 24 +- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 22 +- .../fr/ird/observe/ui/usage/UsagesUIHandler.java | 4 +- ...ObserveSimpleValidatorMessageTableRenderer.java | 2 +- .../util/ObserveValidatorMessageTableRenderer.java | 2 +- .../resources/i18n/observe-swing_en_GB.properties | 166 ++++++-- .../resources/i18n/observe-swing_es_ES.properties | 164 +++++-- .../resources/i18n/observe-swing_fr_FR.properties | 174 ++++++-- observe-validation/pom.xml | 6 +- ...ion.xml => Gear-n1-create-error-validation.xml} | 2 + ...n.xml => Gear-n1-create-warning-validation.xml} | 2 + ...ion.xml => Gear-n1-update-error-validation.xml} | 2 + ...n.xml => Gear-n1-update-warning-validation.xml} | 2 + ...arCaracteristic-n1-create-error-validation.xml} | 22 +- ...Caracteristic-n1-create-warning-validation.xml} | 2 + ...arCaracteristic-n1-update-error-validation.xml} | 22 +- ...Caracteristic-n1-update-warning-validation.xml} | 2 + ...racteristicType-n1-create-error-validation.xml} | 2 + ...cteristicType-n1-create-warning-validation.xml} | 2 + ...racteristicType-n1-update-error-validation.xml} | 2 + ...cteristicType-n1-update-warning-validation.xml} | 2 + ...seFeaturesSeine-n1-update-error-validation.xml} | 26 +- ...TransmittingBuoy-n1-update-error-validation.xml | 12 + .../TripSeine-n1-create-warning-validation.xml | 39 -- ...-update-gearUseFeatures-warning-validation.xml} | 8 +- .../TripSeine-n1-update-warning-validation.xml | 40 -- .../i18n/observe-validation_en_GB.properties | 10 +- .../i18n/observe-validation_es_ES.properties | 10 +- .../i18n/observe-validation_fr_FR.properties | 10 +- .../validation/BeanValidatorDetectorTest.java | 16 +- pom.xml | 42 +- src/site/site_fr.xml | 48 +-- 120 files changed, 3783 insertions(+), 1465 deletions(-) create mode 100644 .gitignore create 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/ReplicationDataModel.java create mode 100644 observe-business/src/test/resources/db/3.16/ANO-6611.sql.gz create mode 100644 observe-business/src/test/resources/db/3.16/referentiel.sql.gz copy observe-entities/src/main/java/fr/ird/observe/entities/longline/{Sections.java => TripLonglines.java} (59%) create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/referentiel/GearCaracteristicTypes.java create mode 100644 observe-entities/src/main/resources/db/3.16/add-gear-data-H2.sql create mode 100644 observe-entities/src/main/resources/db/3.16/add-gear-data-PG.sql create mode 100644 observe-entities/src/main/resources/db/3.16/add-gear-referential-H2.sql create mode 100644 observe-entities/src/main/resources/db/3.16/add-gear-referential-PG.sql copy observe-entities/src/main/resources/db/{3.11/add-activity-ersId-H2.sql => 3.16/remove-tripSeine-seine-H2.sql} (81%) copy observe-entities/src/main/resources/db/{3.11/add-activity-ersId-H2.sql => 3.16/remove-tripSeine-seine-PG.sql} (81%) copy observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/{SexUI.jaxx => GearCaracteristicTypeUI.jaxx} (87%) copy observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/{OceanUIModel.java => GearCaracteristicTypeUIModel.java} (73%) copy observe-entities/src/main/java/fr/ird/observe/entities/Trips.java => observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.css (63%) copy observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/{OrganismUI.jaxx => GearCaracteristicUI.jaxx} (81%) copy observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/{VesselSizeCategoryUIModel.java => GearCaracteristicUIModel.java} (61%) copy observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/{SpeciesListUI.css => GearUI.css} (68%) copy observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/{SpeciesListUI.jaxx => GearUI.jaxx} (86%) copy observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/{SpeciesUIHandler.java => GearUIHandler.java} (81%) create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIModel.java create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java copy observe-swing/src/main/java/fr/ird/observe/ui/content/{impl/longline/BasketsTableModel.java => table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java} (51%) copy observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/{longline/CatchLonglineTableModel.java => seine/GearUseFeaturesSeineTableModel.java} (57%) create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.css create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIModel.java copy observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Sex-n1-update-error-validation.xml => Gear-n1-create-error-validation.xml} (99%) copy observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Sex-n1-create-warning-validation.xml => Gear-n1-create-warning-validation.xml} (99%) copy observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Sex-n1-update-error-validation.xml => Gear-n1-update-error-validation.xml} (99%) copy observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Sex-n1-create-warning-validation.xml => Gear-n1-update-warning-validation.xml} (99%) copy observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Organism-n1-create-error-validation.xml => GearCaracteristic-n1-create-error-validation.xml} (84%) copy observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Sex-n1-create-warning-validation.xml => GearCaracteristic-n1-create-warning-validation.xml} (99%) copy observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Organism-n1-create-error-validation.xml => GearCaracteristic-n1-update-error-validation.xml} (84%) copy observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Sex-n1-create-warning-validation.xml => GearCaracteristic-n1-update-warning-validation.xml} (99%) copy observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Sex-n1-update-error-validation.xml => GearCaracteristicType-n1-create-error-validation.xml} (99%) copy observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Sex-n1-create-warning-validation.xml => GearCaracteristicType-n1-create-warning-validation.xml} (99%) copy observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Sex-n1-update-error-validation.xml => GearCaracteristicType-n1-update-error-validation.xml} (99%) copy observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Sex-n1-create-warning-validation.xml => GearCaracteristicType-n1-update-warning-validation.xml} (99%) copy observe-validation/src/main/resources/fr/ird/observe/entities/seine/{ObjectSchoolEstimate-n1-update-error-validation.xml => GearUseFeaturesSeine-n1-update-error-validation.xml} (71%) copy observe-validation/src/main/resources/fr/ird/observe/entities/{longline/Branchline-n1-update-catchLongline-error-validation.xml => seine/TripSeine-n1-update-gearUseFeatures-warning-validation.xml} (82%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.