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 3832e63 fixes #6875: Mise en page du formulaireComposition détaillée/Détail avançon Merge branch 'feature/6875' into develop new 875eee4 refs #6855: add referentials new ac39262 refs #6855: add seine gear data + remove old seine data new 991e8cd refs #6855: add seine gear data + remove old seine data new e563e3b refs #6855: ajout données equipements pour la seine des traductions + correction du la dll new 5fc039a refs #6855: pas possible d'avoir des not-null sur les relations inverses new 48b30c8 refs #6855: debut d'interface graphique new de9e812 ajout d'une validation sur le pays d'un balise new 6ceee17 correction du warning sur le nombre d'équipements d'une marée seine new 441cee8 correction du calcul des données dans le contexte new 38fdbc9 pouvoir decorer les propriétés avec un autre prefixe + passage en méthode statique new 1847c06 utilisation de clefs i18n specifiques pour les noeuds de l'arbre de navigation new 3d15ec0 refs #6855 ecran autonome pour les equipements d'une marée seine new 078d4d5 i18n new 807da8e ajout validation sur GearUseFeature.number new e387f56 refs#6855 edition des caracteristics d'un equipeemnt new 98d1030 ajout d'un order sur les mesures new 79abd36 fixes #6855: Saisie générique des caractéristiques de l'équipement du bateau & migration senne Merge branch 'feature/6855' into develop The 17 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 79abd36faee00a5ebe17f8003fbed98880b4f391 Merge: 3832e63 98d1030 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 7 18:24:34 2015 +0200 fixes #6855: Saisie générique des caractéristiques de l'équipement du bateau & migration senne Merge branch 'feature/6855' into develop commit 98d103010bd6b1983dad3a61ce60f6e5b87497bd Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 7 18:24:28 2015 +0200 ajout d'un order sur les mesures commit e387f565f15ccb20d67f33a5cabb37670220684d Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 7 18:00:56 2015 +0200 refs#6855 edition des caracteristics d'un equipeemnt commit 807da8eeb4b0436402c20ff04b8984469d61a1d4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 7 18:00:14 2015 +0200 ajout validation sur GearUseFeature.number commit 078d4d575128a1c95bbff918d400cab4efc6dac0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 19:15:39 2015 +0200 i18n commit 3d15ec0b19d16a306ad622aa840bb99e9cd61fcd Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 19:15:22 2015 +0200 refs #6855 ecran autonome pour les equipements d'une marée seine commit 1847c06a85add11eb5a305cd046d0bd59a4ca5bf Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 19:14:00 2015 +0200 utilisation de clefs i18n specifiques pour les noeuds de l'arbre de navigation commit 38fdbc9f1ed01b1fc45bb668caa72c5384813ff9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 19:12:36 2015 +0200 pouvoir decorer les propriétés avec un autre prefixe + passage en méthode statique commit 441cee8d47de35050efa34297af97c76eb5986e5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 19:10:18 2015 +0200 correction du calcul des données dans le contexte commit 6ceee17c5600d8eabe43387e99ab61c6d264cdf3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 19:08:51 2015 +0200 correction du warning sur le nombre d'équipements d'une marée seine commit de9e8127e601b321d2ec1d404f2c9950d817289d Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 19:08:31 2015 +0200 ajout d'une validation sur le pays d'un balise commit 48b30c868253f39ba71c8f418677ddcfd57febed Author: Tony Chemit <chemit@codelutin.com> Date: Tue Mar 24 16:39:13 2015 +0000 refs #6855: debut d'interface graphique commit 5fc039a4aa40cf1caa6ea0966f469b95037a991f Author: Tony Chemit <chemit@codelutin.com> Date: Tue Mar 24 16:38:22 2015 +0000 refs #6855: pas possible d'avoir des not-null sur les relations inverses commit e563e3b7800331be2515b0f39d921fe1f16e5eb5 Author: Tony Chemit <chemit@codelutin.com> Date: Tue Mar 24 14:21:38 2015 +0000 refs #6855: ajout données equipements pour la seine des traductions + correction du la dll commit 991e8cdcbb3cf4ef1238647b20e3539ac0c366ba Author: Tony Chemit <chemit@codelutin.com> Date: Tue Mar 24 09:03:10 2015 +0000 refs #6855: add seine gear data + remove old seine data commit ac3926208390b66ed609fae187d0905b9e676aff Author: Tony Chemit <chemit@codelutin.com> Date: Tue Mar 24 09:03:00 2015 +0000 refs #6855: add seine gear data + remove old seine data commit 875eee4dc4ccc18b7c879cfd18a6739378fe7dff Author: Tony Chemit <chemit@codelutin.com> Date: Mon Mar 23 19:14:21 2015 +0000 refs #6855: add referentials Summary of changes: .../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 | 2 +- .../ird/observe/db/constants/DataContextType.java | 36 +- .../i18n/observe-business_en_GB.properties | 4 + .../i18n/observe-business_es_ES.properties | 4 + .../i18n/observe-business_fr_FR.properties | 4 + .../java/fr/ird/observe/entities/Entities.java | 48 +-- .../migration/AbstractDataSourceMigration.java | 4 +- .../DataSourceMigrationForVersion_3_16.java | 139 +++++++ .../referentiel/GearCaracteristicTypes.java | 61 +++ .../main/resources/db/3.16/add-gear-data-H2.sql | 18 + .../main/resources/db/3.16/add-gear-data-PG.sql | 18 + .../resources/db/3.16/add-gear-referential-H2.sql | 123 ++++++ .../resources/db/3.16/add-gear-referential-PG.sql | 119 ++++++ .../db/3.16/remove-tripSeine-seine-H2.sql | 3 + .../db/3.16/remove-tripSeine-seine-PG.sql | 3 + .../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 .../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/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 +- .../ref/impl/GearCaracteristicTypeUIModel.java | 20 + .../ui/content/ref/impl/GearCaracteristicUI.css | 36 +- .../{OrganismUI.jaxx => GearCaracteristicUI.jaxx} | 62 ++- .../content/ref/impl/GearCaracteristicUIModel.java | 27 ++ .../ref/impl/{SpeciesListUI.css => GearUI.css} | 22 +- .../ref/impl/{SpeciesListUI.jaxx => GearUI.jaxx} | 49 +-- .../{VesselUIHandler.java => GearUIHandler.java} | 46 +-- .../observe/ui/content/ref/impl/GearUIModel.java | 70 ++++ .../ui/content/table/ContentTableUIHandler.java | 8 +- .../seine/GearUseFeatureMeasurementCellEditor.java | 123 ++++++ .../GearUseFeatureMeasurementCellRenderer.java | 91 +++++ ...GearUseFeaturesMeasurementSeinesTableModel.java | 102 +++++ .../impl/seine/GearUseFeaturesSeineTableModel.java | 94 +++++ .../table/impl/seine/GearUseFeaturesSeineUI.css | 91 +++++ .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 148 +++++++ .../impl/seine/GearUseFeaturesSeineUIHandler.java | 451 +++++++++++++++++++++ .../impl/seine/GearUseFeaturesSeineUIModel.java | 100 +++++ .../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 ++++++-- ...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 +- 98 files changed, 3049 insertions(+), 919 deletions(-) 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 create mode 100644 observe-entities/src/main/resources/db/3.16/remove-tripSeine-seine-H2.sql create mode 100644 observe-entities/src/main/resources/db/3.16/remove-tripSeine-seine-PG.sql copy observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/{SexUI.jaxx => GearCaracteristicTypeUI.jaxx} (87%) create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicTypeUIModel.java 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%) create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUIModel.java 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/{VesselUIHandler.java => GearUIHandler.java} (59%) 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 create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java 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>.