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

branch feature/7622 updated (4990580 -> 853af50)
by codelutin.com scm Nov. 17, 2015

Nov. 17, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7622 in repository observe. See http://git.codelutin.com/observe.git from 4990580 correction de l'action de déplacement des routes depuis la liste (refs #7622) new b88ea5c meilleur gestion de l'activation du menu de fermeture des neouds (refs #7622) new e9a78f7 fix decorateur (refs #7622) new 853af50 correction du déplacement des routes (fixes #7622) 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 853af5047b88c0a45cf614a8b119875f2e75c2ec Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Nov 17 15:35:26 2015 +0100 correction du déplacement des routes (fixes #7622) commit e9a78f780c930d12cceb4dbbf669a9ef15cf452f Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Nov 17 14:49:44 2015 +0100 fix decorateur (refs #7622) commit b88ea5c6620fe796c2063363289b72674ce3bff0 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Nov 17 14:29:31 2015 +0100 meilleur gestion de l'activation du menu de fermeture des neouds (refs #7622) Summary of changes: .../ui/actions/shared/MoveRoutesUIAction.java | 22 ++++++++++++---------- .../tree/ObserveNavigationTreeShowPopupAction.java | 15 +++++++++++++-- 2 files changed, 25 insertions(+), 12 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/7622 updated (84e8818 -> 4990580)
by codelutin.com scm Nov. 17, 2015

Nov. 17, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7622 in repository observe. See http://git.codelutin.com/observe.git from 84e8818 ajout de l'icone (refs #7622) new 61e3841 ajout d'une methode pour déplacer plusieurs routes (refs #7622) new 2e52eeb ajout de l'icone de déplacement de route (refs #7622) new a409c49 refactoring de la sélection des éléments des listes (refs #7622) new e7d132e ajout du bouton pour déplacer des routes depuis la liste (refs #7622) new aee93ce refactoring des actions du menu contextuel de l'arbre (refs #7622) new f2355c4 correction des positions (refs #7622) new 4990580 correction de l'action de déplacement des routes depuis la liste (refs #7622) 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 49905802674d40c2170ba05c1ef874e3ccda434e Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Nov 17 12:27:19 2015 +0100 correction de l'action de déplacement des routes depuis la liste (refs #7622) commit f2355c430d38c3f9ffe19ca1dd793b11b024c4bb Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Nov 17 12:04:10 2015 +0100 correction des positions (refs #7622) commit aee93cea8dc4e2ab6b17afde38e2232b22411573 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Nov 17 12:00:42 2015 +0100 refactoring des actions du menu contextuel de l'arbre (refs #7622) commit e7d132e9f24b0498d0a84492cd347195be6a8dab Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Nov 17 12:00:02 2015 +0100 ajout du bouton pour déplacer des routes depuis la liste (refs #7622) commit a409c498abee1fb058d50df9b3cf566054fec48e Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Nov 17 11:59:07 2015 +0100 refactoring de la sélection des éléments des listes (refs #7622) commit 2e52eeb12bf9a78b11cd5a634e43c8e7fd3e16bd Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Nov 17 11:56:13 2015 +0100 ajout de l'icone de déplacement de route (refs #7622) commit 61e3841003577098f0c188d7cac9cde6303ecfc2 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Nov 17 11:55:45 2015 +0100 ajout d'une methode pour déplacer plusieurs routes (refs #7622) Summary of changes: .../src/main/filters/observe-ui.properties | 3 + .../observe/ObserveSwingApplicationContext.java | 2 + .../main/java/fr/ird/observe/ui/ObserveMainUI.css | 48 +------- .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 14 +-- ...eTripsUIAction.java => MoveRoutesUIAction.java} | 131 ++++++++++---------- .../actions/shared/MoveTripLonglinesUIAction.java | 7 -- .../ui/actions/shared/MoveTripSeinesUIAction.java | 7 -- .../ui/actions/shared/MoveTripsUIAction.java | 5 +- .../ird/observe/ui/content/list/ContentListUI.css | 10 +- .../ird/observe/ui/content/list/ContentListUI.jaxx | 13 +- .../ui/content/list/ContentListUIModel.java | 25 ++-- .../content/list/impl/longline/TripLonglinesUI.css | 9 +- .../list/impl/longline/TripLonglinesUI.jaxx | 22 +--- .../ui/content/list/impl/seine/RoutesUI.css | 6 + .../ui/content/list/impl/seine/RoutesUI.jaxx | 3 + .../ui/content/list/impl/seine/TripSeinesUI.css | 6 +- .../ui/content/list/impl/seine/TripSeinesUI.jaxx | 22 +--- .../content/list/impl/seine/TripSeinesUIModel.java | 26 ---- .../tree/ObserveNavigationTreeShowPopupAction.java | 133 ++++++++------------- .../observe-application-swing_en_GB.properties | 4 + .../observe-application-swing_es_ES.properties | 4 + .../observe-application-swing_fr_FR.properties | 6 +- .../v1/seine/RouteServiceController.java | 7 ++ .../services/service/seine/RouteService.java | 6 + .../services/service/seine/RouteServiceTopia.java | 22 ++++ 25 files changed, 223 insertions(+), 318 deletions(-) copy observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/{MoveTripsUIAction.java => MoveRoutesUIAction.java} (52%) -- 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/7622 created (now 84e8818)
by codelutin.com scm Nov. 16, 2015

Nov. 16, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7622 in repository observe. See http://git.codelutin.com/observe.git at 84e8818 ajout de l'icone (refs #7622) This branch includes the following new commits: new 5eefa47 ajout des menus pour les routes (refs #7622) new a3b7a04 actions de déplcement des routes et marées (refs #7622) new dfc2880 ajout d'une méthode pour savoir si un noeud est un noeud de route (refs #7622) new c622f51 ajout des nouveaux menus sur les noeuds de route (refs #7622) new c5a6d71 i18n (refs #7622) new d5ae5d9 ajout des méthodes pour déplacer une route (refs #7622) new 84e8818 ajout de l'icone (refs #7622) 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 84e8818322bb7621d28ebb28ceb0dffcb177ce9b Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Nov 16 16:50:19 2015 +0100 ajout de l'icone (refs #7622) commit d5ae5d99a408202000a752c543a88fffac324a99 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Nov 16 16:39:20 2015 +0100 ajout des méthodes pour déplacer une route (refs #7622) commit c5a6d718e604965368b95179355d13b46a2c636e Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Nov 16 16:39:16 2015 +0100 i18n (refs #7622) commit c622f514b8db26962a99a4e16a8a01c2d0bdb451 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Nov 16 16:36:05 2015 +0100 ajout des nouveaux menus sur les noeuds de route (refs #7622) commit dfc28806db4d7f3eb0ebf731b050ebaa9cac4a0a Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Nov 16 16:35:13 2015 +0100 ajout d'une méthode pour savoir si un noeud est un noeud de route (refs #7622) commit a3b7a04b8edc588b784dc2a4621a79aed0693e0e Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Nov 16 16:34:41 2015 +0100 actions de déplcement des routes et marées (refs #7622) commit 5eefa4766140764f3fbe6d263720384407da3172 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Nov 16 16:33:53 2015 +0100 ajout des menus pour les routes (refs #7622) -- 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/refactor_reference updated (b0ef319 -> 30aadab)
by codelutin.com scm Nov. 14, 2015

Nov. 14, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/refactor_reference in repository observe. See http://git.codelutin.com/observe.git discards b0ef319 Début d'implantation d'un cache de référentiels (à finir) discards b393c43 Ajout d'un service pour récupérer des referecne set (à finir) discards 17cdae8 Ajout de définition de requètes de données discards 85b03ab Ajout d'une méthode toString pour faire un rendu simple d'un dto discards 1765ec2 Ajout de méthodes pour faire un rendu i18n plus facile adds 51f9e80 fix test sur l'id du noeud de tripseine adds af43768 fix icons dans le menu navigation + typo adds 494870b Certaines Actions sur une base ouverte sont disponibles alors que la base n'est pas ouverte (fixes #7702) adds f0ef937 Cacher la barre d'actions une fois l'action d'ouverture de base lancée (fixes #7703) adds e745b1d réajout des menus de navigation vers les marées, activités et sets adds ab3f0e9 suppression code mort + fixmes adds 21e9d0b Ajout de traductions (refs 7708) adds adcbd54 gestion des erreurs dans l'ecran de test de connexion au serveur distant (refs #7708) adds c518d5a afficher les erreurs de connexion au source de données (refs 7708) adds ae7075f ajouter le sablier pendant le test de la connexion (refs 7708) adds 3aadb10 conflit entre le fitrage des ressources par le pom et les varibles de templates ftl (refs 7708) adds 08b7d39 Merge branch 'feature/7708' into develop adds 91ab4c8 ajouter les template dans les ressources (refs #7715) adds 00828bf revue de l'algo de recherche d'une RTP : on essaye d'abord avec le sex fourni puis ensuite avec le sex indéterminé si pas trouvé cf https://forge.codelutin.com/projects/observe/repository/revisions/9b9960714… fixes #7719 adds 7fb9846 afficher les droits sur les sources de données (refs #7717) adds fd1ca99 Merge branch 'feature/7717' into develop adds 567280d ajout du test pour l'algo de recherche de rtp (refs #7719) adds d568cc8 fix test adds 3a20d4d fixes #7719 ajout du TU adds 40c0036 déplacement des classes encore utilisées hors du package business adds 5cc123b suppression du code mort adds c74fc00 déplacement du package de gps adds 7183b3f fix dependencies adds 93de948 suppression du code mort adds 5100c7a suppression du code mort + refactoring adds 2bbf609 désélectionner les ligne avant l'insertion (refs #7615) adds 3827e37 Merge branch 'feature/7615-2' into develop adds 1857d71 desactiver le menu contextuel 'cloturer' sur une marée quand une route ou une activité sont ouvertes (refs #7621) new 220789a Ajout de méthodes pour faire un rendu i18n plus facile new 2f01ded Ajout d'une méthode toString pour faire un rendu simple d'un dto new ab4af87 Ajout de définition de requètes de données new fd559ab Ajout d'un service pour récupérer des referecne set (à finir) new aee09c8 Début d'implantation d'un cache de référentiels (à finir) new 64ba103 introduction nouvelle api de references plus simple et mise en place new 65fcee2 remove dead code new 30aadab Ajout d'une action pour recharger la configuration du serveur 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 (b0ef319) \ N -- N -- N refs/heads/feature/refactor_reference (30aadab) 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 8 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 30aadabb42bcdce8b7eea62cafd9acc8ac415779 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 14 02:21:21 2015 +0100 Ajout d'une action pour recharger la configuration du serveur commit 65fcee2f8a94c1981cf00037d41a07a16dbed1ad Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 14 02:12:49 2015 +0100 remove dead code commit 64ba10386d93f9845c93d3d0458b5d4de165c2e2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 14 02:12:31 2015 +0100 introduction nouvelle api de references plus simple et mise en place commit aee09c8fadf10b42869c5974796d46ba7e0d63a4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 12 09:45:18 2015 +0100 Début d'implantation d'un cache de référentiels (à finir) commit fd559ab947c47f4db0f468f7bcc7d738b797cce3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 12 09:44:07 2015 +0100 Ajout d'un service pour récupérer des referecne set (à finir) commit ab4af876b2e83b7ac6a1e5ffad2b3d0fa97982ed Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 12 09:43:36 2015 +0100 Ajout de définition de requètes de données commit 2f01dedd7af13a4bec591baa5d54c642a98e005f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 12 09:42:33 2015 +0100 Ajout d'une méthode toString pour faire un rendu simple d'un dto commit 220789ab5da785b64163cb1a74cc2877e4c502e9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 12 09:41:33 2015 +0100 Ajout de méthodes pour faire un rendu i18n plus facile Summary of changes: observe-application-swing/pom.xml | 19 +- .../fr/ird/observe/ObserveOpenDataManager.java | 2 +- .../main/java/fr/ird/observe/ObserveRunner.java | 12 +- .../observe/ObserveSwingApplicationContext.java | 6 +- .../fr/ird/observe/ObserveSwingBinderService.java | 22 - .../java/fr/ird/observe/ObserveTextGenerator.java | 7 + .../observe/business/LonglinePositionAware.java | 56 --- .../fr/ird/observe/business/SendMessageAble.java | 34 -- .../observe/business/db/constants/DataPolicy.java | 72 --- .../business/db/constants/DataSourceState.java | 40 -- .../business/db/model/DataSelectionModel.java | 495 --------------------- .../ObserveSwingApplicationConfig.java | 4 +- .../ObserveSwingApplicationConfigOption.java | 5 +- .../ird/observe/{business => }/db/DataContext.java | 22 +- .../fr/ird/observe/db/ObserveSwingDataSource.java | 14 + .../ird/observe/db/constantes/ConnexionStatus.java | 66 --- .../ird/observe/db/constants/ConnexionStatus.java | 0 .../{constantes => constants}/ConstantsI18n.java | 2 +- .../db/{constantes => constants}/CreationMode.java | 2 +- .../db/constants/DataContextType.java | 4 +- .../db/{constantes => constants}/DbMode.java | 2 +- .../java/fr/ird/observe/ui/DecoratorService.java | 4 +- .../main/java/fr/ird/observe/ui/ObserveMainUI.css | 49 +- .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 31 +- .../fr/ird/observe/ui/ObserveMainUIHandler.java | 2 +- .../observe/ui/actions/AbstractObserveAction.java | 32 ++ .../observe/ui/actions/ChangeStorageAction.java | 2 +- .../ird/observe/ui/actions/CloseStorageAction.java | 3 +- .../ui/actions/ImportStorageFromFileAction.java | 4 +- .../observe/ui/actions/ReloadStorageAction.java | 3 +- .../ui/actions/SaveStorageToFileAction.java | 3 +- .../ui/actions/shared/AbstractUIAction.java | 3 +- .../java/fr/ird/observe/ui/admin/AdminStep.java | 2 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 3 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 6 +- .../observe/ui/admin/config/ConfigUIHandler.java | 30 +- .../observe/ui/admin/gps/GPSAbleTableModel.java | 2 +- .../ui/admin/gps/GPSActivityTableModel.java | 2 +- .../observe/ui/admin/gps/ImportGPSUIHandler.java | 6 +- .../ui/admin/validate/ValidateUIHandler.java | 11 - .../java/fr/ird/observe/ui/content/ContentUI.jaxx | 2 +- .../ird/observe/ui/content/ContentUIHandler.java | 4 +- .../ird/observe/ui/content/ObserveContentUI.java | 2 +- .../content/impl/longline/BranchlineUIHandler.java | 4 +- .../LonglineDetailCompositionUIHandler.java | 8 +- .../LonglineGlobalCompositionUIHandler.java | 4 +- .../impl/longline/SetLonglineUIHandler.java | 4 +- .../ActivitySeineObservedSystemUIHandler.java | 4 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 4 +- .../impl/seine/FloatingObjectUIHandler.java | 4 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 6 +- .../ui/content/list/ContentListUIHandler.java | 2 +- .../impl/longline/ActivityLonglinesUIHandler.java | 4 +- .../list/impl/longline/TripLonglinesUIHandler.java | 4 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 4 +- .../content/list/impl/seine/RoutesUIHandler.java | 4 +- .../list/impl/seine/TripSeinesUIHandler.java | 4 +- .../ui/content/open/ContentOpenableUIHandler.java | 2 +- .../impl/longline/ActivityLonglineUIHandler.java | 4 +- .../open/impl/longline/TripLonglineUIHandler.java | 4 +- .../open/impl/seine/ActivitySeineUIHandler.java | 4 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 4 +- .../open/impl/seine/TripSeineUIHandler.java | 4 +- .../ui/content/ref/ContentReferenceUIHandler.java | 2 +- .../ui/content/ref/ReferenceHomeUIHandler.java | 2 +- .../ui/content/table/ContentTableUIHandler.java | 4 +- .../impl/longline/BaitsCompositionUIHandler.java | 2 +- .../longline/BranchlinesCompositionUIHandler.java | 2 +- .../impl/longline/CatchLonglineUIHandler.java | 2 +- .../table/impl/longline/EncounterUIHandler.java | 2 +- .../longline/FloatlinesCompositionUIHandler.java | 2 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 4 +- .../impl/longline/HooksCompositionUIHandler.java | 2 +- .../table/impl/longline/SensorUsedUIHandler.java | 2 +- .../content/table/impl/longline/TdrUIHandler.java | 2 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 4 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 2 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 4 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 2 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 2 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 2 +- .../table/impl/seine/TargetCatchUIHandler.java | 2 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 2 +- .../table/impl/seine/TargetSampleUIHandler.java | 4 +- .../ird/observe/ui/storage/ObstunaAdminAction.java | 2 +- .../ird/observe/ui/storage/RemoteUILauncher.java | 2 +- .../ui/storage/StorageBackupUILauncher.java | 3 +- .../java/fr/ird/observe/ui/storage/StorageUI.css | 4 + .../java/fr/ird/observe/ui/storage/StorageUI.jaxx | 2 +- .../ird/observe/ui/storage/StorageUIHandler.java | 8 +- .../ird/observe/ui/storage/StorageUILauncher.java | 2 +- .../fr/ird/observe/ui/storage/StorageUIModel.java | 191 +++++--- .../observe/ui/storage/tabs/ChooseDbModeUI.jaxx | 4 +- .../ird/observe/ui/storage/tabs/ConfigDataUI.jaxx | 2 +- .../ui/storage/tabs/ConfigReferentielUI.jaxx | 2 +- .../fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx | 4 +- .../ui/storage/tabs/StorageTabUIHandler.java | 34 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 2 +- .../ird/observe/ui/tree/ActivityLonglineNode.java | 6 - .../fr/ird/observe/ui/tree/DtoNodeSupport.java | 1 - .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 2 +- .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 6 - .../loadors/ActivityLonglineNodeChildLoador.java | 1 - .../loadors/ProgramLonglineNodeChildLoador.java | 4 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 6 - .../converter => ui/util}/FloatConverter.java | 2 +- .../ui/util/table/EditableTableModelSupport.java | 5 +- .../ird/observe/validation/ValidationContext.java | 2 +- .../validation/ValidationMessageDetector.java | 2 +- .../dto/ActivitySimpleSpeedDtoValidator.java | 4 +- .../validator/dto/ActivitySpeedDtoValidator.java | 4 +- .../main/resources/ftl/connexionTestResult_fr.ftl | 5 +- .../ftl/dataSourceConnectionReport_fr.ftl | 87 +--- .../src/main/resources/ftl/dataSourcePolicy_fr.ftl | 32 ++ .../ftl/storageModelDataSourceConfiguration_fr.ftl | 71 ++- .../observe-application-swing_en_GB.properties | 5 + .../observe-application-swing_es_ES.properties | 5 + .../observe-application-swing_fr_FR.properties | 13 +- .../web/ObserveWebApplicationContext.java | 16 + .../web/ObserveWebApplicationListener.java | 2 + .../application/web/ObserveWebMotionRender.java | 8 - .../web/controller/v1/ConfigurationController.java | 23 + .../controller/v1/ObserveWebErrorController.java | 31 +- .../v1/ReferenceSetServiceController.java | 10 +- ...ava => ObserveReferenceSetRequestInjector.java} | 37 +- .../web/request/ObserveWebRequestContext.java | 6 +- .../ObserveWebSecurityApplicationContext.java | 6 + .../referentiel/LengthWeightParameters.java | 137 +++--- .../observe/services/http/ObserveHttpError.java | 46 ++ .../security/AdminApiKeyNotFoundException.java | 2 +- .../AuthenticationTokenNotFoundException.java | 2 +- .../BadObserveWebUserPasswordException.java | 2 +- .../security/InvalidAdminKeyApiException.java | 2 +- .../InvalidAuthenticationTokenException.java | 2 +- .../ObserveWebSecurityExceptionSupport.java | 2 +- .../SecurityRequestContextNotFoundException.java | 2 +- .../security/UnknownObserveWebUserException.java | 2 +- .../UnknownObserveWebUserForDatabaseException.java | 2 +- .../security/UserLoginNotFoundException.java | 2 +- .../security/UserPasswordNotFoundException.java | 2 +- .../services/service/ReferenceSetDefinition.java | 70 --- .../service/ReferenceSetPropertyDefinition.java | 67 --- .../service/ReferenceSetRequestDefinition.java | 53 --- .../service/ReferenceSetRequestDefinitions.java | 39 -- .../service/ReferenceSetRequestKeyDefinition.java | 86 ---- .../services/service/ReferenceSetService.java | 8 +- .../service/ReferentialReferenceSetResult.java | 55 --- observe-services-model/pom.xml | 6 + .../java/fr/ird/observe/services/dto/IdDtos.java | 18 + .../observe/services/dto/gson/ClassAdapter.java | 39 +- .../services/dto/gson/ObserveDtoGsonSupplier.java | 2 + .../dto/gson/ObserveReferenceSetAdapter.java | 122 +++++ .../services/dto/reference/ObserveReference.java | 61 +++ .../dto/reference/ObserveReferenceSet.java | 69 +++ .../dto/reference/ObserveReferenceSetRequest.java | 20 +- .../dto/reference/ObserveReferenceSetResult.java | 64 +++ .../dto/reference/ObserveReferentialReference.java | 79 ++++ .../definition/ObserveReferenceSetDefinition.java | 76 ++++ .../definition/ObserveReferenceSetDefinitions.java | 41 +- .../ObserveReferenceSetRequestDefinition.java | 53 +++ .../ObserveReferenceSetRequestDefinitions.java | 50 +++ .../ObserveReferenceSetRequestKeyDefinition.java | 74 +++ .../fr/ird/observe/util}/gps/CoordinateHelper.java | 2 +- .../java/fr/ird/observe/util}/gps/GPSAble.java | 2 +- .../fr/ird/observe/util}/gps/GPSFileReader.java | 2 +- .../java/fr/ird/observe/util}/gps/GPSPoint.java | 2 +- .../fr/ird/observe/util}/gps/GPSPointImpl.java | 2 +- .../fr/ird/observe/util}/gps/GPSPointInterval.java | 2 +- .../observe/util}/gps/GPSPointIntervalImpl.java | 2 +- .../java/fr/ird/observe/util}/gps/GPSRoute.java | 2 +- .../fr/ird/observe/util}/gps/GPSRouteImpl.java | 2 +- .../java/fr/ird/observe/util}/gps/GPSService.java | 2 +- .../java/fr/ird/observe/util}/gps/GpsPoints.java | 2 +- .../observe/services/ObserveHttpErrorAdapter.java | 37 ++ .../services/ObserveServiceFactoryRest.java | 9 +- .../services/ObserveServiceRestErrorException.java | 16 + .../ObserveServiceRestNotAvailableException.java | 1 + .../services/http/ObserveResponseBuilder.java | 35 +- .../service/ReferenceSetServiceRestTest.java | 96 ++++ .../EntityToReferentialReferenceDtoBuilder.java | 109 ----- .../dto/reference/ObserveReferenceSetBuilder.java | 250 +++++++++++ .../services/service/DataSourceServiceTopia.java | 7 +- .../services/service/ReferenceSetServiceTopia.java | 124 +++--- .../referentiel/LengthWeightParemetersTest.java | 244 ++++++++++ .../service/ReferenceSetServiceTopiaTest.java | 54 +++ 185 files changed, 2365 insertions(+), 1886 deletions(-) delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/LonglinePositionAware.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/SendMessageAble.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataPolicy.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataSourceState.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/model/DataSelectionModel.java rename observe-application-swing/src/main/java/fr/ird/observe/{business => }/db/DataContext.java (97%) delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/db/constantes/ConnexionStatus.java copy {observe-business => observe-application-swing}/src/main/java/fr/ird/observe/db/constants/ConnexionStatus.java (100%) rename observe-application-swing/src/main/java/fr/ird/observe/db/{constantes => constants}/ConstantsI18n.java (93%) rename observe-application-swing/src/main/java/fr/ird/observe/db/{constantes => constants}/CreationMode.java (98%) rename observe-application-swing/src/main/java/fr/ird/observe/{business => }/db/constants/DataContextType.java (99%) rename observe-application-swing/src/main/java/fr/ird/observe/db/{constantes => constants}/DbMode.java (98%) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/actions/AbstractObserveAction.java rename observe-application-swing/src/main/java/fr/ird/observe/{business/converter => ui/util}/FloatConverter.java (98%) create mode 100644 observe-application-swing/src/main/resources/ftl/dataSourcePolicy_fr.ftl copy observe-application-web/src/main/java/fr/ird/observe/application/web/injector/{ObserveClassInjector.java => ObserveReferenceSetRequestInjector.java} (51%) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/http/ObserveHttpError.java rename {observe-application-web/src/main/java/fr/ird/observe/application/web => observe-services-api/src/main/java/fr/ird/observe/services}/security/AdminApiKeyNotFoundException.java (95%) rename {observe-application-web/src/main/java/fr/ird/observe/application/web => observe-services-api/src/main/java/fr/ird/observe/services}/security/AuthenticationTokenNotFoundException.java (95%) rename {observe-application-web/src/main/java/fr/ird/observe/application/web => observe-services-api/src/main/java/fr/ird/observe/services}/security/BadObserveWebUserPasswordException.java (96%) rename {observe-application-web/src/main/java/fr/ird/observe/application/web => observe-services-api/src/main/java/fr/ird/observe/services}/security/InvalidAdminKeyApiException.java (96%) rename {observe-application-web/src/main/java/fr/ird/observe/application/web => observe-services-api/src/main/java/fr/ird/observe/services}/security/InvalidAuthenticationTokenException.java (96%) rename {observe-application-web/src/main/java/fr/ird/observe/application/web => observe-services-api/src/main/java/fr/ird/observe/services}/security/ObserveWebSecurityExceptionSupport.java (96%) rename {observe-application-web/src/main/java/fr/ird/observe/application/web => observe-services-api/src/main/java/fr/ird/observe/services}/security/SecurityRequestContextNotFoundException.java (95%) rename {observe-application-web/src/main/java/fr/ird/observe/application/web => observe-services-api/src/main/java/fr/ird/observe/services}/security/UnknownObserveWebUserException.java (96%) rename {observe-application-web/src/main/java/fr/ird/observe/application/web => observe-services-api/src/main/java/fr/ird/observe/services}/security/UnknownObserveWebUserForDatabaseException.java (96%) rename {observe-application-web/src/main/java/fr/ird/observe/application/web => observe-services-api/src/main/java/fr/ird/observe/services}/security/UserLoginNotFoundException.java (95%) rename {observe-application-web/src/main/java/fr/ird/observe/application/web => observe-services-api/src/main/java/fr/ird/observe/services}/security/UserPasswordNotFoundException.java (95%) delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/ReferenceSetDefinition.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/ReferenceSetPropertyDefinition.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/ReferenceSetRequestDefinition.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/ReferenceSetRequestDefinitions.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/ReferenceSetRequestKeyDefinition.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialReferenceSetResult.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ObserveReferenceSetAdapter.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReference.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferenceSet.java rename observe-services-api/src/main/java/fr/ird/observe/services/service/ReferenceSetRequest.java => observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferenceSetRequest.java (57%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferenceSetResult.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferentialReference.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetDefinition.java rename observe-services-api/src/main/java/fr/ird/observe/services/service/ReferenceSetDefinitions.java => observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetDefinitions.java (90%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetRequestDefinition.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetRequestDefinitions.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetRequestKeyDefinition.java rename {observe-application-swing/src/main/java/fr/ird/observe/business => observe-services-model/src/main/java/fr/ird/observe/util}/gps/CoordinateHelper.java (97%) rename {observe-application-swing/src/main/java/fr/ird/observe/business => observe-services-model/src/main/java/fr/ird/observe/util}/gps/GPSAble.java (97%) rename {observe-application-swing/src/main/java/fr/ird/observe/business => observe-services-model/src/main/java/fr/ird/observe/util}/gps/GPSFileReader.java (99%) rename {observe-application-swing/src/main/java/fr/ird/observe/business => observe-services-model/src/main/java/fr/ird/observe/util}/gps/GPSPoint.java (98%) rename {observe-application-swing/src/main/java/fr/ird/observe/business => observe-services-model/src/main/java/fr/ird/observe/util}/gps/GPSPointImpl.java (98%) rename {observe-application-swing/src/main/java/fr/ird/observe/business => observe-services-model/src/main/java/fr/ird/observe/util}/gps/GPSPointInterval.java (99%) rename {observe-application-swing/src/main/java/fr/ird/observe/business => observe-services-model/src/main/java/fr/ird/observe/util}/gps/GPSPointIntervalImpl.java (98%) rename {observe-application-swing/src/main/java/fr/ird/observe/business => observe-services-model/src/main/java/fr/ird/observe/util}/gps/GPSRoute.java (99%) rename {observe-application-swing/src/main/java/fr/ird/observe/business => observe-services-model/src/main/java/fr/ird/observe/util}/gps/GPSRouteImpl.java (99%) rename {observe-application-swing/src/main/java/fr/ird/observe/business => observe-services-model/src/main/java/fr/ird/observe/util}/gps/GPSService.java (98%) rename {observe-application-swing/src/main/java/fr/ird/observe/business => observe-services-model/src/main/java/fr/ird/observe/util}/gps/GpsPoints.java (99%) create mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/ObserveHttpErrorAdapter.java create mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRestErrorException.java create mode 100644 observe-services-rest/src/test/java/fr/ird/observe/services/service/ReferenceSetServiceRestTest.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferenceSetBuilder.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemetersTest.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferenceSetServiceTopiaTest.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 8

branch develop updated (3827e37 -> 1857d71)
by codelutin.com scm Nov. 13, 2015

Nov. 13, 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 3827e37 Merge branch 'feature/7615-2' into develop new 1857d71 desactiver le menu contextuel 'cloturer' sur une marée quand une route ou une activité sont ouvertes (refs #7621) 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 1857d71fd16166422ca7ef1dc2bf3429b3102142 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Nov 13 17:43:05 2015 +0100 desactiver le menu contextuel 'cloturer' sur une marée quand une route ou une activité sont ouvertes (refs #7621) Summary of changes: .../src/main/java/fr/ird/observe/ui/ObserveMainUI.css | 1 + 1 file changed, 1 insertion(+) -- 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/7621-2 deleted (was 1857d71)
by codelutin.com scm Nov. 13, 2015

Nov. 13, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7621-2 in repository observe. See http://git.codelutin.com/observe.git was 1857d71 desactiver le menu contextuel 'cloturer' sur une marée quand une route ou une activité sont ouvertes (refs #7621) This change permanently discards the following revisions: discards 1857d71 desactiver le menu contextuel 'cloturer' sur une marée quand une route ou une activité sont ouvertes (refs #7621) -- 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/7621-2 created (now 1857d71)
by codelutin.com scm Nov. 13, 2015

Nov. 13, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7621-2 in repository observe. See http://git.codelutin.com/observe.git at 1857d71 desactiver le menu contextuel 'cloturer' sur une marée quand une route ou une activité sont ouvertes (refs #7621) This branch includes the following new commits: new 1857d71 desactiver le menu contextuel 'cloturer' sur une marée quand une route ou une activité sont ouvertes (refs #7621) 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 1857d71fd16166422ca7ef1dc2bf3429b3102142 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Nov 13 17:43:05 2015 +0100 desactiver le menu contextuel 'cloturer' sur une marée quand une route ou une activité sont ouvertes (refs #7621) -- 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 (5100c7a -> 3827e37)
by codelutin.com scm Nov. 13, 2015

Nov. 13, 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 5100c7a suppression du code mort + refactoring new 2bbf609 désélectionner les ligne avant l'insertion (refs #7615) new 3827e37 Merge branch 'feature/7615-2' into develop 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 3827e37773dc0ee0f868bbe214cab0133ba79370 Merge: 5100c7a 2bbf609 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Nov 13 17:05:54 2015 +0100 Merge branch 'feature/7615-2' into develop commit 2bbf609624f02e94edcefd60188d9cdaa0a87b13 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Nov 13 15:12:06 2015 +0100 désélectionner les ligne avant l'insertion (refs #7615) Summary of changes: .../ui/content/impl/longline/LonglineDetailCompositionUIHandler.java | 4 ---- .../java/fr/ird/observe/ui/util/table/EditableTableModelSupport.java | 5 ++++- 2 files changed, 4 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 2

branch feature/7615-2 deleted (was 2bbf609)
by codelutin.com scm Nov. 13, 2015

Nov. 13, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7615-2 in repository observe. See http://git.codelutin.com/observe.git was 2bbf609 désélectionner les ligne avant l'insertion (refs #7615) This change permanently discards the following revisions: discards 2bbf609 désélectionner les ligne avant l'insertion (refs #7615) -- 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/7615-2 created (now 2bbf609)
by codelutin.com scm Nov. 13, 2015

Nov. 13, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7615-2 in repository observe. See http://git.codelutin.com/observe.git at 2bbf609 désélectionner les ligne avant l'insertion (refs #7615) This branch includes the following new commits: new 2bbf609 désélectionner les ligne avant l'insertion (refs #7615) 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 2bbf609624f02e94edcefd60188d9cdaa0a87b13 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Nov 13 15:12:06 2015 +0100 désélectionner les ligne avant l'insertion (refs #7615) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1