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

branch develop updated (af70d9e -> 6281818)
by codelutin.com scm 15 Apr '15

15 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 af70d9e refs #6970 Ajout d'un message utilisateur si une liste d'espèce n'a pas pu être chargée new 6281818 refs #6963 Ajout d'un message utilisateur si une liste d'espèce n'a pas pu être chargée 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 (af70d9e) \ N -- N -- N refs/heads/develop (6281818) 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 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 62818186b96b78f96498d791b602f6d540a5b24e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 15 18:11:19 2015 +0200 refs #6963 Ajout d'un message utilisateur si une liste d'espèce n'a pas pu être chargée Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch develop updated (68bcb13 -> af70d9e)
by codelutin.com scm 15 Apr '15

15 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 68bcb13 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 783b02a refs #6963 Ajout d'un binder sur les SpeciesList new 8236694 fixes #6963: Problème technique lors de la synchro de référentiel central -> local, lorsqu'une entité a été ajoutée à une display list d'espèces Merge branch 'feature/6963' into develop new af70d9e refs #6970 Ajout d'un message utilisateur si une liste d'espèce n'a pas pu être chargée 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 af70d9e750b9474fb3d213bc9dc2e07b54616868 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 15 18:11:19 2015 +0200 refs #6970 Ajout d'un message utilisateur si une liste d'espèce n'a pas pu être chargée commit 8236694c13754c9b7a2ddca47adc10e3bd61a4e7 Merge: 68bcb13 783b02a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 15 16:45:27 2015 +0200 fixes #6963: Problème technique lors de la synchro de référentiel central -> local, lorsqu'une entité a été ajoutée à une display list d'espèces Merge branch 'feature/6963' into develop commit 783b02a33d66a80e0b8082d7e01c30cea8fa8d0f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 15 16:45:23 2015 +0200 refs #6963 Ajout d'un binder sur les SpeciesList Summary of changes: .../fr/ird/observe/ObserveApplicationContext.java | 9 +++++++++ .../ui/content/table/ContentTableUIHandler.java | 23 ++++++++++++++++++++-- .../impl/longline/CatchLonglineUIHandler.java | 4 ++-- .../table/impl/longline/EncounterUIHandler.java | 2 +- .../content/table/impl/longline/TdrUIHandler.java | 2 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 2 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 4 ++-- .../table/impl/seine/TargetCatchUIHandler.java | 3 ++- .../impl/seine/TargetDiscardCatchUIHandler.java | 2 +- .../resources/i18n/observe-swing_en_GB.properties | 7 +++++++ .../resources/i18n/observe-swing_es_ES.properties | 7 +++++++ .../resources/i18n/observe-swing_fr_FR.properties | 7 +++++++ 12 files changed, 61 insertions(+), 11 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 release/4.0-RC2 deleted (was 40f1c32)
by codelutin.com scm 11 Apr '15

11 Apr '15

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

1 0

branch develop updated (0f672e6 -> 68bcb13)
by codelutin.com scm 11 Apr '15

11 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 0f672e6 [jgitflow-maven-plugin]updating poms for 4.0-RC3-SNAPSHOT development new 866219a [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 41c4614 prepare release (add license headers) new fc9b92b [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC2' with non-snapshot versions new 9796dcf Merge branch 'release/4.0-RC2' new ed99710 prepare release (add license headers) new 40f1c32 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC2' with non-snapshot versions new 2b2c42d Merge branch 'release/4.0-RC2' new 72573b7 Merge branch 'master' into develop new 68bcb13 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 9 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 68bcb1325d74d994e589906437cc21b808d82320 Author: Maven Release <maven-release(a)codelutin.com> Date: Sat Apr 11 09:07:22 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 72573b7431eb0ddd5882b0b4ff194132cb553e1c Merge: 866219a 2b2c42d Author: Maven Release <maven-release(a)codelutin.com> Date: Sat Apr 11 09:07:21 2015 +0000 Merge branch 'master' into develop commit 866219a8144de891bc586c83ac217fc4b3a1a43a Author: Maven Release <maven-release(a)codelutin.com> Date: Sat Apr 11 09:07:20 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 2b2c42dab27a4bb29ccf06947ea6e67a8b4a57c3 Merge: 9796dcf 40f1c32 Author: Maven Release <maven-release(a)codelutin.com> Date: Sat Apr 11 09:07:17 2015 +0000 Merge branch 'release/4.0-RC2' commit 40f1c32cdebb2fcf0ba0c883ac45b653cf9308f3 Author: Maven Release <maven-release(a)codelutin.com> Date: Sat Apr 11 09:02:08 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC2' with non-snapshot versions commit ed9971037a12e3439381ff007aec469c79dfc142 Author: Maven Release <maven-release(a)codelutin.com> Date: Sat Apr 11 09:01:46 2015 +0000 prepare release (add license headers) commit 9796dcfaa24bbab11ff957ba6b9ba66b8a52d9e1 Merge: a723a7c fc9b92b Author: Maven Release <maven-release(a)codelutin.com> Date: Sat Apr 11 08:26:33 2015 +0000 Merge branch 'release/4.0-RC2' commit fc9b92bc8510603c572966c0809425bbef8b3d0b Author: Maven Release <maven-release(a)codelutin.com> Date: Sat Apr 11 08:22:15 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC2' with non-snapshot versions commit 41c4614232fec595a74260f1f477f45a8db255cf Author: Maven Release <maven-release(a)codelutin.com> Date: Sat Apr 11 08:22:00 2015 +0000 prepare release (add license headers) Summary of changes: .../entities/longline/ActivityLonglineDAOImpl.java | 22 +++++++++++++++++++++ .../DataSourceMigrationForVersion_4_0_RC2.java | 22 +++++++++++++++++++++ .../entities/referentiel/ProgramDAOImpl.java | 22 +++++++++++++++++++++ .../entities/seine/ActivitySeineDAOImpl.java | 22 +++++++++++++++++++++ .../entities/seine/FloatingObjectDAOImpl.java | 22 +++++++++++++++++++++ .../ird/observe/entities/seine/RouteDAOImpl.java | 22 +++++++++++++++++++++ .../db/4.0-RC2/clean-program-gear-type-H2.sql | 21 ++++++++++++++++++++ .../db/4.0-RC2/clean-program-gear-type-PG.sql | 23 +++++++++++++++++++++- .../ird/observe/ui/tree/ActivityLonglineNode.java | 22 +++++++++++++++++++++ .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 22 +++++++++++++++++++++ .../fr/ird/observe/ui/tree/EntityNodeSupport.java | 22 +++++++++++++++++++++ .../observe/ui/tree/FloatingObjectSeineNode.java | 22 +++++++++++++++++++++ .../ird/observe/ui/tree/ProgramLonglineNode.java | 22 +++++++++++++++++++++ .../fr/ird/observe/ui/tree/ProgramSeineNode.java | 22 +++++++++++++++++++++ .../fr/ird/observe/ui/tree/RouteSeineNode.java | 22 +++++++++++++++++++++ .../fr/ird/observe/ui/tree/SetLonglineNode.java | 22 +++++++++++++++++++++ .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 22 +++++++++++++++++++++ .../fr/ird/observe/ui/tree/TripLonglineNode.java | 22 +++++++++++++++++++++ .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 22 +++++++++++++++++++++ 19 files changed, 417 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 9

annotated tag observe-4.0-RC2 created (now fa75b56)
by codelutin.com scm 11 Apr '15

11 Apr '15

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

1 0

branch release/4.0-RC2 updated (ce89019 -> 40f1c32)
by codelutin.com scm 11 Apr '15

11 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-RC2 in repository observe. See http://git.codelutin.com/observe.git from ce89019 refs #6934 mise à jour du topiaversion adds ed99710 prepare release (add license headers) adds 40f1c32 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC2' with non-snapshot versions No new revisions were added by this update. Summary of changes: observe-business/pom.xml | 2 +- observe-entities/pom.xml | 2 +- .../entities/longline/ActivityLonglineDAOImpl.java | 22 ++++++++++++++++++++++ .../DataSourceMigrationForVersion_4_0_RC2.java | 22 ++++++++++++++++++++++ .../entities/referentiel/ProgramDAOImpl.java | 22 ++++++++++++++++++++++ .../entities/seine/ActivitySeineDAOImpl.java | 22 ++++++++++++++++++++++ .../entities/seine/FloatingObjectDAOImpl.java | 22 ++++++++++++++++++++++ .../ird/observe/entities/seine/RouteDAOImpl.java | 22 ++++++++++++++++++++++ .../db/4.0-RC2/clean-program-gear-type-H2.sql | 21 +++++++++++++++++++++ .../db/4.0-RC2/clean-program-gear-type-PG.sql | 21 +++++++++++++++++++++ observe-swing/pom.xml | 2 +- .../ird/observe/ui/tree/ActivityLonglineNode.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/ui/tree/EntityNodeSupport.java | 22 ++++++++++++++++++++++ .../observe/ui/tree/FloatingObjectSeineNode.java | 22 ++++++++++++++++++++++ .../ird/observe/ui/tree/ProgramLonglineNode.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/ui/tree/ProgramSeineNode.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/ui/tree/RouteSeineNode.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/ui/tree/SetLonglineNode.java | 22 ++++++++++++++++++++++ .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 22 ++++++++++++++++++++++ .../fr/ird/observe/ui/tree/TripLonglineNode.java | 22 ++++++++++++++++++++++ .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 22 ++++++++++++++++++++++ observe-validation/pom.xml | 2 +- pom.xml | 2 +- 24 files changed, 421 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch master updated (a723a7c -> 2b2c42d)
by codelutin.com scm 11 Apr '15

11 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch master in repository observe. See http://git.codelutin.com/observe.git from a723a7c Merge branch 'release/4.0-RC1' adds 3598cb3 [jgitflow-maven-plugin]updating poms for 4.0-RC2-SNAPSHOT development adds 83abb77 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 3d38290 Merge branch 'master' into develop adds 4baf239 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 569c1fb fix site configuration adds f2b1378 refs #6921: Mauvais libéllé lors de la création d'une base distante adds dc617b2 refs #6919 (possibilité d'avoir la source en cours de création) adds c24bd6b refs #6920: Ne pas supprimer le schméma public adds 83cadbe refs #6922 topia 2.9.5 corrige le problème adds e6c1bde refs #6923 Ajout de dbHost et dbPort dans le script adds 9f25408 refs #6913 modification du fichier des rapports adds d619408 refs #6914 ajouts de méthodes de récupération des entitiés pour la décoration de l'arbre et des listes adds 1e65cb0 refs #6914 ajout d'un decorateur pour TripLongline et suppression de celui Trip adds 6460fbd refs #6914 Ajout dans le modèle de sélection de l'arbre d'un cache d'entités utilisées pour le construire adds 894d747 refs #6914 Ajout d'un cache d'entité chargée dans les noeuds de l'arbre de navigation + ne pas accéder à la datasource depuis le renderer adds 08bde7b refs #6914 utilisation des listes simplfiées aussi dans les écrans de liste adds 3c6245c refs #6914 suppression d'un chargeur de noeud par association (trop couteux) adds 7e2a04d refs 6934 ajout d'une migration 4.0-RC2 adds bd6b92f ne pas faire de migration lors des tests adds 92410cf fix site configuration adds a036248 refs #6921: Mauvais libéllé lors de la création d'une base distante adds 9c79c44 fixes #6921: Mauvais libéllé lors de la création d'une base distante Merge branch 'feature/6921' into develop adds 54c2925 refs #6919 (possibilité d'avoir la source en cours de création) adds bc47e51 fixes #6919: Problème de création de base distante (avec recopie de données) Merge branch 'feature/6919' into develop adds 5c79e02 refs #6920: Ne pas supprimer le schméma public adds 900b718 fixes #6920: Problème de création d'une nouvelle base (suppression schéma public) Merge branch 'feature/6920' into develop adds 57e9f55 refs #6922 topia 2.9.5 corrige le problème adds bb72058 fixes #6922: Problème de création d'une nouvelle base (table tms_version non créée) Merge branch 'feature/6922' into develop adds 8705801 refs #6923 Ajout de dbHost et dbPort dans le script adds be1457d fixes #6923: Amélioration du script apply-extra.sh Merge branch 'feature/6923' into develop adds f3c07de refs #6913 modification du fichier des rapports adds 43448a9 fixes #6913: Inclure ce fichier observe-report.properties dans la 4.0 RC2 Merge branch 'feature/6913' into develop adds e6018f0 refs #6914 ajouts de méthodes de récupération des entitiés pour la décoration de l'arbre et des listes adds cbfc737 refs #6914 ajout d'un decorateur pour TripLongline et suppression de celui Trip adds 93826a7 refs #6914 Ajout dans le modèle de sélection de l'arbre d'un cache d'entités utilisées pour le construire adds 4289e1e refs #6914 Ajout d'un cache d'entité chargée dans les noeuds de l'arbre de navigation + ne pas accéder à la datasource depuis le renderer adds 0fd01fa refs #6914 utilisation des listes simplfiées aussi dans les écrans de liste adds 1be23f3 refs #6914 suppression d'un chargeur de noeud par association (trop couteux) adds 7b0afb8 fixes #6914: Amélioration des temps d'ouverture de l'arbre de navigation Merge branch 'feature/6914' into develop adds 46a27f1 refs #6933 ajout de getOcean sur le contrat de Trip adds b8f6625 refs #6933 Pouvoir récuperer tous les marées adds 04196f9 refs #6933 Récuperation de toutes les marees + utilisation des deux type de marees adds eeab0f2 fixes #6933: bug à l'exportation données vers base centrale Merge branch 'feature/6933' into develop adds 9022064 ajout base pour tests de la dernière migration adds e36da41 refs #6937 utilisation de topia 2.9.5.1 (corrige le problème des suppressions d'associations) adds 0025d45 refs #6937 modification de la relation dans le modèle adds 39432f2 fixes #6937: Problème lors de la synchronisation des référentiels Merge branch 'feature/6937' into develop adds 39b6abd refs #6939 suppression de la case à cocher qui correspondait à l'import access adds 677db7b fixes #6939: Une case à cocher est toujours présente mais sans libellé dans les actions Merge branch 'feature/6939' into develop adds 4038961 refs #6938 on rattache le program a sa maree dans le modele de selection adds f745d40 refs #6938 Suppression de méthodes sur les dao (on utilise le chargement via le modèle de sélection) + ajout de méthode pour supprimer une marée adds e359dc6 refs #6938 Utilisation du modèel de sélection pour obtenir les marées existantes sur la base distante + nettoyage du code adds 0b850cd refs #6938 simplification et amélioration du code d'export de marées adds 2ccfb51 fixes #6938: [ObServeLL] Revue de la fonctionnalité d'export de marée Merge branch 'feature/6938' into develop adds 41c4614 prepare release (add license headers) adds fc9b92b [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC2' with non-snapshot versions adds 9796dcf Merge branch 'release/4.0-RC2' adds ce89019 refs #6934 mise à jour du topiaversion adds ed99710 prepare release (add license headers) adds 40f1c32 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC2' with non-snapshot versions adds 2b2c42d Merge branch 'release/4.0-RC2' No new revisions were added by this update. Summary of changes: observe-business/pom.xml | 2 +- .../src/main/filters/observe-reports.properties | 20 +- .../src/main/java/fr/ird/observe/DataService.java | 441 +++++++++++++++++---- .../main/java/fr/ird/observe/DecoratorService.java | 6 +- .../java/fr/ird/observe/db/ReplicationService.java | 17 +- .../ird/observe/db/model/DataSelectionModel.java | 32 +- .../java/fr/ird/observe/db/util/PGInstall.java | 8 +- ...ipDecorator.java => TripLonglineDecorator.java} | 21 +- .../replication/H2LonglineReplicateDataTest.java | 2 +- .../test/resources/db/4.0-RC2/referentiel.sql.gz | Bin 0 -> 138115 bytes observe-entities/pom.xml | 2 +- .../main/java/fr/ird/observe/entities/Trip.java | 3 + .../ird/observe/entities/constants/GearType.java | 11 + .../entities/constants/ReferenceLocale.java | 34 ++ .../entities/longline/ActivityLonglineDAOImpl.java | 140 +++++++ .../entities/longline/TripLonglineDAOImpl.java | 137 ++++++- .../migration/AbstractDataSourceMigration.java | 3 +- ... => DataSourceMigrationForVersion_4_0_RC2.java} | 55 ++- .../entities/referentiel/ProgramDAOImpl.java | 123 ++++++ .../entities/referentiel/ReferenceEntities.java | 1 + .../entities/seine/ActivitySeineDAOImpl.java | 141 +++++++ .../entities/seine/FloatingObjectDAOImpl.java | 124 ++++++ .../ird/observe/entities/seine/RouteDAOImpl.java | 115 ++++++ .../observe/entities/seine/TripSeineDAOImpl.java | 135 ++++++- .../clean-program-gear-type-H2.sql} | 7 +- .../clean-program-gear-type-PG.sql} | 8 +- .../src/main/xmi/observe-common.properties | 2 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-longline.zargo | Bin 93859 -> 93860 bytes .../src/main/xmi/observe-seine.properties | 2 +- observe-swing/pom.xml | 2 +- .../assembly/dist/obstuna-admin/apply-extra.sh | 14 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 6 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 127 +++--- .../fr/ird/observe/ui/admin/config/ConfigUI.jaxx | 6 - .../ui/admin/consolidate/ConsolidateUIHandler.java | 26 +- .../ird/observe/ui/admin/export/ExportModel.java | 86 +++- .../observe/ui/admin/export/ExportUIHandler.java | 158 ++------ .../fr/ird/observe/ui/admin/export/TripEntry.java | 53 +-- .../ui/admin/export/TripToExportTableModel.java | 29 +- .../ird/observe/ui/content/ContentUIHandler.java | 5 +- .../impl/longline/SetLonglineUIHandler.java | 3 +- .../impl/seine/FloatingObjectUIHandler.java | 3 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 3 +- .../impl/longline/ActivityLonglinesUIHandler.java | 16 +- .../list/impl/longline/TripLonglinesUIHandler.java | 10 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 16 +- .../content/list/impl/seine/RoutesUIHandler.java | 12 +- .../list/impl/seine/TripSeinesUIHandler.java | 10 +- .../ui/content/open/ContentOpenableUIHandler.java | 28 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 3 +- .../ird/observe/ui/storage/tabs/ConfigDataUI.css | 4 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 41 +- .../ActivityLonglineNode.java} | 26 +- .../ActivitySeineNode.java} | 26 +- .../fr/ird/observe/ui/tree/EntityNodeSupport.java | 168 ++++++++ .../FloatingObjectSeineNode.java} | 26 +- .../ird/observe/ui/tree/ObserveDataProvider.java | 11 + .../java/fr/ird/observe/ui/tree/ObserveNode.java | 66 +-- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 75 +++- .../ProgramLonglineNode.java} | 26 +- .../ProgramSeineNode.java} | 25 +- .../RouteSeineNode.java} | 25 +- .../SetLonglineNode.java} | 26 +- .../SetSeineNode.java} | 26 +- .../TripLonglineNode.java} | 25 +- .../TripSeineNode.java} | 25 +- .../actions/ChangeTripProgramActionListener.java | 6 +- .../AbstractAssociationNodeChildLoador.java | 68 ---- .../loadors/ActivityLonglineNodeChildLoador.java | 22 +- .../loadors/ActivityLonglinesNodeChildLoador.java | 26 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 49 ++- .../loadors/ActivitySeinesNodeChildLoador.java | 27 +- .../loadors/FloatingObjectNodeChildLoador.java | 4 +- .../loadors/ProgramLonglineNodeChildLoador.java | 12 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 14 +- .../ui/tree/loadors/RootNodeChildLoador.java | 25 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 24 +- .../tree/loadors/SetLonglineNodeChildLoador.java | 4 +- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 1 + .../resources/i18n/observe-swing_en_GB.properties | 2 + .../resources/i18n/observe-swing_es_ES.properties | 2 + .../resources/i18n/observe-swing_fr_FR.properties | 4 +- observe-validation/pom.xml | 2 +- pom.xml | 41 +- src/site/site_fr.xml | 6 +- 86 files changed, 2252 insertions(+), 918 deletions(-) rename observe-business/src/main/java/fr/ird/observe/decorator/{TripDecorator.java => TripLonglineDecorator.java} (67%) create mode 100644 observe-business/src/test/resources/db/4.0-RC2/referentiel.sql.gz create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineDAOImpl.java copy observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/{DataSourceMigrationForVersion_3_12.java => DataSourceMigrationForVersion_4_0_RC2.java} (54%) create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramDAOImpl.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineDAOImpl.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectDAOImpl.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteDAOImpl.java copy observe-entities/src/main/resources/db/{3.14/remove-hooksPerBasketCount-field-H2.sql => 4.0-RC2/clean-program-gear-type-H2.sql} (65%) copy observe-entities/src/main/resources/db/{3.14/remove-hooksPerBasketCount-field-H2.sql => 4.0-RC2/clean-program-gear-type-PG.sql} (66%) mode change 100644 => 100755 observe-swing/src/main/assembly/dist/obstuna-admin/apply-extra.sh copy observe-swing/src/main/java/fr/ird/observe/ui/{content/ref/impl/GearCaracteristicTypeUIModel.java => tree/ActivityLonglineNode.java} (53%) copy observe-swing/src/main/java/fr/ird/observe/ui/{content/ref/impl/GearCaracteristicTypeUIModel.java => tree/ActivitySeineNode.java} (54%) create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/tree/EntityNodeSupport.java copy observe-swing/src/main/java/fr/ird/observe/ui/{content/ref/impl/GearCaracteristicTypeUIModel.java => tree/FloatingObjectSeineNode.java} (54%) copy observe-swing/src/main/java/fr/ird/observe/ui/{content/ref/ReferenceHomeUIModel.java => tree/ProgramLonglineNode.java} (54%) copy observe-swing/src/main/java/fr/ird/observe/ui/{content/ref/ReferenceHomeUIModel.java => tree/ProgramSeineNode.java} (55%) copy observe-swing/src/main/java/fr/ird/observe/ui/{content/ref/impl/GearCaracteristicTypeUIModel.java => tree/RouteSeineNode.java} (61%) copy observe-swing/src/main/java/fr/ird/observe/ui/{content/ref/impl/GearCaracteristicTypeUIModel.java => tree/SetLonglineNode.java} (54%) copy observe-swing/src/main/java/fr/ird/observe/ui/{content/ref/impl/GearCaracteristicTypeUIModel.java => tree/SetSeineNode.java} (55%) copy observe-swing/src/main/java/fr/ird/observe/ui/{content/ref/impl/GearCaracteristicTypeUIModel.java => tree/TripLonglineNode.java} (59%) copy observe-swing/src/main/java/fr/ird/observe/ui/{content/ref/impl/GearCaracteristicTypeUIModel.java => tree/TripSeineNode.java} (61%) delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractAssociationNodeChildLoador.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

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

11 Apr '15

The ObServe team is pleased to announce the observe-4.0-RC2 release! Projet ObServe Documentation of the project can be found here: https://observe.codelutin.com Changes ------- Changes in this version include: New features: o Inclure ce fichier observe-report.properties dans la 4.0 RC2 Issue: 6913. Thanks to Pascal CAUQUIL. Resolved by tchemit. o Amélioration des temps d'ouverture de l'arbre de navigation Issue: 6914. Thanks to Tony Chemit. Resolved by tchemit. o Amélioration du script apply-extra.sh Issue: 6923. Thanks to Tony Chemit. Resolved by tchemit. o [ObServeLL] Revue de la fonctionnalité d'export de marée Issue: 6938. Thanks to Tony Chemit. Resolved by tchemit. Fixed Bugs: o Mauvais libéllé lors de la création d'une base distante Issue: 6921. Thanks to Tony Chemit. Resolved by tchemit. o Problème de création d'une nouvelle base (suppression schéma public) Issue: 6920. Thanks to Tony Chemit. Resolved by tchemit. o Problème de création d'une nouvelle base (table tms_version non créée) Issue: 6922. Thanks to Tony Chemit. Resolved by tchemit. o Problème de création de base distante (avec recopie de données) Issue: 6919. Thanks to Tony Chemit. Resolved by tchemit. o Problème sur la type de Program.geartype Issue: 6934. Thanks to Tony Chemit. Resolved by tchemit. o bug à l'exportation données vers base centrale Issue: 6933. Thanks to Philippe Sabarros. Resolved by pcauquil. o Problème lors de la synchronisation des référentiels Issue: 6937. Thanks to Tony Chemit. Resolved by tchemit. o Une case à cocher est toujours présente mais sans libellé dans les actions Issue: 6939. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/observe/files * observe-4.0-RC2.zip - http://forge.codelutin.com/attachments/download/3084 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -ObServe team

1 0

branch release/4.0-RC2 created (now ce89019)
by codelutin.com scm 11 Apr '15

11 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-RC2 in repository observe. See http://git.codelutin.com/observe.git at ce89019 refs #6934 mise à jour du topiaversion No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch develop updated (ce89019 -> 0f672e6)
by codelutin.com scm 11 Apr '15

11 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 ce89019 refs #6934 mise à jour du topiaversion new 0f672e6 [jgitflow-maven-plugin]updating poms for 4.0-RC3-SNAPSHOT development The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 0f672e619aebfa7f756ffa2c923adb0237b4c06c Author: Maven Release <maven-release(a)codelutin.com> Date: Sat Apr 11 08:57:04 2015 +0000 [jgitflow-maven-plugin]updating poms for 4.0-RC3-SNAPSHOT development Summary of changes: observe-business/pom.xml | 2 +- observe-entities/pom.xml | 2 +- observe-swing/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1