This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git 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 .../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 | 58 ++ .../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 | 150 ++++++ .../impl/longline/GearUseFeaturesLonglineUI.css | 97 ++++ .../impl/longline/GearUseFeaturesLonglineUI.jaxx | 154 ++++++ .../longline/GearUseFeaturesLonglineUIHandler.java | 587 +++++++++++++++++++++ .../longline/GearUseFeaturesLonglineUIModel.java | 125 +++++ ...rUseFeaturesMeasurementLonglinesTableModel.java | 124 +++++ .../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, 1585 insertions(+), 62 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.