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

branch feature/7553 updated (a79e2e3 -> 0a70a85)
by codelutin.com scm 05 Oct '15

05 Oct '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7553 in repository observe. See http://git.codelutin.com/observe.git from a79e2e3 - rustine sur le DataContextType pour la sélection du parentId dans l'arbre - fix bug de decorator (refs #7553) new 0a70a85 remove fixme 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 0a70a856774973408c236db8836d909486d74e54 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Oct 5 15:30:25 2015 +0200 remove fixme Summary of changes: .../fr/ird/observe/business/db/constants/DataContextType.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/7553 updated (f534bee -> a79e2e3)
by codelutin.com scm 05 Oct '15

05 Oct '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7553 in repository observe. See http://git.codelutin.com/observe.git from f534bee fix error new a79e2e3 - rustine sur le DataContextType pour la sélection du parentId dans l'arbre - fix bug de decorator (refs #7553) 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 a79e2e3548b3337be83832d587a0e656747e5482 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Oct 5 15:14:41 2015 +0200 - rustine sur le DataContextType pour la sélection du parentId dans l'arbre - fix bug de decorator (refs #7553) Summary of changes: .../fr/ird/observe/business/db/constants/DataContextType.java | 9 ++++++++- .../java/fr/ird/observe/ui/content/ContentUIInitializer.java | 2 +- .../main/java/fr/ird/observe/ui/content/ContentUIManager.java | 3 +++ .../src/main/java/fr/ird/observe/ui/content/ContentUIModel.java | 9 +++++++++ .../observe/ui/content/list/impl/seine/TripSeinesUIHandler.java | 2 +- 5 files changed, 22 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch develop updated (3ba428e -> f9f19a0)
by codelutin.com scm 05 Oct '15

05 Oct '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 3ba428e Retour sur develop pour pouvoir utiliser la partie ouverture de base (RAF la creation d'une base locale). Merge branch 'feature/7549' into develop new 0c38504 ajout d'un gestionnaire pour les données ouvertes (refs #7469) new bc06d62 Ajout commentaire + méthode de fermeture (qui doit être appelée à chaque fermeture de source de données) (refs #7469) new 6132465 Séparer les données PS et LL, utiliser les id en paramètres des fonctions (refs #7469) new 859931b utilisation du gestionnaire d'ouverture dans les handlers des UI (refs #7469) new 3d6dad9 Mettre les méthodes ensembles new a5c07a2 Ajout de plus de préconditions et meilleure gestion de la nullité : un identifiant est juste null ou pas mais pas vide new f9f19a0 Refs #7469, retour sur develop reste à bien fermer le gestionnaire de données ouvertes lors de la fermeture d'une source de données Merge branch 'feature/7469' into develop The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit f9f19a03f98851c3a9509f9e1b3329e2a2dc90b1 Merge: 3ba428e a5c07a2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Oct 5 15:02:40 2015 +0200 Refs #7469, retour sur develop reste à bien fermer le gestionnaire de données ouvertes lors de la fermeture d'une source de données Merge branch 'feature/7469' into develop commit a5c07a2f30ad85732c7aadc722fc5cfbe7bdd848 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Oct 5 15:02:31 2015 +0200 Ajout de plus de préconditions et meilleure gestion de la nullité : un identifiant est juste null ou pas mais pas vide commit 3d6dad9d119b58f465a12aac2dcafb5b74f4c4b9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Oct 5 14:45:37 2015 +0200 Mettre les méthodes ensembles commit 859931bed664e479974ec667e174c3e90327a6ac Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Oct 5 13:41:23 2015 +0200 utilisation du gestionnaire d'ouverture dans les handlers des UI (refs #7469) commit 613246597f7fe9157a3fc59a48a597d419d3abac Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Oct 5 12:00:47 2015 +0200 Séparer les données PS et LL, utiliser les id en paramètres des fonctions (refs #7469) commit bc06d62314e41eea22d161a85c9d60f8efc21b2b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Oct 5 11:27:20 2015 +0200 Ajout commentaire + méthode de fermeture (qui doit être appelée à chaque fermeture de source de données) (refs #7469) commit 0c3850490182189f90cecc9cce0b6ed6b5f6b3ea Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Oct 5 11:11:08 2015 +0200 ajout d'un gestionnaire pour les données ouvertes (refs #7469) Summary of changes: .../fr/ird/observe/ObserveOpenDataManager.java | 152 +++++++++++++++++++++ .../observe/ObserveSwingApplicationContext.java | 15 ++ .../ui/content/open/ContentOpenableUIHandler.java | 17 ++- .../impl/longline/ActivityLonglineUIHandler.java | 18 +++ .../open/impl/longline/TripLonglineUIHandler.java | 18 +++ .../open/impl/seine/ActivitySeineUIHandler.java | 18 +++ .../ui/content/open/impl/seine/RouteUIHandler.java | 17 ++- .../open/impl/seine/TripSeineUIHandler.java | 18 +++ 8 files changed, 264 insertions(+), 9 deletions(-) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ObserveOpenDataManager.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 7

branch feature/7469 deleted (was a5c07a2)
by codelutin.com scm 05 Oct '15

05 Oct '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7469 in repository observe. See http://git.codelutin.com/observe.git was a5c07a2 Ajout de plus de préconditions et meilleure gestion de la nullité : un identifiant est juste null ou pas mais pas vide This change permanently discards the following revisions: discards a5c07a2 Ajout de plus de préconditions et meilleure gestion de la nullité : un identifiant est juste null ou pas mais pas vide discards 3d6dad9 Mettre les méthodes ensembles discards 859931b utilisation du gestionnaire d'ouverture dans les handlers des UI (refs #7469) discards 6132465 Séparer les données PS et LL, utiliser les id en paramètres des fonctions (refs #7469) discards bc06d62 Ajout commentaire + méthode de fermeture (qui doit être appelée à chaque fermeture de source de données) (refs #7469) discards 0c38504 ajout d'un gestionnaire pour les données ouvertes (refs #7469) -- 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/7469 updated (859931b -> a5c07a2)
by codelutin.com scm 05 Oct '15

05 Oct '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7469 in repository observe. See http://git.codelutin.com/observe.git from 859931b utilisation du gestionnaire d'ouverture dans les handlers des UI (refs #7469) new 3d6dad9 Mettre les méthodes ensembles new a5c07a2 Ajout de plus de préconditions et meilleure gestion de la nullité : un identifiant est juste null ou pas mais pas vide The 2 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 a5c07a2f30ad85732c7aadc722fc5cfbe7bdd848 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Oct 5 15:02:31 2015 +0200 Ajout de plus de préconditions et meilleure gestion de la nullité : un identifiant est juste null ou pas mais pas vide commit 3d6dad9d119b58f465a12aac2dcafb5b74f4c4b9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Oct 5 14:45:37 2015 +0200 Mettre les méthodes ensembles Summary of changes: .../fr/ird/observe/ObserveOpenDataManager.java | 52 +++++++++++++++------- .../ui/content/open/impl/seine/RouteUIHandler.java | 18 ++++---- 2 files changed, 45 insertions(+), 25 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 2

branch feature/7469 updated (6132465 -> 859931b)
by codelutin.com scm 05 Oct '15

05 Oct '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7469 in repository observe. See http://git.codelutin.com/observe.git from 6132465 Séparer les données PS et LL, utiliser les id en paramètres des fonctions (refs #7469) new 859931b utilisation du gestionnaire d'ouverture dans les handlers des UI (refs #7469) 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 859931bed664e479974ec667e174c3e90327a6ac Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Oct 5 13:41:23 2015 +0200 utilisation du gestionnaire d'ouverture dans les handlers des UI (refs #7469) Summary of changes: .../ui/content/open/ContentOpenableUIHandler.java | 17 +++++++++++------ .../open/impl/longline/ActivityLonglineUIHandler.java | 18 ++++++++++++++++++ .../open/impl/longline/TripLonglineUIHandler.java | 18 ++++++++++++++++++ .../open/impl/seine/ActivitySeineUIHandler.java | 18 ++++++++++++++++++ .../ui/content/open/impl/seine/RouteUIHandler.java | 17 ++++++++++++++--- .../ui/content/open/impl/seine/TripSeineUIHandler.java | 18 ++++++++++++++++++ 6 files changed, 97 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/7553 updated (03ae345 -> f534bee)
by codelutin.com scm 05 Oct '15

05 Oct '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7553 in repository observe. See http://git.codelutin.com/observe.git from 03ae345 fix error new f534bee fix error 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 f534beee299d6ed2c5a8ddb9a70c141748cf8e49 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Oct 5 12:28:21 2015 +0200 fix error Summary of changes: .../main/java/fr/ird/observe/ObserveSwingApplicationContext.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/7553 updated (3a03a15 -> 03ae345)
by codelutin.com scm 05 Oct '15

05 Oct '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7553 in repository observe. See http://git.codelutin.com/observe.git from 3a03a15 rebase sur develop new 03ae345 fix error 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 03ae34579955ba0c0cab67812ea46661b44a9c68 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Oct 5 12:18:23 2015 +0200 fix error Summary of changes: .../src/main/java/fr/ird/observe/ui/DecoratorService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/7553 updated (7a28fd1 -> 3a03a15)
by codelutin.com scm 05 Oct '15

05 Oct '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7553 in repository observe. See http://git.codelutin.com/observe.git discards 7a28fd1 fecthEntity sur les noeuds (refs #7553) discards 2248f25 chargement des objets flottants (refs #7553) discards 148c047 fix id (refs #7553) discards 53e2380 affichage des icones des noeuds (refs #7553) discards 747f827 chargement des noeuds des routes (refs #7553) discards 58ba04b remplacement des anciens datasources par les nouveaux discards 45fa95f chargement des tripseine dans l'arbre (refs #7553) discards cf10568 chargement des programmes dans l'arbre (refs #7553) adds da72826 début d'utilisation des services dans doSave et doDelete (refs #7531) adds 48e222f utilisation des services dans doSave et doDelete adds 1301e7e début d'utilisation des services dans doSave et doDelete (refs #7531) adds 28d8c9c utilisation des services dans doSave et doDelete adds 18f6d90 Fix merge adds eb48311 appel des services pour le load et precreate (refs #7531) adds b878fd0 appel de services dans dopersist (refs #7531) adds 3f33c38 suppression des fixme (refs #7531) adds 5788fd3 utilisation des services dans getChilds des lists (refs #7531) adds a34fca2 fix tests + chargement du parent dans les listes (refs #7531) adds ed2dfa8 fix tests et compilation (ils ne passent pas mais ça compile) (refs #7531) adds 413a37a fix des services pour recuperer les stubsdto (refs #7531) adds 6cbffa6 modif d'une mauvais classe de DTO (refs #7531) adds c4b0e75 Fix merges adds 248c1f6 mise en place du générateur de text (refs #7547) adds 0e8bc21 deplacement de l'instance du generateur de text dans le context de l'application + utiliser la local de la configuration(refs #7547) adds f83390a Utiliser un moteur de template pour générer le rendu des résumés d'action (Termine #7547) Merge branch 'feature/7547' into develop adds ff31642 ajout du DTO pour les utilisateurs de la base PG (refs #7549) adds 6e20360 ajout des méthodes de service pour gérer la securité des bases PG (refs #7549) adds 34b2c0e renomage en observeDbUserDto et ajout du role d'administrator (refs #7549) adds 8ec40fe ajout du converter pour les DTO (refs #7549) adds bfcd27c migration des tâches administratives, mise ren place de la Sécurité (refs #7549) adds 600a69c miragtion des base de données (refs #7549) adds e324081 migrer une base sans l'ouvrir, verification de la version de la base local au chargement et migration si nécessaire (refs #7549) adds 3457320 verification des versions a la connection avec un serveur et a l'ouverture de la base (refs #7549) adds 6910618 adapter le rapport de connexion au base a la gestion de la sécurité (suite au rebase) (refs #7549) adds 5d38d12 rendre serializable la connexion a une source de donnees adds 61939e6 fix typo adds 9ca1de5 Renommage des méthodes qui font appels à nos listeners pour respecter la norme JavaBean adds 3ba428e Retour sur develop pour pouvoir utiliser la partie ouverture de base (RAF la creation d'une base locale). Merge branch 'feature/7549' into develop new 959a5b9 chargement des programmes dans l'arbre (refs #7553) new db9fd0a chargement des tripseine dans l'arbre (refs #7553) new 2335488 remplacement des anciens datasources par les nouveaux new 6d9b0ec chargement des noeuds des routes (refs #7553) new 18db8eb affichage des icones des noeuds (refs #7553) new beb0d83 fix id (refs #7553) new 479cfdf chargement des objets flottants (refs #7553) new 7fa02b9 fecthEntity sur les noeuds (refs #7553) new 3a03a15 rebase sur develop 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 (7a28fd1) \ N -- N -- N refs/heads/feature/7553 (3a03a15) 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 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 3a03a156bb0dd3278cc7350b4efac709514c1d49 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Oct 5 12:14:31 2015 +0200 rebase sur develop commit 7fa02b90f8153804c668df8d9bd08b54d53821aa Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Oct 5 11:32:19 2015 +0200 fecthEntity sur les noeuds (refs #7553) commit 479cfdf0f8f99b3f5ec68007e0639c1387bf3ec2 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Oct 2 11:47:19 2015 +0200 chargement des objets flottants (refs #7553) commit beb0d83b93f07af07b575fbe596b526f22a49a57 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 1 18:10:27 2015 +0200 fix id (refs #7553) commit 18db8eb4973d32f6157eb31c2884391574ca263d Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 1 15:25:50 2015 +0200 affichage des icones des noeuds (refs #7553) commit 6d9b0ec3e06e7bff34a3ae7a5e521ed12389f239 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 1 11:36:57 2015 +0200 chargement des noeuds des routes (refs #7553) commit 2335488512509a946abebd783ab462fbda0729ce Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Sep 30 16:37:41 2015 +0200 remplacement des anciens datasources par les nouveaux commit db9fd0aacb486656b364cfa915472be42386a186 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Sep 30 15:50:48 2015 +0200 chargement des tripseine dans l'arbre (refs #7553) commit 959a5b987679bdbeee4c1c85286dd7e46810ce06 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Sep 30 11:32:02 2015 +0200 chargement des programmes dans l'arbre (refs #7553) Summary of changes: observe-application-swing/pom.xml | 6 + .../main/java/fr/ird/observe/ObserveCLAction.java | 7 - .../java/fr/ird/observe/ObserveServiceHelper.java | 27 +- .../observe/ObserveSwingApplicationContext.java | 69 +++- .../java/fr/ird/observe/ObserveTextGenerator.java | 104 +++++ .../ird/observe/business/util/SecurityModel.java | 217 ---------- .../ObserveSwingApplicationConfig.java | 9 +- .../fr/ird/observe/db/ObserveSwingDataSource.java | 113 +++-- .../java/fr/ird/observe/db/constantes/DbMode.java | 2 +- .../java/fr/ird/observe/ui/DecoratorService.java | 49 +-- .../fr/ird/observe/ui/ObserveMainUIHandler.java | 9 +- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 48 +-- .../observe/ui/actions/ShowStorageInfoAction.java | 15 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 19 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 3 +- .../observe/ui/admin/report/ReportUIHandler.java | 3 +- .../ird/observe/ui/content/ContentUIHandler.java | 98 +---- .../observe/ui/content/ContentUIInitializer.java | 202 ++++----- .../ird/observe/ui/content/ContentUIManager.java | 64 +-- .../content/impl/longline/BranchlineUIHandler.java | 35 +- .../LonglineDetailCompositionUIHandler.java | 36 +- .../LonglineDetailCompositionUIInitializer.java | 4 - .../longline/LonglineDetailCompositionUIModel.java | 7 - .../impl/longline/SetLonglineUIHandler.java | 105 +++-- .../ActivitySeineObservedSystemUIHandler.java | 32 +- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 6 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 124 +++--- ...tingObjectTransmittingBuoyOperationUIModel.java | 16 +- .../impl/seine/FloatingObjectUIHandler.java | 92 ++--- .../ui/content/impl/seine/SetSeineUIHandler.java | 117 +++--- .../ui/content/list/ContentListUIHandler.java | 7 +- .../impl/longline/ActivityLonglinesUIHandler.java | 36 +- .../list/impl/longline/TripLonglinesUIHandler.java | 38 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 36 +- .../content/list/impl/seine/RoutesUIHandler.java | 35 +- .../list/impl/seine/TripSeinesUIHandler.java | 39 +- .../ui/content/open/ContentOpenableUIHandler.java | 18 +- .../impl/longline/ActivityLonglineUIHandler.java | 178 ++++---- .../open/impl/longline/TripLonglineUIHandler.java | 138 +++---- .../open/impl/seine/ActivitySeineUIHandler.java | 125 +++--- .../ui/content/open/impl/seine/RouteUIHandler.java | 164 ++++---- .../open/impl/seine/TripSeineUIHandler.java | 160 ++++---- .../ui/content/ref/ContentReferenceUIHandler.java | 242 +++++------ .../ui/content/table/ContentTableUIHandler.java | 97 ++--- .../ui/content/table/ContentTableUIModel.java | 19 +- .../table/impl/longline/BaitsCompositionUI.jaxx | 11 +- .../impl/longline/BaitsCompositionUIHandler.java | 26 +- .../impl/longline/BaitsCompositionUIModel.java | 9 +- .../impl/longline/BranchlinesCompositionUI.jaxx | 11 +- .../longline/BranchlinesCompositionUIHandler.java | 31 +- .../longline/BranchlinesCompositionUIModel.java | 8 +- .../impl/longline/CatchLonglineUIHandler.java | 30 +- .../table/impl/longline/EncounterUIHandler.java | 24 +- .../longline/FloatlinesCompositionUIHandler.java | 26 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 29 +- .../impl/longline/HooksCompositionUIHandler.java | 25 +- .../table/impl/longline/SensorUsedUIHandler.java | 21 +- .../content/table/impl/longline/TdrUIHandler.java | 21 +- .../impl/longline/WeightMeasuresTableModel.java | 5 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 29 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 20 + .../table/impl/seine/NonTargetSampleUIHandler.java | 20 + .../impl/seine/ObjectObservedSpeciesUIHandler.java | 21 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 20 + .../table/impl/seine/SchoolEstimateUIHandler.java | 20 + .../table/impl/seine/TargetCatchUIHandler.java | 21 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 50 ++- .../table/impl/seine/TargetSampleUIHandler.java | 22 + .../ird/observe/ui/storage/ObstunaAdminAction.java | 455 ++++++++++++--------- .../ird/observe/ui/storage/RemoteUILauncher.java | 48 +-- .../ird/observe/ui/storage/StorageUIHandler.java | 417 +++---------------- .../fr/ird/observe/ui/storage/StorageUIModel.java | 94 +++-- .../fr/ird/observe/ui/storage/tabs/ConfigUI.css | 5 +- .../fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx | 3 +- .../ui/storage/tabs/DataSelectionModel.java | 27 +- .../observe/ui/storage/tabs/RolesTableModel.java | 62 ++- .../fr/ird/observe/ui/storage/tabs/RolesUI.css | 2 +- .../fr/ird/observe/ui/storage/tabs/RolesUI.jaxx | 2 +- .../ird/observe/ui/storage/tabs/SecurityModel.java | 174 ++++++++ .../ui/storage/tabs/StorageTabUIHandler.java | 41 +- .../EditableTableWithCacheTableModelSupport.java | 24 +- .../observe/ui/util/tripMap/TripMapUIHandler.java | 6 +- .../main/resources/ftl/connexionTestResult_fr.ftl | 20 + .../ftl/dataSourceConnectionReport_fr.ftl | 348 ++++++++++++++++ .../resources/ftl/dataSourceInformation_fr.ftl | 54 +++ .../ftl/dataSourceSelectModeResume_fr.ftl | 40 ++ .../ftl/storageModelDataSourceConfiguration_fr.ftl | 18 + .../observe-application-swing_en_GB.properties | 6 + .../observe-application-swing_es_ES.properties | 6 + .../observe-application-swing_fr_FR.properties | 6 + .../web/ObserveWebApplicationContext.java | 6 +- .../web/ObserveWebApplicationListener.java | 3 + .../ObserveWebApplicationConfiguration.java | 10 + .../ObserveWebApplicationConfigurationOption.java | 2 + .../controller/v1/DataSourceServiceController.java | 29 +- .../web/controller/v1/PingServiceController.java | 11 +- .../v1/ReferentialServiceController.java | 4 +- .../ActivityLonglineServiceController.java | 14 +- ...LonglineGlobalCompositionServiceController.java | 4 +- .../v1/longline/SetLonglineServiceController.java | 4 +- .../v1/longline/TripLonglineServiceController.java | 9 +- ...tivitySeineObservedSystemServiceController.java | 4 +- .../v1/seine/ActivitySeineServiceController.java | 5 +- .../v1/seine/FloatingObjectServiceController.java | 4 +- .../v1/seine/NonTargetSampleServiceController.java | 4 +- .../v1/seine/RouteServiceController.java | 9 +- .../v1/seine/SetSeineServiceController.java | 4 +- .../v1/seine/TargetSampleServiceController.java | 4 +- ...TransmittingBuoyOperationServiceController.java | 4 +- .../v1/seine/TripSeineServiceController.java | 4 +- .../ObserveDtoConverter.java} | 34 +- .../web/injector/ObserveDtoInjector.java | 30 +- .../ObserveWebSecurityApplicationContext.java | 6 +- .../src/main/resources/observeweb.conf | 3 +- .../migration/AbstractDataSourceMigration.java | 61 ++- .../i18n/observe-entities_en_GB.properties | 4 - .../i18n/observe-entities_es_ES.properties | 4 - .../i18n/observe-entities_fr_FR.properties | 4 - .../services/service/BabModelVersionException.java | 34 ++ .../services/service/DataSourceService.java | 28 +- .../ird/observe/services/service/PingService.java | 5 +- .../services/service/ReferentialService.java | 2 +- .../service/longline/ActivityLonglineService.java | 13 +- .../SetLonglineGlobalCompositionService.java | 2 +- .../service/longline/SetLonglineService.java | 2 +- .../service/longline/TripLonglineService.java | 7 +- .../seine/ActivitySeineObservedSystemService.java | 2 +- .../service/seine/ActivitySeineService.java | 2 +- .../service/seine/FloatingObjectService.java | 2 +- .../service/seine/NonTargetSampleService.java | 2 +- .../services/service/seine/RouteService.java | 5 +- .../services/service/seine/SetSeineService.java | 2 +- .../service/seine/TargetSampleService.java | 2 +- .../seine/TransmittingBuoyOperationService.java | 2 +- .../services/service/seine/TripSeineService.java | 2 +- .../ObserveDataSourceConfiguration.java | 4 + .../configuration/ObserveDataSourceConnection.java | 4 +- .../ObserveDataSourceConnectionSupport.java | 2 + .../ObserveDataSourceInformation.java | 62 +++ .../ObserveDataSourceConfigurationRest.java | 17 + .../ObserveDataSourceConnectionRest.java | 2 + ...ObserveDataSourceConfigurationTopiaSupport.java | 13 + .../ObserveDataSourceConnectionTopia.java | 2 + .../observe/services/dto/ObserveDbUserDtos.java | 22 + .../services/dto/constants/ObserveDbRole.java | 14 + .../src/main/xmi/observe-services-dto-common.zargo | Bin 35328 -> 39020 bytes .../fr/ird/observe/services/TestClassResource.java | 5 + .../ird/observe/services/TestMethodResource.java | 10 +- .../service/DataSourceServiceRestTest.java | 4 +- .../service/seine/TripSeineServiceRestTest.java | 3 +- .../ObserveDataSourceConfigurationMainFactory.java | 13 +- .../fr/ird/observe/services/ObserveJdbcHelper.java | 154 +++++++ .../observe/services/ObserveSecurityHelper.java | 306 ++++++++++++++ .../services/dto/ObserveDtosInitializer.java | 10 + .../services/service/DataSourceServiceTopia.java | 141 ++++++- .../services/service/ReferentialServiceTopia.java | 6 +- .../longline/ActivityLonglineServiceTopia.java | 60 ++- .../SetLonglineGlobalCompositionServiceTopia.java | 4 +- .../service/longline/SetLonglineServiceTopia.java | 4 +- .../service/longline/TripLonglineServiceTopia.java | 40 +- .../ActivitySeineObservedSystemServiceTopia.java | 4 +- .../service/seine/ActivitySeineServiceTopia.java | 5 +- .../service/seine/FloatingObjectServiceTopia.java | 4 +- .../service/seine/NonTargetSampleServiceTopia.java | 4 +- .../services/service/seine/RouteServiceTopia.java | 40 +- .../service/seine/SetSeineServiceTopia.java | 5 +- .../service/seine/TargetSampleServiceTopia.java | 4 +- .../TransmittingBuoyOperationServiceTopia.java | 4 +- .../service/seine/TripSeineServiceTopia.java | 7 +- .../i18n/observe-services-topia_en_GB.properties | 1 + .../i18n/observe-services-topia_es_ES.properties | 1 + .../i18n/observe-services-topia_fr_FR.properties | 1 + .../services/ApplicationContextResource.java | 3 + .../ObserveDataSourceConnectionTopiaTaiste.java | 2 + .../services/service/AbstractServiceTopiaTest.java | 2 +- .../service/DataSourceServiceTopiaTest.java | 6 +- .../fr/ird/observe/services/service/RigthTest.java | 40 +- .../service/seine/TripSeineServiceTopiaTest.java | 6 +- .../main/java/fr/ird/observe/test/TestHelper.java | 32 ++ .../src/main/resources/observetest.properties | 3 + pom.xml | 7 + 181 files changed, 4148 insertions(+), 2661 deletions(-) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ObserveTextGenerator.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/util/SecurityModel.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/SecurityModel.java create mode 100644 observe-application-swing/src/main/resources/ftl/connexionTestResult_fr.ftl create mode 100644 observe-application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl create mode 100644 observe-application-swing/src/main/resources/ftl/dataSourceInformation_fr.ftl create mode 100644 observe-application-swing/src/main/resources/ftl/dataSourceSelectModeResume_fr.ftl create mode 100644 observe-application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_fr.ftl copy observe-application-web/src/main/java/fr/ird/observe/application/web/{injector/ObserveDtoInjector.java => converter/ObserveDtoConverter.java} (59%) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/BabModelVersionException.java create mode 100644 observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceInformation.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/ObserveDbUserDtos.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/ObserveDbRole.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/ObserveSecurityHelper.java create mode 100644 observe-test-data/src/main/resources/observetest.properties -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 9

branch feature/7469 updated (bc06d62 -> 6132465)
by codelutin.com scm 05 Oct '15

05 Oct '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7469 in repository observe. See http://git.codelutin.com/observe.git from bc06d62 Ajout commentaire + méthode de fermeture (qui doit être appelée à chaque fermeture de source de données) (refs #7469) new 6132465 Séparer les données PS et LL, utiliser les id en paramètres des fonctions (refs #7469) 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 613246597f7fe9157a3fc59a48a597d419d3abac Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Oct 5 12:00:47 2015 +0200 Séparer les données PS et LL, utiliser les id en paramètres des fonctions (refs #7469) Summary of changes: .../fr/ird/observe/ObserveOpenDataManager.java | 127 +++++++++++---------- 1 file changed, 65 insertions(+), 62 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1