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 discards 11dd926 refs #6855: debut d'interface graphique discards 4b99b40 refs #6855: pas possible d'avoir des not-null sur les relations inverses discards efa7bed refs #6855: ajout données equipements pour la seine des traductions + correction du la dll discards 5f2ad23 refs #6855: add seine gear data + remove old seine data discards 1c1665e refs #6855: add seine gear data + remove old seine data discards ab86358 refs #6855: add referentials This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/develop (643ee6d) \ O -- O -- O (11dd926) Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: .../main/java/fr/ird/observe/DecoratorService.java | 9 - .../main/java/fr/ird/observe/db/DataContext.java | 4 - .../i18n/observe-business_en_GB.properties | 3 - .../i18n/observe-business_es_ES.properties | 3 - .../i18n/observe-business_fr_FR.properties | 3 - .../java/fr/ird/observe/entities/Entities.java | 40 ++- .../migration/AbstractDataSourceMigration.java | 4 +- .../DataSourceMigrationForVersion_3_16.java | 139 --------- .../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 35711 -> 33078 bytes .../src/main/xmi/observe-longline.properties | 4 +- .../src/main/xmi/observe-seine.properties | 8 +- observe-entities/src/main/xmi/observe-seine.zargo | Bin 85926 -> 82186 bytes .../ui/content/open/impl/seine/TripSeineUI.css | 35 ++- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 345 +++++++++++---------- .../open/impl/seine/TripSeineUIHandler.java | 31 +- .../content/open/impl/seine/TripSeineUIModel.java | 10 +- .../content/ref/impl/GearCaracteristicTypeUI.jaxx | 162 ---------- .../ref/impl/GearCaracteristicTypeUIModel.java | 20 -- .../ui/content/ref/impl/GearCaracteristicUI.css | 42 --- .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 186 ----------- .../content/ref/impl/GearCaracteristicUIModel.java | 27 -- .../fr/ird/observe/ui/content/ref/impl/GearUI.css | 49 --- .../fr/ird/observe/ui/content/ref/impl/GearUI.jaxx | 196 ------------ .../observe/ui/content/ref/impl/GearUIHandler.java | 82 ----- .../observe/ui/content/ref/impl/GearUIModel.java | 70 ----- .../ui/content/table/ContentTableUIHandler.java | 8 +- .../table/impl/seine/GearUseFeaturesSeineUI.css | 61 ---- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 135 -------- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 174 ----------- .../impl/seine/GearUseFeaturesSeineUIModel.java | 79 ----- .../resources/i18n/observe-swing_en_GB.properties | 47 +-- .../resources/i18n/observe-swing_es_ES.properties | 48 --- .../resources/i18n/observe-swing_fr_FR.properties | 56 +--- .../Gear-n1-create-error-validation.xml | 75 ----- .../Gear-n1-create-warning-validation.xml | 67 ---- .../Gear-n1-update-error-validation.xml | 75 ----- .../Gear-n1-update-warning-validation.xml | 67 ---- ...earCaracteristic-n1-create-error-validation.xml | 90 ------ ...rCaracteristic-n1-create-warning-validation.xml | 67 ---- ...earCaracteristic-n1-update-error-validation.xml | 90 ------ ...rCaracteristic-n1-update-warning-validation.xml | 67 ---- ...aracteristicType-n1-create-error-validation.xml | 75 ----- ...acteristicType-n1-create-warning-validation.xml | 67 ---- ...aracteristicType-n1-update-error-validation.xml | 75 ----- ...acteristicType-n1-update-warning-validation.xml | 67 ---- ...UseFeaturesSeine-n1-update-error-validation.xml | 46 --- .../TripSeine-n1-create-warning-validation.xml | 39 +++ ...1-update-gearUseFeatures-warning-validation.xml | 41 --- .../TripSeine-n1-update-warning-validation.xml | 40 +++ .../i18n/observe-validation_en_GB.properties | 5 +- .../i18n/observe-validation_es_ES.properties | 5 +- .../i18n/observe-validation_fr_FR.properties | 8 +- .../validation/BeanValidatorDetectorTest.java | 16 +- 60 files changed, 371 insertions(+), 3078 deletions(-) delete mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java delete mode 100644 observe-entities/src/main/resources/db/3.16/add-gear-data-H2.sql delete mode 100644 observe-entities/src/main/resources/db/3.16/add-gear-data-PG.sql delete mode 100644 observe-entities/src/main/resources/db/3.16/add-gear-referential-H2.sql delete mode 100644 observe-entities/src/main/resources/db/3.16/add-gear-referential-PG.sql delete mode 100644 observe-entities/src/main/resources/db/3.16/remove-tripSeine-seine-H2.sql delete mode 100644 observe-entities/src/main/resources/db/3.16/remove-tripSeine-seine-PG.sql delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicTypeUIModel.java delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.css delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.jaxx delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUIModel.java delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.css delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.jaxx delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIHandler.java delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIModel.java delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.css delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIModel.java delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-error-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-warning-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-update-error-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-update-warning-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-error-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-warning-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-update-error-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-update-warning-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-error-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-warning-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-error-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-warning-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/seine/GearUseFeaturesSeine-n1-update-error-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-gearUseFeatures-warning-validation.xml -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.