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

branch develop updated (8946a1d -> 3832e63)
by codelutin.com scm April 7, 2015

April 7, 2015

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 April 6, 2015

April 6, 2015

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 April 6, 2015

April 6, 2015

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 April 5, 2015

April 5, 2015

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 April 5, 2015

April 5, 2015

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 April 5, 2015

April 5, 2015

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 April 5, 2015

April 5, 2015

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

[ANN] - ObServe 3.15.1 released
by codelutin.com Release Notification March 22, 2015

March 22, 2015

The ObServe team is pleased to announce the observe-3.15.1 release! Projet ObServe Documentation of the project can be found here: http://observe.codelutin.com Changes ------- Changes in this version include: New features: o Amélioration de la migration Issue: 6851. Thanks to Tony Chemit. Resolved by tchemit. o Comportement du masque de saisie des coordonnées + ordre des boutons radio Issue: 6219. Thanks to Pascal CAUQUIL. Resolved by tchemit. Fixed Bugs: o Certaines traductions ont disparues Issue: 6850. Thanks to Tony Chemit. Resolved by tchemit. o Lorsque l'on change de quadrant, cela altère les coordonnées Issue: 6852. Thanks to Tony Chemit. Resolved by tchemit. o Ne pas ouvrir une base locale si sa version est supérieure à celle de l'application Issue: 2883. Thanks to Pascal CAUQUIL. Resolved by tchemit. o Les tableaux de synthèse PS ne fonctionnent plus Issue: 6720. Thanks to Pascal CAUQUIL. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/observe/files * observe-3.15.1.zip - http://forge.codelutin.com/attachments/download/3018 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -ObServe team

1 0

[ANN] - ObServe 3.15 released
by codelutin.com Release Notification March 19, 2015

March 19, 2015

The ObServe team is pleased to announce the observe-3.15 release! Projet ObServe Documentation of the project can be found here: http://observe.codelutin.com Changes ------- Changes in this version include: New features: o [ObserveLL] Le libellé de l'activité dans l'arbre devrait contenir sa date Issue: 6700. Thanks to Pascal CAUQUIL. Resolved by tchemit. o [ObserveLL] Formulaire Opération de pêche/Enregistreur de profondeur : déplacer des champs sur un onglet supplémentaire Issue: 6712. Thanks to Pascal CAUQUIL. Resolved by tchemit. o [ObserveLL] Changement entiers vers décimaux sur entité TDR Issue: 6713. Thanks to Pascal CAUQUIL. Resolved by tchemit. o [ObserveLL] Mise en page formulaire Opération de pêche/Composition détaillée Issue: 6715. Thanks to Pascal CAUQUIL. Resolved by tchemit. o [ObserveLL] Quelques adaptations sur le formulaire "Captures" Issue: 6719. Thanks to Pascal CAUQUIL. Resolved by tchemit. o Par défaut, replier la réglette du réglage de l'heure Issue: 6752. Thanks to Pascal CAUQUIL. Resolved by tchemit. o [ObserveLL] Formulaires Capture et TDR : présentation des 3 listes déroulante en entonoir Issue: 6751. Thanks to Pascal CAUQUIL. Resolved by tchemit. o [ObserveLL] Supprimer champs Opération de pêche / Caractéristiques / Longueur d'avançon & Longueur traceline Issue: 6754. Thanks to Pascal CAUQUIL. Resolved by tchemit. o [ObserveLL] Appliquer un warning sur Capteur utilisé / Numéro de série Issue: 6755. Thanks to Pascal CAUQUIL. Resolved by tchemit. o [ObserveLL] Persister les templates sur Opération de pêche / Définition détaillée Issue: 6760. Thanks to Pascal CAUQUIL. Resolved by tchemit. o Améliorer la gestion du focus sur les champs heure/minutes d'un horodatage Issue: 6761. Thanks to Pascal CAUQUIL. Resolved by tchemit. o [ObserveLL] Formulaire Captures : agencement des champs Issue: 6770. Thanks to Pascal CAUQUIL. Resolved by tchemit. o [ObserveLL] Formulaire Captures : afficher 3 colonnes supplémentaires dans le tableau récapitulatif des captures Issue: 6774. Thanks to Pascal CAUQUIL. Resolved by tchemit. o [ObserveLL] Formulaire Captures : Différencier le libellé du bouton "Nouveau" de celui des autres boutons "Nouveau" Issue: 6771. Thanks to Pascal CAUQUIL. Resolved by tchemit. o [ObserveLL] Formulaire Activité : Remplir la date de la première activité d'une marée Issue: 6777. Thanks to Pascal CAUQUIL. Resolved by tchemit. o Arbre de navigation : quelques améliorations Issue: 6815. Thanks to Pascal CAUQUIL. Resolved by tchemit. o [ObserveLL] Formulaire Activité/Opération de pêche/enregistreur de profondeur : permettre la nullité de l'hortadatage Issue: 6814. Thanks to Pascal CAUQUIL. Resolved by tchemit. o [ObserveLL] Quelques adaptations sur le formulaire Composition globale Issue: 6718. Thanks to Pascal CAUQUIL. Resolved by tchemit. o [ObserveLL] Formulaire Captures : ajouter un onglet qui reprend le contenu de Composition détaillée/Détail avançon Issue: 6772. Thanks to Pascal CAUQUIL. Resolved by tchemit. o [ObserveLL] Ecran composition détaillée de la palangre Issue: 6604. Thanks to Pascal CAUQUIL. Resolved by tchemit. Fixed Bugs: o [ObserveLL] La sauvegarde ne prend pas en compte les marées LL Issue: 6605. Thanks to Pascal CAUQUIL. Resolved by tchemit. o [ObserveLL] Exception sur l'enregistrement d'une activité Issue: 6603. Thanks to Pascal CAUQUIL. Resolved by tchemit. o [ObserveLL] Problème sur libellé de la marée LL dans l'arbre de navigation Issue: 6701. Thanks to Pascal CAUQUIL. Resolved by tchemit. o Localisation des captures et TDR sur la composition détaillée de la palangre/fonctionnement en entonoir des listes section/basket/branchline Issue: 6707. Thanks to Pascal CAUQUIL. Resolved by tchemit. o Ecran composition détaillée de la palangre : accès à l'onglet "Détail avançon" Issue: 6717. Thanks to Pascal CAUQUIL. Resolved by tchemit. o [ObserveLL] Le mécanisme qui pilote la valeur par défaut de branchline.timer semble ne pas fonctionner Issue: 6750. Thanks to Pascal CAUQUIL. Resolved by tchemit. o Il manque des espèces dans la combo box espèces du formulaire captures Issue: 6461. Thanks to Philippe Sabarros. Resolved by pcauquil. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/observe/files * observe-3.15.zip - http://forge.codelutin.com/attachments/download/3010 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -ObServe team

1 0

[ANN] - ObServe 3.14 released
by codelutin.com Release Notification Jan. 27, 2015

Jan. 27, 2015

The ObServe team is pleased to announce the observe-3.14 release! Projet ObServe Documentation of the project can be found here: http://observe.codelutin.com Changes ------- Changes in this version include: New features: o Amélioration ou ajout de contrôles Issue: 6499. Thanks to Tony Chemit. Resolved by tchemit. Fixed Bugs: o Lorsque toutes les tailles d'un échantillon sont supprimées, l'échantillon reste en base Issue: 6523. Thanks to Pascal CAUQUIL. Resolved by tchemit. o Mauvaise gestion des flags targetsample.discarded et targetlength.discarded Issue: 6527. Thanks to Pascal CAUQUIL. Resolved by tchemit. o Impossible d'afficher l'écran Estimation banc Issue: 6530. Thanks to Tony Chemit. Resolved by tchemit. o La migration change le type du champ activitebateau.code (et d'autres) Issue: 6483. Thanks to Pascal CAUQUIL. Resolved by tchemit. Changes: o Supprimer un champs redondant sur l'opération de pêche (LL) Issue: 6529. 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-3.14.zip - http://forge.codelutin.com/attachments/download/2801 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -ObServe team

1 0