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

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

branch feature/6855 updated (11dd926 -> 8980667)
by codelutin.com scm 06 Apr '15

06 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 from 11dd926 refs #6855: debut d'interface graphique new 689034b ajout d'une validation sur le pays d'un balise new bcac9e7 correction du warning sur le nombre d'équipements d'une marée seine new 260d44f correction du calcul des données dans le contexte new 1664d37 pouvoir decorer les propriétés avec un autre prefixe + passage en méthode statique new 3d4f947 utilisation de clefs i18n specifiques pour les noeuds de l'arbre de navigation new cdd899d refs #6855 ecran autonome pour les equipements d'une marée seine new 8980667 i18n 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 8980667643dcc4611476b8be71ecf16a2291e961 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 6 19:15:39 2015 +0200 i18n commit cdd899d012cdba13e24f0d6c964b66578e18f17a 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 3d4f9474df76450f1330ce36ea6b31489990447d 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 1664d3772fa039966e31ab1355174aa22242349a 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 260d44f71caf77ed52a45db4040df86cfba3aa75 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 bcac9e7aeab21eea1ce56fd54b4ecddee564cffc 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 689034ba2c39fde6421e8605a9a09369c0ab1df0 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 Summary of changes: .../fr/ird/observe/ConsolidateDataService.java | 4 +- .../src/main/java/fr/ird/observe/DataService.java | 2 +- .../main/java/fr/ird/observe/DecoratorService.java | 31 +- .../main/java/fr/ird/observe/db/DataContext.java | 104 ++++++- .../java/fr/ird/observe/db/ReplicationService.java | 2 +- .../ird/observe/db/constants/DataContextType.java | 36 +-- .../i18n/observe-business_en_GB.properties | 1 + .../i18n/observe-business_es_ES.properties | 1 + .../i18n/observe-business_fr_FR.properties | 1 + .../java/fr/ird/observe/entities/Entities.java | 8 + .../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 | 15 +- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 311 ++++++++++----------- .../open/impl/seine/TripSeineUIHandler.java | 76 ----- .../content/open/impl/seine/TripSeineUIModel.java | 53 ---- .../ui/content/ref/ContentReferenceUIHandler.java | 8 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 12 +- .../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 | 115 ++++++-- .../resources/i18n/observe-swing_es_ES.properties | 118 ++++++-- .../resources/i18n/observe-swing_fr_FR.properties | 116 ++++++-- ...TransmittingBuoy-n1-update-error-validation.xml | 12 + ...1-update-gearUseFeatures-warning-validation.xml | 2 +- .../i18n/observe-validation_en_GB.properties | 4 + .../i18n/observe-validation_es_ES.properties | 4 + .../i18n/observe-validation_fr_FR.properties | 7 +- 51 files changed, 819 insertions(+), 583 deletions(-) -- 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 (643ee6d -> 8946a1d)
by codelutin.com scm 06 Apr '15

06 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 643ee6d fixes #6704: LL/PS - Libellé des marées dans l'arbre new 5e5dc08 add .gitignore new 4165eb4 passage sous git et utilisation de codelutinpom new cb365f6 refs #6904 correction de la disposition new 8946a1d fixes #6904: Mauvais disposition sur l'écran des activités senne Merge branch 'feature/6904' 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 8946a1dd033b96ad62fe88359939403122bf81e1 Merge: 4165eb4 cb365f6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 6 20:32:11 2015 +0200 fixes #6904: Mauvais disposition sur l'écran des activités senne Merge branch 'feature/6904' into develop commit cb365f6a7e4c3fed85d23c894543477e7e772740 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 6 20:31:59 2015 +0200 refs #6904 correction de la disposition commit 4165eb4c3f1db2c76eee4efbd251695efbefba99 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 6 20:21:18 2015 +0200 passage sous git et utilisation de codelutinpom commit 5e5dc0895d07b4b378104be6e10e74a9e37ab546 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 6 20:14:17 2015 +0200 add .gitignore Summary of changes: .gitignore | 12 ++++++ .../content/open/impl/seine/ActivitySeineUI.jaxx | 6 +-- pom.xml | 34 ++++++--------- src/site/site_fr.xml | 48 +++++++--------------- 4 files changed, 42 insertions(+), 58 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 4

branch feature/6855 created (now 11dd926)
by codelutin.com scm 05 Apr '15

05 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 at 11dd926 refs #6855: debut d'interface graphique This branch includes the following new commits: new ab86358 refs #6855: add referentials new 1c1665e refs #6855: add seine gear data + remove old seine data new 5f2ad23 refs #6855: add seine gear data + remove old seine data new efa7bed refs #6855: ajout données equipements pour la seine des traductions + correction du la dll new 4b99b40 refs #6855: pas possible d'avoir des not-null sur les relations inverses new 11dd926 refs #6855: debut d'interface graphique 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 11dd92678a337419ec7a2b990fb14c5ca58fae44 Author: Tony Chemit <chemit(a)codelutin.com> Date: Tue Mar 24 16:39:13 2015 +0000 refs #6855: debut d'interface graphique commit 4b99b40d36ce0e313735e97132e1caa6733cefd4 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 efa7bedad905451378db7f818272942041613674 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 5f2ad2349e01fb5c084352224d63684b6a8830ee 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 1c1665e89aad038a00d5ffb37c288aa2f0c2da53 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 ab863584ff97731d81fceb99da4c898e58766cde Author: Tony Chemit <chemit(a)codelutin.com> Date: Mon Mar 23 19:14:21 2015 +0000 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 6

branch develop updated (11dd926 -> 643ee6d)
by codelutin.com scm 05 Apr '15

05 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 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 This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/develop (643ee6d) \ O -- O -- O (11dd926) Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: .../main/java/fr/ird/observe/DecoratorService.java | 9 - .../main/java/fr/ird/observe/db/DataContext.java | 4 - .../i18n/observe-business_en_GB.properties | 3 - .../i18n/observe-business_es_ES.properties | 3 - .../i18n/observe-business_fr_FR.properties | 3 - .../java/fr/ird/observe/entities/Entities.java | 40 ++- .../migration/AbstractDataSourceMigration.java | 4 +- .../DataSourceMigrationForVersion_3_16.java | 139 --------- .../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 35711 -> 33078 bytes .../src/main/xmi/observe-longline.properties | 4 +- .../src/main/xmi/observe-seine.properties | 8 +- observe-entities/src/main/xmi/observe-seine.zargo | Bin 85926 -> 82186 bytes .../ui/content/open/impl/seine/TripSeineUI.css | 35 ++- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 345 +++++++++++---------- .../open/impl/seine/TripSeineUIHandler.java | 31 +- .../content/open/impl/seine/TripSeineUIModel.java | 10 +- .../content/ref/impl/GearCaracteristicTypeUI.jaxx | 162 ---------- .../ref/impl/GearCaracteristicTypeUIModel.java | 20 -- .../ui/content/ref/impl/GearCaracteristicUI.css | 42 --- .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 186 ----------- .../content/ref/impl/GearCaracteristicUIModel.java | 27 -- .../fr/ird/observe/ui/content/ref/impl/GearUI.css | 49 --- .../fr/ird/observe/ui/content/ref/impl/GearUI.jaxx | 196 ------------ .../observe/ui/content/ref/impl/GearUIHandler.java | 82 ----- .../observe/ui/content/ref/impl/GearUIModel.java | 70 ----- .../ui/content/table/ContentTableUIHandler.java | 8 +- .../table/impl/seine/GearUseFeaturesSeineUI.css | 61 ---- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 135 -------- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 174 ----------- .../impl/seine/GearUseFeaturesSeineUIModel.java | 79 ----- .../resources/i18n/observe-swing_en_GB.properties | 47 +-- .../resources/i18n/observe-swing_es_ES.properties | 48 --- .../resources/i18n/observe-swing_fr_FR.properties | 56 +--- .../Gear-n1-create-error-validation.xml | 75 ----- .../Gear-n1-create-warning-validation.xml | 67 ---- .../Gear-n1-update-error-validation.xml | 75 ----- .../Gear-n1-update-warning-validation.xml | 67 ---- ...earCaracteristic-n1-create-error-validation.xml | 90 ------ ...rCaracteristic-n1-create-warning-validation.xml | 67 ---- ...earCaracteristic-n1-update-error-validation.xml | 90 ------ ...rCaracteristic-n1-update-warning-validation.xml | 67 ---- ...aracteristicType-n1-create-error-validation.xml | 75 ----- ...acteristicType-n1-create-warning-validation.xml | 67 ---- ...aracteristicType-n1-update-error-validation.xml | 75 ----- ...acteristicType-n1-update-warning-validation.xml | 67 ---- ...UseFeaturesSeine-n1-update-error-validation.xml | 46 --- .../TripSeine-n1-create-warning-validation.xml | 39 +++ ...1-update-gearUseFeatures-warning-validation.xml | 41 --- .../TripSeine-n1-update-warning-validation.xml | 40 +++ .../i18n/observe-validation_en_GB.properties | 5 +- .../i18n/observe-validation_es_ES.properties | 5 +- .../i18n/observe-validation_fr_FR.properties | 8 +- .../validation/BeanValidatorDetectorTest.java | 16 +- 60 files changed, 371 insertions(+), 3078 deletions(-) delete mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java delete mode 100644 observe-entities/src/main/resources/db/3.16/add-gear-data-H2.sql delete mode 100644 observe-entities/src/main/resources/db/3.16/add-gear-data-PG.sql delete mode 100644 observe-entities/src/main/resources/db/3.16/add-gear-referential-H2.sql delete mode 100644 observe-entities/src/main/resources/db/3.16/add-gear-referential-PG.sql delete mode 100644 observe-entities/src/main/resources/db/3.16/remove-tripSeine-seine-H2.sql delete mode 100644 observe-entities/src/main/resources/db/3.16/remove-tripSeine-seine-PG.sql delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicTypeUIModel.java delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.css delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.jaxx delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUIModel.java delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.css delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.jaxx delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIHandler.java delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIModel.java delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.css delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIModel.java delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-error-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-warning-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-update-error-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-update-warning-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-error-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-warning-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-update-error-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-update-warning-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-error-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-warning-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-error-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-warning-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/seine/GearUseFeaturesSeine-n1-update-error-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-gearUseFeatures-warning-validation.xml -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch observe-3.1.2 deleted (was f322741)
by codelutin.com scm 05 Apr '15

05 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch observe-3.1.2 in repository observe. See http://git.codelutin.com/observe.git was f322741 [maven-release-plugin] prepare for next development iteration This change permanently discards the following revisions: discards f322741 [maven-release-plugin] prepare for next development iteration -- 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 (11dd926 -> fcb6456)
by codelutin.com scm 05 Apr '15

05 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 omits 11dd926 refs #6855: debut d'interface graphique omits 4b99b40 refs #6855: pas possible d'avoir des not-null sur les relations inverses omits efa7bed refs #6855: ajout données equipements pour la seine des traductions + correction du la dll omits 5f2ad23 refs #6855: add seine gear data + remove old seine data omits 1c1665e refs #6855: add seine gear data + remove old seine data omits ab86358 refs #6855: add referentials omits 643ee6d fixes #6704: LL/PS - Libellé des marées dans l'arbre omits f508dcb [maven-release-plugin] prepare for next development iteration adds fcb6456 [maven-release-plugin] copy for tag observe-3.15.1 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 (11dd926) \ N -- N -- N refs/heads/master (fcb6456) 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. No new revisions were added by this update. Summary of changes: observe-business/pom.xml | 2 +- .../main/java/fr/ird/observe/DecoratorService.java | 9 - .../main/java/fr/ird/observe/db/DataContext.java | 4 - .../fr/ird/observe/decorator/TripDecorator.java | 2 +- .../ird/observe/decorator/TripSeineDecorator.java | 2 +- .../i18n/observe-business_en_GB.properties | 3 - .../i18n/observe-business_es_ES.properties | 3 - .../i18n/observe-business_fr_FR.properties | 3 - observe-entities/pom.xml | 2 +- .../java/fr/ird/observe/entities/Entities.java | 40 ++- .../migration/AbstractDataSourceMigration.java | 4 +- .../DataSourceMigrationForVersion_3_16.java | 139 --------- .../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 35711 -> 33078 bytes .../src/main/xmi/observe-longline.properties | 4 +- .../src/main/xmi/observe-seine.properties | 8 +- observe-entities/src/main/xmi/observe-seine.zargo | Bin 85926 -> 82186 bytes observe-swing/pom.xml | 2 +- .../ui/content/open/impl/seine/TripSeineUI.css | 35 ++- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 345 +++++++++++---------- .../open/impl/seine/TripSeineUIHandler.java | 31 +- .../content/open/impl/seine/TripSeineUIModel.java | 10 +- .../content/ref/impl/GearCaracteristicTypeUI.jaxx | 162 ---------- .../ref/impl/GearCaracteristicTypeUIModel.java | 20 -- .../ui/content/ref/impl/GearCaracteristicUI.css | 42 --- .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 186 ----------- .../content/ref/impl/GearCaracteristicUIModel.java | 27 -- .../fr/ird/observe/ui/content/ref/impl/GearUI.css | 49 --- .../fr/ird/observe/ui/content/ref/impl/GearUI.jaxx | 196 ------------ .../observe/ui/content/ref/impl/GearUIHandler.java | 82 ----- .../observe/ui/content/ref/impl/GearUIModel.java | 70 ----- .../ui/content/table/ContentTableUIHandler.java | 8 +- .../table/impl/seine/GearUseFeaturesSeineUI.css | 61 ---- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 135 -------- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 174 ----------- .../impl/seine/GearUseFeaturesSeineUIModel.java | 79 ----- .../resources/i18n/observe-swing_en_GB.properties | 47 +-- .../resources/i18n/observe-swing_es_ES.properties | 48 --- .../resources/i18n/observe-swing_fr_FR.properties | 56 +--- observe-validation/pom.xml | 2 +- .../Gear-n1-create-error-validation.xml | 75 ----- .../Gear-n1-create-warning-validation.xml | 67 ---- .../Gear-n1-update-error-validation.xml | 75 ----- .../Gear-n1-update-warning-validation.xml | 67 ---- ...earCaracteristic-n1-create-error-validation.xml | 90 ------ ...rCaracteristic-n1-create-warning-validation.xml | 67 ---- ...earCaracteristic-n1-update-error-validation.xml | 90 ------ ...rCaracteristic-n1-update-warning-validation.xml | 67 ---- ...aracteristicType-n1-create-error-validation.xml | 75 ----- ...acteristicType-n1-create-warning-validation.xml | 67 ---- ...aracteristicType-n1-update-error-validation.xml | 75 ----- ...acteristicType-n1-update-warning-validation.xml | 67 ---- ...UseFeaturesSeine-n1-update-error-validation.xml | 46 --- .../TripSeine-n1-create-warning-validation.xml | 39 +++ ...1-update-gearUseFeatures-warning-validation.xml | 41 --- .../TripSeine-n1-update-warning-validation.xml | 40 +++ .../i18n/observe-validation_en_GB.properties | 5 +- .../i18n/observe-validation_es_ES.properties | 5 +- .../i18n/observe-validation_fr_FR.properties | 8 +- .../validation/BeanValidatorDetectorTest.java | 16 +- pom.xml | 8 +- 67 files changed, 381 insertions(+), 3088 deletions(-) delete mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java delete mode 100644 observe-entities/src/main/resources/db/3.16/add-gear-data-H2.sql delete mode 100644 observe-entities/src/main/resources/db/3.16/add-gear-data-PG.sql delete mode 100644 observe-entities/src/main/resources/db/3.16/add-gear-referential-H2.sql delete mode 100644 observe-entities/src/main/resources/db/3.16/add-gear-referential-PG.sql delete mode 100644 observe-entities/src/main/resources/db/3.16/remove-tripSeine-seine-H2.sql delete mode 100644 observe-entities/src/main/resources/db/3.16/remove-tripSeine-seine-PG.sql delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicTypeUIModel.java delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.css delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.jaxx delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUIModel.java delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.css delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.jaxx delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIHandler.java delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIModel.java delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.css delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIModel.java delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-error-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-warning-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-update-error-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-update-warning-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-error-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-warning-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-update-error-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-update-warning-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-error-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-warning-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-error-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-warning-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/seine/GearUseFeaturesSeine-n1-update-error-validation.xml delete mode 100644 observe-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-gearUseFeatures-warning-validation.xml -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0