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

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

branch develop updated (3832e63 -> 79abd36)
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 3832e63 fixes #6875: Mise en page du formulaireComposition détaillée/Détail avançon Merge branch 'feature/6875' into develop new 875eee4 refs #6855: add referentials new ac39262 refs #6855: add seine gear data + remove old seine data new 991e8cd refs #6855: add seine gear data + remove old seine data new e563e3b refs #6855: ajout données equipements pour la seine des traductions + correction du la dll new 5fc039a refs #6855: pas possible d'avoir des not-null sur les relations inverses new 48b30c8 refs #6855: debut d'interface graphique new de9e812 ajout d'une validation sur le pays d'un balise new 6ceee17 correction du warning sur le nombre d'équipements d'une marée seine new 441cee8 correction du calcul des données dans le contexte new 38fdbc9 pouvoir decorer les propriétés avec un autre prefixe + passage en méthode statique new 1847c06 utilisation de clefs i18n specifiques pour les noeuds de l'arbre de navigation new 3d15ec0 refs #6855 ecran autonome pour les equipements d'une marée seine new 078d4d5 i18n new 807da8e ajout validation sur GearUseFeature.number new e387f56 refs#6855 edition des caracteristics d'un equipeemnt new 98d1030 ajout d'un order sur les mesures new 79abd36 fixes #6855: Saisie générique des caractéristiques de l'équipement du bateau & migration senne Merge branch 'feature/6855' into develop The 17 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 79abd36faee00a5ebe17f8003fbed98880b4f391 Merge: 3832e63 98d1030 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 7 18:24:34 2015 +0200 fixes #6855: Saisie générique des caractéristiques de l'équipement du bateau & migration senne Merge branch 'feature/6855' into develop commit 98d103010bd6b1983dad3a61ce60f6e5b87497bd Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 7 18:24:28 2015 +0200 ajout d'un order sur les mesures commit e387f565f15ccb20d67f33a5cabb37670220684d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 7 18:00:56 2015 +0200 refs#6855 edition des caracteristics d'un equipeemnt commit 807da8eeb4b0436402c20ff04b8984469d61a1d4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 7 18:00:14 2015 +0200 ajout validation sur GearUseFeature.number commit 078d4d575128a1c95bbff918d400cab4efc6dac0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 6 19:15:39 2015 +0200 i18n commit 3d15ec0b19d16a306ad622aa840bb99e9cd61fcd Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 6 19:15:22 2015 +0200 refs #6855 ecran autonome pour les equipements d'une marée seine commit 1847c06a85add11eb5a305cd046d0bd59a4ca5bf Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 6 19:14:00 2015 +0200 utilisation de clefs i18n specifiques pour les noeuds de l'arbre de navigation commit 38fdbc9f1ed01b1fc45bb668caa72c5384813ff9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 6 19:12:36 2015 +0200 pouvoir decorer les propriétés avec un autre prefixe + passage en méthode statique commit 441cee8d47de35050efa34297af97c76eb5986e5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 6 19:10:18 2015 +0200 correction du calcul des données dans le contexte commit 6ceee17c5600d8eabe43387e99ab61c6d264cdf3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 6 19:08:51 2015 +0200 correction du warning sur le nombre d'équipements d'une marée seine commit de9e8127e601b321d2ec1d404f2c9950d817289d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 6 19:08:31 2015 +0200 ajout d'une validation sur le pays d'un balise commit 48b30c868253f39ba71c8f418677ddcfd57febed Author: Tony Chemit <chemit(a)codelutin.com> Date: Tue Mar 24 16:39:13 2015 +0000 refs #6855: debut d'interface graphique commit 5fc039a4aa40cf1caa6ea0966f469b95037a991f Author: Tony Chemit <chemit(a)codelutin.com> Date: Tue Mar 24 16:38:22 2015 +0000 refs #6855: pas possible d'avoir des not-null sur les relations inverses commit e563e3b7800331be2515b0f39d921fe1f16e5eb5 Author: Tony Chemit <chemit(a)codelutin.com> Date: Tue Mar 24 14:21:38 2015 +0000 refs #6855: ajout données equipements pour la seine des traductions + correction du la dll commit 991e8cdcbb3cf4ef1238647b20e3539ac0c366ba Author: Tony Chemit <chemit(a)codelutin.com> Date: Tue Mar 24 09:03:10 2015 +0000 refs #6855: add seine gear data + remove old seine data commit ac3926208390b66ed609fae187d0905b9e676aff Author: Tony Chemit <chemit(a)codelutin.com> Date: Tue Mar 24 09:03:00 2015 +0000 refs #6855: add seine gear data + remove old seine data commit 875eee4dc4ccc18b7c879cfd18a6739378fe7dff Author: Tony Chemit <chemit(a)codelutin.com> Date: Mon Mar 23 19:14:21 2015 +0000 refs #6855: add referentials Summary of changes: .../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 | 2 +- .../ird/observe/db/constants/DataContextType.java | 36 +- .../i18n/observe-business_en_GB.properties | 4 + .../i18n/observe-business_es_ES.properties | 4 + .../i18n/observe-business_fr_FR.properties | 4 + .../java/fr/ird/observe/entities/Entities.java | 48 +-- .../migration/AbstractDataSourceMigration.java | 4 +- .../DataSourceMigrationForVersion_3_16.java | 139 +++++++ .../referentiel/GearCaracteristicTypes.java | 61 +++ .../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 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 .../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/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 +- .../ref/impl/GearCaracteristicTypeUIModel.java | 20 + .../ui/content/ref/impl/GearCaracteristicUI.css | 36 +- .../{OrganismUI.jaxx => GearCaracteristicUI.jaxx} | 62 ++- .../content/ref/impl/GearCaracteristicUIModel.java | 27 ++ .../ref/impl/{SpeciesListUI.css => GearUI.css} | 22 +- .../ref/impl/{SpeciesListUI.jaxx => GearUI.jaxx} | 49 +-- .../{VesselUIHandler.java => GearUIHandler.java} | 46 +-- .../observe/ui/content/ref/impl/GearUIModel.java | 70 ++++ .../ui/content/table/ContentTableUIHandler.java | 8 +- .../seine/GearUseFeatureMeasurementCellEditor.java | 123 ++++++ .../GearUseFeatureMeasurementCellRenderer.java | 91 +++++ ...GearUseFeaturesMeasurementSeinesTableModel.java | 102 +++++ .../impl/seine/GearUseFeaturesSeineTableModel.java | 94 +++++ .../table/impl/seine/GearUseFeaturesSeineUI.css | 91 +++++ .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 148 +++++++ .../impl/seine/GearUseFeaturesSeineUIHandler.java | 451 +++++++++++++++++++++ .../impl/seine/GearUseFeaturesSeineUIModel.java | 100 +++++ .../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 ++++++-- ...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 +- 98 files changed, 3049 insertions(+), 919 deletions(-) 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 create mode 100644 observe-entities/src/main/resources/db/3.16/remove-tripSeine-seine-H2.sql create mode 100644 observe-entities/src/main/resources/db/3.16/remove-tripSeine-seine-PG.sql copy observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/{SexUI.jaxx => GearCaracteristicTypeUI.jaxx} (87%) create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicTypeUIModel.java 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%) create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUIModel.java 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/{VesselUIHandler.java => GearUIHandler.java} (59%) 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 create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java 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 17

branch feature/6855 deleted (was 078d4d5)
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 feature/6855 in repository observe. See http://git.codelutin.com/observe.git was 078d4d5 i18n This change permanently discards the following revisions: discards 078d4d5 i18n discards 3d15ec0 refs #6855 ecran autonome pour les equipements d'une marée seine discards 1847c06 utilisation de clefs i18n specifiques pour les noeuds de l'arbre de navigation discards 38fdbc9 pouvoir decorer les propriétés avec un autre prefixe + passage en méthode statique discards 441cee8 correction du calcul des données dans le contexte discards 6ceee17 correction du warning sur le nombre d'équipements d'une marée seine discards de9e812 ajout d'une validation sur le pays d'un balise discards 48b30c8 refs #6855: debut d'interface graphique discards 5fc039a refs #6855: pas possible d'avoir des not-null sur les relations inverses discards e563e3b refs #6855: ajout données equipements pour la seine des traductions + correction du la dll discards 991e8cd refs #6855: add seine gear data + remove old seine data discards ac39262 refs #6855: add seine gear data + remove old seine data discards 875eee4 refs #6855: add referentials -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch feature/6855 updated (8980667 -> 078d4d5)
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 feature/6855 in repository observe. See http://git.codelutin.com/observe.git discards 8980667 i18n discards cdd899d refs #6855 ecran autonome pour les equipements d'une marée seine discards 3d4f947 utilisation de clefs i18n specifiques pour les noeuds de l'arbre de navigation discards 1664d37 pouvoir decorer les propriétés avec un autre prefixe + passage en méthode statique discards 260d44f correction du calcul des données dans le contexte discards bcac9e7 correction du warning sur le nombre d'équipements d'une marée seine discards 689034b ajout d'une validation sur le pays d'un balise 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 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 new 875eee4 refs #6855: add referentials new ac39262 refs #6855: add seine gear data + remove old seine data new 991e8cd refs #6855: add seine gear data + remove old seine data new e563e3b refs #6855: ajout données equipements pour la seine des traductions + correction du la dll new 5fc039a refs #6855: pas possible d'avoir des not-null sur les relations inverses new 48b30c8 refs #6855: debut d'interface graphique new de9e812 ajout d'une validation sur le pays d'un balise new 6ceee17 correction du warning sur le nombre d'équipements d'une marée seine new 441cee8 correction du calcul des données dans le contexte new 38fdbc9 pouvoir decorer les propriétés avec un autre prefixe + passage en méthode statique new 1847c06 utilisation de clefs i18n specifiques pour les noeuds de l'arbre de navigation new 3d15ec0 refs #6855 ecran autonome pour les equipements d'une marée seine new 078d4d5 i18n This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (8980667) \ N -- N -- N refs/heads/feature/6855 (078d4d5) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 13 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 078d4d575128a1c95bbff918d400cab4efc6dac0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 6 19:15:39 2015 +0200 i18n commit 3d15ec0b19d16a306ad622aa840bb99e9cd61fcd Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 6 19:15:22 2015 +0200 refs #6855 ecran autonome pour les equipements d'une marée seine commit 1847c06a85add11eb5a305cd046d0bd59a4ca5bf Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 6 19:14:00 2015 +0200 utilisation de clefs i18n specifiques pour les noeuds de l'arbre de navigation commit 38fdbc9f1ed01b1fc45bb668caa72c5384813ff9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 6 19:12:36 2015 +0200 pouvoir decorer les propriétés avec un autre prefixe + passage en méthode statique commit 441cee8d47de35050efa34297af97c76eb5986e5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 6 19:10:18 2015 +0200 correction du calcul des données dans le contexte commit 6ceee17c5600d8eabe43387e99ab61c6d264cdf3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 6 19:08:51 2015 +0200 correction du warning sur le nombre d'équipements d'une marée seine commit de9e8127e601b321d2ec1d404f2c9950d817289d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 6 19:08:31 2015 +0200 ajout d'une validation sur le pays d'un balise commit 48b30c868253f39ba71c8f418677ddcfd57febed Author: Tony Chemit <chemit(a)codelutin.com> Date: Tue Mar 24 16:39:13 2015 +0000 refs #6855: debut d'interface graphique commit 5fc039a4aa40cf1caa6ea0966f469b95037a991f Author: Tony Chemit <chemit(a)codelutin.com> Date: Tue Mar 24 16:38:22 2015 +0000 refs #6855: pas possible d'avoir des not-null sur les relations inverses commit e563e3b7800331be2515b0f39d921fe1f16e5eb5 Author: Tony Chemit <chemit(a)codelutin.com> Date: Tue Mar 24 14:21:38 2015 +0000 refs #6855: ajout données equipements pour la seine des traductions + correction du la dll commit 991e8cdcbb3cf4ef1238647b20e3539ac0c366ba Author: Tony Chemit <chemit(a)codelutin.com> Date: Tue Mar 24 09:03:10 2015 +0000 refs #6855: add seine gear data + remove old seine data commit ac3926208390b66ed609fae187d0905b9e676aff Author: Tony Chemit <chemit(a)codelutin.com> Date: Tue Mar 24 09:03:00 2015 +0000 refs #6855: add seine gear data + remove old seine data commit 875eee4dc4ccc18b7c879cfd18a6739378fe7dff Author: Tony Chemit <chemit(a)codelutin.com> Date: Mon Mar 23 19:14:21 2015 +0000 refs #6855: add referentials Summary of changes: .gitignore | 12 +++ observe-business/pom.xml | 60 +----------- observe-entities/pom.xml | 108 +-------------------- observe-swing/pom.xml | 3 +- .../ui/content/impl/longline/BranchlineUI.jaxx | 15 +-- .../impl/longline/LonglineDetailCompositionUI.jaxx | 9 +- .../LonglineDetailCompositionUIInitializer.java | 6 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 6 +- observe-validation/pom.xml | 4 +- pom.xml | 34 +++---- src/site/site_fr.xml | 48 +++------ 11 files changed, 63 insertions(+), 242 deletions(-) create mode 100644 .gitignore -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 13

branch develop updated (8946a1d -> 3832e63)
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 8946a1d fixes #6904: Mauvais disposition sur l'écran des activités senne Merge branch 'feature/6904' into develop new dcf8ebd passage sous git et utilisation de codelutinpom new 55e94f8 refs #6875 correction de la mise en page du formulaire détail avançon new 3832e63 fixes #6875: Mise en page du formulaireComposition détaillée/Détail avançon Merge branch 'feature/6875' into develop The 3 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 3832e63eec6571f4ce44fdf2832de796b863a600 Merge: 8946a1d 55e94f8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 7 09:58:45 2015 +0200 fixes #6875: Mise en page du formulaireComposition détaillée/Détail avançon Merge branch 'feature/6875' into develop commit 55e94f883ec717021ffd76990239d7faaf8ce76c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 7 09:58:37 2015 +0200 refs #6875 correction de la mise en page du formulaire détail avançon commit dcf8ebd6b7cfe9941a1aa925cff70d5e27921fc3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 7 08:54:59 2015 +0200 passage sous git et utilisation de codelutinpom Summary of changes: observe-business/pom.xml | 60 +----------- observe-entities/pom.xml | 108 +-------------------- observe-swing/pom.xml | 3 +- .../ui/content/impl/longline/BranchlineUI.jaxx | 15 +-- .../impl/longline/LonglineDetailCompositionUI.jaxx | 9 +- .../LonglineDetailCompositionUIInitializer.java | 6 +- observe-validation/pom.xml | 4 +- 7 files changed, 21 insertions(+), 184 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 3