November 2016 - Observe-commits - mailman.cloud.codelutin.com

branch develop updated (012ae4a -> b96f52e)
by codelutin.com scm 02 Nov '16

02 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 012ae4a Fix code mapping (Fixes #8391) new 9dd2350 Ajout champs sur vessel (persistence) new e1dabcc Ajout champs sur vessel (service) new 438b00e Ajout champs sur vessel (ui) new b96f52e [REFERENTIEL] Ajouter des colonnes dans Vessel (Fixes #8475) Merge branch 'feature/8475' into develop The 4 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 b96f52e5dd4c729464bb442aaac836874023657d Merge: 012ae4a 438b00e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 17:39:45 2016 +0100 [REFERENTIEL] Ajouter des colonnes dans Vessel (Fixes #8475) Merge branch 'feature/8475' into develop commit 438b00e74a5696a4d5ef9f1d6197a974a820532e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 17:39:42 2016 +0100 Ajout champs sur vessel (ui) commit e1dabcce66e2797f00b43ab49a7ffc4a6e3d9a7c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 17:39:27 2016 +0100 Ajout champs sur vessel (service) commit 9dd23505c2a043f67c79d0f3669d30d60464d6c9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 17:39:17 2016 +0100 Ajout champs sur vessel (persistence) Summary of changes: .../swing/ui/content/ref/impl/VesselUI.jaxx | 70 +++++++++++++++++++++ .../swing/ui/content/ref/impl/VesselUI.jcss | 63 +++++++++++++++++++ .../swing/ui/content/ref/impl/VesselUIModel.java | 40 ++++++++---- .../i18n/application-swing_en_GB.properties | 7 +++ .../i18n/application-swing_es_ES.properties | 7 +++ .../i18n/application-swing_fr_FR.properties | 7 +++ .../DataSourceMigrationForVersion_5_1.java | 1 + .../V5_1_12_evol_8475_vessel_add_fields-H2.sql | 7 +++ .../V5_1_12_evol_8475_vessel_add_fields-PG.sql | 7 +++ entities/src/main/xmi/observe-common.zargo | Bin 38441 -> 38794 bytes .../src/main/xmi/observe-services-dto-common.zargo | Bin 42688 -> 43074 bytes .../topia/binder/referential/VesselBinder.java | 15 ++++- 12 files changed, 210 insertions(+), 14 deletions(-) create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_12_evol_8475_vessel_add_fields-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_12_evol_8475_vessel_add_fields-PG.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch develop updated (d1b0407 -> 012ae4a)
by codelutin.com scm 02 Nov '16

02 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from d1b0407 i18n new 012ae4a Fix code mapping (Fixes #8391) The 1 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 012ae4abd2c4c3a6acb53f93eddd4a7b6e958b38 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 16:53:36 2016 +0100 Fix code mapping (Fixes #8391) Summary of changes: .../migration/versions/DataSourceMigrationForVersion_5_1.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (ce5b988 -> d1b0407)
by codelutin.com scm 02 Nov '16

02 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from ce5b988 Ajout de champs liés au marquage d'individus (Fixes #8571) Merge branch 'feature/8571' into develop new d1b0407 i18n The 1 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 d1b0407263f44ff3b9de48b0dafaca300b9ea2c8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 16:46:08 2016 +0100 i18n Summary of changes: .../src/main/resources/i18n/application-swing_fr_FR.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (c6b0f1a -> ce5b988)
by codelutin.com scm 02 Nov '16

02 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from c6b0f1a [REFERENTIEL] Référentiel Espèces - gestion du type de mesure par défaut (refs-80 #8391) new 986452d Fix back migration new 1b266f6 Correction code new 1709445 Ajout length.tagNumber (persistence) new 3a1bbb5 Ajout length.tagNumber (service) new 5731c8b Ajout length.tagNumber (ui) new ce5b988 Ajout de champs liés au marquage d'individus (Fixes #8571) Merge branch 'feature/8571' into develop The 6 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 ce5b98830fe1bdf0cd1f66fffe3f48f632476742 Merge: c6b0f1a 5731c8b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 16:44:59 2016 +0100 Ajout de champs liés au marquage d'individus (Fixes #8571) Merge branch 'feature/8571' into develop commit 5731c8b5e3234edc204e528b3f4a62360406aea0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 16:44:53 2016 +0100 Ajout length.tagNumber (ui) commit 3a1bbb557ec05f1c97132407b61c1ab44bb38d5b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 16:44:41 2016 +0100 Ajout length.tagNumber (service) commit 17094452cd38c8e36d430a61afe683a7ce7bdb10 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 16:44:28 2016 +0100 Ajout length.tagNumber (persistence) commit 1b266f629b212c6ab21e0e894a8554cad783a43d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 16:44:06 2016 +0100 Correction code commit 986452d75fcd366f533b4cbd97b3353ca00c4a0f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 15:47:26 2016 +0100 Fix back migration Summary of changes: .../table/impl/longline/CatchLonglineUI.jaxx | 15 ++++++++++++-- .../table/impl/longline/CatchLonglineUI.jcss | 17 +++++++++++++++ .../table/impl/longline/CatchLonglineUIModel.java | 2 ++ .../content/table/impl/seine/AbstractSampleUI.jcss | 17 +++++++++++++++ .../table/impl/seine/AbstractSampleUIHandler.java | 19 +++++++++++++---- .../table/impl/seine/NonTargetSampleUI.jaxx | 15 ++++++++++++++ .../content/table/impl/seine/TargetSampleUI.jaxx | 16 ++++++++++++++ .../table/impl/seine/TargetSampleUIModel.java | 3 ++- .../i18n/application-swing_en_GB.properties | 2 ++ .../i18n/application-swing_es_ES.properties | 2 ++ .../i18n/application-swing_fr_FR.properties | 2 ++ .../DataSourceMigrationForVersion_5_1.java | 23 ++++++++++----------- .../V5_1_11_evol_8571_length_add_tagNumber-H2.sql | 3 +++ .../V5_1_11_evol_8571_length_add_tagNumber-PG.sql | 3 +++ entities/src/main/xmi/observe-longline.zargo | Bin 93649 -> 93746 bytes entities/src/main/xmi/observe-seine.zargo | Bin 85870 -> 86054 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 67880 -> 67946 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59857 -> 60028 bytes .../topia/binder/data/CatchLonglineBinder.java | 2 ++ .../topia/binder/data/NonTargetLengthBinder.java | 2 ++ .../topia/binder/data/TargetLengthBinder.java | 2 ++ 21 files changed, 126 insertions(+), 19 deletions(-) create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_11_evol_8571_length_add_tagNumber-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_11_evol_8571_length_add_tagNumber-PG.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch develop updated (8462307 -> c6b0f1a)
by codelutin.com scm 02 Nov '16

02 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 8462307 Ajout du champ Sexe sur les échantillons de cible (Fixes #8572) Merge branch 'feature/8572' into develop new 9ac4f43 Ajout Species.sizeMeatureType + suppresion Species.lengthMeasureType (persistence) new bf37388 Ajout Species.sizeMeatureType + suppresion Species.lengthMeasureType (service) new 3b7c516 Ajout Species.sizeMeatureType + suppresion Species.lengthMeasureType (ui) new c6b0f1a [REFERENTIEL] Référentiel Espèces - gestion du type de mesure par défaut (refs-80 #8391) The 4 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 c6b0f1a75336d90cd57e419b67bbd40de7224a98 Merge: 8462307 3b7c516 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 15:35:24 2016 +0100 [REFERENTIEL] Référentiel Espèces - gestion du type de mesure par défaut (refs-80 #8391) Merge branch 'feature/8391' into develop commit 3b7c516965f91fe8dee0549e06b8734f3132c9f4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 15:35:14 2016 +0100 Ajout Species.sizeMeatureType + suppresion Species.lengthMeasureType (ui) commit bf37388f3470b899c6f5f8ddaf6aa8f9d484468c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 15:34:27 2016 +0100 Ajout Species.sizeMeatureType + suppresion Species.lengthMeasureType (service) commit 9ac4f430ce124c64d7c97a9cf471a26d6e909efe Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 15:30:07 2016 +0100 Ajout Species.sizeMeatureType + suppresion Species.lengthMeasureType (persistence) Summary of changes: .../SpeciesDto-ui-create-error-validation.xml | 11 +++ .../SpeciesDto-ui-update-error-validation.xml | 10 +++ .../application-swing-validation_en_GB.properties | 1 + .../application-swing-validation_es_ES.properties | 1 + .../application-swing-validation_fr_FR.properties | 1 + .../swing/ui/content/ref/impl/SpeciesUI.jaxx | 23 +++-- .../swing/ui/content/ref/impl/SpeciesUI.jcss | 22 +++-- .../swing/ui/content/ref/impl/SpeciesUIModel.java | 5 +- .../content/table/impl/seine/AbstractSampleUI.jcss | 1 + .../table/impl/seine/NonTargetSampleUI.jaxx | 15 ++-- .../DataSourceMigrationForVersion_5_1.java | 99 +++++++++++++++++++-- ...10_evol_8391_species_add_sizeMeasureType-H2.sql | 2 + ...10_evol_8391_species_add_sizeMeasureType-PG.sql | 2 + entities/src/main/xmi/observe-common.zargo | Bin 37986 -> 38441 bytes .../ReferentialReferenceSetDefinitions.java | 2 +- .../src/main/xmi/observe-services-dto-common.zargo | Bin 42563 -> 42688 bytes services-dto/src/main/xmi/observe-services-dto.ini | 1 + .../Species-service-error-validation.xml | 10 +++ .../services-topia-validation_en_GB.properties | 1 + .../services-topia-validation_es_ES.properties | 1 + .../services-topia-validation_fr_FR.properties | 1 + .../topia/binder/referential/SpeciesBinder.java | 10 ++- 22 files changed, 176 insertions(+), 43 deletions(-) create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_10_evol_8391_species_add_sizeMeasureType-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_10_evol_8391_species_add_sizeMeasureType-PG.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch develop updated (7d19452 -> 8462307)
by codelutin.com scm 02 Nov '16

02 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 7d19452 [LL][PS] Possibilité de saisie directe au clavier des dates/heures sans passer par le calendrier (Fixes #7877) new 644b2a6 Ajout TargetLength.sex (persistence) new 7346b7a Ajout TargetLength.sex (service) new c9d3dfa Ajout TargetLength.sex (ui) new 8462307 Ajout du champ Sexe sur les échantillons de cible (Fixes #8572) Merge branch 'feature/8572' into develop The 4 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 8462307850128601d722dad9fd90a68a8fb8412b Merge: 7d19452 c9d3dfa Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 13:34:28 2016 +0100 Ajout du champ Sexe sur les échantillons de cible (Fixes #8572) Merge branch 'feature/8572' into develop commit c9d3dfad77b31bb06507d8320a80dc3d7af3cd80 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 13:34:21 2016 +0100 Ajout TargetLength.sex (ui) commit 7346b7a63156afcca29a6421c64726440f8c50a9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 13:34:18 2016 +0100 Ajout TargetLength.sex (service) commit 644b2a66bfaf6ebddb4798b43e2257cc4d4e08fc Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 13:34:15 2016 +0100 Ajout TargetLength.sex (persistence) Summary of changes: .../TargetLengthDto-ui-update-error-validation.xml | 12 ++++++++++++ .../application-swing-validation_en_GB.properties | 1 + .../application-swing-validation_es_ES.properties | 1 + .../application-swing-validation_fr_FR.properties | 1 + .../content/table/impl/seine/AbstractSampleUI.jcss | 21 ++++++++++++++++++--- .../table/impl/seine/NonTargetSampleUI.jcss | 10 ---------- .../content/table/impl/seine/TargetSampleUI.jaxx | 11 +++++++++++ .../table/impl/seine/TargetSampleUIHandler.java | 8 ++++++-- .../table/impl/seine/TargetSampleUIModel.java | 2 ++ .../i18n/application-swing_en_GB.properties | 2 ++ .../i18n/application-swing_es_ES.properties | 2 ++ .../i18n/application-swing_fr_FR.properties | 2 ++ .../DataSourceMigrationForVersion_5_1.java | 1 + .../V5_1_09_evol_7877_targetLength_add_sex-H2.sql | 2 ++ .../V5_1_09_evol_7877_targetLength_add_sex-PG.sql | 2 ++ entities/src/main/xmi/observe-seine.zargo | Bin 85633 -> 85870 bytes .../request/ReferenceSetRequestDefinitions.java | 1 + .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59655 -> 59857 bytes services-dto/src/main/xmi/observe-services-dto.ini | 1 + .../TargetLength-service-error-validation.xml | 12 ++++++++++++ .../services-topia-validation_en_GB.properties | 1 + .../services-topia-validation_es_ES.properties | 1 + .../services-topia-validation_fr_FR.properties | 1 + .../topia/binder/data/TargetLengthBinder.java | 4 ++++ 24 files changed, 84 insertions(+), 15 deletions(-) create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_09_evol_7877_targetLength_add_sex-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_09_evol_7877_targetLength_add_sex-PG.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch develop updated (62ee1a4 -> 7d19452)
by codelutin.com scm 02 Nov '16

02 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 62ee1a4 [PS] Unicité des enregistrements des rejets de thons à modifier (Fixes #7510) new 3bbaad5 Remove unused code new 7d19452 [LL][PS] Possibilité de saisie directe au clavier des dates/heures sans passer par le calendrier (Fixes #7877) The 2 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 7d19452861cc1a3f51319db0fa56672f59d604e6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 12:28:46 2016 +0100 [LL][PS] Possibilité de saisie directe au clavier des dates/heures sans passer par le calendrier (Fixes #7877) commit 3bbaad58ec811e91d519a3f43ecd77362bc51676 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 11:37:42 2016 +0100 Remove unused code Summary of changes: .../swing/ui/content/ContentUIInitializer.java | 49 ++++++++++++++++++++-- .../impl/seine/TargetDiscardCatchUIHandler.java | 25 ----------- 2 files changed, 45 insertions(+), 29 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (f88c42c -> 62ee1a4)
by codelutin.com scm 02 Nov '16

02 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from f88c42c [PS] Saisie des échantillons de cible : modification de la gestion des types de taille (Fixes #8390) Merge branch 'feature/8390' into develop new 62ee1a4 [PS] Unicité des enregistrements des rejets de thons à modifier (Fixes #7510) The 1 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 62ee1a4186b50a71d3d1d8b7dc94479d708ec639 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 11:28:38 2016 +0100 [PS] Unicité des enregistrements des rejets de thons à modifier (Fixes #7510) Summary of changes: ...-ui-update-targetDiscarded-error-validation.xml | 2 +- .../application-swing-validation_en_GB.properties | 2 +- .../application-swing-validation_es_ES.properties | 2 +- .../application-swing-validation_fr_FR.properties | 2 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 123 +++++++-------------- 5 files changed, 42 insertions(+), 89 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (08a36cc -> f88c42c)
by codelutin.com scm 02 Nov '16

02 Nov '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 08a36cc [PS] Ajout d'un champ sur les captures (Fixes #8375) Merge branch 'feature/8375' into develop new 9743554 renommage champs source en computed (persistence) new f0fedec renommage champs source en computed (service) new de7ec84 renommage champs source en computed (ui) new e3bd0f8 [iso] factorisation de code new 7a7204e [PS] Renommer 2 champs dans nontargetlength (Fixes #8389) Merge branch 'feature/8389' into develop new df70644 Renommage script de migration new d3be653 Déplacement de SizeMeasureType et WeightMeasureType dans le référentiel commun (persistence) new 76ebec9 Déplacement de SizeMeasureType et WeightMeasureType dans le référentiel commun (service) new 6119279 Improve log levels new d1d368d Fix show config if no data source is open new 6e60cfc Déplacement de SizeMeasureType et WeightMeasureType dans le référentiel commun (ui) new f88c42c [PS] Saisie des échantillons de cible : modification de la gestion des types de taille (Fixes #8390) Merge branch 'feature/8390' into develop The 12 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 f88c42c32bf75b434e8b3ecc28819ef27018c356 Merge: df70644 6e60cfc Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 10:18:59 2016 +0100 [PS] Saisie des échantillons de cible : modification de la gestion des types de taille (Fixes #8390) Merge branch 'feature/8390' into develop commit 6e60cfcd1abdfd685f70337570e68f62295bb272 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 10:18:24 2016 +0100 Déplacement de SizeMeasureType et WeightMeasureType dans le référentiel commun (ui) commit d1d368d1a8a261f598e6504728d5352f244c5715 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 10:17:44 2016 +0100 Fix show config if no data source is open commit 611927925a64362eb06acb81e6af345ceb4e4082 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 10:17:19 2016 +0100 Improve log levels commit 76ebec9a3adf965e93b48ab6617631a47d7529f9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 10:16:57 2016 +0100 Déplacement de SizeMeasureType et WeightMeasureType dans le référentiel commun (service) commit d3be653452f118feb17e688a8b48824115433fb3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Nov 2 10:15:06 2016 +0100 Déplacement de SizeMeasureType et WeightMeasureType dans le référentiel commun (persistence) commit df706446d7b4331024e76165327625bbb09f32ae Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Oct 31 14:24:56 2016 +0100 Renommage script de migration commit 7a7204e1fedbf91230af61f8f9a6bd1447a34bef Merge: 08a36cc e3bd0f8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Oct 31 13:02:18 2016 +0100 [PS] Renommer 2 champs dans nontargetlength (Fixes #8389) Merge branch 'feature/8389' into develop commit e3bd0f87385c4418f3581feec0ff1fc4de77ed38 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Oct 31 13:01:41 2016 +0100 [iso] factorisation de code commit de7ec844610f7f125d27ca1cdbfea398d4c2b597 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Oct 31 12:48:05 2016 +0100 renommage champs source en computed (ui) commit f0fedec7809b10771bf05178cf586c008f02408b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Oct 31 12:47:55 2016 +0100 renommage champs source en computed (service) commit 97435540e3294449aa7adaca981cb807de1b0aaa Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Oct 31 12:47:40 2016 +0100 renommage champs source en computed (persistence) Summary of changes: .../src/main/resources/log4j.properties | 2 +- .../src/main/resources/observe-log4j.properties | 2 +- .../swing/decoration/DecoratorService.java | 4 +- ...zeMeasureTypeDto-ui-create-error-validation.xml | 0 ...MeasureTypeDto-ui-create-warning-validation.xml | 0 ...zeMeasureTypeDto-ui-update-error-validation.xml | 0 ...MeasureTypeDto-ui-update-warning-validation.xml | 0 ...htMeasureTypeDto-ui-create-error-validation.xml | 0 ...MeasureTypeDto-ui-create-warning-validation.xml | 0 ...htMeasureTypeDto-ui-update-error-validation.xml | 0 ...MeasureTypeDto-ui-update-warning-validation.xml | 0 .../TargetLengthDto-ui-update-error-validation.xml | 18 +++++ .../application-swing-validation_en_GB.properties | 3 + .../application-swing-validation_es_ES.properties | 3 + .../application-swing-validation_fr_FR.properties | 3 + .../validation/BeanValidatorDetectorTest.java | 4 +- .../swing/ui/actions/ShowConfigAction.java | 4 +- .../ref/impl/{longline => }/SizeMeasureTypeUI.jaxx | 8 +- .../{longline => }/SizeMeasureTypeUIModel.java | 4 +- .../impl/{longline => }/WeightMeasureTypeUI.jaxx | 8 +- .../{longline => }/WeightMeasureTypeUIModel.java | 4 +- .../impl/longline/CatchLonglineUIHandler.java | 4 +- .../impl/longline/SizeMeasuresTableModel.java | 2 +- .../impl/longline/WeightMeasuresTableModel.java | 2 +- .../content/table/impl/seine/AbstractSampleUI.jcss | 8 +- .../table/impl/seine/AbstractSampleUIHandler.java | 53 +++++++++++++ .../table/impl/seine/NonTargetSampleUI.jaxx | 4 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 49 +++--------- .../table/impl/seine/NonTargetSampleUIModel.java | 4 +- .../content/table/impl/seine/TargetSampleUI.jaxx | 30 +++---- .../content/table/impl/seine/TargetSampleUI.jcss | 24 ++++-- .../table/impl/seine/TargetSampleUIHandler.java | 87 +++++++++++---------- .../table/impl/seine/TargetSampleUIModel.java | 15 ++-- .../i18n/application-swing_en_GB.properties | 5 +- .../i18n/application-swing_es_ES.properties | 5 +- .../i18n/application-swing_fr_FR.properties | 5 +- .../DataSourceMigrationForVersion_5_1.java | 64 +++++++++++++++ .../resources/db/3.5/traduction_attributes.csv | 2 +- ...1_03_evol_6997_delete_supportVesselName-H2.sql} | 0 ...1_03_evol_6997_delete_supportVesselName-PG.sql} | 0 .../V5_1_07_evol_8389_rename_source_columns-H2.sql | 4 + .../V5_1_07_evol_8389_rename_source_columns-PG.sql | 4 + .../V5_1_08_evol_8390_measure_type-H2.sql | 19 +++++ .../V5_1_08_evol_8390_measure_type-PG.sql | 18 +++++ .../observe/entities/LengthWeightComputable.java | 8 +- .../observe/entities/seine/NonTargetCatchImpl.java | 8 +- entities/src/main/xmi/observe-common.zargo | Bin 37331 -> 37986 bytes entities/src/main/xmi/observe-longline.zargo | Bin 93635 -> 93649 bytes entities/src/main/xmi/observe-seine.zargo | Bin 83528 -> 85633 bytes .../observe/services/dto/AbstractReference.java | 2 +- .../ReferentialReferenceSetDefinitions.java | 4 +- .../request/ReferenceSetRequestDefinitions.java | 7 +- .../dto/referential/ReferentialHelper.java | 8 +- .../dto/referential/SizeMeasureTypeHelper.java | 58 ++++++++++++++ .../src/main/xmi/observe-services-dto-common.zargo | Bin 41934 -> 42563 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 67604 -> 67880 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59440 -> 59655 bytes services-dto/src/main/xmi/observe-services-dto.ini | 5 +- .../actions/validate/ValidateServiceRestTest.java | 4 +- .../SizeMeasureType-service-error-validation.xml | 0 .../SizeMeasureType-service-warning-validation.xml | 0 .../WeightMeasureType-service-error-validation.xml | 0 ...eightMeasureType-service-warning-validation.xml | 0 .../TargetLength-service-error-validation.xml | 17 ++++ .../services-topia-validation_en_GB.properties | 3 + .../services-topia-validation_es_ES.properties | 3 + .../services-topia-validation_fr_FR.properties | 3 + .../validation/BeanValidatorDetectorTest.java | 4 +- .../topia/binder/BinderEngineInitializer.java | 8 +- .../topia/binder/data/NonTargetLengthBinder.java | 8 +- .../topia/binder/data/SizeMeasureBinder.java | 4 +- .../topia/binder/data/TargetLengthBinder.java | 14 ++-- .../topia/binder/data/WeightMeasureBinder.java | 4 +- .../binder/referential/SizeMeasureTypeBinder.java | 4 +- .../referential/WeightMeasureTypeBinder.java | 4 +- .../consolidate/ConsolidateDataServiceTopia.java | 32 ++++---- .../services/topia/binder/BinderEngineTest.java | 4 +- .../actions/validate/ValidateServiceTopiaTest.java | 4 +- .../src/main/filters/observe-reports.properties | 16 ++-- 79 files changed, 486 insertions(+), 225 deletions(-) rename application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{longline => }/SizeMeasureTypeDto-ui-create-error-validation.xml (100%) rename application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{longline => }/SizeMeasureTypeDto-ui-create-warning-validation.xml (100%) rename application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{longline => }/SizeMeasureTypeDto-ui-update-error-validation.xml (100%) rename application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{longline => }/SizeMeasureTypeDto-ui-update-warning-validation.xml (100%) rename application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{longline => }/WeightMeasureTypeDto-ui-create-error-validation.xml (100%) rename application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{longline => }/WeightMeasureTypeDto-ui-create-warning-validation.xml (100%) rename application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{longline => }/WeightMeasureTypeDto-ui-update-error-validation.xml (100%) rename application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{longline => }/WeightMeasureTypeDto-ui-update-warning-validation.xml (100%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/{longline => }/SizeMeasureTypeUI.jaxx (96%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/{longline => }/SizeMeasureTypeUIModel.java (89%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/{longline => }/WeightMeasureTypeUI.jaxx (96%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/{longline => }/WeightMeasureTypeUIModel.java (88%) create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUIHandler.java rename entities-migration/src/main/resources/db/migration/{V5_1_03_evol-6997_delete_supportVesselName-PG.sql => V5_1_03_evol_6997_delete_supportVesselName-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/{V5_1_03_evol-6997_delete_supportVesselName-H2.sql => V5_1_03_evol_6997_delete_supportVesselName-PG.sql} (100%) create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_07_evol_8389_rename_source_columns-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_07_evol_8389_rename_source_columns-PG.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_08_evol_8390_measure_type-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_08_evol_8390_measure_type-PG.sql create mode 100644 services-dto/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java rename services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{longline => }/SizeMeasureType-service-error-validation.xml (100%) rename services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{longline => }/SizeMeasureType-service-warning-validation.xml (100%) rename services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{longline => }/WeightMeasureType-service-error-validation.xml (100%) rename services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{longline => }/WeightMeasureType-service-warning-validation.xml (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 12