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 571a41e fixes #7011: [ObServePS] Impossible de rajouter des mises en oeuvre de caractéristique à un équipement Merge branch 'feature/7011' into develop new 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) new f68723b ajout de la validation pour les équipements du modèle LL + correction de clefs i18n (refs #7013) new 5a47fbe ajout de l'écran d'édition des équipements du modèle LL (refs #7013) new 5a6de36 ajout de la méthode de récupération des caractértistiques pour le modèle LL (refs #7013) new af793a4 fixes #7013: [ObServeLL] Ajout de l'écran des équipements Merge branch 'feature/7013' into develop The 5 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 af793a4e63dba947f9c4fcd030795d687c061f68 Merge: 571a41e 5a6de36 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 23 10:47:14 2015 +0200 fixes #7013: [ObServeLL] Ajout de l'écran des équipements Merge branch 'feature/7013' into develop commit 5a6de36fb3b4206bf5b5598996a197154ee47b9f Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 23 09:44:39 2015 +0200 ajout de la méthode de récupération des caractértistiques pour le modèle LL (refs #7013) commit 5a47fbef066236c21a69cd83414d1ad779c6bde9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 23 09:44:03 2015 +0200 ajout de l'écran d'édition des équipements du modèle LL (refs #7013) commit f68723b5686de6769776a414b96e222a11428e8b Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 23 09:31:05 2015 +0200 ajout de la validation pour les équipements du modèle LL + correction de clefs i18n (refs #7013) commit ad69dc5ff5f2d3a915c622ed355f7e61251504fb Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 23 09:21:37 2015 +0200 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) Summary of changes: .../src/main/java/fr/ird/observe/DataService.java | 51 ++++++++ .../test/resources/db/4.0-RC4/referentiel.sql.gz | Bin 0 -> 138256 bytes .../java/fr/ird/observe/entities/Entities.java | 56 +++++---- .../migration/AbstractDataSourceMigration.java | 4 +- ... => DataSourceMigrationForVersion_4_0_RC4.java} | 48 +++----- .../main/resources/db/4.0-RC4/add-gear-data-H2.sql | 18 +++ .../main/resources/db/4.0-RC4/add-gear-data-PG.sql | 19 +++ .../src/main/xmi/observe-common.properties | 2 +- .../src/main/xmi/observe-longline.properties | 10 +- .../src/main/xmi/observe-longline.zargo | Bin 93860 -> 96409 bytes .../src/main/xmi/observe-seine.properties | 4 +- observe-entities/src/main/xmi/observe-seine.zargo | Bin 85905 -> 85905 bytes .../ird/observe/ui/content/ContentUIManager.java | 2 + .../GearUseFeaturesLonglineTableModel.java} | 45 +++---- .../GearUseFeaturesLonglineUI.css} | 24 ++-- .../GearUseFeaturesLonglineUI.jaxx} | 32 ++--- .../GearUseFeaturesLonglineUIHandler.java} | 135 +++++++++++---------- .../longline/GearUseFeaturesLonglineUIModel.java | 125 +++++++++++++++++++ ...UseFeaturesMeasurementLonglinesTableModel.java} | 24 ++-- .../loadors/ProgramLonglineNodeChildLoador.java | 24 ++-- .../resources/i18n/observe-swing_en_GB.properties | 52 +++++--- .../resources/i18n/observe-swing_es_ES.properties | 24 ++++ .../resources/i18n/observe-swing_fr_FR.properties | 24 ++++ ...FeaturesLongline-n1-update-error-validation.xml | 34 ++++++ ...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 +- 29 files changed, 564 insertions(+), 221 deletions(-) create mode 100644 observe-business/src/test/resources/db/4.0-RC4/referentiel.sql.gz copy observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/{DataSourceMigrationForVersion_3_12.java => DataSourceMigrationForVersion_4_0_RC4.java} (51%) 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-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} (75%) copy observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/{seine/GearUseFeaturesSeineUI.jaxx => longline/GearUseFeaturesLonglineUI.jaxx} (77%) copy observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/{seine/GearUseFeaturesSeineUIHandler.java => longline/GearUseFeaturesLonglineUIHandler.java} (75%) 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-validation/src/main/resources/fr/ird/observe/entities/longline/GearUseFeaturesLongline-n1-update-error-validation.xml -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.