April 2015 - Observe-commits - mailman.cloud.codelutin.com

02/35: refs #6921: Mauvais libéllé lors de la création d'une base distante
by codelutin.com scm 10 Apr '15

10 Apr '15

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 a036248f1ec327b7e12541f737824da847c703a1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 10:22:28 2015 +0200 refs #6921: Mauvais libéllé lors de la création d'une base distante --- .../src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.css | 4 ++-- observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties | 2 ++ observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties | 2 ++ observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.css b/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.css index 3255b68..cfa946c 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.css +++ b/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.css @@ -42,13 +42,13 @@ #importDataFromBackup { value:{CreationMode.IMPORT_EXTERNAL_DUMP}; - text:{CreationMode.IMPORT_EXTERNAL_DUMP.getLabel()}; + text:"observe.synchro.import.data.fromBackup"; selected:{model.getDataImportMode() == CreationMode.IMPORT_EXTERNAL_DUMP}; } #importDataFromRemote { value:{CreationMode.IMPORT_REMOTE_STORAGE}; - text:{CreationMode.IMPORT_REMOTE_STORAGE.getLabel()}; + text:"observe.synchro.import.data.fromRemoteStorage"; selected:{model.getDataImportMode() == CreationMode.IMPORT_REMOTE_STORAGE}; } diff --git a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties index 9e6ca24..b8481be 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties @@ -1654,6 +1654,8 @@ observe.synchro.config.validate= observe.synchro.config.validation.report= observe.synchro.configuration= observe.synchro.continue.with.no.save.report= +observe.synchro.import.data.fromBackup= +observe.synchro.import.data.fromRemoteStorage= observe.synchro.importGPS.invalidIntervals.list= observe.synchro.message.all.obsolete.entities.fixed= observe.synchro.message.need.save.for.synchro.operation= diff --git a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties index b990dfe..5798666 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties @@ -1654,6 +1654,8 @@ observe.synchro.config.validate=Configuración de la validación observe.synchro.config.validation.report=Informe de validación observe.synchro.configuration=Configuración de las operaciones observe.synchro.continue.with.no.save.report=Continuar sin guardar el informe +observe.synchro.import.data.fromBackup= +observe.synchro.import.data.fromRemoteStorage= observe.synchro.importGPS.invalidIntervals.list=Lista de los intervalos de puntos gps no usables observe.synchro.message.all.obsolete.entities.fixed=No hay mas referencias a los objetos obsoletos. observe.synchro.message.need.save.for.synchro.operation=La operación de sincronización de referenciales ha generado cambios diff --git a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties index 900636e..5f540dc 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties @@ -1652,6 +1652,8 @@ observe.synchro.config.validate=Configuration de la validation observe.synchro.config.validation.report=Rapport de validation observe.synchro.configuration=Configuration des opérations observe.synchro.continue.with.no.save.report=Continuer sans sauver de rapport +observe.synchro.import.data.fromBackup=Importer les données depuis une sauvegarde de base locale (*.sql.gz) +observe.synchro.import.data.fromRemoteStorage=Importer les données depuis une base distante observe.synchro.importGPS.invalidIntervals.list=Liste des intervalles de points gps non utilisables observe.synchro.message.all.obsolete.entities.fixed=Il n'y a plus de références sur des objets obsolètes. observe.synchro.message.need.save.for.synchro.operation=L'opération de synchronisation du référentiel a engendrée des modifications. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch release/4.0-RC1 deleted (was 6e2ec35)
by codelutin.com scm 07 Apr '15

07 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-RC1 in repository observe. See http://git.codelutin.com/observe.git was 6e2ec35 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC1' with non-snapshot versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch develop updated (3598cb3 -> 4baf239)
by codelutin.com scm 07 Apr '15

07 Apr '15

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 3598cb3 [jgitflow-maven-plugin]updating poms for 4.0-RC2-SNAPSHOT development new 83abb77 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds fcb6456 [maven-release-plugin] copy for tag observe-3.15.1 adds 2f5abad [jgitflow-maven-plugin]updating poms for branch '4.0-RC1' with snapshot versions new f5a7430 fix tests new b370ff0 add licenses headers new 6e2ec35 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC1' with non-snapshot versions new a723a7c Merge branch 'release/4.0-RC1' new 3d38290 Merge branch 'master' into develop new 4baf239 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 7 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 4baf2392b242783e96f8ced2a577641ec6c501b0 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 7 20:45:20 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 3d3829019209ae1b3473d1a0703aef5218963f11 Merge: 83abb77 a723a7c Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 7 20:45:19 2015 +0000 Merge branch 'master' into develop commit 83abb7739e17e797164bb674f03bd1adebb30011 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 7 20:45:18 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit a723a7c3b67f43ce1fc8a7d5166f1e52f18555fe Merge: fcb6456 6e2ec35 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 7 20:45:15 2015 +0000 Merge branch 'release/4.0-RC1' commit 6e2ec35ae990410eee9863b2837b98cc0441bea4 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 7 20:40:20 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC1' with non-snapshot versions commit b370ff07766d7abbc686f67153305f044c8838fe Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 7 20:40:04 2015 +0000 add licenses headers commit f5a7430eea21e62671d9cc7390db4e727214032f Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 7 20:39:54 2015 +0000 fix tests Summary of changes: .../its/replication/AbstractReplicateDataTest.java | 7 ++++++- .../replication/H2LonglineReplicateDataTest.java | 23 ++++++++++++++++++++++ .../its/replication/ReplicationDataModel.java | 22 +++++++++++++++++++++ .../observe/entities/longline/TripLonglines.java | 22 +++++++++++++++++++++ .../DataSourceMigrationForVersion_3_16.java | 22 +++++++++++++++++++++ .../referentiel/GearCaracteristicTypes.java | 22 +++++++++++++++++++++ .../main/resources/db/3.16/add-gear-data-H2.sql | 21 ++++++++++++++++++++ .../main/resources/db/3.16/add-gear-data-PG.sql | 21 ++++++++++++++++++++ .../resources/db/3.16/add-gear-referential-H2.sql | 21 ++++++++++++++++++++ .../resources/db/3.16/add-gear-referential-PG.sql | 21 ++++++++++++++++++++ .../db/3.16/remove-tripSeine-seine-H2.sql | 21 ++++++++++++++++++++ .../db/3.16/remove-tripSeine-seine-PG.sql | 21 ++++++++++++++++++++ .../ref/impl/GearCaracteristicTypeUIModel.java | 22 +++++++++++++++++++++ .../content/ref/impl/GearCaracteristicUIModel.java | 22 +++++++++++++++++++++ .../observe/ui/content/ref/impl/GearUIHandler.java | 22 +++++++++++++++++++++ .../observe/ui/content/ref/impl/GearUIModel.java | 22 +++++++++++++++++++++ .../seine/GearUseFeatureMeasurementCellEditor.java | 22 +++++++++++++++++++++ .../GearUseFeatureMeasurementCellRenderer.java | 22 +++++++++++++++++++++ ...GearUseFeaturesMeasurementSeinesTableModel.java | 22 +++++++++++++++++++++ .../impl/seine/GearUseFeaturesSeineTableModel.java | 22 +++++++++++++++++++++ .../impl/seine/GearUseFeaturesSeineUIHandler.java | 22 +++++++++++++++++++++ .../impl/seine/GearUseFeaturesSeineUIModel.java | 22 +++++++++++++++++++++ 22 files changed, 463 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 7

annotated tag observe-4.0-RC1 created (now 2bf45b1)
by codelutin.com scm 07 Apr '15

07 Apr '15

This is an automated email from the git hooks/post-receive script. New change to annotated tag observe-4.0-RC1 in repository observe. See http://git.codelutin.com/observe.git at 2bf45b1 (tag) tagging a723a7c3b67f43ce1fc8a7d5166f1e52f18555fe (commit) replaces observe-3.15.1 tagged by Maven Release on Tue Apr 7 20:45:15 2015 +0000 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.0-RC1 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch release/4.0-RC1 updated (2f5abad -> 6e2ec35)
by codelutin.com scm 07 Apr '15

07 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-RC1 in repository observe. See http://git.codelutin.com/observe.git from 2f5abad [jgitflow-maven-plugin]updating poms for branch '4.0-RC1' with snapshot versions adds f5a7430 fix tests adds b370ff0 add licenses headers adds 6e2ec35 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC1' with non-snapshot versions No new revisions were added by this update. Summary of changes: observe-business/pom.xml | 2 +- .../its/replication/AbstractReplicateDataTest.java | 7 ++++++- .../replication/H2LonglineReplicateDataTest.java | 23 ++++++++++++++++++++++ .../its/replication/ReplicationDataModel.java | 22 +++++++++++++++++++++ observe-entities/pom.xml | 2 +- .../observe/entities/longline/TripLonglines.java | 22 +++++++++++++++++++++ .../DataSourceMigrationForVersion_3_16.java | 22 +++++++++++++++++++++ .../referentiel/GearCaracteristicTypes.java | 22 +++++++++++++++++++++ .../main/resources/db/3.16/add-gear-data-H2.sql | 21 ++++++++++++++++++++ .../main/resources/db/3.16/add-gear-data-PG.sql | 21 ++++++++++++++++++++ .../resources/db/3.16/add-gear-referential-H2.sql | 21 ++++++++++++++++++++ .../resources/db/3.16/add-gear-referential-PG.sql | 21 ++++++++++++++++++++ .../db/3.16/remove-tripSeine-seine-H2.sql | 21 ++++++++++++++++++++ .../db/3.16/remove-tripSeine-seine-PG.sql | 21 ++++++++++++++++++++ observe-swing/pom.xml | 2 +- .../ref/impl/GearCaracteristicTypeUIModel.java | 22 +++++++++++++++++++++ .../content/ref/impl/GearCaracteristicUIModel.java | 22 +++++++++++++++++++++ .../observe/ui/content/ref/impl/GearUIHandler.java | 22 +++++++++++++++++++++ .../observe/ui/content/ref/impl/GearUIModel.java | 22 +++++++++++++++++++++ .../seine/GearUseFeatureMeasurementCellEditor.java | 22 +++++++++++++++++++++ .../GearUseFeatureMeasurementCellRenderer.java | 22 +++++++++++++++++++++ ...GearUseFeaturesMeasurementSeinesTableModel.java | 22 +++++++++++++++++++++ .../impl/seine/GearUseFeaturesSeineTableModel.java | 22 +++++++++++++++++++++ .../impl/seine/GearUseFeaturesSeineUIHandler.java | 22 +++++++++++++++++++++ .../impl/seine/GearUseFeaturesSeineUIModel.java | 22 +++++++++++++++++++++ observe-validation/pom.xml | 2 +- pom.xml | 2 +- 27 files changed, 468 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch master updated (fcb6456 -> a723a7c)
by codelutin.com scm 07 Apr '15

07 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch master in repository observe. See http://git.codelutin.com/observe.git from fcb6456 [maven-release-plugin] copy for tag observe-3.15.1 adds f508dcb [maven-release-plugin] prepare for next development iteration adds 643ee6d fixes #6704: LL/PS - Libellé des marées dans l'arbre adds 5e5dc08 add .gitignore adds 4165eb4 passage sous git et utilisation de codelutinpom adds cb365f6 refs #6904 correction de la disposition adds 8946a1d fixes #6904: Mauvais disposition sur l'écran des activités senne Merge branch 'feature/6904' into develop adds dcf8ebd passage sous git et utilisation de codelutinpom adds 55e94f8 refs #6875 correction de la mise en page du formulaire détail avançon adds 3832e63 fixes #6875: Mise en page du formulaireComposition détaillée/Détail avançon Merge branch 'feature/6875' into develop adds 875eee4 refs #6855: add referentials adds ac39262 refs #6855: add seine gear data + remove old seine data adds 991e8cd refs #6855: add seine gear data + remove old seine data adds e563e3b refs #6855: ajout données equipements pour la seine des traductions + correction du la dll adds 5fc039a refs #6855: pas possible d'avoir des not-null sur les relations inverses adds 48b30c8 refs #6855: debut d'interface graphique adds de9e812 ajout d'une validation sur le pays d'un balise adds 6ceee17 correction du warning sur le nombre d'équipements d'une marée seine adds 441cee8 correction du calcul des données dans le contexte adds 38fdbc9 pouvoir decorer les propriétés avec un autre prefixe + passage en méthode statique adds 1847c06 utilisation de clefs i18n specifiques pour les noeuds de l'arbre de navigation adds 3d15ec0 refs #6855 ecran autonome pour les equipements d'une marée seine adds 078d4d5 i18n adds 807da8e ajout validation sur GearUseFeature.number adds e387f56 refs#6855 edition des caracteristics d'un equipeemnt adds 98d1030 ajout d'un order sur les mesures adds 79abd36 fixes #6855: Saisie générique des caractéristiques de l'équipement du bateau & migration senne Merge branch 'feature/6855' into develop adds e0e0a1f refs #6855 fix migration script adds 6e8c562 Add 3.16 test referntial database adds b9b4bbd fix data context adds d69d186 fix entities order to replicate adds 0d9ee4e add fix in ReplicationService to reattach after replication missing tdr association adds 1b9936a add a test adds 8b3211f fixes #6611: [ObserveLL] La sauvegarde d'une marée de type palangre ne conserve pas les Tdr Merge branch 'feature/6611' into develop adds 2f5abad [jgitflow-maven-plugin]updating poms for branch '4.0-RC1' with snapshot versions adds f5a7430 fix tests adds b370ff0 add licenses headers adds 6e2ec35 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC1' with non-snapshot versions adds a723a7c Merge branch 'release/4.0-RC1' No new revisions were added by this update. Summary of changes: .gitignore | 12 + observe-business/pom.xml | 62 +-- .../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 | 114 ++++- .../ird/observe/db/constants/DataContextType.java | 36 +- .../fr/ird/observe/decorator/TripDecorator.java | 2 +- .../ird/observe/decorator/TripSeineDecorator.java | 2 +- .../i18n/observe-business_en_GB.properties | 4 + .../i18n/observe-business_es_ES.properties | 4 + .../i18n/observe-business_fr_FR.properties | 4 + .../its/replication/AbstractReplicateDataTest.java | 220 ++++------ .../replication/H2LonglineReplicateDataTest.java | 200 +++++++++ .../its/replication/ReplicationDataModel.java | 170 ++++++++ .../src/test/resources/db/3.16/ANO-6611.sql.gz | Bin 0 -> 172354 bytes .../src/test/resources/db/3.16/referentiel.sql.gz | Bin 0 -> 138114 bytes observe-entities/pom.xml | 110 +---- .../java/fr/ird/observe/entities/Entities.java | 90 ++-- .../longline/{Sections.java => TripLonglines.java} | 27 +- .../migration/AbstractDataSourceMigration.java | 4 +- .../DataSourceMigrationForVersion_3_16.java | 161 +++++++ .../referentiel/GearCaracteristicTypes.java | 83 ++++ .../main/resources/db/3.16/add-gear-data-H2.sql | 39 ++ .../main/resources/db/3.16/add-gear-data-PG.sql | 39 ++ .../resources/db/3.16/add-gear-referential-H2.sql | 141 ++++++ .../resources/db/3.16/add-gear-referential-PG.sql | 140 ++++++ .../remove-tripSeine-seine-H2.sql} | 4 +- .../remove-tripSeine-seine-PG.sql} | 4 +- .../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 observe-swing/pom.xml | 5 +- .../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/impl/longline/BranchlineUI.jaxx | 15 +- .../impl/longline/LonglineDetailCompositionUI.jaxx | 9 +- .../LonglineDetailCompositionUIHandler.java | 2 +- .../LonglineDetailCompositionUIInitializer.java | 6 +- .../LonglineGlobalCompositionUIHandler.java | 2 +- .../impl/longline/SetLonglineUIHandler.java | 2 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 6 +- .../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 +- ...odel.java => GearCaracteristicTypeUIModel.java} | 16 +- .../ui/content/ref/impl/GearCaracteristicUI.css | 36 +- .../{OrganismUI.jaxx => GearCaracteristicUI.jaxx} | 62 ++- ...yUIModel.java => GearCaracteristicUIModel.java} | 25 +- .../ref/impl/{SpeciesListUI.css => GearUI.css} | 22 +- .../ref/impl/{SpeciesListUI.jaxx => GearUI.jaxx} | 49 +-- .../{SpeciesUIHandler.java => GearUIHandler.java} | 24 +- .../observe/ui/content/ref/impl/GearUIModel.java | 92 ++++ .../ui/content/table/ContentTableUIHandler.java | 8 +- .../seine/GearUseFeatureMeasurementCellEditor.java | 145 +++++++ .../GearUseFeatureMeasurementCellRenderer.java | 113 +++++ ...earUseFeaturesMeasurementSeinesTableModel.java} | 118 ++--- .../GearUseFeaturesSeineTableModel.java} | 47 +- .../table/impl/seine/GearUseFeaturesSeineUI.css | 91 ++++ .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 148 +++++++ .../impl/seine/GearUseFeaturesSeineUIHandler.java | 473 +++++++++++++++++++++ .../impl/seine/GearUseFeaturesSeineUIModel.java | 122 ++++++ .../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 ++++++-- observe-validation/pom.xml | 6 +- ...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 +- pom.xml | 42 +- src/site/site_fr.xml | 48 +-- 120 files changed, 3783 insertions(+), 1465 deletions(-) create mode 100644 .gitignore create mode 100644 observe-business/src/test/java/fr/ird/observe/its/replication/H2LonglineReplicateDataTest.java create mode 100644 observe-business/src/test/java/fr/ird/observe/its/replication/ReplicationDataModel.java create mode 100644 observe-business/src/test/resources/db/3.16/ANO-6611.sql.gz create mode 100644 observe-business/src/test/resources/db/3.16/referentiel.sql.gz copy observe-entities/src/main/java/fr/ird/observe/entities/longline/{Sections.java => TripLonglines.java} (59%) 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 copy observe-entities/src/main/resources/db/{3.11/add-activity-ersId-H2.sql => 3.16/remove-tripSeine-seine-H2.sql} (81%) copy observe-entities/src/main/resources/db/{3.11/add-activity-ersId-H2.sql => 3.16/remove-tripSeine-seine-PG.sql} (81%) copy observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/{SexUI.jaxx => GearCaracteristicTypeUI.jaxx} (87%) copy observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/{OceanUIModel.java => GearCaracteristicTypeUIModel.java} (73%) 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%) copy observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/{VesselSizeCategoryUIModel.java => GearCaracteristicUIModel.java} (61%) 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/{SpeciesUIHandler.java => GearUIHandler.java} (81%) 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 copy observe-swing/src/main/java/fr/ird/observe/ui/content/{impl/longline/BasketsTableModel.java => table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java} (51%) copy observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/{longline/CatchLonglineTableModel.java => seine/GearUseFeaturesSeineTableModel.java} (57%) 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(a)list.forge.codelutin.com>.

1 0

[ANN] - ObServe 4.0-RC1 released
by codelutin.com Release Notification 07 Apr '15

07 Apr '15

The ObServe team is pleased to announce the observe-4.0-RC1 release! Projet ObServe Documentation of the project can be found here: https://observe.codelutin.com Changes ------- Changes in this version include: New features: o Saisie générique des caractéristiques de l'équipement du bateau & migration senne Issue: 6855. Thanks to Tony Chemit. Resolved by tchemit. o LL/PS - Libellé des marées dans l'arbre Issue: 6704. Thanks to Pascal CAUQUIL. Resolved by tchemit. o [ObServeLL] Association d'une capture à un TDR Issue: 6884. Thanks to Njaratiana Rabearisoa. Resolved by pcauquil. Fixed Bugs: o [ObServeLL] Echec de la mise à jour de la version 3.14 -> 3.15.1 Issue: 6854. Thanks to Njaratiana Rabearisoa. Resolved by tchemit. o [ObserveLL] La sauvegarde d'une marée de type palangre ne conserve pas les Tdr Issue: 6611. Thanks to Tony Chemit. Resolved by tchemit. o [ObServeLL] Mise en page du formulaireComposition détaillée/Détail avançon Issue: 6875. Thanks to Pascal CAUQUIL. Resolved by tchemit. o [ObServePS] Mauvais disposition sur l'écran des activités senne Issue: 6904. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/observe/files * observe-4.0-RC1.zip - http://forge.codelutin.com/attachments/download/3068 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -ObServe team

1 0

branch release/4.0-RC1 created (now 2f5abad)
by codelutin.com scm 07 Apr '15

07 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-RC1 in repository observe. See http://git.codelutin.com/observe.git at 2f5abad [jgitflow-maven-plugin]updating poms for branch '4.0-RC1' with snapshot versions This branch includes the following new commits: new 2f5abad [jgitflow-maven-plugin]updating poms for branch '4.0-RC1' with snapshot versions 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 2f5abad29a0171477fc83fd5a1fdd343a957683f Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 7 20:20:57 2015 +0000 [jgitflow-maven-plugin]updating poms for branch '4.0-RC1' with snapshot versions -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch develop updated (8b3211f -> 3598cb3)
by codelutin.com scm 07 Apr '15

07 Apr '15

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 8b3211f fixes #6611: [ObserveLL] La sauvegarde d'une marée de type palangre ne conserve pas les Tdr Merge branch 'feature/6611' into develop new 3598cb3 [jgitflow-maven-plugin]updating poms for 4.0-RC2-SNAPSHOT development 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 3598cb37242a6dffea3d96a588292c1bb1e2d0fc Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 7 20:21:09 2015 +0000 [jgitflow-maven-plugin]updating poms for 4.0-RC2-SNAPSHOT development Summary of changes: observe-business/pom.xml | 2 +- observe-entities/pom.xml | 2 +- observe-swing/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch develop updated (79abd36 -> 8b3211f)
by codelutin.com scm 07 Apr '15

07 Apr '15

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 79abd36 fixes #6855: Saisie générique des caractéristiques de l'équipement du bateau & migration senne Merge branch 'feature/6855' into develop new e0e0a1f refs #6855 fix migration script new 6e8c562 Add 3.16 test referntial database new b9b4bbd fix data context new d69d186 fix entities order to replicate new 0d9ee4e add fix in ReplicationService to reattach after replication missing tdr association new 1b9936a add a test new 8b3211f fixes #6611: [ObserveLL] La sauvegarde d'une marée de type palangre ne conserve pas les Tdr Merge branch 'feature/6611' into develop The 7 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 8b3211fab99111c9a491b22fca78df2d46adf7ca Merge: b9b4bbd 1b9936a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 7 22:16:30 2015 +0200 fixes #6611: [ObserveLL] La sauvegarde d'une marée de type palangre ne conserve pas les Tdr Merge branch 'feature/6611' into develop commit 1b9936af1b0dd47a741f78a3b597834473932640 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 7 22:16:24 2015 +0200 add a test commit 0d9ee4e8dd307031c8e4cdb13727dbe3edb5d4cd Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 7 22:15:54 2015 +0200 add fix in ReplicationService to reattach after replication missing tdr association commit d69d186bcc24b44996b4040f785fa0f9564e264d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 7 22:14:38 2015 +0200 fix entities order to replicate commit b9b4bbdb8dc43a305e62a8b0ada240ae2ecc2e3f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 7 19:37:59 2015 +0200 fix data context commit 6e8c562aac15006cff0ed02787797bfec948e4fc Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 7 19:19:31 2015 +0200 Add 3.16 test referntial database commit e0e0a1f6a1c654499513b042aba9e3fbb39aadee Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 7 19:12:01 2015 +0200 refs #6855 fix migration script Summary of changes: .../java/fr/ird/observe/db/ReplicationService.java | 112 ++++++++++- .../its/replication/AbstractReplicateDataTest.java | 213 +++++++-------------- .../replication/H2LonglineReplicateDataTest.java | 177 +++++++++++++++++ .../its/replication/ReplicationDataModel.java | 148 ++++++++++++++ .../src/test/resources/db/3.16/ANO-6611.sql.gz | Bin 0 -> 172354 bytes .../src/test/resources/db/3.16/referentiel.sql.gz | Bin 0 -> 138114 bytes .../java/fr/ird/observe/entities/Entities.java | 42 ++-- .../observe/entities/longline/TripLonglines.java | 32 ++++ .../resources/db/3.16/add-gear-referential-H2.sql | 3 - .../LonglineDetailCompositionUIHandler.java | 2 +- .../LonglineGlobalCompositionUIHandler.java | 2 +- .../impl/longline/SetLonglineUIHandler.java | 2 +- 12 files changed, 555 insertions(+), 178 deletions(-) create mode 100644 observe-business/src/test/java/fr/ird/observe/its/replication/H2LonglineReplicateDataTest.java create mode 100644 observe-business/src/test/java/fr/ird/observe/its/replication/ReplicationDataModel.java create mode 100644 observe-business/src/test/resources/db/3.16/ANO-6611.sql.gz create mode 100644 observe-business/src/test/resources/db/3.16/referentiel.sql.gz create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglines.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 7