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

branch develop updated (7f5fa3a -> 99c1bb8)
by codelutin.com scm 20 Aug '15

20 Aug '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 7f5fa3a Merge branch 'feature/7458-dto-services' into develop new 19bc788 Suppression d'un module obsolete new 48bb23d Introduction d'une API pour la configuration des services new 1cb472f Introduction du module de configuration pour l'implantation ToPIA new d7745fd Introduction du module de configuration pour l'implantation REST new d3dc431 renommage du module swing new bca4151 Renommage de l'application web new a1e44fa Ajout du module d'utilisation des services (à utiliser dans chaque application) new 28f01bf On repart sur du nommage plus classique... new 5e1f3ff Renommage du cache de type de services new 341e3dc Mise en place de la configuration de la data source des service topia new 55176db Ajout de la généricité sur les attributs de référence + prise en compte dans le builder de dto new a20943e fix merge new 99c1bb8 On quitte pour mieux revenir! The 13 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 99c1bb8f2b28609eef7678ff9ba18e50e5412107 Merge: 7f5fa3a a20943e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Aug 20 16:08:54 2015 +0200 On quitte pour mieux revenir! Merge branch 'feature/7463' into develop commit a20943ec14300552a1f75512092208f3cc53988d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Aug 20 16:04:50 2015 +0200 fix merge commit 55176dba135b0a0198a6c720cd75edceb92c797d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Aug 20 15:54:39 2015 +0200 Ajout de la généricité sur les attributs de référence + prise en compte dans le builder de dto commit 341e3dc1a85922868f5b753ea9c530bc4b3d375e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Aug 20 15:54:00 2015 +0200 Mise en place de la configuration de la data source des service topia commit 5e1f3ff3568ec77ec8b3f2074ae8a7d1fb7e8e20 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Aug 20 15:28:04 2015 +0200 Renommage du cache de type de services commit 28f01bfaa58fb2ee26234c028b65eebce70ebe87 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Aug 20 11:55:58 2015 +0200 On repart sur du nommage plus classique... commit a1e44fa21d47b35682bccc31490696d943eddfaa Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Aug 20 11:25:03 2015 +0200 Ajout du module d'utilisation des services (à utiliser dans chaque application) commit bca4151830c75f63126c01500b10c35df30eadf4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Aug 20 11:24:21 2015 +0200 Renommage de l'application web commit d3dc43103ccee29617b65f80c65fc32ed6d93f5f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Aug 20 11:23:41 2015 +0200 renommage du module swing commit d7745fd4908285511c26864592cc313bf20fc935 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Aug 20 11:21:46 2015 +0200 Introduction du module de configuration pour l'implantation REST commit 1cb472fde6e4fe900c96e414245b62c6bdc7ffe0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Aug 20 11:13:45 2015 +0200 Introduction du module de configuration pour l'implantation ToPIA commit 48bb23d3ffe15fa2cf64ed49e1f593fa14ffbc3b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Aug 20 11:07:14 2015 +0200 Introduction d'une API pour la configuration des services commit 19bc788cf3cdde11ed220038c61b15c05cca2e6c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Aug 20 10:36:36 2015 +0200 Suppression d'un module obsolete Summary of changes: .../LICENSE.txt | 0 .../README.txt | 0 .../changelog.txt | 0 .../pom.xml | 26 +- .../src/license/THIRD-PARTY.properties | 0 .../src/main/assembly/bin.xml | 0 .../dist/doc/observe_manuel_administration.pdf | Bin .../dist/doc/observe_manuel_observateur.pdf | Bin .../src/main/assembly/dist/go.bat | 0 .../src/main/assembly/dist/go.sh | 0 .../main/assembly/dist/obstuna-admin/README.txt | 0 .../assembly/dist/obstuna-admin/apply-extra.sh | 0 .../assembly/dist/obstuna-admin/create-obstuna.bat | 0 .../assembly/dist/obstuna-admin/create-obstuna.sh | 0 .../obstuna-admin/createdb/create-empty-obstuna.sh | 0 .../obstuna-admin/createdb/create-ird_obstuna.sh | 0 .../obstuna-admin/createdb/create-test_obstuna.sh | 0 .../assembly/dist/obstuna-admin/drop-obstuna.bat | 0 .../assembly/dist/obstuna-admin/drop-obstuna.sh | 0 .../extra/create-postgis-1-activity.sql | 0 .../extra/create-postgis-2-harbour.sql | 0 .../extra/create-postgis-3-activity-seine.sql | 0 .../extra/create-postgis-4-activity-longine.sql | 0 .../extra/function_enhanced_sets_school_types.sql | 0 .../assembly/dist/obstuna-admin/update-obstuna.bat | 0 .../assembly/dist/obstuna-admin/update-obstuna.sh | 0 .../dist/obstuna-admin/update-security-obstuna.bat | 0 .../dist/obstuna-admin/update-security-obstuna.sh | 0 .../src/main/assembly/dist/util/README.txt | 0 .../src/main/assembly/dist/util/backup-obstuna.sh | 0 .../src/main/assembly/dist/util/create-postgis.sh | 0 .../src/main/assembly/dist/util/generate-id.bat | 0 .../src/main/assembly/dist/util/generate-id.sh | 0 .../main/assembly/dist/util/tables/data-tables.txt | 0 .../dist/util/tables/referentiel-tables.txt | 0 .../src/main/assembly/map.xml | 0 .../src/main/assembly/sql/v1/README.txt | 0 .../main/assembly/sql/v1/create-obstuna-linux.sh | 0 .../main/assembly/sql/v1/create-obstuna-solaris.sh | 0 .../src/main/assembly/sql/v1/create-postgis.sh | 0 .../src/main/assembly/sql/v1/createdb-script.sh | 0 .../v1/security/create-admin-security-script.sh | 0 .../v1/security/create-default-security-script.sh | 0 .../v1/security/create-reader-security-script.sh | 0 .../sql/v1/security/create-security-script.sh | 0 .../security/create-technicien-security-script.sh | 0 .../src/main/assembly/sql/v1/security/tables.txt | 0 .../src/main/assembly/sql/v1/sql/obstuna.sql | 0 .../src/main/assembly/sql/v2/README.txt | 0 .../main/filters/observe-application.properties | 0 .../src/main/filters/observe-ui.properties | 0 .../java/fr/ird/observe/ObserveActionExecutor.java | 0 .../main/java/fr/ird/observe/ObserveAdminCLI.java | 0 .../observe/ObserveApplicationConfigProvider.java | 0 .../main/java/fr/ird/observe/ObserveCLAction.java | 0 .../main/java/fr/ird/observe/ObserveConfig.java | 0 .../java/fr/ird/observe/ObserveConfigOption.java | 0 .../main/java/fr/ird/observe/ObserveContext.java | 0 .../fr/ird/observe/ObserveResourceManager.java | 0 .../main/java/fr/ird/observe/ObserveRunner.java | 0 .../src/main/java/fr/ird/observe/package.html | 0 .../main/java/fr/ird/observe/ui/ObserveCommon.css | 0 .../main/java/fr/ird/observe/ui/ObserveMainUI.css | 0 .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 0 .../fr/ird/observe/ui/ObserveMainUIHandler.java | 0 .../java/fr/ird/observe/ui/ObserveUICallback.java | 0 .../main/java/fr/ird/observe/ui/ObserveUIMode.java | 0 .../src/main/java/fr/ird/observe/ui/UIHelper.java | 0 .../actions/ChangeApplicationLanguageAction.java | 0 .../observe/ui/actions/ChangeDbLanguageAction.java | 0 .../observe/ui/actions/ChangeStorageAction.java | 0 .../observe/ui/actions/CloseApplicationAction.java | 0 .../fr/ird/observe/ui/actions/CloseHelpAction.java | 0 .../ird/observe/ui/actions/CloseStorageAction.java | 0 .../fr/ird/observe/ui/actions/GotoSiteAction.java | 0 .../ui/actions/ImportStorageFromFileAction.java | 0 .../ird/observe/ui/actions/LaunchAdminAction.java | 0 .../ui/actions/ReloadApplicationAction.java | 0 .../actions/ReloadDefaultConfigurationAction.java | 0 .../observe/ui/actions/ReloadResourcesAction.java | 0 .../observe/ui/actions/ReloadStorageAction.java | 0 .../ui/actions/SaveStorageToFileAction.java | 0 .../fr/ird/observe/ui/actions/ShowAboutAction.java | 0 .../ird/observe/ui/actions/ShowConfigAction.java | 0 .../observe/ui/actions/ShowStorageInfoAction.java | 0 .../observe/ui/actions/StartH2WebServerAction.java | 0 .../observe/ui/actions/StartServerModeAction.java | 0 .../observe/ui/actions/StopH2WebServerAction.java | 0 .../observe/ui/actions/StopServerModeAction.java | 0 .../ui/actions/shared/AbstractUIAction.java | 0 .../ui/actions/shared/CancelCreateUIAction.java | 0 .../ui/actions/shared/CloseAndCreateUIAction.java | 0 .../ui/actions/shared/CloseOpenUIAction.java | 0 .../ui/actions/shared/DeleteDataUIAction.java | 0 .../ui/actions/shared/DeleteReferenceUIAction.java | 0 .../observe/ui/actions/shared/GoDownUIAction.java | 0 .../observe/ui/actions/shared/GoUpUIAction.java | 0 .../observe/ui/actions/shared/ReOpenUIAction.java | 0 .../ui/actions/shared/ResetEditUIAction.java | 0 .../ui/actions/shared/SaveEditUIAction.java | 0 .../ui/actions/shared/SelectNodeUIAction.java | 0 .../ui/actions/shared/SelectOpenNodeUIAction.java | 0 .../fr/ird/observe/ui/admin/AdminActionModel.java | 0 .../fr/ird/observe/ui/admin/AdminActionWorker.java | 0 .../java/fr/ird/observe/ui/admin/AdminStep.java | 0 .../java/fr/ird/observe/ui/admin/AdminTabUI.css | 0 .../java/fr/ird/observe/ui/admin/AdminTabUI.jaxx | 0 .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 0 .../main/java/fr/ird/observe/ui/admin/AdminUI.css | 0 .../main/java/fr/ird/observe/ui/admin/AdminUI.jaxx | 0 .../fr/ird/observe/ui/admin/AdminUIHandler.java | 0 .../fr/ird/observe/ui/admin/AdminUILauncher.java | 0 .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 0 .../fr/ird/observe/ui/admin/config/ConfigUI.css | 0 .../fr/ird/observe/ui/admin/config/ConfigUI.jaxx | 0 .../observe/ui/admin/config/ConfigUIHandler.java | 0 .../ird/observe/ui/admin/config/SelectDataUI.css | 0 .../ird/observe/ui/admin/config/SelectDataUI.jaxx | 0 .../ui/admin/consolidate/ConsolidateModel.java | 0 .../observe/ui/admin/consolidate/ConsolidateUI.css | 0 .../ui/admin/consolidate/ConsolidateUI.jaxx | 0 .../ui/admin/consolidate/ConsolidateUIHandler.java | 0 .../ird/observe/ui/admin/export/ExportModel.java | 0 .../fr/ird/observe/ui/admin/export/ExportUI.css | 0 .../fr/ird/observe/ui/admin/export/ExportUI.jaxx | 0 .../observe/ui/admin/export/ExportUIHandler.java | 0 .../fr/ird/observe/ui/admin/export/TripEntry.java | 0 .../ui/admin/export/TripToExportTableModel.java | 0 .../observe/ui/admin/gps/GPSAbleTableModel.java | 0 .../ui/admin/gps/GPSActivityTableModel.java | 0 .../ird/observe/ui/admin/gps/ImportGPSConfigUI.css | 0 .../observe/ui/admin/gps/ImportGPSConfigUI.jaxx | 0 .../ird/observe/ui/admin/gps/ImportGPSModel.java | 0 .../fr/ird/observe/ui/admin/gps/ImportGPSUI.css | 0 .../fr/ird/observe/ui/admin/gps/ImportGPSUI.jaxx | 0 .../observe/ui/admin/gps/ImportGPSUIHandler.java | 0 .../ird/observe/ui/admin/report/ReportConfigUI.css | 0 .../observe/ui/admin/report/ReportConfigUI.jaxx | 0 .../ird/observe/ui/admin/report/ReportModel.java | 0 .../fr/ird/observe/ui/admin/report/ReportUI.css | 0 .../fr/ird/observe/ui/admin/report/ReportUI.jaxx | 0 .../observe/ui/admin/report/ReportUIHandler.java | 0 .../observe/ui/admin/report/ResultTableModel.java | 0 .../ird/observe/ui/admin/resume/ShowResumeUI.css | 0 .../ird/observe/ui/admin/resume/ShowResumeUI.jaxx | 0 .../ui/admin/resume/ShowResumeUIHandler.java | 0 .../ird/observe/ui/admin/save/SaveLocalModel.java | 0 .../fr/ird/observe/ui/admin/save/SaveLocalUI.css | 0 .../fr/ird/observe/ui/admin/save/SaveLocalUI.jaxx | 0 .../observe/ui/admin/save/SaveLocalUIHandler.java | 0 .../ObsoleteEntityListCellRenderer.java | 0 .../synchronize/ObsoleteEntityTableModel.java | 0 .../ui/admin/synchronize/SynchronizeModel.java | 0 .../observe/ui/admin/synchronize/SynchronizeUI.css | 0 .../ui/admin/synchronize/SynchronizeUI.jaxx | 0 .../ui/admin/synchronize/SynchronizeUIHandler.java | 0 .../observe/ui/admin/validate/ValidateConfigUI.css | 0 .../ui/admin/validate/ValidateConfigUI.jaxx | 0 .../validate/ValidateEntityListCellRenderer.java | 0 .../observe/ui/admin/validate/ValidateModel.java | 0 .../ird/observe/ui/admin/validate/ValidateUI.css | 0 .../ird/observe/ui/admin/validate/ValidateUI.jaxx | 0 .../ui/admin/validate/ValidateUIHandler.java | 0 .../main/java/fr/ird/observe/ui/content/Common.css | 0 .../fr/ird/observe/ui/content/ContentMode.java | 0 .../java/fr/ird/observe/ui/content/ContentUI.css | 0 .../java/fr/ird/observe/ui/content/ContentUI.jaxx | 0 .../ird/observe/ui/content/ContentUIHandler.java | 0 .../observe/ui/content/ContentUIInitializer.java | 0 .../ird/observe/ui/content/ContentUIManager.java | 0 .../fr/ird/observe/ui/content/ContentUIModel.java | 0 .../ird/observe/ui/content/ObserveContentUI.java | 0 .../content/impl/longline/BasketsTableModel.java | 0 .../ui/content/impl/longline/BranchlineUI.css | 0 .../ui/content/impl/longline/BranchlineUI.jaxx | 0 .../content/impl/longline/BranchlineUIHandler.java | 0 .../content/impl/longline/BranchlineUIModel.java | 0 .../impl/longline/BranchlinesTableModel.java | 0 .../LonglineCompositionTableModelSupport.java | 0 .../impl/longline/LonglineDetailCompositionUI.css | 0 .../impl/longline/LonglineDetailCompositionUI.jaxx | 0 .../LonglineDetailCompositionUIHandler.java | 0 .../LonglineDetailCompositionUIInitializer.java | 0 .../longline/LonglineDetailCompositionUIModel.java | 0 ...onglineDetailCompositionUIValidationHelper.java | 0 .../impl/longline/LonglineGlobalCompositionUI.css | 0 .../impl/longline/LonglineGlobalCompositionUI.jaxx | 0 .../LonglineGlobalCompositionUIHandler.java | 0 .../longline/LonglineGlobalCompositionUIModel.java | 0 .../impl/longline/SectionTemplatesTableModel.java | 0 .../content/impl/longline/SectionsTableModel.java | 0 .../ui/content/impl/longline/SetLonglineUI.css | 0 .../ui/content/impl/longline/SetLonglineUI.jaxx | 0 .../impl/longline/SetLonglineUIHandler.java | 0 .../content/impl/longline/SetLonglineUIModel.java | 0 .../impl/seine/ActivitySeineObservedSystemUI.css | 0 .../impl/seine/ActivitySeineObservedSystemUI.jaxx | 0 .../ActivitySeineObservedSystemUIHandler.java | 0 .../seine/ActivitySeineObservedSystemUIModel.java | 0 .../FloatingObjectTransmittingBuoyOperationUI.css | 0 .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 0 ...ngObjectTransmittingBuoyOperationUIHandler.java | 0 ...tingObjectTransmittingBuoyOperationUIModel.java | 0 .../ui/content/impl/seine/FloatingObjectUI.css | 0 .../ui/content/impl/seine/FloatingObjectUI.jaxx | 0 .../impl/seine/FloatingObjectUIHandler.java | 0 .../content/impl/seine/FloatingObjectUIModel.java | 0 .../observe/ui/content/impl/seine/SetSeineUI.css | 0 .../observe/ui/content/impl/seine/SetSeineUI.jaxx | 0 .../ui/content/impl/seine/SetSeineUIHandler.java | 0 .../ui/content/impl/seine/SetSeineUIModel.java | 0 .../ird/observe/ui/content/impl/seine/package.html | 0 .../ird/observe/ui/content/list/ContentListUI.css | 0 .../ird/observe/ui/content/list/ContentListUI.jaxx | 0 .../ui/content/list/ContentListUIHandler.java | 0 .../ui/content/list/ContentListUIModel.java | 0 .../list/impl/longline/ActivityLonglinesUI.css | 0 .../list/impl/longline/ActivityLonglinesUI.jaxx | 0 .../impl/longline/ActivityLonglinesUIHandler.java | 0 .../impl/longline/ActivityLonglinesUIModel.java | 0 .../ui/content/list/impl/longline/CommonListUI.css | 0 .../content/list/impl/longline/TripLonglinesUI.css | 0 .../list/impl/longline/TripLonglinesUI.jaxx | 0 .../list/impl/longline/TripLonglinesUIHandler.java | 0 .../list/impl/longline/TripLonglinesUIModel.java | 0 .../content/list/impl/seine/ActivitySeinesUI.css | 0 .../content/list/impl/seine/ActivitySeinesUI.jaxx | 0 .../list/impl/seine/ActivitySeinesUIHandler.java | 0 .../list/impl/seine/ActivitySeinesUIModel.java | 0 .../ui/content/list/impl/seine/CommonListUI.css | 0 .../ui/content/list/impl/seine/RoutesUI.css | 0 .../ui/content/list/impl/seine/RoutesUI.jaxx | 0 .../content/list/impl/seine/RoutesUIHandler.java | 0 .../ui/content/list/impl/seine/RoutesUIModel.java | 0 .../ui/content/list/impl/seine/TripSeinesUI.css | 0 .../ui/content/list/impl/seine/TripSeinesUI.jaxx | 0 .../list/impl/seine/TripSeinesUIHandler.java | 0 .../content/list/impl/seine/TripSeinesUIModel.java | 0 .../fr/ird/observe/ui/content/list/package.html | 0 .../observe/ui/content/open/ContentOpenableUI.css | 0 .../observe/ui/content/open/ContentOpenableUI.jaxx | 0 .../ui/content/open/ContentOpenableUIHandler.java | 0 .../ui/content/open/ContentOpenableUIModel.java | 0 .../open/impl/longline/ActivityLonglineUI.css | 0 .../open/impl/longline/ActivityLonglineUI.jaxx | 0 .../impl/longline/ActivityLonglineUIHandler.java | 0 .../impl/longline/ActivityLonglineUIModel.java | 0 .../content/open/impl/longline/TripLonglineUI.css | 0 .../content/open/impl/longline/TripLonglineUI.jaxx | 0 .../open/impl/longline/TripLonglineUIHandler.java | 0 .../open/impl/longline/TripLonglineUIModel.java | 0 .../ui/content/open/impl/seine/ActivitySeineUI.css | 0 .../content/open/impl/seine/ActivitySeineUI.jaxx | 0 .../open/impl/seine/ActivitySeineUIHandler.java | 0 .../open/impl/seine/ActivitySeineUIModel.java | 0 .../observe/ui/content/open/impl/seine/RouteUI.css | 0 .../ui/content/open/impl/seine/RouteUI.jaxx | 0 .../ui/content/open/impl/seine/RouteUIHandler.java | 0 .../ui/content/open/impl/seine/RouteUIModel.java | 0 .../ui/content/open/impl/seine/TripSeineUI.css | 0 .../ui/content/open/impl/seine/TripSeineUI.jaxx | 0 .../open/impl/seine/TripSeineUIHandler.java | 0 .../content/open/impl/seine/TripSeineUIModel.java | 0 .../java/fr/ird/observe/ui/content/package.html | 0 .../observe/ui/content/ref/ContentReferenceUI.css | 0 .../observe/ui/content/ref/ContentReferenceUI.jaxx | 0 .../ui/content/ref/ContentReferenceUIHandler.java | 0 .../ui/content/ref/ContentReferenceUIModel.java | 0 .../ird/observe/ui/content/ref/ReferenceHomeUI.css | 0 .../observe/ui/content/ref/ReferenceHomeUI.jaxx | 0 .../ui/content/ref/ReferenceHomeUIHandler.java | 0 .../ui/content/ref/ReferenceHomeUIModel.java | 0 .../ref/ReferentialContentUIInitializer.java | 0 .../ui/content/ref/UniqueKeyTableModel.java | 0 .../ird/observe/ui/content/ref/impl/CountryUI.css | 0 .../ird/observe/ui/content/ref/impl/CountryUI.jaxx | 0 .../ui/content/ref/impl/CountryUIModel.java | 0 .../ird/observe/ui/content/ref/impl/FpaZoneUI.css | 0 .../ird/observe/ui/content/ref/impl/FpaZoneUI.jaxx | 0 .../ui/content/ref/impl/FpaZoneUIModel.java | 0 .../content/ref/impl/GearCaracteristicTypeUI.jaxx | 0 .../ref/impl/GearCaracteristicTypeUIModel.java | 0 .../ui/content/ref/impl/GearCaracteristicUI.css | 0 .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 0 .../content/ref/impl/GearCaracteristicUIModel.java | 0 .../fr/ird/observe/ui/content/ref/impl/GearUI.css | 0 .../fr/ird/observe/ui/content/ref/impl/GearUI.jaxx | 0 .../observe/ui/content/ref/impl/GearUIHandler.java | 0 .../observe/ui/content/ref/impl/GearUIModel.java | 0 .../ird/observe/ui/content/ref/impl/HarbourUI.css | 0 .../ird/observe/ui/content/ref/impl/HarbourUI.jaxx | 0 .../ui/content/ref/impl/HarbourUIModel.java | 0 .../ui/content/ref/impl/I18nReferenceEntity.css | 0 .../content/ref/impl/LengthWeightParameterUI.css | 0 .../content/ref/impl/LengthWeightParameterUI.jaxx | 0 .../ref/impl/LengthWeightParameterUIHandler.java | 0 .../ref/impl/LengthWeightParameterUIModel.java | 0 .../ref/impl/NeedCommentReferenceEntity.css | 0 .../ird/observe/ui/content/ref/impl/OceanUI.jaxx | 0 .../observe/ui/content/ref/impl/OceanUIModel.java | 0 .../ird/observe/ui/content/ref/impl/OrganismUI.css | 0 .../observe/ui/content/ref/impl/OrganismUI.jaxx | 0 .../ui/content/ref/impl/OrganismUIModel.java | 0 .../ird/observe/ui/content/ref/impl/PersonUI.css | 0 .../ird/observe/ui/content/ref/impl/PersonUI.jaxx | 0 .../observe/ui/content/ref/impl/PersonUIModel.java | 0 .../content/ref/impl/ProgramObservationEnum.java | 0 .../ird/observe/ui/content/ref/impl/ProgramUI.css | 0 .../ird/observe/ui/content/ref/impl/ProgramUI.jaxx | 0 .../ui/content/ref/impl/ProgramUIHandler.java | 0 .../ui/content/ref/impl/ProgramUIModel.java | 0 .../ui/content/ref/impl/ReferenceEntity.css | 0 .../fr/ird/observe/ui/content/ref/impl/SexUI.jaxx | 0 .../observe/ui/content/ref/impl/SexUIModel.java | 0 .../observe/ui/content/ref/impl/SpeciesGroupUI.css | 0 .../ui/content/ref/impl/SpeciesGroupUI.jaxx | 0 .../ui/content/ref/impl/SpeciesGroupUIModel.java | 0 .../observe/ui/content/ref/impl/SpeciesListUI.css | 0 .../observe/ui/content/ref/impl/SpeciesListUI.jaxx | 0 .../ui/content/ref/impl/SpeciesListUIHandler.java | 0 .../ui/content/ref/impl/SpeciesListUIModel.java | 0 .../ird/observe/ui/content/ref/impl/SpeciesUI.css | 0 .../ird/observe/ui/content/ref/impl/SpeciesUI.jaxx | 0 .../ui/content/ref/impl/SpeciesUIHandler.java | 0 .../ui/content/ref/impl/SpeciesUIModel.java | 0 .../ui/content/ref/impl/VesselSizeCategoryUI.css | 0 .../ui/content/ref/impl/VesselSizeCategoryUI.jaxx | 0 .../ref/impl/VesselSizeCategoryUIModel.java | 0 .../observe/ui/content/ref/impl/VesselTypeUI.jaxx | 0 .../ui/content/ref/impl/VesselTypeUIModel.java | 0 .../ird/observe/ui/content/ref/impl/VesselUI.css | 0 .../ird/observe/ui/content/ref/impl/VesselUI.jaxx | 0 .../ui/content/ref/impl/VesselUIHandler.java | 0 .../observe/ui/content/ref/impl/VesselUIModel.java | 0 .../ref/impl/longline/BaitHaulingStatusUI.jaxx | 0 .../impl/longline/BaitHaulingStatusUIModel.java | 0 .../ref/impl/longline/BaitSettingStatusUI.jaxx | 0 .../impl/longline/BaitSettingStatusUIModel.java | 0 .../ui/content/ref/impl/longline/BaitTypeUI.jaxx | 0 .../content/ref/impl/longline/BaitTypeUIModel.java | 0 .../ref/impl/longline/CatchFateLonglineUI.jaxx | 0 .../impl/longline/CatchFateLonglineUIModel.java | 0 .../content/ref/impl/longline/EncounterTypeUI.jaxx | 0 .../ref/impl/longline/EncounterTypeUIModel.java | 0 .../ui/content/ref/impl/longline/HealthnessUI.jaxx | 0 .../ref/impl/longline/HealthnessUIModel.java | 0 .../content/ref/impl/longline/HookPositionUI.jaxx | 0 .../ref/impl/longline/HookPositionUIModel.java | 0 .../ui/content/ref/impl/longline/HookSizeUI.jaxx | 0 .../content/ref/impl/longline/HookSizeUIModel.java | 0 .../ui/content/ref/impl/longline/HookTypeUI.jaxx | 0 .../content/ref/impl/longline/HookTypeUIModel.java | 0 .../impl/longline/ItemHorizontalPositionUI.jaxx | 0 .../longline/ItemHorizontalPositionUIModel.java | 0 .../ref/impl/longline/ItemVerticalPositionUI.jaxx | 0 .../impl/longline/ItemVerticalPositionUIModel.java | 0 .../ref/impl/longline/LightsticksColorUI.jaxx | 0 .../ref/impl/longline/LightsticksColorUIModel.java | 0 .../ref/impl/longline/LightsticksTypeUI.jaxx | 0 .../ref/impl/longline/LightsticksTypeUIModel.java | 0 .../ui/content/ref/impl/longline/LineTypeUI.jaxx | 0 .../content/ref/impl/longline/LineTypeUIModel.java | 0 .../content/ref/impl/longline/MaturityStatusUI.css | 0 .../ref/impl/longline/MaturityStatusUI.jaxx | 0 .../ref/impl/longline/MaturityStatusUIModel.java | 0 .../ref/impl/longline/MitigationTypeUI.jaxx | 0 .../ref/impl/longline/MitigationTypeUIModel.java | 0 .../ui/content/ref/impl/longline/SensorBrandUI.css | 0 .../content/ref/impl/longline/SensorBrandUI.jaxx | 0 .../ref/impl/longline/SensorBrandUIModel.java | 0 .../ref/impl/longline/SensorDataFormatUI.jaxx | 0 .../ref/impl/longline/SensorDataFormatUIModel.java | 0 .../ui/content/ref/impl/longline/SensorTypeUI.jaxx | 0 .../ref/impl/longline/SensorTypeUIModel.java | 0 .../content/ref/impl/longline/SettingShapeUI.jaxx | 0 .../ref/impl/longline/SettingShapeUIModel.java | 0 .../ref/impl/longline/SizeMeasureTypeUI.jaxx | 0 .../ref/impl/longline/SizeMeasureTypeUIModel.java | 0 .../ref/impl/longline/StomacFullnessUI.jaxx | 0 .../ref/impl/longline/StomacFullnessUIModel.java | 0 .../ui/content/ref/impl/longline/TripTypeUI.jaxx | 0 .../content/ref/impl/longline/TripTypeUIModel.java | 0 .../impl/longline/VesselActivityLonglineUI.jaxx | 0 .../longline/VesselActivityLonglineUIModel.java | 0 .../ref/impl/longline/WeightMeasureTypeUI.jaxx | 0 .../impl/longline/WeightMeasureTypeUIModel.java | 0 .../ui/content/ref/impl/seine/DetectionModeUI.jaxx | 0 .../ref/impl/seine/DetectionModeUIModel.java | 0 .../ui/content/ref/impl/seine/ObjectFateUI.jaxx | 0 .../content/ref/impl/seine/ObjectFateUIModel.java | 0 .../content/ref/impl/seine/ObjectOperationUI.jaxx | 0 .../ref/impl/seine/ObjectOperationUIModel.java | 0 .../ui/content/ref/impl/seine/ObjectTypeUI.jaxx | 0 .../content/ref/impl/seine/ObjectTypeUIModel.java | 0 .../ui/content/ref/impl/seine/ObservedSystemUI.css | 0 .../content/ref/impl/seine/ObservedSystemUI.jaxx | 0 .../ref/impl/seine/ObservedSystemUIModel.java | 0 .../content/ref/impl/seine/ReasonForDiscardUI.jaxx | 0 .../ref/impl/seine/ReasonForDiscardUIModel.java | 0 .../ref/impl/seine/ReasonForNoFishingUI.jaxx | 0 .../ref/impl/seine/ReasonForNoFishingUIModel.java | 0 .../content/ref/impl/seine/ReasonForNullSetUI.jaxx | 0 .../ref/impl/seine/ReasonForNullSetUIModel.java | 0 .../ui/content/ref/impl/seine/SpeciesFateUI.jaxx | 0 .../content/ref/impl/seine/SpeciesFateUIModel.java | 0 .../ui/content/ref/impl/seine/SpeciesStatusUI.jaxx | 0 .../ref/impl/seine/SpeciesStatusUIModel.java | 0 .../ref/impl/seine/SurroundingActivityUI.jaxx | 0 .../ref/impl/seine/SurroundingActivityUIModel.java | 0 .../impl/seine/TransmittingBuoyOperationUI.jaxx | 0 .../seine/TransmittingBuoyOperationUIModel.java | 0 .../ref/impl/seine/TransmittingBuoyTypeUI.jaxx | 0 .../impl/seine/TransmittingBuoyTypeUIModel.java | 0 .../ref/impl/seine/VesselActivitySeineUI.jaxx | 0 .../ref/impl/seine/VesselActivitySeineUIModel.java | 0 .../ui/content/ref/impl/seine/WeightCategoryUI.css | 0 .../content/ref/impl/seine/WeightCategoryUI.jaxx | 0 .../ref/impl/seine/WeightCategoryUIModel.java | 0 .../observe/ui/content/ref/impl/seine/WindUI.css | 0 .../observe/ui/content/ref/impl/seine/WindUI.jaxx | 0 .../ui/content/ref/impl/seine/WindUIModel.java | 0 .../fr/ird/observe/ui/content/ref/package.html | 0 .../ird/observe/ui/content/table/CommonTable.css | 0 .../observe/ui/content/table/ContentTableMeta.java | 0 .../ui/content/table/ContentTableModel.java | 0 .../observe/ui/content/table/ContentTableUI.css | 0 .../observe/ui/content/table/ContentTableUI.jaxx | 0 .../ui/content/table/ContentTableUIHandler.java | 0 .../content/table/ContentTableUIInitializer.java | 0 .../ui/content/table/ContentTableUIModel.java | 0 .../ui/content/table/ObserveContentTableUI.java | 0 .../table/impl/longline/BaitsCompositionUI.css | 0 .../table/impl/longline/BaitsCompositionUI.jaxx | 0 .../impl/longline/BaitsCompositionUIHandler.java | 0 .../impl/longline/BaitsCompositionUIModel.java | 0 .../impl/longline/BranchlinesCompositionUI.css | 0 .../impl/longline/BranchlinesCompositionUI.jaxx | 0 .../longline/BranchlinesCompositionUIHandler.java | 0 .../longline/BranchlinesCompositionUIModel.java | 0 .../impl/longline/CatchAcquisitionModeEnum.java | 0 .../CatchLonglineContentTableUIInitializer.java | 0 .../impl/longline/CatchLonglineTableModel.java | 0 .../table/impl/longline/CatchLonglineUI.css | 0 .../table/impl/longline/CatchLonglineUI.jaxx | 0 .../impl/longline/CatchLonglineUIHandler.java | 0 .../table/impl/longline/CatchLonglineUIModel.java | 0 .../ui/content/table/impl/longline/EncounterUI.css | 0 .../content/table/impl/longline/EncounterUI.jaxx | 0 .../table/impl/longline/EncounterUIHandler.java | 0 .../table/impl/longline/EncounterUIModel.java | 0 .../impl/longline/FloatlinesCompositionUI.css | 0 .../impl/longline/FloatlinesCompositionUI.jaxx | 0 .../longline/FloatlinesCompositionUIHandler.java | 0 .../longline/FloatlinesCompositionUIModel.java | 0 .../GearUseFeaturesLonglineTableModel.java | 0 .../impl/longline/GearUseFeaturesLonglineUI.css | 0 .../impl/longline/GearUseFeaturesLonglineUI.jaxx | 0 .../longline/GearUseFeaturesLonglineUIHandler.java | 0 .../longline/GearUseFeaturesLonglineUIModel.java | 0 ...rUseFeaturesMeasurementLonglinesTableModel.java | 0 .../table/impl/longline/HooksCompositionUI.css | 0 .../table/impl/longline/HooksCompositionUI.jaxx | 0 .../impl/longline/HooksCompositionUIHandler.java | 0 .../impl/longline/HooksCompositionUIModel.java | 0 .../impl/longline/LonglinePositionHelper.java | 0 .../content/table/impl/longline/SensorUsedUI.css | 0 .../content/table/impl/longline/SensorUsedUI.jaxx | 0 .../table/impl/longline/SensorUsedUIHandler.java | 0 .../table/impl/longline/SensorUsedUIModel.java | 0 .../impl/longline/SizeMeasuresTableModel.java | 0 .../ui/content/table/impl/longline/TdrUI.css | 0 .../ui/content/table/impl/longline/TdrUI.jaxx | 0 .../content/table/impl/longline/TdrUIHandler.java | 0 .../ui/content/table/impl/longline/TdrUIModel.java | 0 .../impl/longline/WeightMeasuresTableModel.java | 0 .../content/table/impl/seine/AbstractSampleUI.css | 0 .../content/table/impl/seine/CodeMesureEnum.java | 0 .../seine/GearUseFeatureMeasurementCellEditor.java | 0 .../GearUseFeatureMeasurementCellRenderer.java | 0 ...GearUseFeaturesMeasurementSeinesTableModel.java | 0 .../impl/seine/GearUseFeaturesSeineTableModel.java | 0 .../table/impl/seine/GearUseFeaturesSeineUI.css | 0 .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 0 .../impl/seine/GearUseFeaturesSeineUIHandler.java | 0 .../impl/seine/GearUseFeaturesSeineUIModel.java | 0 .../impl/seine/ModeSaisieEchantillonEnum.java | 0 .../content/table/impl/seine/NonTargetCatchUI.css | 0 .../content/table/impl/seine/NonTargetCatchUI.jaxx | 0 .../table/impl/seine/NonTargetCatchUIHandler.java | 0 .../table/impl/seine/NonTargetCatchUIModel.java | 0 .../content/table/impl/seine/NonTargetSampleUI.css | 0 .../table/impl/seine/NonTargetSampleUI.jaxx | 0 .../table/impl/seine/NonTargetSampleUIHandler.java | 0 .../table/impl/seine/NonTargetSampleUIModel.java | 0 .../table/impl/seine/ObjectObservedSpeciesUI.css | 0 .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 0 .../impl/seine/ObjectObservedSpeciesUIHandler.java | 0 .../impl/seine/ObjectObservedSpeciesUIModel.java | 0 .../table/impl/seine/ObjectSchoolEstimateUI.css | 0 .../table/impl/seine/ObjectSchoolEstimateUI.jaxx | 0 .../impl/seine/ObjectSchoolEstimateUIHandler.java | 0 .../impl/seine/ObjectSchoolEstimateUIModel.java | 0 .../content/table/impl/seine/SchoolEstimateUI.css | 0 .../content/table/impl/seine/SchoolEstimateUI.jaxx | 0 .../table/impl/seine/SchoolEstimateUIHandler.java | 0 .../table/impl/seine/SchoolEstimateUIModel.java | 0 .../ui/content/table/impl/seine/TargetCatchUI.css | 0 .../ui/content/table/impl/seine/TargetCatchUI.jaxx | 0 .../table/impl/seine/TargetCatchUIHandler.java | 0 .../table/impl/seine/TargetCatchUIModel.java | 0 .../table/impl/seine/TargetDiscardCatchUI.css | 0 .../table/impl/seine/TargetDiscardCatchUI.jaxx | 0 .../impl/seine/TargetDiscardCatchUIHandler.java | 0 .../impl/seine/TargetDiscardCatchUIModel.java | 0 .../table/impl/seine/TargetSampleCaptureUI.css | 0 .../table/impl/seine/TargetSampleCaptureUI.jaxx | 0 .../table/impl/seine/TargetSampleRejeteUI.css | 0 .../table/impl/seine/TargetSampleRejeteUI.jaxx | 0 .../ui/content/table/impl/seine/TargetSampleUI.css | 0 .../content/table/impl/seine/TargetSampleUI.jaxx | 0 .../table/impl/seine/TargetSampleUIHandler.java | 0 .../table/impl/seine/TargetSampleUIModel.java | 0 .../fr/ird/observe/ui/content/table/package.html | 0 .../src/main/java/fr/ird/observe/ui/package.html | 0 .../ird/observe/ui/storage/ObstunaAdminAction.java | 0 .../ird/observe/ui/storage/RemoteUILauncher.java | 0 .../ui/storage/StorageBackupUILauncher.java | 0 .../fr/ird/observe/ui/storage/StorageStep.java | 0 .../java/fr/ird/observe/ui/storage/StorageUI.css | 0 .../java/fr/ird/observe/ui/storage/StorageUI.jaxx | 0 .../ird/observe/ui/storage/StorageUIHandler.java | 0 .../ird/observe/ui/storage/StorageUILauncher.java | 0 .../fr/ird/observe/ui/storage/StorageUIModel.java | 0 .../java/fr/ird/observe/ui/storage/package.html | 0 .../fr/ird/observe/ui/storage/tabs/BackupUI.css | 0 .../fr/ird/observe/ui/storage/tabs/BackupUI.jaxx | 0 .../ird/observe/ui/storage/tabs/ChooseDbModeUI.css | 0 .../observe/ui/storage/tabs/ChooseDbModeUI.jaxx | 0 .../ird/observe/ui/storage/tabs/ConfigDataUI.css | 0 .../ird/observe/ui/storage/tabs/ConfigDataUI.jaxx | 0 .../ui/storage/tabs/ConfigReferentielUI.css | 0 .../ui/storage/tabs/ConfigReferentielUI.jaxx | 0 .../fr/ird/observe/ui/storage/tabs/ConfigUI.css | 0 .../fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx | 0 .../fr/ird/observe/ui/storage/tabs/ConfirmUI.css | 0 .../fr/ird/observe/ui/storage/tabs/ConfirmUI.jaxx | 0 .../observe/ui/storage/tabs/RolesTableModel.java | 0 .../fr/ird/observe/ui/storage/tabs/RolesUI.css | 0 .../fr/ird/observe/ui/storage/tabs/RolesUI.jaxx | 0 .../ird/observe/ui/storage/tabs/SelectDataUI.css | 0 .../ird/observe/ui/storage/tabs/SelectDataUI.jaxx | 0 .../ird/observe/ui/storage/tabs/StorageTabUI.css | 0 .../ird/observe/ui/storage/tabs/StorageTabUI.jaxx | 0 .../ui/storage/tabs/StorageTabUIHandler.java | 0 .../fr/ird/observe/ui/storage/tabs/package.html | 0 .../ui/tree/AbstractObserveTreeCellRenderer.java | 0 .../ird/observe/ui/tree/ActivityLonglineNode.java | 0 .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 0 .../ui/tree/DataSelectionTreeCellRenderer.java | 0 .../ui/tree/DataSelectionTreeSelectionModel.java | 0 .../fr/ird/observe/ui/tree/EntityNodeSupport.java | 0 .../observe/ui/tree/FloatingObjectSeineNode.java | 0 .../ui/tree/NavigationTreeCellRenderer.java | 0 .../ui/tree/NavigationTreeSelectionModel.java | 0 .../ird/observe/ui/tree/ObserveDataProvider.java | 0 .../tree/ObserveNavigationTreeShowPopupAction.java | 0 .../java/fr/ird/observe/ui/tree/ObserveNode.java | 0 .../fr/ird/observe/ui/tree/ObserveTreeBridge.java | 0 .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 0 .../ird/observe/ui/tree/ProgramLonglineNode.java | 0 .../fr/ird/observe/ui/tree/ProgramSeineNode.java | 0 .../fr/ird/observe/ui/tree/RouteSeineNode.java | 0 .../fr/ird/observe/ui/tree/SetLonglineNode.java | 0 .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 0 .../fr/ird/observe/ui/tree/TripLonglineNode.java | 0 .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 0 .../actions/ChangeTripProgramActionListener.java | 0 .../ui/tree/loadors/AbstractNodeChildLoador.java | 0 .../loadors/ActivityLonglineNodeChildLoador.java | 0 .../loadors/ActivityLonglinesNodeChildLoador.java | 0 .../tree/loadors/ActivitySeineNodeChildLoador.java | 0 .../loadors/ActivitySeinesNodeChildLoador.java | 0 .../loadors/FloatingObjectNodeChildLoador.java | 0 .../loadors/ProgramLonglineNodeChildLoador.java | 0 .../tree/loadors/ProgramSeineNodeChildLoador.java | 0 .../loadors/ReferenceCommonNodeChildLoador.java | 0 .../loadors/ReferenceLonglineNodeChildLoador.java | 0 .../loadors/ReferenceSeineNodeChildLoador.java | 0 .../ui/tree/loadors/RootNodeChildLoador.java | 0 .../ui/tree/loadors/RoutesNodeChildLoador.java | 0 .../tree/loadors/SetLonglineNodeChildLoador.java | 0 .../ui/tree/loadors/SetSeineNodeChildLoador.java | 0 .../java/fr/ird/observe/ui/usage/UsagesUI.jaxx | 0 .../fr/ird/observe/ui/usage/UsagesUIHandler.java | 0 .../java/fr/ird/observe/ui/util/BooleanEditor.java | 0 .../ird/observe/ui/util/JVetoableTabbedPane.java | 0 ...ObserveSimpleValidatorMessageTableRenderer.java | 0 .../ObserveSwingValidatorMessageTableModel.java | 0 .../util/ObserveValidatorMessageTableRenderer.java | 0 .../fr/ird/observe/ui/util/SpringUtilities.java | 0 .../ui/util/table/AbstractSelectTableAction.java | 0 .../AutotSelectRowAndShowPopupActionSupport.java | 0 .../fr/ird/observe/ui/util/table/EditableList.java | 0 .../ui/util/table/EditableTableModelSupport.java | 0 .../EditableTableWithCacheTableModelSupport.java | 0 .../util/table/MoveToNextEditableCellAction.java | 0 .../ui/util/table/MoveToNextEditableRowAction.java | 0 .../table/MoveToPreviousEditableCellAction.java | 0 .../table/MoveToPreviousEditableRowAction.java | 0 .../table/ObserveBooleanTableCellRenderer.java | 0 .../observe/ui/util/tripMap/ObserveMapPane.java | 0 .../ui/util/tripMap/ObserveMapPaneLegendItem.java | 0 .../util/tripMap/ObserverMapPanLegendDrawer.java | 0 .../ui/util/tripMap/TripMapContentBuilder.java | 0 .../fr/ird/observe/ui/util/tripMap/TripMapUI.css | 0 .../fr/ird/observe/ui/util/tripMap/TripMapUI.jaxx | 0 .../observe/ui/util/tripMap/TripMapUIHandler.java | 0 .../map/shapeFiles/borders/WDBII_border_l_L1.dbf | Bin .../map/shapeFiles/borders/WDBII_border_l_L1.prj | 0 .../map/shapeFiles/borders/WDBII_border_l_L1.shp | Bin .../map/shapeFiles/borders/WDBII_border_l_L1.shx | Bin .../main/map/shapeFiles/continents/GSHHS_l_L1.dbf | Bin .../main/map/shapeFiles/continents/GSHHS_l_L1.prj | 0 .../main/map/shapeFiles/continents/GSHHS_l_L1.shp | Bin .../main/map/shapeFiles/continents/GSHHS_l_L1.shx | Bin .../main/map/shapeFiles/continents/GSHHS_l_L6.dbf | Bin .../main/map/shapeFiles/continents/GSHHS_l_L6.prj | 0 .../main/map/shapeFiles/continents/GSHHS_l_L6.shp | Bin .../main/map/shapeFiles/continents/GSHHS_l_L6.shx | Bin .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.dbf | Bin .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.prj | 0 .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp | Bin .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shx | Bin .../main/map/shapeFiles/zee/World_EEZ_v8_2014.dbf | Bin .../main/map/shapeFiles/zee/World_EEZ_v8_2014.prj | 0 .../main/map/shapeFiles/zee/World_EEZ_v8_2014.sbn | Bin .../main/map/shapeFiles/zee/World_EEZ_v8_2014.sbx | Bin .../main/map/shapeFiles/zee/World_EEZ_v8_2014.shp | Bin .../map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml | 0 .../main/map/shapeFiles/zee/World_EEZ_v8_2014.shx | Bin .../src/main/map/style.xml | 0 .../org.nuiton.config.ApplicationConfigProvider | 0 .../observe-application-swing_en_GB.properties | 1789 ++++++++++---------- .../observe-application-swing_es_ES.properties | 1789 ++++++++++---------- .../observe-application-swing_fr_FR.properties | 1789 ++++++++++---------- .../resources/i18n/observe-swing_en_GB.properties | 0 .../resources/i18n/observe-swing_es_ES.properties | 0 .../resources/i18n/observe-swing_fr_FR.properties | 0 .../src/main/resources/icons/action-about.png | Bin .../src/main/resources/icons/action-accept.png | Bin .../src/main/resources/icons/action-add.png | Bin .../resources/icons/action-application-reload.png | Bin .../main/resources/icons/action-bean-sort-down.png | Bin .../main/resources/icons/action-bean-sort-up.png | Bin .../src/main/resources/icons/action-bean-sort.png | Bin .../src/main/resources/icons/action-calculator.png | Bin .../src/main/resources/icons/action-cancel.png | Bin .../src/main/resources/icons/action-center.png | Bin .../src/main/resources/icons/action-close.png | Bin .../src/main/resources/icons/action-closeTab.png | Bin .../main/resources/icons/action-combobox-reset.png | Bin .../resources/icons/action-combobox-reset2.png | Bin .../main/resources/icons/action-combobox-sort.png | Bin .../src/main/resources/icons/action-config.png | Bin .../resources/icons/action-connect_creating.png | Bin .../src/main/resources/icons/action-connect_no.png | Bin .../src/main/resources/icons/action-connect_ok.png | Bin .../resources/icons/action-connect_untested.png | Bin .../src/main/resources/icons/action-connected.png | Bin .../main/resources/icons/action-data-calcule.png | Bin .../main/resources/icons/action-data-export.png | Bin .../main/resources/icons/action-data-import.png | Bin .../main/resources/icons/action-data-observe.png | Bin .../src/main/resources/icons/action-db-change.png | Bin .../src/main/resources/icons/action-db-local.png | Bin .../src/main/resources/icons/action-db-none.png | Bin .../src/main/resources/icons/action-db-reload.png | Bin .../src/main/resources/icons/action-db-remote.png | Bin .../resources/icons/action-db-start-server.png | Bin .../main/resources/icons/action-db-stop-server.png | Bin .../src/main/resources/icons/action-delete.png | Bin .../resources/icons/action-edit-measurements.png | Bin .../src/main/resources/icons/action-exit.png | Bin .../main/resources/icons/action-fileChooser.png | Bin .../src/main/resources/icons/action-generate.png | Bin .../src/main/resources/icons/action-go-back.png | Bin .../src/main/resources/icons/action-go-detail.png | Bin .../src/main/resources/icons/action-go-down.png | Bin .../src/main/resources/icons/action-go-jump.png | Bin .../src/main/resources/icons/action-go-up.png | Bin .../src/main/resources/icons/action-help.png | Bin .../src/main/resources/icons/action-i18n-en.png | Bin .../src/main/resources/icons/action-i18n-es.png | Bin .../src/main/resources/icons/action-i18n-fr.png | Bin .../src/main/resources/icons/action-i18n-uk.png | Bin .../src/main/resources/icons/action-import-gps.png | Bin .../main/resources/icons/action-information.png | Bin .../main/resources/icons/action-insert-after.png | Bin .../main/resources/icons/action-insert-before.png | Bin .../main/resources/icons/action-local-export.png | Bin .../main/resources/icons/action-local-import.png | Bin .../main/resources/icons/action-mode-create.png | Bin .../src/main/resources/icons/action-mode-read.png | Bin .../main/resources/icons/action-mode-update.png | Bin .../src/main/resources/icons/action-next-step.png | Bin .../src/main/resources/icons/action-openLink.png | Bin .../main/resources/icons/action-previous-step.png | Bin .../main/resources/icons/action-remote-export.png | Bin .../main/resources/icons/action-remote-import.png | Bin .../src/main/resources/icons/action-reopen.png | Bin .../main/resources/icons/action-report-copy.png | Bin .../src/main/resources/icons/action-report-run.png | Bin .../src/main/resources/icons/action-report.png | Bin .../src/main/resources/icons/action-revert.png | Bin .../src/main/resources/icons/action-save.png | Bin .../resources/icons/action-select-ssl-cert.png | Bin .../src/main/resources/icons/action-show-help.png | Bin .../resources/icons/action-show-informations.png | Bin .../src/main/resources/icons/action-show-keys.png | Bin .../main/resources/icons/action-show-usages.png | Bin .../src/main/resources/icons/action-site.png | Bin .../src/main/resources/icons/action-synch.png | Bin .../main/resources/icons/action-synchro-pause.png | Bin .../main/resources/icons/action-synchro-start.png | Bin .../main/resources/icons/action-synchro-stop.png | Bin .../src/main/resources/icons/action-translate.png | Bin .../src/main/resources/icons/action-ui-reload.png | Bin .../main/resources/icons/action-unconnected.png | Bin .../src/main/resources/icons/action-validate.png | Bin .../resources/icons/action-verify-equation.png | Bin .../src/main/resources/icons/logo OT_rvb.png | Bin .../src/main/resources/icons/logo-OT_web.png | Bin .../src/main/resources/icons/logo_ird.png | Bin .../main/resources/icons/navigation/activite.png | Bin .../src/main/resources/icons/navigation/bateau.png | Bin .../src/main/resources/icons/navigation/calee.png | Bin .../resources/icons/navigation/ird/activity16.png | Bin .../resources/icons/navigation/ird/activity24.png | Bin .../icons/navigation/ird/floatingObject16.png | Bin .../icons/navigation/ird/floatingObject24.png | Bin .../icons/navigation/ird/observedSystem16.png | Bin .../icons/navigation/ird/observedSystem24.png | Bin .../resources/icons/navigation/ird/program16.png | Bin .../resources/icons/navigation/ird/program24.png | Bin .../icons/navigation/ird/referentiel16.png | Bin .../icons/navigation/ird/referentiel24.png | Bin .../resources/icons/navigation/ird/route16.png | Bin .../resources/icons/navigation/ird/route24.png | Bin .../main/resources/icons/navigation/ird/set16.png | Bin .../main/resources/icons/navigation/ird/set24.png | Bin .../icons/navigation/ird/sub_floatingObject16.png | Bin .../icons/navigation/ird/sub_floatingObject24.png | Bin .../icons/navigation/ird/sub_referentiel16.png | Bin .../resources/icons/navigation/ird/sub_set16.png | Bin .../resources/icons/navigation/ird/sub_set24.png | Bin .../main/resources/icons/navigation/ird/trip16.png | Bin .../main/resources/icons/navigation/ird/trip24.png | Bin .../src/main/resources/icons/navigation/maree.png | Bin .../resources/icons/navigation/objetFlottant.png | Bin .../resources/icons/navigation/observateur.png | Bin .../src/main/resources/icons/navigation/ocean.png | Bin .../main/resources/icons/navigation/picto_a 24.png | Bin .../main/resources/icons/navigation/picto_b 16.png | Bin .../main/resources/icons/navigation/picto_b 24.png | Bin .../main/resources/icons/navigation/picto_c 16.png | Bin .../main/resources/icons/navigation/picto_c 24.png | Bin .../main/resources/icons/navigation/picto_d 16.png | Bin .../main/resources/icons/navigation/picto_d 24.png | Bin .../main/resources/icons/navigation/picto_e 24.png | Bin .../main/resources/icons/navigation/picto_f 16.png | Bin .../main/resources/icons/navigation/picto_f 24.png | Bin .../main/resources/icons/navigation/programme.png | Bin .../src/main/resources/icons/navigation/route.png | Bin .../src/main/resources/icons/navigation/senne.png | Bin .../resources/icons/navigation/systemeObserve.png | Bin .../src/main/resources/log4j.properties | 0 .../src/main/resources/observe-log4j.properties | 0 .../src/main/ssl/cacert.jks | Bin .../src/main/ssl/server.crt | 0 .../src/main/ssl/server.key | 0 ...glineDetailCompositionValidatorServiceTest.java | 0 .../src/test/resources/log4j.properties | 0 .../LICENSE.txt | 0 .../README.txt | 0 .../pom.xml | 13 +- .../web/ObserveWebApplicationContext.java | 38 +- .../web/ObserveWebApplicationListener.java | 42 + .../application/web/ObserveWebMotionFilter.java | 10 +- .../web/ObserveWebMotionJsonHelper.java | 6 +- .../application/web/ObserveWebMotionRender.java | 12 +- .../web/controller/ObserveWebMotionController.java | 4 +- .../controller/ReferentialServiceController.java | 5 +- observe-application-web/src/main/resources/mapping | 12 + .../src/main/webapp/WEB-INF/web.xml | 4 +- observe-services-api/pom.xml | 6 +- .../observe/services/ObserveServiceFactory.java | 2 + .../services/ObserveServiceFactorySupport.java | 6 +- .../LICENSE.txt | 0 .../README.txt | 0 .../pom.xml | 17 +- .../ObserveDataSourceConfiguration.java | 2 +- .../src/test/resources/log4j.properties | 0 .../LICENSE.txt | 0 .../README.txt | 0 .../pom.xml | 11 +- .../ObserveDataSourceConfigurationRest.java | 6 +- .../fr.ird.observe.services.ObserveServiceFactory | 1 + .../src/test/resources/log4j.properties | 0 .../LICENSE.txt | 0 .../README.txt | 0 .../pom.xml | 35 +- .../ObserveDataSourceConfigurationTopiaH2.java | 51 + .../ObserveDataSourceConfigurationTopiaPG.java | 64 + ...ObserveDataSourceConfigurationTopiaSupport.java | 88 + .../src/test/resources/log4j.properties | 0 .../xmi/observe-services-dto-common.properties | 32 + .../rest/client/ObserveRestClientService.java | 23 - .../fr.ird.observe.services.ObserveServiceFactory | 1 - .../ObserveRestWebMotionApplicationListener.java | 42 - .../src/main/resources/mapping | 12 - .../LICENSE.txt | 0 .../README.txt | 0 .../pom.xml | 16 +- .../services/ObserveServiceContextRest.java | 11 +- .../services/ObserveServiceFactoryRest.java | 20 +- .../ird/observe/services/ObserveServiceRest.java | 20 + .../rest/wm/ObserveRestApplicationContext.java | 42 - .../rest/wm/ObserveRestApplicationListener.java | 42 - .../rest/wm/ObserveRestWebMotionFilter.java | 62 - .../services/service/ReferentialServiceRest.java | 7 +- .../fr.ird.observe.services.ObserveServiceFactory | 1 + observe-services-rest/src/main/resources/mapping | 28 - .../src/main/webapp/WEB-INF/web.xml | 36 - .../service/ReferentialServiceRestTest.java | 11 +- .../src/test/resources/log4j.properties | 0 .../LICENSE.txt | 0 .../README.txt | 0 .../pom.xml | 79 +- .../services/ObserveServiceMainFactory.java | 1 + .../src/test/resources/log4j.properties | 0 observe-services-topia/pom.xml | 16 +- .../observe/services/AbstractObserveService.java | 5 +- ...ontext.java => ObserveServiceContextTopia.java} | 21 +- .../services/ObserveServiceFactoryTopia.java | 281 +++ .../services/{topia => }/ObserveServiceTopia.java | 11 +- .../{topia => }/builder/DtoToEntityBuilder.java | 6 +- .../{topia => }/builder/EntityToDtoBuilder.java | 37 +- .../builder/EntityToReferenceDtoBuilder.java | 4 +- .../EntityToReferentialReferenceDtoBuilder.java | 4 +- .../services/{topia => dto}/ObserveDtoBinders.java | 3 +- .../{topia => dto}/ObserveDtosInitializer.java | 658 ++++--- .../service/ReferentialServiceTopia.java | 9 +- .../ActivitySeineObservedSystemServiceTopia.java | 5 +- .../service/seine/ActivitySeineServiceTopia.java | 4 +- .../service/seine/FloatingObjectServiceTopia.java | 4 +- .../topia/ObserveTopiaDataSourceConfiguration.java | 22 - .../services/topia/ObserveTopiaServiceFactory.java | 171 -- .../fr.ird.observe.services.ObserveServiceFactory | 2 +- .../services/ObserveServiceFactoryTopiaTaiste.java | 37 + .../builder/DtoToEntityBuilderTest.java | 4 +- .../builder/EntityToDtoBuilderTest.java | 17 +- .../{topia => }/ApplicationContextResource.java | 14 +- .../service/{topia => }/DataSourceResource.java | 56 +- .../service => }/ReferentialServiceTopiaTest.java | 33 +- pom.xml | 10 +- 865 files changed, 3991 insertions(+), 3757 deletions(-) rename {observe-swing => observe-application-swing}/LICENSE.txt (100%) rename {observe-swing => observe-application-swing}/README.txt (100%) rename {observe-swing => observe-application-swing}/changelog.txt (100%) rename {observe-swing => observe-application-swing}/pom.xml (94%) rename {observe-swing => observe-application-swing}/src/license/THIRD-PARTY.properties (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/bin.xml (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/doc/observe_manuel_administration.pdf (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/doc/observe_manuel_observateur.pdf (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/go.bat (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/go.sh (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/obstuna-admin/README.txt (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/obstuna-admin/apply-extra.sh (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/obstuna-admin/create-obstuna.bat (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/obstuna-admin/create-obstuna.sh (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/obstuna-admin/createdb/create-empty-obstuna.sh (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/obstuna-admin/createdb/create-ird_obstuna.sh (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/obstuna-admin/createdb/create-test_obstuna.sh (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/obstuna-admin/drop-obstuna.bat (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/obstuna-admin/drop-obstuna.sh (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/obstuna-admin/extra/create-postgis-1-activity.sql (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/obstuna-admin/extra/create-postgis-2-harbour.sql (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/obstuna-admin/extra/create-postgis-3-activity-seine.sql (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/obstuna-admin/extra/create-postgis-4-activity-longine.sql (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/obstuna-admin/extra/function_enhanced_sets_school_types.sql (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/obstuna-admin/update-obstuna.bat (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/obstuna-admin/update-obstuna.sh (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/obstuna-admin/update-security-obstuna.bat (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/obstuna-admin/update-security-obstuna.sh (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/util/README.txt (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/util/backup-obstuna.sh (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/util/create-postgis.sh (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/util/generate-id.bat (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/util/generate-id.sh (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/util/tables/data-tables.txt (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/dist/util/tables/referentiel-tables.txt (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/map.xml (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/sql/v1/README.txt (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/sql/v1/create-obstuna-linux.sh (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/sql/v1/create-obstuna-solaris.sh (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/sql/v1/create-postgis.sh (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/sql/v1/createdb-script.sh (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/sql/v1/security/create-admin-security-script.sh (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/sql/v1/security/create-default-security-script.sh (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/sql/v1/security/create-reader-security-script.sh (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/sql/v1/security/create-security-script.sh (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/sql/v1/security/create-technicien-security-script.sh (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/sql/v1/security/tables.txt (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/sql/v1/sql/obstuna.sql (100%) rename {observe-swing => observe-application-swing}/src/main/assembly/sql/v2/README.txt (100%) rename {observe-swing => observe-application-swing}/src/main/filters/observe-application.properties (100%) rename {observe-swing => observe-application-swing}/src/main/filters/observe-ui.properties (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ObserveActionExecutor.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ObserveAdminCLI.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ObserveApplicationConfigProvider.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ObserveCLAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ObserveConfig.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ObserveConfigOption.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ObserveContext.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ObserveResourceManager.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ObserveRunner.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/package.html (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/ObserveCommon.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/ObserveMainUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/ObserveUICallback.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/ObserveUIMode.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/UIHelper.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/ChangeApplicationLanguageAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/ChangeDbLanguageAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/ChangeStorageAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/CloseApplicationAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/CloseHelpAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/CloseStorageAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/GotoSiteAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/ImportStorageFromFileAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/LaunchAdminAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/ReloadApplicationAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/ReloadDefaultConfigurationAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/ReloadResourcesAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/ReloadStorageAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/SaveStorageToFileAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/ShowAboutAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/ShowConfigAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/ShowStorageInfoAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/StartH2WebServerAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/StartServerModeAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/StopH2WebServerAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/StopServerModeAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/shared/AbstractUIAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/shared/CancelCreateUIAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/shared/CloseAndCreateUIAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/shared/CloseOpenUIAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/shared/DeleteDataUIAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/shared/DeleteReferenceUIAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/shared/GoDownUIAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/shared/GoUpUIAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/shared/ReOpenUIAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/shared/ResetEditUIAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/shared/SaveEditUIAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/shared/SelectNodeUIAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/actions/shared/SelectOpenNodeUIAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/AdminActionModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/AdminActionWorker.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/AdminStep.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/AdminTabUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/AdminTabUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/AdminUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/AdminUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/AdminUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/AdminUILauncher.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/config/ConfigUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/config/ConfigUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/config/ConfigUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/export/ExportUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/export/ExportUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/export/TripEntry.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/export/TripToExportTableModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/gps/GPSAbleTableModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/gps/GPSActivityTableModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSConfigUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSConfigUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/report/ReportConfigUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/report/ReportConfigUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/report/ReportModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/report/ReportUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/report/ReportUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/report/ResultTableModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/resume/ShowResumeUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/resume/ShowResumeUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/resume/ShowResumeUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityListCellRenderer.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityTableModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/validate/ValidateConfigUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/validate/ValidateConfigUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/validate/ValidateEntityListCellRenderer.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/validate/ValidateModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/Common.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ContentMode.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ContentUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ContentUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/longline/BasketsTableModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlinesTableModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineCompositionTableModelSupport.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionTemplatesTableModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionsTableModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/impl/seine/package.html (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/list/ContentListUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/list/ContentListUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/list/ContentListUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/list/impl/longline/CommonListUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/list/impl/seine/CommonListUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/list/package.html (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/package.html (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/UniqueKeyTableModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/CountryUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/CountryUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/CountryUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/FpaZoneUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/FpaZoneUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/FpaZoneUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicTypeUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/I18nReferenceEntity.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/NeedCommentReferenceEntity.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/OceanUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/OceanUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/OrganismUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/OrganismUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/OrganismUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/PersonUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/PersonUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/PersonUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramObservationEnum.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/ReferenceEntity.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/SexUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/SexUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesGroupUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesGroupUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesGroupUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselSizeCategoryUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselSizeCategoryUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselSizeCategoryUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselTypeUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselTypeUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitHaulingStatusUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitHaulingStatusUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitSettingStatusUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitSettingStatusUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitTypeUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitTypeUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/CatchFateLonglineUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/CatchFateLonglineUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/EncounterTypeUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/EncounterTypeUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HealthnessUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HealthnessUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookPositionUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookPositionUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookSizeUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookSizeUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookTypeUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookTypeUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/ItemHorizontalPositionUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/ItemHorizontalPositionUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/ItemVerticalPositionUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/ItemVerticalPositionUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LightsticksColorUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LightsticksColorUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LightsticksTypeUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LightsticksTypeUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LineTypeUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LineTypeUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/MaturityStatusUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/MaturityStatusUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/MaturityStatusUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/MitigationTypeUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/MitigationTypeUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorBrandUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorBrandUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorBrandUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorDataFormatUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorDataFormatUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorTypeUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorTypeUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SettingShapeUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SettingShapeUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SizeMeasureTypeUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SizeMeasureTypeUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/StomacFullnessUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/StomacFullnessUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/TripTypeUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/TripTypeUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/VesselActivityLonglineUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/VesselActivityLonglineUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/WeightMeasureTypeUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/WeightMeasureTypeUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/DetectionModeUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/DetectionModeUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectFateUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectFateUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectOperationUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectOperationUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectTypeUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectTypeUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObservedSystemUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObservedSystemUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObservedSystemUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForDiscardUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForDiscardUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForNoFishingUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForNoFishingUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForNullSetUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForNullSetUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SpeciesFateUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SpeciesFateUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SpeciesStatusUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SpeciesStatusUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SurroundingActivityUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SurroundingActivityUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/TransmittingBuoyOperationUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/TransmittingBuoyOperationUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/TransmittingBuoyTypeUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/TransmittingBuoyTypeUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/VesselActivitySeineUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/VesselActivitySeineUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WeightCategoryUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WeightCategoryUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WeightCategoryUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WindUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WindUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WindUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/ref/package.html (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/CommonTable.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/ContentTableMeta.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/ContentTableModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/ContentTableUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/ContentTableUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIInitializer.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/ObserveContentTableUI.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchAcquisitionModeEnum.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineTableModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesMeasurementLonglinesTableModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/LonglinePositionHelper.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SizeMeasuresTableModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/longline/WeightMeasuresTableModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/AbstractSampleUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/CodeMesureEnum.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ModeSaisieEchantillonEnum.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleCaptureUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleCaptureUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleRejeteUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleRejeteUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/content/table/package.html (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/package.html (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/ObstunaAdminAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/RemoteUILauncher.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/StorageBackupUILauncher.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/StorageStep.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/StorageUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/StorageUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/StorageUILauncher.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/package.html (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/tabs/BackupUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/tabs/BackupUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/tabs/ChooseDbModeUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/tabs/ChooseDbModeUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigReferentielUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigReferentielUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/tabs/ConfirmUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/tabs/ConfirmUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/tabs/RolesTableModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/tabs/RolesUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/tabs/RolesUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/tabs/SelectDataUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/tabs/SelectDataUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/storage/tabs/package.html (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/DataSelectionTreeCellRenderer.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/DataSelectionTreeSelectionModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/EntityNodeSupport.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/NavigationTreeCellRenderer.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/NavigationTreeSelectionModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/ObserveDataProvider.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/ObserveNode.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/ObserveTreeBridge.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/actions/ChangeTripProgramActionListener.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractNodeChildLoador.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeinesNodeChildLoador.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/usage/UsagesUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/usage/UsagesUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/util/BooleanEditor.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/util/JVetoableTabbedPane.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/util/ObserveSimpleValidatorMessageTableRenderer.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/util/ObserveSwingValidatorMessageTableModel.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/util/ObserveValidatorMessageTableRenderer.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/util/SpringUtilities.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/util/table/AbstractSelectTableAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/util/table/AutotSelectRowAndShowPopupActionSupport.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/util/table/EditableList.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/util/table/EditableTableModelSupport.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/util/table/EditableTableWithCacheTableModelSupport.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/util/table/MoveToNextEditableCellAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/util/table/MoveToNextEditableRowAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/util/table/MoveToPreviousEditableCellAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/util/table/MoveToPreviousEditableRowAction.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/util/table/ObserveBooleanTableCellRenderer.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/util/tripMap/ObserveMapPane.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/util/tripMap/ObserveMapPaneLegendItem.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/util/tripMap/ObserverMapPanLegendDrawer.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapContentBuilder.java (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUI.css (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUI.jaxx (100%) rename {observe-swing => observe-application-swing}/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java (100%) rename {observe-swing => observe-application-swing}/src/main/map/shapeFiles/borders/WDBII_border_l_L1.dbf (100%) rename {observe-swing => observe-application-swing}/src/main/map/shapeFiles/borders/WDBII_border_l_L1.prj (100%) rename {observe-swing => observe-application-swing}/src/main/map/shapeFiles/borders/WDBII_border_l_L1.shp (100%) rename {observe-swing => observe-application-swing}/src/main/map/shapeFiles/borders/WDBII_border_l_L1.shx (100%) rename {observe-swing => observe-application-swing}/src/main/map/shapeFiles/continents/GSHHS_l_L1.dbf (100%) rename {observe-swing => observe-application-swing}/src/main/map/shapeFiles/continents/GSHHS_l_L1.prj (100%) rename {observe-swing => observe-application-swing}/src/main/map/shapeFiles/continents/GSHHS_l_L1.shp (100%) rename {observe-swing => observe-application-swing}/src/main/map/shapeFiles/continents/GSHHS_l_L1.shx (100%) rename {observe-swing => observe-application-swing}/src/main/map/shapeFiles/continents/GSHHS_l_L6.dbf (100%) rename {observe-swing => observe-application-swing}/src/main/map/shapeFiles/continents/GSHHS_l_L6.prj (100%) rename {observe-swing => observe-application-swing}/src/main/map/shapeFiles/continents/GSHHS_l_L6.shp (100%) rename {observe-swing => observe-application-swing}/src/main/map/shapeFiles/continents/GSHHS_l_L6.shx (100%) rename {observe-swing => observe-application-swing}/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.dbf (100%) rename {observe-swing => observe-application-swing}/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.prj (100%) rename {observe-swing => observe-application-swing}/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp (100%) rename {observe-swing => observe-application-swing}/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shx (100%) rename {observe-swing => observe-application-swing}/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.dbf (100%) rename {observe-swing => observe-application-swing}/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.prj (100%) rename {observe-swing => observe-application-swing}/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbn (100%) rename {observe-swing => observe-application-swing}/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbx (100%) rename {observe-swing => observe-application-swing}/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp (100%) rename {observe-swing => observe-application-swing}/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml (100%) rename {observe-swing => observe-application-swing}/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shx (100%) rename {observe-swing => observe-application-swing}/src/main/map/style.xml (100%) rename {observe-swing => observe-application-swing}/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider (100%) copy observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties => observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties (51%) copy observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties => observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties (51%) copy observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties => observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties (51%) rename {observe-swing => observe-application-swing}/src/main/resources/i18n/observe-swing_en_GB.properties (100%) rename {observe-swing => observe-application-swing}/src/main/resources/i18n/observe-swing_es_ES.properties (100%) rename {observe-swing => observe-application-swing}/src/main/resources/i18n/observe-swing_fr_FR.properties (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-about.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-accept.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-add.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-application-reload.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-bean-sort-down.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-bean-sort-up.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-bean-sort.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-calculator.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-cancel.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-center.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-close.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-closeTab.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-combobox-reset.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-combobox-reset2.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-combobox-sort.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-config.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-connect_creating.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-connect_no.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-connect_ok.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-connect_untested.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-connected.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-data-calcule.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-data-export.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-data-import.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-data-observe.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-db-change.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-db-local.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-db-none.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-db-reload.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-db-remote.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-db-start-server.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-db-stop-server.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-delete.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-edit-measurements.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-exit.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-fileChooser.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-generate.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-go-back.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-go-detail.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-go-down.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-go-jump.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-go-up.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-help.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-i18n-en.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-i18n-es.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-i18n-fr.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-i18n-uk.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-import-gps.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-information.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-insert-after.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-insert-before.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-local-export.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-local-import.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-mode-create.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-mode-read.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-mode-update.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-next-step.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-openLink.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-previous-step.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-remote-export.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-remote-import.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-reopen.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-report-copy.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-report-run.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-report.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-revert.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-save.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-select-ssl-cert.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-show-help.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-show-informations.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-show-keys.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-show-usages.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-site.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-synch.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-synchro-pause.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-synchro-start.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-synchro-stop.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-translate.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-ui-reload.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-unconnected.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-validate.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/action-verify-equation.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/logo OT_rvb.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/logo-OT_web.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/logo_ird.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/activite.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/bateau.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/calee.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/ird/activity16.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/ird/activity24.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/ird/floatingObject16.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/ird/floatingObject24.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/ird/observedSystem16.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/ird/observedSystem24.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/ird/program16.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/ird/program24.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/ird/referentiel16.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/ird/referentiel24.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/ird/route16.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/ird/route24.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/ird/set16.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/ird/set24.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/ird/sub_floatingObject16.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/ird/sub_floatingObject24.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/ird/sub_referentiel16.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/ird/sub_set16.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/ird/sub_set24.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/ird/trip16.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/ird/trip24.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/maree.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/objetFlottant.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/observateur.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/ocean.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/picto_a 24.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/picto_b 16.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/picto_b 24.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/picto_c 16.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/picto_c 24.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/picto_d 16.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/picto_d 24.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/picto_e 24.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/picto_f 16.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/picto_f 24.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/programme.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/route.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/senne.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/icons/navigation/systemeObserve.png (100%) rename {observe-swing => observe-application-swing}/src/main/resources/log4j.properties (100%) rename {observe-swing => observe-application-swing}/src/main/resources/observe-log4j.properties (100%) rename {observe-swing => observe-application-swing}/src/main/ssl/cacert.jks (100%) rename {observe-swing => observe-application-swing}/src/main/ssl/server.crt (100%) rename {observe-swing => observe-application-swing}/src/main/ssl/server.key (100%) rename {observe-swing => observe-application-swing}/src/test/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java (100%) rename {observe-swing => observe-application-swing}/src/test/resources/log4j.properties (100%) rename {observe-services-rest-wm => observe-application-web}/LICENSE.txt (100%) rename {observe-services-rest-wm => observe-application-web}/README.txt (100%) rename {observe-services-rest-wm => observe-application-web}/pom.xml (89%) rename observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionApplicationContext.java => observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContext.java (52%) create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java rename observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionFilter.java => observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java (80%) rename observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionJsonHelper.java => observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionJsonHelper.java (95%) rename observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionRender.java => observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionRender.java (74%) rename observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionController.java => observe-application-web/src/main/java/fr/ird/observe/application/web/controller/ObserveWebMotionController.java (50%) rename observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/service/ReferentialServiceRest.java => observe-application-web/src/main/java/fr/ird/observe/application/web/controller/ReferentialServiceController.java (89%) create mode 100644 observe-application-web/src/main/resources/mapping rename {observe-services-rest-wm => observe-application-web}/src/main/webapp/WEB-INF/web.xml (78%) copy {observe-services-model => observe-services-configuration-api}/LICENSE.txt (100%) copy {observe-services-model => observe-services-configuration-api}/README.txt (100%) copy {observe-services-api => observe-services-configuration-api}/pom.xml (74%) rename {observe-services-api/src/main/java/fr/ird/observe/services => observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration}/ObserveDataSourceConfiguration.java (74%) rename {observe-services-rest-client => observe-services-configuration-api}/src/test/resources/log4j.properties (100%) rename {observe-services-rest-client => observe-services-configuration-rest}/LICENSE.txt (100%) rename {observe-services-rest-client => observe-services-configuration-rest}/README.txt (100%) copy {observe-services-rest-client => observe-services-configuration-rest}/pom.xml (84%) rename observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientDataSourceConfiguration.java => observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java (76%) create mode 100644 observe-services-configuration-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory copy {observe-services-topia => observe-services-configuration-rest}/src/test/resources/log4j.properties (100%) copy {observe-validation => observe-services-configuration-topia}/LICENSE.txt (100%) copy {observe-validation => observe-services-configuration-topia}/README.txt (100%) copy {observe-services-rest-client => observe-services-configuration-topia}/pom.xml (71%) create mode 100644 observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaH2.java create mode 100644 observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaPG.java create mode 100644 observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaSupport.java copy {observe-services-topia => observe-services-configuration-topia}/src/test/resources/log4j.properties (100%) delete mode 100644 observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientService.java delete mode 100644 observe-services-rest-client/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory delete mode 100644 observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionApplicationListener.java delete mode 100644 observe-services-rest-wm/src/main/resources/mapping copy {observe-validation => observe-services-rest}/LICENSE.txt (100%) copy {observe-validation => observe-services-rest}/README.txt (100%) rename {observe-services-rest-client => observe-services-rest}/pom.xml (78%) rename observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceContext.java => observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceContextRest.java (60%) rename observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceFactory.java => observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java (59%) create mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRest.java delete mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestApplicationContext.java delete mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestApplicationListener.java delete mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionFilter.java rename observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestClient.java => observe-services-rest/src/main/java/fr/ird/observe/services/service/ReferentialServiceRest.java (79%) create mode 100644 observe-services-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory delete mode 100644 observe-services-rest/src/main/resources/mapping delete mode 100644 observe-services-rest/src/main/webapp/WEB-INF/web.xml rename {observe-services-rest-client/src/test/java/fr/ird/observe/services/rest/client => observe-services-rest/src/test/java/fr/ird/observe/services}/service/ReferentialServiceRestTest.java (72%) copy {observe-services-topia => observe-services-rest}/src/test/resources/log4j.properties (100%) copy {observe-services-model => observe-services-runner}/LICENSE.txt (100%) copy {observe-services-model => observe-services-runner}/README.txt (100%) copy {observe-services-topia => observe-services-runner}/pom.xml (63%) rename {observe-services-api => observe-services-runner}/src/main/java/fr/ird/observe/services/ObserveServiceMainFactory.java (97%) copy {observe-services-topia => observe-services-runner}/src/test/resources/log4j.properties (100%) rename observe-services-topia/src/main/java/fr/ird/observe/services/{topia/ObserveTopiaServiceContext.java => ObserveServiceContextTopia.java} (62%) create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java rename observe-services-topia/src/main/java/fr/ird/observe/services/{topia => }/ObserveServiceTopia.java (92%) rename observe-services-topia/src/main/java/fr/ird/observe/services/{topia => }/builder/DtoToEntityBuilder.java (97%) rename observe-services-topia/src/main/java/fr/ird/observe/services/{topia => }/builder/EntityToDtoBuilder.java (79%) rename observe-services-topia/src/main/java/fr/ird/observe/services/{topia => }/builder/EntityToReferenceDtoBuilder.java (94%) rename observe-services-topia/src/main/java/fr/ird/observe/services/{topia => }/builder/EntityToReferentialReferenceDtoBuilder.java (95%) rename observe-services-topia/src/main/java/fr/ird/observe/services/{topia => dto}/ObserveDtoBinders.java (94%) rename observe-services-topia/src/main/java/fr/ird/observe/services/{topia => dto}/ObserveDtosInitializer.java (75%) rename observe-services-topia/src/main/java/fr/ird/observe/services/{topia => }/service/ReferentialServiceTopia.java (94%) rename observe-services-topia/src/main/java/fr/ird/observe/services/{topia => }/service/seine/ActivitySeineObservedSystemServiceTopia.java (78%) rename observe-services-topia/src/main/java/fr/ird/observe/services/{topia => }/service/seine/ActivitySeineServiceTopia.java (90%) rename observe-services-topia/src/main/java/fr/ird/observe/services/{topia => }/service/seine/FloatingObjectServiceTopia.java (90%) delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaDataSourceConfiguration.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaServiceFactory.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/ObserveServiceFactoryTopiaTaiste.java rename observe-services-topia/src/test/java/fr/ird/observe/services/{topia => }/builder/DtoToEntityBuilderTest.java (98%) rename observe-services-topia/src/test/java/fr/ird/observe/services/{topia => }/builder/EntityToDtoBuilderTest.java (91%) rename observe-services-topia/src/test/java/fr/ird/observe/services/service/{topia => }/ApplicationContextResource.java (83%) rename observe-services-topia/src/test/java/fr/ird/observe/services/service/{topia => }/DataSourceResource.java (57%) rename observe-services-topia/src/test/java/fr/ird/observe/services/service/{topia/service => }/ReferentialServiceTopiaTest.java (82%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 13

branch develop updated (a4bb288 -> 7f5fa3a)
by codelutin.com scm 20 Aug '15

20 Aug '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 a4bb288 Merge branch 'feature/7458' into develop new 0576d84 add tdr longline service adn fix dtos longline (refs #7458). new b6083fc init dto and fix model (refs #7458). new 7f5fa3a Merge branch 'feature/7458-dto-services' into develop The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 7f5fa3a646de55fcb6a9713280bdb42a48c8c72b Merge: a4bb288 b6083fc Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 20 15:20:55 2015 +0200 Merge branch 'feature/7458-dto-services' into develop commit b6083fc98faedee6ae94c3ab76ff8149fc99cbad Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 20 15:20:18 2015 +0200 init dto and fix model (refs #7458). commit 0576d845b3be5fe0e6e3874772890c3cc26cf759 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 20 11:23:50 2015 +0200 add tdr longline service adn fix dtos longline (refs #7458). Summary of changes: .../services/service/longline/TdrService.java | 20 + .../main/xmi/observe-services-dto-longline.zargo | Bin 77309 -> 57827 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 54397 -> 54397 bytes .../services/topia/ObserveDtosInitializer.java | 551 ++++++++++++++++++--- 4 files changed, 491 insertions(+), 80 deletions(-) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TdrService.java -- 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/7458-dto-services deleted (was b6083fc)
by codelutin.com scm 20 Aug '15

20 Aug '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7458-dto-services in repository observe. See http://git.codelutin.com/observe.git was b6083fc init dto and fix model (refs #7458). This change permanently discards the following revisions: discards b6083fc init dto and fix model (refs #7458). discards 0576d84 add tdr longline service adn fix dtos longline (refs #7458). -- 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/7458-dto-services updated (0576d84 -> b6083fc)
by codelutin.com scm 20 Aug '15

20 Aug '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7458-dto-services in repository observe. See http://git.codelutin.com/observe.git from 0576d84 add tdr longline service adn fix dtos longline (refs #7458). new b6083fc init dto and fix model (refs #7458). 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 b6083fc98faedee6ae94c3ab76ff8149fc99cbad Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 20 15:20:18 2015 +0200 init dto and fix model (refs #7458). Summary of changes: .../main/xmi/observe-services-dto-longline.zargo | Bin 58140 -> 57827 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 54397 -> 54397 bytes .../services/topia/ObserveDtosInitializer.java | 545 ++++++++++++++++++--- 3 files changed, 468 insertions(+), 77 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/7458-dto-services created (now 0576d84)
by codelutin.com scm 20 Aug '15

20 Aug '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7458-dto-services in repository observe. See http://git.codelutin.com/observe.git at 0576d84 add tdr longline service adn fix dtos longline (refs #7458). This branch includes the following new commits: new 0576d84 add tdr longline service adn fix dtos longline (refs #7458). 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 0576d845b3be5fe0e6e3874772890c3cc26cf759 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 20 11:23:50 2015 +0200 add tdr longline service adn fix dtos longline (refs #7458). -- 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 (0b1e832 -> a4bb288)
by codelutin.com scm 20 Aug '15

20 Aug '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 0b1e832 Mise en place des modules de service (termine #7457) Merge branch 'feature/7457' into develop new ec6bbe3 Modèle Seine : remplacer les associations vers les objets du referentiel par des associations vers des objets de type referentialLabel (refs #7458). new 6f6346e Renommage en dto + génération du modèle Longline new a19edd4 Modèle Seine : correction de la generation des DTO (refs #7458). new 24ae978 fix tag values new 7a163b9 Dto décrivant les formulaire (refs #7458). new c432553 fix properties (refs #7458). new 80044c4 Simplification des configurations de modele + correction de certains noms de dtos new 6827738 Ajout d'un constructeur de ReferentielLabelDto mais ausii pour les FormDto new 01bfc95 Deplacement d'un test new bf2a9f7 Ajout d'un builder de ReferentialDto à partir d'une entité new ffa3d72 Suppression des traductions sur les constantes + prise en compte dans le builder de Dto new 4086edc add activitySeine Services (refs #7458). new a7d0bd5 typage du labelset new ad485d1 Ajout dun premier binding pour les RTP new 8683d26 Premiers tests pour ReferentialServiceTopia new fe6cdca on desactive pour le moment le module rest) new 497ba00 Gestion de la locale des référentiels new 6c688a1 Ajout commentaires sur un test new 5eda038 Correction d'un test + optimisation des dépendances new c6e7300 Correction des liens sur certains référentiels + tester le chargement de tous les référentiels new 6e008ba Pour les référentiels en lecture seule, on ne prend que la label des références rencontrées new ea86ae6 Ajout d'une exception lorsqu'on a pas pas trouvé une donnée + test de suppression new d457cd3 update model seine dto (refs #7458). new dc03b68 update model longline dto (refs #7458). new 2f63e0b On retourne des universes de références vides en mode lecture new a5f7ff9 Renommage Label en Reference, introduction de Reference ReferentialReference new ccd5a13 add seine services dto (refs #7458). new 13e7ada add commentable dto (refs #7458). new 0d3aee4 add set seine service and fix floating Object (refs #7458). new 1a129f2 add school estimate service (refs #7458). new 9536321 Suppression d'une entité non voulue (booleanDto) new a8f3901 Mise en place d'une classe pour initialiser tous les dto du modèle new 92c92c9 Utilisation des binders pour effectuer les créations de dto new 72ad572 Réorganisation ordre des méthodes new 655d35c add target catch service (refs #7458). new aedcaa3 add non target catch service (refs #7458). new f276030 add taget and non target sample service (refs #7458). new 7f8a9fc add route service (refs #7458). new 983991b Correction to context to binder new 1068bbd Ajout du type sur une référence new bd5b868 Création d'un paquetage builder pour y mettre tous les types de builders new ebf58da Deplacement de code réutilisable dans le service de base + mise en place de la transformation dto vers entite (à finir) new 65741be add openable entity and start dtosInitializer (refs #7458). new d07d9b2 Permettre de générer des binders avec des types différents new 3ae2785 Utilisation de la nouvelle API sur les binder pour faire les transformations de type new c0295ec correction du nom d'une propriété new 6609e00 add some service for longline (refs #7458). new 57c39cc debut de services rest + restructuration des paquetages new fb5a769 add catche longline service (refs #7458). new a4bb288 Merge branch 'feature/7458' into develop The 50 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 a4bb28877abea83f3b676d21775a6f7f01f4a3e0 Merge: 0b1e832 fb5a769 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 20 09:43:51 2015 +0200 Merge branch 'feature/7458' into develop commit fb5a769f95f8622289ff3a0d0a69b4bc84fad95e Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 20 09:42:07 2015 +0200 add catche longline service (refs #7458). commit 57c39cc277aba366fc6dd24cae60f3a41a01903a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Aug 20 09:25:53 2015 +0200 debut de services rest + restructuration des paquetages commit 6609e00fa0130dfccd104dd32fd44a78518209ea Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Aug 19 17:34:02 2015 +0200 add some service for longline (refs #7458). commit c0295ec93fb6a26ac63c0c1e328b5f2f2851e9f2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 19 16:06:42 2015 +0200 correction du nom d'une propriété commit 3ae2785dbe55ef96db002e542a2e36d7685446d5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 19 16:06:16 2015 +0200 Utilisation de la nouvelle API sur les binder pour faire les transformations de type commit d07d9b2d5c8b0c4e593bdfe5651759b33d036830 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 19 14:56:47 2015 +0200 Permettre de générer des binders avec des types différents commit 65741bea8d0b85c598b59bfa4479d760d6fc12c1 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Aug 19 14:39:48 2015 +0200 add openable entity and start dtosInitializer (refs #7458). commit ebf58daf77949cafa19b3d75218277d58a9f6f4a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 19 14:05:04 2015 +0200 Deplacement de code réutilisable dans le service de base + mise en place de la transformation dto vers entite (à finir) commit bd5b868e25ff6701fda79304400ca9b168bfcd59 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 19 14:04:15 2015 +0200 Création d'un paquetage builder pour y mettre tous les types de builders commit 1068bbd0eb79acf93ef121598cdf2a6aabbd9403 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 19 14:03:14 2015 +0200 Ajout du type sur une référence commit 983991baaf9f300841899eb6d327739abd967a5d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 19 14:02:09 2015 +0200 Correction to context to binder commit 7f8a9fc43a95be3b88b90da78c92827fec28fcde Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Aug 19 13:42:00 2015 +0200 add route service (refs #7458). commit f27603058c768fb368d6ce571e3a6dcc697b851f Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Aug 19 12:16:01 2015 +0200 add taget and non target sample service (refs #7458). commit aedcaa30783bb84631a8874e6be8580bbee60f1c Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Aug 19 11:21:43 2015 +0200 add non target catch service (refs #7458). commit 655d35cbcf0eabd62e55a3a31dca53306a4bcc69 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Aug 19 10:52:26 2015 +0200 add target catch service (refs #7458). commit 72ad572dafd1f5184f10c24a3e5ed2f42a10ad76 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 19 10:48:18 2015 +0200 Réorganisation ordre des méthodes commit 92c92c9ab2a7406f1e4752a2ca4bd198ef78683a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 19 10:33:56 2015 +0200 Utilisation des binders pour effectuer les créations de dto commit a8f3901d865d49b26668c1f17eaacefa173da4d4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 19 10:33:32 2015 +0200 Mise en place d'une classe pour initialiser tous les dto du modèle commit 9536321da00442bd6fffac738d1cf809bb6bbe68 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 19 10:32:28 2015 +0200 Suppression d'une entité non voulue (booleanDto) commit 1a129f2c1eddabdbee342aabca9c8c96b8955aed Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Aug 19 10:27:16 2015 +0200 add school estimate service (refs #7458). commit 0d3aee4ced8a1065685eddf9939c7c59434d6c32 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Aug 19 10:09:22 2015 +0200 add set seine service and fix floating Object (refs #7458). commit 13e7ada90bd1fb51ad5818e95e620f0f1fad3a2d Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Aug 19 09:25:10 2015 +0200 add commentable dto (refs #7458). commit ccd5a13386d0597c618c43ed9a168aad0f6fbf34 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Aug 18 18:09:29 2015 +0200 add seine services dto (refs #7458). commit a5f7ff953c6110db69e554518274f93666133884 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 16:36:49 2015 +0200 Renommage Label en Reference, introduction de Reference ReferentialReference commit 2f63e0b41cfc83a31580c4796d4f4c7b3cc0d2df Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 15:01:47 2015 +0200 On retourne des universes de références vides en mode lecture commit dc03b68ee60f7bf2382db4e0ab5bd4463f51d549 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Aug 18 16:31:28 2015 +0200 update model longline dto (refs #7458). commit d457cd30d07e42ec980aacb343fff5cb5156cf15 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Aug 18 16:19:05 2015 +0200 update model seine dto (refs #7458). commit ea86ae6913b46c64f4b9be640feb55014525a710 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 14:22:47 2015 +0200 Ajout d'une exception lorsqu'on a pas pas trouvé une donnée + test de suppression commit 6e008ba2a5289fe5b65130cb15598b8bbebe6dae Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 13:36:19 2015 +0200 Pour les référentiels en lecture seule, on ne prend que la label des références rencontrées commit c6e7300cad250e52f3a0e038dacef38745d730af Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 13:18:53 2015 +0200 Correction des liens sur certains référentiels + tester le chargement de tous les référentiels commit 5eda0387cd3024c01eeba176fb3c30db5dcbc347 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 12:28:55 2015 +0200 Correction d'un test + optimisation des dépendances commit 6c688a16bb382ff3a04948153893f30c8cd18dce Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 12:23:13 2015 +0200 Ajout commentaires sur un test commit 497ba0087fc05db383796d1ad532ce409989b592 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 12:19:42 2015 +0200 Gestion de la locale des référentiels commit fe6cdca8f7d7b60c23345c4a518705e88f8b7421 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 11:07:32 2015 +0200 on desactive pour le moment le module rest) commit 8683d266283c84244fde46a57b5693f6f2cd7534 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 10:57:13 2015 +0200 Premiers tests pour ReferentialServiceTopia commit ad485d156bb9d1342776560332a118203a667593 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 10:56:36 2015 +0200 Ajout dun premier binding pour les RTP commit a7d0bd51fbe8e816aa62025cf3687fc2ba774b29 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 09:59:18 2015 +0200 typage du labelset commit 4086edc66eba55e764634f449f607d6830fc6388 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Aug 18 10:48:55 2015 +0200 add activitySeine Services (refs #7458). commit ffa3d7213f8d389129bdce70cb5cc29d40abd4ef Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 09:16:35 2015 +0200 Suppression des traductions sur les constantes + prise en compte dans le builder de Dto commit bf2a9f7af94bd58e294ba09f101c9927ac22cf5b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 08:39:23 2015 +0200 Ajout d'un builder de ReferentialDto à partir d'une entité commit 01bfc953183ea34ca1dafcc7dc08c5d89fbf7633 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 08:38:12 2015 +0200 Deplacement d'un test commit 682773800442901e3c98af3b2c6084aa2e9c9960 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 08:37:19 2015 +0200 Ajout d'un constructeur de ReferentielLabelDto mais ausii pour les FormDto commit 80044c4cfe3b4bacf378d0c77caaf12ca0f3377a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 08:33:47 2015 +0200 Simplification des configurations de modele + correction de certains noms de dtos commit c432553eec78ca869fa2662834e7dd5fa659c36d Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Aug 17 18:26:21 2015 +0200 fix properties (refs #7458). commit 7a163b9cf9f1a2c9dd8fcfab81a7f3762a28ecce Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Aug 17 18:25:36 2015 +0200 Dto décrivant les formulaire (refs #7458). commit 24ae978df8a3e972b0a39eb9f9f410bf715e87e0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Aug 17 16:43:45 2015 +0200 fix tag values commit a19edd40a9439e85db460f7769b7d83ee6622ee3 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Aug 17 16:38:41 2015 +0200 Modèle Seine : correction de la generation des DTO (refs #7458). commit 6f6346e068dca2ad0040e7d392b475dd26b1c13f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Aug 17 16:12:45 2015 +0200 Renommage en dto + génération du modèle Longline commit ec6bbe32b7aacf805d847afe48c776239dbf85f4 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Aug 17 15:57:00 2015 +0200 Modèle Seine : remplacer les associations vers les objets du referentiel par des associations vers des objets de type referentialLabel (refs #7458). Summary of changes: observe-services-api/pom.xml | 18 + .../observe/services/ObserveServiceContext.java | 4 +- .../observe/services/ObserveServiceFactory.java | 4 +- ...xt.java => ObserveDataSourceConfiguration.java} | 4 +- .../services/ObserveServiceApplicationContext.java | 24 + .../observe/services/ObserveServiceContext.java | 8 + .../observe/services/ObserveServiceFactory.java | 4 +- .../services/ObserveServiceFactorySupport.java | 4 +- .../services/ObserveServiceMainFactory.java | 30 +- .../services/service/DataNotFoundException.java | 30 + .../services/service/ReferentialService.java | 20 +- .../longline/ActivityLongLineEncouterService.java | 20 + .../ActivityLongLineSensorUsedService.java | 21 + .../service/longline/ActivitySeineService.java | 29 + .../service/longline/CatchLonglineService.java | 23 + .../longline/GearUseFeaturesLonglineService.java | 30 + .../SetLonglineDetailCompositionService.java | 20 + .../SetLonglineGlobalCompositionService.java | 20 + .../service/longline/SetLonglineService.java | 28 + .../service/longline/TripLonglineService.java | 30 + .../seine/ActivitySeineObservedSystemService.java | 20 + .../service/seine/ActivitySeineService.java | 29 + .../service/seine/FloatingObjectService.java | 30 + .../service/seine/GearUseFeaturesSeineService.java | 30 + .../service/seine/NonTargetCatchService.java | 19 + .../service/seine/NonTargetSampleService.java | 19 + .../seine/ObjectObservedSpeciesService.java | 20 + .../service/seine/ObjectSchoolEstimateService.java | 19 + .../services/service/seine/RouteService.java | 30 + .../service/seine/SchoolEstimateService.java | 20 + .../services/service/seine/SetSeineService.java | 28 + .../services/service/seine/TargetCatchService.java | 19 + .../service/seine/TargetSampleService.java | 20 + .../seine/TransmittingBuoyOperationService.java | 20 + .../services/service/seine/TripSeineService.java | 30 + .../services/FakeObserveServiceContext.java | 10 - .../services/FakeObserveServiceFactory.java | 19 - .../services/ObserveServiceMainFactoryTest.java | 23 - .../fr.ird.observe.services.ObserveServiceFactory | 1 - observe-services-model/pom.xml | 24 +- .../{model => dto}/AbstractObserveDto.java | 2 +- .../ReferentialFormDto.java => dto/FormDto.java} | 12 +- .../java/fr/ird/observe/services/dto/FormDtos.java | 24 + .../fr/ird/observe/services/dto/ReferenceDto.java | 51 + .../fr/ird/observe/services/dto/ReferenceDtos.java | 11 + .../ird/observe/services/dto/ReferenceSetDto.java | 17 + .../ird/observe/services/dto/ReferenceSetDtos.java | 20 + .../dto/ReferenceValueNotFoundException.java | 28 + .../{model => dto}/constants/GearType.java | 2 +- .../{model => dto}/constants/ReferenceStatus.java | 2 +- .../services/dto/constants/ReferentialLocale.java | 124 ++ .../seine/NonTargetCatchComputedValueSource.java | 52 + .../services/dto/constants/seine/Ownership.java | 51 + .../constants/seine/SchoolType.java} | 35 +- .../seine/TypeTransmittingBuoyOperation.java | 68 ++ .../dto/referential/ReferentialReferenceDto.java | 65 + .../dto/referential/ReferentialReferenceDtos.java | 18 + .../model/referential/ReferentialFormDtos.java | 15 - .../xmi/observe-services-dto-common.properties | 13 + .../src/main/xmi/observe-services-dto-common.zargo | Bin 0 -> 34074 bytes ...es => observe-services-dto-longline.properties} | 4 +- .../main/xmi/observe-services-dto-longline.zargo | Bin 0 -> 77309 bytes ...rties => observe-services-dto-seine.properties} | 4 +- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 0 -> 54397 bytes .../xmi/observe-services-model-common.properties | 13 - .../main/xmi/observe-services-model-common.zargo | Bin 32880 -> 0 bytes .../main/xmi/observe-services-model-longline.zargo | Bin 96124 -> 0 bytes .../main/xmi/observe-services-model-seine.zargo | Bin 85518 -> 0 bytes .../LICENSE.txt | 0 .../README.txt | 0 .../pom.xml | 43 +- .../ObserveRestClientDataSourceConfiguration.java | 39 + .../rest/client/ObserveRestClientService.java | 23 + .../client/ObserveRestClientServiceContext.java | 38 + .../client/ObserveRestClientServiceFactory.java | 46 + .../service/ReferentialServiceRestClient.java | 54 + .../fr.ird.observe.services.ObserveServiceFactory | 1 + .../client/service/ReferentialServiceRestTest.java | 45 + .../src/test/resources/log4j.properties | 0 .../LICENSE.txt | 0 .../README.txt | 0 .../pom.xml | 59 +- .../wm/ObserveRestWebMotionApplicationContext.java | 81 ++ .../ObserveRestWebMotionApplicationListener.java | 42 + .../rest/wm/ObserveRestWebMotionController.java | 11 + .../rest/wm/ObserveRestWebMotionFilter.java | 55 + .../rest/wm/ObserveRestWebMotionJsonHelper.java | 130 ++ .../rest/wm/ObserveRestWebMotionRender.java | 52 + .../rest/wm/service/ReferentialServiceRest.java | 66 + .../src/main/resources/mapping | 12 + .../src/main/webapp/WEB-INF/web.xml | 25 + .../services/ObserveServiceContextRest.java | 10 - .../services/ObserveServiceFactoryRest.java | 33 - .../ird/observe/services/ObserveServiceRest.java | 17 - .../rest/wm/ObserveRestApplicationContext.java | 42 + .../rest/wm/ObserveRestApplicationListener.java | 42 + .../rest/wm/ObserveRestWebMotionFilter.java | 62 + .../services/service/ReferentialServiceRest.java | 58 - .../fr.ird.observe.services.ObserveServiceFactory | 1 - observe-services-rest/src/main/resources/mapping | 28 + .../src/main/webapp/WEB-INF/web.xml | 36 + .../referential/ReferentialServiceRestTest.java | 37 - observe-services-topia/pom.xml | 35 +- .../observe/services/AbstractObserveService.java | 5 +- .../services/ObserveServiceContextTopia.java | 33 - .../ird/observe/services/ObserveServiceTopia.java | 20 - .../services/service/ReferentialDtoBuilder.java | 171 --- .../services/service/ReferentialServiceTopia.java | 220 ---- .../observe/services/topia/ObserveDtoBinders.java | 39 + .../services/topia/ObserveDtosInitializer.java | 1262 ++++++++++++++++++++ .../services/topia/ObserveServiceTopia.java | 117 ++ .../topia/ObserveTopiaDataSourceConfiguration.java | 22 + .../services/topia/ObserveTopiaServiceContext.java | 54 + .../ObserveTopiaServiceFactory.java} | 44 +- .../services/topia/builder/DtoToEntityBuilder.java | 184 +++ .../services/topia/builder/EntityToDtoBuilder.java | 198 +++ .../topia/builder/EntityToReferenceDtoBuilder.java | 49 + .../EntityToReferentialReferenceDtoBuilder.java | 49 + .../topia/service/ReferentialServiceTopia.java | 138 +++ .../ActivitySeineObservedSystemServiceTopia.java | 27 + .../service/seine/ActivitySeineServiceTopia.java | 46 + .../service/seine/FloatingObjectServiceTopia.java | 46 + .../fr.ird.observe.services.ObserveServiceFactory | 2 +- .../service/ReferentialDtoBuilderTest.java | 72 -- .../referential/ReferentialServiceTopiaTest.java | 37 - .../service/topia/ApplicationContextResource.java | 83 ++ .../services/service/topia/DataSourceResource.java | 126 ++ .../topia/service/ReferentialServiceTopiaTest.java | 232 ++++ .../topia/builder/DtoToEntityBuilderTest.java | 117 ++ .../topia/builder/EntityToDtoBuilderTest.java | 130 ++ pom.xml | 53 +- 131 files changed, 5238 insertions(+), 993 deletions(-) copy observe-services-api/src/main/java/fr/ird/observe/services/{ObserveServiceContext.java => ObserveDataSourceConfiguration.java} (55%) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceApplicationContext.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/DataNotFoundException.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivitySeineService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/CatchLonglineService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/GearUseFeaturesLonglineService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/GearUseFeaturesSeineService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java delete mode 100644 observe-services-api/src/test/java/fr/ird/observe/services/FakeObserveServiceContext.java delete mode 100644 observe-services-api/src/test/java/fr/ird/observe/services/FakeObserveServiceFactory.java delete mode 100644 observe-services-api/src/test/java/fr/ird/observe/services/ObserveServiceMainFactoryTest.java delete mode 100644 observe-services-api/src/test/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory rename observe-services-model/src/main/java/fr/ird/observe/services/{model => dto}/AbstractObserveDto.java (95%) rename observe-services-model/src/main/java/fr/ird/observe/services/{model/referential/ReferentialFormDto.java => dto/FormDto.java} (61%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDtos.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceDto.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceDtos.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDto.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDtos.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceValueNotFoundException.java copy observe-services-model/src/main/java/fr/ird/observe/services/{model => dto}/constants/GearType.java (96%) rename observe-services-model/src/main/java/fr/ird/observe/services/{model => dto}/constants/ReferenceStatus.java (85%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferentialLocale.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/NonTargetCatchComputedValueSource.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/Ownership.java rename observe-services-model/src/main/java/fr/ird/observe/services/{model/constants/GearType.java => dto/constants/seine/SchoolType.java} (55%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/TypeTransmittingBuoyOperation.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceDto.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceDtos.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/model/referential/ReferentialFormDtos.java create mode 100644 observe-services-model/src/main/xmi/observe-services-dto-common.properties create mode 100644 observe-services-model/src/main/xmi/observe-services-dto-common.zargo rename observe-services-model/src/main/xmi/{observe-services-model-longline.properties => observe-services-dto-longline.properties} (71%) create mode 100644 observe-services-model/src/main/xmi/observe-services-dto-longline.zargo rename observe-services-model/src/main/xmi/{observe-services-model-seine.properties => observe-services-dto-seine.properties} (71%) create mode 100644 observe-services-model/src/main/xmi/observe-services-dto-seine.zargo delete mode 100644 observe-services-model/src/main/xmi/observe-services-model-common.properties delete mode 100644 observe-services-model/src/main/xmi/observe-services-model-common.zargo delete mode 100644 observe-services-model/src/main/xmi/observe-services-model-longline.zargo delete mode 100644 observe-services-model/src/main/xmi/observe-services-model-seine.zargo rename {observe-services-rest => observe-services-rest-client}/LICENSE.txt (100%) rename {observe-services-rest => observe-services-rest-client}/README.txt (100%) copy {observe-services-rest => observe-services-rest-client}/pom.xml (61%) create mode 100644 observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientDataSourceConfiguration.java create mode 100644 observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientService.java create mode 100644 observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceContext.java create mode 100644 observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceFactory.java create mode 100644 observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestClient.java create mode 100644 observe-services-rest-client/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory create mode 100644 observe-services-rest-client/src/test/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestTest.java rename {observe-services-rest => observe-services-rest-client}/src/test/resources/log4j.properties (100%) copy {observe-validation => observe-services-rest-wm}/LICENSE.txt (100%) copy {observe-validation => observe-services-rest-wm}/README.txt (100%) rename {observe-services-rest => observe-services-rest-wm}/pom.xml (67%) create mode 100644 observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionApplicationContext.java create mode 100644 observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionApplicationListener.java create mode 100644 observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionController.java create mode 100644 observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionFilter.java create mode 100644 observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionJsonHelper.java create mode 100644 observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionRender.java create mode 100644 observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/service/ReferentialServiceRest.java create mode 100644 observe-services-rest-wm/src/main/resources/mapping create mode 100644 observe-services-rest-wm/src/main/webapp/WEB-INF/web.xml delete mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceContextRest.java delete mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java delete mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRest.java create mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestApplicationContext.java create mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestApplicationListener.java create mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionFilter.java delete mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/service/ReferentialServiceRest.java delete mode 100644 observe-services-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory create mode 100644 observe-services-rest/src/main/resources/mapping create mode 100644 observe-services-rest/src/main/webapp/WEB-INF/web.xml delete mode 100644 observe-services-rest/src/test/java/fr/ird/observe/services/service/referential/ReferentialServiceRestTest.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveDtoBinders.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveDtosInitializer.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaDataSourceConfiguration.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaServiceContext.java rename observe-services-topia/src/main/java/fr/ird/observe/services/{ObserveServiceFactoryTopia.java => topia/ObserveTopiaServiceFactory.java} (64%) create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/builder/DtoToEntityBuilder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/builder/EntityToDtoBuilder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/builder/EntityToReferenceDtoBuilder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/builder/EntityToReferentialReferenceDtoBuilder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/service/ReferentialServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineObservedSystemServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/FloatingObjectServiceTopia.java delete mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java delete mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/referential/ReferentialServiceTopiaTest.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/topia/ApplicationContextResource.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/topia/DataSourceResource.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/topia/service/ReferentialServiceTopiaTest.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/topia/builder/DtoToEntityBuilderTest.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/topia/builder/EntityToDtoBuilderTest.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 23

29/50: add set seine service and fix floating Object (refs #7458).
by codelutin.com scm 20 Aug '15

20 Aug '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 0d3aee4ced8a1065685eddf9939c7c59434d6c32 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Aug 19 10:09:22 2015 +0200 add set seine service and fix floating Object (refs #7458). --- .../seine/ObjectObservedSpeciesService.java | 11 +++----- .../service/seine/ObjectSchoolEstimateService.java | 18 +++---------- .../services/service/seine/SetSeineService.java | 28 +++++++++++++++++++++ .../seine/TransmittingBuoyOperationService.java | 18 +++---------- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 57951 -> 55018 bytes 5 files changed, 40 insertions(+), 35 deletions(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java index 72e59b4..45fb2e4 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java @@ -2,22 +2,19 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; -import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; +import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; import fr.ird.observe.services.spi.Write; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff(a)codelutin.com */ public interface ObjectObservedSpeciesService extends ObserveService { - List<ObjectObservedSpeciesDto> loadToRead(String activitySeineId); + FormDto<FloatingObjectObservedSpeciesDto> loadToRead(String floatingObjectId); - FormDto<ActivitySeineObservedSystemDto> loadToEdit(String activitySeineId); + FormDto<FloatingObjectObservedSpeciesDto> loadToEdit(String floatingObjectId); @Write - String save(FormDto<ActivitySeineObservedSystemDto> form); + String save(FormDto<FloatingObjectObservedSpeciesDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java index a576c90..4845c4b 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java @@ -2,28 +2,18 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; +import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; import fr.ird.observe.services.spi.Write; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff(a)codelutin.com */ public interface ObjectSchoolEstimateService extends ObserveService { - FormDto<ObjectSchoolEstimateDto> loadToRead(String objectSchoolEstimateId); - - List<ReferenceDto<ObjectSchoolEstimateDto>> getObjectSchoolEstimateByFloatingObject(String floatingObjectId); - - FormDto<ObjectSchoolEstimateDto> loadToEdit(String objectSchoolEstimateId); + FormDto<FloatingObjectSchoolEstimateDto> loadToRead(String floatingObjectId); - FormDto<ObjectSchoolEstimateDto> preCreate(String floatingObjectId); - - @Write - String save(FormDto<ObjectSchoolEstimateDto> form); + FormDto<FloatingObjectSchoolEstimateDto> loadToEdit(String floatingObjectId); @Write - void delete(String FloatingObjectId, String objectSchoolEstimateId); + String save(FormDto<FloatingObjectSchoolEstimateDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java new file mode 100644 index 0000000..34665f7 --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java @@ -0,0 +1,28 @@ +package fr.ird.observe.services.service.seine; + +import fr.ird.observe.services.ObserveService; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.spi.Write; + +/** + * @author Sylvain Bavencoff - bavencoff(a)codelutin.com + */ +public interface SetSeineService extends ObserveService { + + ReferenceDto<SetSeineDto> getSetSeineByActivitySeine(String activitySeineId); + + FormDto<SetSeineDto> loadToRead(String setSeineId); + + FormDto<SetSeineDto> loadToEdit(String setSeineId); + + FormDto<SetSeineDto> preCreate(String activitySeineId); + + @Write + String save(FormDto<SetSeineDto> form); + + @Write + void delete(String activitySeineId, String setSeineId); + +} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java index 96ff8b3..3839627 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java @@ -2,29 +2,19 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto; +import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; import fr.ird.observe.services.spi.Write; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff(a)codelutin.com */ public interface TransmittingBuoyOperationService extends ObserveService { - FormDto<TransmittingBuoyOperationDto> loadToRead(String transmittingBuoyOperationId); - - List<ReferenceDto<TransmittingBuoyOperationDto>> getTransmittingBuoyOperationByFloatingObject(String floatingObjectId); - - FormDto<TransmittingBuoyOperationDto> loadToEdit(String transmittingBuoyOperationId); + FormDto<FloatingObjectTransmittingBuoyDto> loadToRead(String floatingObjectId); - FormDto<TransmittingBuoyOperationDto> preCreate(String floatingObjectId); - - @Write - String save(FormDto<TransmittingBuoyOperationDto> form); + FormDto<FloatingObjectTransmittingBuoyDto> loadToEdit(String floatingObjectId); @Write - void delete(String FloatingObjectId, String activitySeineId); + String save(FormDto<FloatingObjectTransmittingBuoyDto> form); } diff --git a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo index 5e61b98..49052d8 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

28/50: add commentable dto (refs #7458).
by codelutin.com scm 20 Aug '15

20 Aug '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 13e7ada90bd1fb51ad5818e95e620f0f1fad3a2d Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Aug 19 09:25:10 2015 +0200 add commentable dto (refs #7458). --- .../src/main/xmi/observe-services-dto-common.zargo | Bin 33490 -> 33741 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 55090 -> 57951 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo index 89d3f35..826b46f 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo differ diff --git a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo index 7126c8e..5e61b98 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

27/50: add seine services dto (refs #7458).
by codelutin.com scm 20 Aug '15

20 Aug '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit ccd5a13386d0597c618c43ed9a168aad0f6fbf34 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Aug 18 18:09:29 2015 +0200 add seine services dto (refs #7458). --- .../seine/ActivitySeineObservedSystemService.java | 3 +- .../service/seine/ActivitySeineService.java | 9 ++--- .../service/seine/FloatingObjectService.java | 30 ++++++++++++++ .../service/seine/GearUseFeaturesSeineService.java | 30 ++++++++++++++ ...vice.java => ObjectObservedSpeciesService.java} | 8 +++- .../service/seine/ObjectSchoolEstimateService.java | 29 +++++++++++++ .../seine/TransmittingBuoyOperationService.java | 30 ++++++++++++++ .../services/service/seine/TripSeineService.java | 30 ++++++++++++++ .../src/main/xmi/observe-services-dto-seine.zargo | Bin 55982 -> 55090 bytes .../service/seine/ActivitySeineServiceTopia.java | 10 ++--- .../service/seine/FloatingObjectServiceTopia.java | 45 +++++++++++++++++++++ 11 files changed, 208 insertions(+), 16 deletions(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java index c9ee23e..20c4b33 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java @@ -1,5 +1,6 @@ package fr.ird.observe.services.service.seine; +import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; import fr.ird.observe.services.spi.Write; @@ -7,7 +8,7 @@ import fr.ird.observe.services.spi.Write; /** * @author Sylvain Bavencoff - bavencoff(a)codelutin.com */ -public interface ActivitySeineObservedSystemService { +public interface ActivitySeineObservedSystemService extends ObserveService { FormDto<ActivitySeineObservedSystemDto> loadToRead(String activitySeineId); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java index 9c46a5e..26368d5 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java @@ -2,20 +2,20 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.spi.Write; -import java.util.Collection; import java.util.List; /** * @author Sylvain Bavencoff - bavencoff(a)codelutin.com */ -public interface ActivitySeineService extends ObserveService { +public interface ActivitySeineService extends ObserveService { FormDto<ActivitySeineDto> loadToRead(String activitySeineId); - List<ActivitySeineDto> getActivitySeineStubByRoute(String routeId); + List<ReferenceDto<ActivitySeineDto>> getActivitySeineByRoute(String routeId); FormDto<ActivitySeineDto> loadToEdit(String activitySeineId); @@ -26,7 +26,4 @@ public interface ActivitySeineService extends ObserveService { @Write void delete(String routeId, String activitySeineId); - - @Write - void delete(String routeId, Collection<String> activitySeineIds); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java new file mode 100644 index 0000000..05c7036 --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java @@ -0,0 +1,30 @@ +package fr.ird.observe.services.service.seine; + +import fr.ird.observe.services.ObserveService; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.seine.FloatingObjectDto; +import fr.ird.observe.services.spi.Write; + +import java.util.List; + +/** + * @author Sylvain Bavencoff - bavencoff(a)codelutin.com + */ +public interface FloatingObjectService extends ObserveService { + + FormDto<FloatingObjectDto> loadToRead(String floatingObjectId); + + List<ReferenceDto<FloatingObjectDto>> getFloatingObjectByActivitySeine(String activitySeineId); + + FormDto<FloatingObjectDto> loadToEdit(String floatingObjectId); + + FormDto<FloatingObjectDto> preCreate(String activitySeineId); + + @Write + String save(FormDto<FloatingObjectDto> form); + + @Write + void delete(String activitySeineId, String floatingObjectId); + +} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/GearUseFeaturesSeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/GearUseFeaturesSeineService.java new file mode 100644 index 0000000..b69e076 --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/GearUseFeaturesSeineService.java @@ -0,0 +1,30 @@ +package fr.ird.observe.services.service.seine; + +import fr.ird.observe.services.ObserveService; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; +import fr.ird.observe.services.spi.Write; + +import java.util.List; + +/** + * @author Sylvain Bavencoff - bavencoff(a)codelutin.com + */ +public interface GearUseFeaturesSeineService extends ObserveService { + + List<GearUseFeaturesSeineDto> getGearUseFeaturesSeineByTripSeine(String tripSeineId); + + FormDto<GearUseFeaturesSeineDto> loadToRead(String gearUseFeaturesSeineId); + + FormDto<GearUseFeaturesSeineDto> loadToEdit(String gearUseFeaturesSeineId); + + FormDto<GearUseFeaturesSeineDto> preCreate(String tripSeineId); + + @Write + String save(FormDto<GearUseFeaturesSeineDto> form); + + @Write + void delete(String tripSeineId, String gearUseFeaturesSeineId); + + +} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java similarity index 60% copy from observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java copy to observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java index c9ee23e..72e59b4 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java @@ -1,15 +1,19 @@ package fr.ird.observe.services.service.seine; +import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; +import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; import fr.ird.observe.services.spi.Write; +import java.util.List; + /** * @author Sylvain Bavencoff - bavencoff(a)codelutin.com */ -public interface ActivitySeineObservedSystemService { +public interface ObjectObservedSpeciesService extends ObserveService { - FormDto<ActivitySeineObservedSystemDto> loadToRead(String activitySeineId); + List<ObjectObservedSpeciesDto> loadToRead(String activitySeineId); FormDto<ActivitySeineObservedSystemDto> loadToEdit(String activitySeineId); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java new file mode 100644 index 0000000..a576c90 --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java @@ -0,0 +1,29 @@ +package fr.ird.observe.services.service.seine; + +import fr.ird.observe.services.ObserveService; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; +import fr.ird.observe.services.spi.Write; + +import java.util.List; + +/** + * @author Sylvain Bavencoff - bavencoff(a)codelutin.com + */ +public interface ObjectSchoolEstimateService extends ObserveService { + + FormDto<ObjectSchoolEstimateDto> loadToRead(String objectSchoolEstimateId); + + List<ReferenceDto<ObjectSchoolEstimateDto>> getObjectSchoolEstimateByFloatingObject(String floatingObjectId); + + FormDto<ObjectSchoolEstimateDto> loadToEdit(String objectSchoolEstimateId); + + FormDto<ObjectSchoolEstimateDto> preCreate(String floatingObjectId); + + @Write + String save(FormDto<ObjectSchoolEstimateDto> form); + + @Write + void delete(String FloatingObjectId, String objectSchoolEstimateId); +} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java new file mode 100644 index 0000000..96ff8b3 --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java @@ -0,0 +1,30 @@ +package fr.ird.observe.services.service.seine; + +import fr.ird.observe.services.ObserveService; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto; +import fr.ird.observe.services.spi.Write; + +import java.util.List; + +/** + * @author Sylvain Bavencoff - bavencoff(a)codelutin.com + */ +public interface TransmittingBuoyOperationService extends ObserveService { + + FormDto<TransmittingBuoyOperationDto> loadToRead(String transmittingBuoyOperationId); + + List<ReferenceDto<TransmittingBuoyOperationDto>> getTransmittingBuoyOperationByFloatingObject(String floatingObjectId); + + FormDto<TransmittingBuoyOperationDto> loadToEdit(String transmittingBuoyOperationId); + + FormDto<TransmittingBuoyOperationDto> preCreate(String floatingObjectId); + + @Write + String save(FormDto<TransmittingBuoyOperationDto> form); + + @Write + void delete(String FloatingObjectId, String activitySeineId); + +} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java new file mode 100644 index 0000000..ec204d9 --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java @@ -0,0 +1,30 @@ +package fr.ird.observe.services.service.seine; + +import fr.ird.observe.services.ObserveService; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.spi.Write; + +import java.util.List; + +/** + * @author Sylvain Bavencoff - bavencoff(a)codelutin.com + */ +public interface TripSeineService extends ObserveService { + + List<ReferenceDto<TripSeineDto>> getTripSeineByProgram(String programId); + + FormDto<TripSeineDto> loadToRead(String tripSeineId); + + FormDto<TripSeineDto> loadToEdit(String tripSeineId); + + FormDto<TripSeineDto> preCreate(String programId); + + @Write + String save(FormDto<TripSeineDto> form); + + @Write + void delete(String tripSeineId); + +} \ No newline at end of file diff --git a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo index ac68371..7126c8e 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo differ diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java index 0e8bbab..048309a 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java @@ -2,9 +2,9 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; -import java.util.Collection; import java.util.List; /** @@ -12,13 +12,14 @@ import java.util.List; */ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements ActivitySeineService { + @Override public FormDto<ActivitySeineDto> loadToRead(String activitySeineId) { return null; } @Override - public List<ActivitySeineDto> getActivitySeineStubByRoute(String routeId) { + public List<ReferenceDto<ActivitySeineDto>> getActivitySeineByRoute(String routeId) { return null; } @@ -41,9 +42,4 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac public void delete(String routeId, String activitySeineId) { } - - @Override - public void delete(String routeId, Collection<String> activitySeineIds) { - - } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java new file mode 100644 index 0000000..8e3702e --- /dev/null +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java @@ -0,0 +1,45 @@ +package fr.ird.observe.services.service.seine; + +import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.seine.FloatingObjectDto; + +import java.util.List; + +/** + * @author Sylvain Bavencoff - bavencoff(a)codelutin.com + */ +public class FloatingObjectServiceTopia extends ObserveServiceTopia implements FloatingObjectService{ + + + @Override + public FormDto<FloatingObjectDto> loadToRead(String floatingObjectId) { + return null; + } + + @Override + public List<ReferenceDto<FloatingObjectDto>> getFloatingObjectByActivitySeine(String activitySeineId) { + return null; + } + + @Override + public FormDto<FloatingObjectDto> loadToEdit(String floatingObjectId) { + return null; + } + + @Override + public FormDto<FloatingObjectDto> preCreate(String activitySeineId) { + return null; + } + + @Override + public String save(FormDto<FloatingObjectDto> form) { + return null; + } + + @Override + public void delete(String activitySeineId, String floatingObjectId) { + + } +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

26/50: Renommage Label en Reference, introduction de Reference ReferentialReference
by codelutin.com scm 20 Aug '15

20 Aug '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit a5f7ff953c6110db69e554518274f93666133884 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 16:36:49 2015 +0200 Renommage Label en Reference, introduction de Reference ReferentialReference --- .../services/service/ReferentialService.java | 4 +- .../java/fr/ird/observe/services/dto/FormDtos.java | 4 +- .../fr/ird/observe/services/dto/ReferenceDto.java | 47 +++++++++++++++ .../fr/ird/observe/services/dto/ReferenceDtos.java | 28 +++++++++ .../ird/observe/services/dto/ReferenceSetDto.java | 17 ++++++ .../ird/observe/services/dto/ReferenceSetDtos.java | 20 +++++++ ...n.java => ReferenceValueNotFoundException.java} | 11 ++-- .../dto/referential/ReferentialLabelSetDto.java | 17 ------ .../dto/referential/ReferentialLabelSetDtos.java | 20 ------- ...lLabelDto.java => ReferentialReferenceDto.java} | 63 +++++++-------------- ...abelDtos.java => ReferentialReferenceDtos.java} | 17 +++--- .../xmi/observe-services-dto-common.properties | 2 +- .../src/main/xmi/observe-services-dto-common.zargo | Bin 33042 -> 33490 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 75679 -> 75830 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 54650 -> 55982 bytes .../services/service/ReferentialServiceRest.java | 6 +- .../referential/ReferentialServiceRestTest.java | 4 +- .../services/service/ReferentialDtoBuilder.java | 10 ++-- .../services/service/ReferentialServiceTopia.java | 32 +++++------ .../service/ReferentialDtoBuilderTest.java | 17 +++--- .../service/ReferentialServiceTopiaTest.java | 14 ++--- 21 files changed, 191 insertions(+), 142 deletions(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java index 1ef629f..5d26659 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java @@ -3,7 +3,7 @@ package fr.ird.observe.services.service; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.referential.ReferentialLabelSetDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.spi.Write; import java.util.Collection; @@ -15,7 +15,7 @@ import java.util.Collection; */ public interface ReferentialService extends ObserveService { - <R extends ReferentialDto> ReferentialLabelSetDto getReferentialLabelSet(Class<R> type); + <R extends ReferentialDto> ReferenceSetDto getReferentialReferenceSet(Class<R> type); <R extends ReferentialDto> FormDto<R> loadToRead(Class<R> type, String id) throws DataNotFoundException; diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDtos.java index 530e2df..07f4d64 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDtos.java @@ -1,7 +1,5 @@ package fr.ird.observe.services.dto; -import fr.ird.observe.services.dto.referential.ReferentialLabelSetDto; - import java.util.Collection; /** @@ -16,7 +14,7 @@ public class FormDtos extends AbstractFormDtos { return result; } - public static <BeanType extends FormDto, R extends IdDto> BeanType newFormDto(Class<R> source, R form, Collection<ReferentialLabelSetDto> labels) { + public static <BeanType extends FormDto, R extends IdDto> BeanType newFormDto(Class<R> source, R form, Collection<ReferenceSetDto> labels) { BeanType result = (BeanType) new FormDto<>(source); result.setForm(form); result.setLabels(labels); diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceDto.java new file mode 100644 index 0000000..d4bac9c --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceDto.java @@ -0,0 +1,47 @@ +package fr.ird.observe.services.dto; + +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; + +import java.io.Serializable; + +public class ReferenceDto<D extends IdDto> extends AbstractReferenceDto { + + private static final long serialVersionUID = 1L; + + protected Class<D> type; + + protected ImmutableList<String> labelPropertyNames; + + protected Serializable[] labelPropertyValues; + + protected void init(Class<D> type, ImmutableList<String> labelPropertyNames) { + this.type = type; + this.labelPropertyNames = labelPropertyNames; + this.labelPropertyValues = new Serializable[labelPropertyNames.size()]; + } + + public Serializable getPropertyValue(String propertyName) { + int propertyIndex = getPropertyIndex(propertyName); + return labelPropertyValues[propertyIndex]; + } + + public ImmutableList<String> getPropertyNames() { + return labelPropertyNames; + } + + public void setPropertyValue(String propertyName, Serializable propertyValue) { + Preconditions.checkNotNull(propertyName, "propertyName parameter can't be null"); + int propertyIndex = getPropertyIndex(propertyName); + labelPropertyValues[propertyIndex] = propertyValue; + } + + protected int getPropertyIndex(String propertyName) { + int index = labelPropertyNames.indexOf(propertyName); + if (index == -1) { + throw new ReferenceValueNotFoundException(type, propertyName); + } + return index; + } + +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceDtos.java new file mode 100644 index 0000000..1012a40 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceDtos.java @@ -0,0 +1,28 @@ +package fr.ird.observe.services.dto; + +import com.google.common.collect.ImmutableList; +import org.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderFactory; + +import java.io.Serializable; +import java.util.Map; + +public class ReferenceDtos extends AbstractReferenceDtos { + + public static <R extends IdDto> ReferenceDto<R> newReferenceDto(Class<R> type, Object source) { + + ReferenceDto<R> dto = new ReferenceDto<>(); + + dto.init(type, ImmutableList.of("TODO")); + Binder binder = BinderFactory.newBinder(source.getClass()); + + String[] propertyNames = null; + Map<String, Object> properties = binder.obtainProperties(source, propertyNames); + for (Map.Entry<String, Object> entry : properties.entrySet()) { + String propertyName = entry.getKey(); + Object propertyValue = entry.getValue(); + dto.setPropertyValue(propertyName, (Serializable) propertyValue); + } + return dto; + } +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDto.java new file mode 100644 index 0000000..1f87fd2 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDto.java @@ -0,0 +1,17 @@ +package fr.ird.observe.services.dto; + +public class ReferenceSetDto<R extends IdDto> extends AbstractReferenceSetDto { + + private static final long serialVersionUID = 1L; + + protected final Class<R> type; + + public ReferenceSetDto(Class<R> type) { + this.type = type; + } + + public Class<R> getType() { + return type; + } + +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDtos.java new file mode 100644 index 0000000..98dfbf8 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDtos.java @@ -0,0 +1,20 @@ +package fr.ird.observe.services.dto; + +import java.util.LinkedHashSet; + +public class ReferenceSetDtos extends AbstractReferenceSetDtos { + + public static <D extends IdDto> ReferenceSetDto<D> newEmptyReferenceSetDto(Class<D> type) { + ReferenceSetDto<D> dto = new ReferenceSetDto<>(type); + dto.setReference(new LinkedHashSet<ReferenceDto>()); + return dto; + } + + public static <D extends IdDto, R extends ReferenceDto<D>> ReferenceSetDto<D> newReferenceSetDto(Class<D> type, + LinkedHashSet<R> labels) { + ReferenceSetDto<D> dto = new ReferenceSetDto<>(type); + dto.setReference((LinkedHashSet) labels); + return dto; + } + +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentielLabelValueNotFoundException.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceValueNotFoundException.java similarity index 50% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentielLabelValueNotFoundException.java rename to observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceValueNotFoundException.java index 6a2f092..03a33e1 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentielLabelValueNotFoundException.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceValueNotFoundException.java @@ -1,18 +1,19 @@ -package fr.ird.observe.services.dto.referential; +package fr.ird.observe.services.dto; /** * Created on 18/08/15. * * @author Tony Chemit - chemit(a)codelutin.com */ -public class ReferentielLabelValueNotFoundException extends RuntimeException { +public class ReferenceValueNotFoundException extends RuntimeException { private static final long serialVersionUID = 1L; - protected final Class<? extends ReferentialDto> dtoType; + protected final Class<? extends IdDto> dtoType; + protected final String propertyName; - public ReferentielLabelValueNotFoundException(Class<? extends ReferentialDto> dtoType, String propertyName) { + public ReferenceValueNotFoundException(Class<? extends IdDto> dtoType, String propertyName) { this.dtoType = dtoType; this.propertyName = propertyName; } @@ -21,7 +22,7 @@ public class ReferentielLabelValueNotFoundException extends RuntimeException { return propertyName; } - public Class<? extends ReferentialDto> getDtoType() { + public Class<? extends IdDto> getDtoType() { return dtoType; } } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelSetDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelSetDto.java deleted file mode 100644 index 2b8a45d..0000000 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelSetDto.java +++ /dev/null @@ -1,17 +0,0 @@ -package fr.ird.observe.services.dto.referential; - -public class ReferentialLabelSetDto<R extends ReferentialDto> extends AbstractReferentialLabelSetDto { - - private static final long serialVersionUID = 1L; - - protected final Class<R> type; - - public ReferentialLabelSetDto(Class<R> type) { - this.type = type; - } - - public Class<R> getType() { - return type; - } - -} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelSetDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelSetDtos.java deleted file mode 100644 index db70705..0000000 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelSetDtos.java +++ /dev/null @@ -1,20 +0,0 @@ -package fr.ird.observe.services.dto.referential; - -import java.util.LinkedHashSet; - -public class ReferentialLabelSetDtos extends AbstractReferentialLabelSetDtos { - - public static <R extends ReferentialDto> ReferentialLabelSetDto<R> newEmptyReferentialLabelSetDto(Class<R> type) { - ReferentialLabelSetDto<R> dto = new ReferentialLabelSetDto<>(type); - dto.setReferentialLabel(new LinkedHashSet<ReferentialLabelDto>()); - return dto; - } - - public static <R extends ReferentialDto> ReferentialLabelSetDto<R> newReferentialLabelSetDto(Class<R> type, - LinkedHashSet<ReferentialLabelDto<R>> labels) { - ReferentialLabelSetDto<R> dto = new ReferentialLabelSetDto<>(type); - dto.setReferentialLabel((LinkedHashSet)labels); - return dto; - } - -} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceDto.java similarity index 59% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelDto.java rename to observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceDto.java index f5550e1..60b43be 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceDto.java @@ -7,18 +7,12 @@ import fr.ird.observe.services.dto.constants.ReferentialLocale; import java.io.Serializable; -public class ReferentialLabelDto<R extends ReferentialDto> extends AbstractReferentialLabelDto { +public class ReferentialReferenceDto<D extends ReferentialDto> extends AbstractReferentialReferenceDto { private static final long serialVersionUID = 1L; public static final String PROPERTY_LABEL = "label"; - protected final Class<R> type; - - protected final ImmutableList<String> labelPropertyNames; - - protected final Serializable[] labelPropertyValues; - public static final ImmutableSet<String> I18N_PROPERTY_NAMES = ImmutableSet.of( I18nReferentialDto.PROPERTY_LABEL1, I18nReferentialDto.PROPERTY_LABEL2, @@ -30,38 +24,11 @@ public class ReferentialLabelDto<R extends ReferentialDto> extends AbstractRefer I18nReferentialDto.PROPERTY_LABEL8 ); - public ReferentialLabelDto(Class<R> type, ReferentialLocale referentialLocale, String... labelPropertyNames) { - this.type = type; - String libelle = referentialLocale.getLibelle(); - ImmutableList.Builder<String> labelPropertyNamesBuilder = new ImmutableList.Builder<>(); - for (String labelPropertyName : labelPropertyNames) { - if (I18N_PROPERTY_NAMES.contains(labelPropertyName)) { - if (libelle.endsWith(labelPropertyName)) { - labelPropertyName = PROPERTY_LABEL; - } else { - continue; - } - } - labelPropertyNamesBuilder.add(labelPropertyName); - } - this.labelPropertyNames = labelPropertyNamesBuilder.build(); - this.labelPropertyValues = new Serializable[labelPropertyNames.length]; - } - - public Class<R> getType() { + public Class<D> getType() { return type; } - public Serializable getLabelPropertyValue(String propertyName) { - int propertyIndex = getPropertyIndex(propertyName); - return labelPropertyValues[propertyIndex]; - } - - public ImmutableList<String> getLabelPropertyNames() { - return labelPropertyNames; - } - - public void setLabelPropertyValue(ReferentialLocale referentialLocale, String propertyName, Serializable propertyValue) { + public void setPropertyValue(ReferentialLocale referentialLocale, String propertyName, Serializable propertyValue) { Preconditions.checkNotNull(referentialLocale, "referentialLocale parameter can't be null"); Preconditions.checkNotNull(propertyName, "propertyName parameter can't be null"); if (I18N_PROPERTY_NAMES.contains(propertyName)) { @@ -72,16 +39,26 @@ public class ReferentialLabelDto<R extends ReferentialDto> extends AbstractRefer } } if (propertyName != null) { - int propertyIndex = getPropertyIndex(propertyName); - labelPropertyValues[propertyIndex] = propertyValue; + setPropertyValue(propertyName, propertyValue); } } - protected int getPropertyIndex(String propertyName) { - int index = labelPropertyNames.indexOf(propertyName); - if (index == -1) { - throw new ReferentielLabelValueNotFoundException(type, propertyName); + protected void init(Class<D> type, ReferentialLocale referentialLocale, String... labelPropertyNames) { + + this.type = type; + String libelle = referentialLocale.getLibelle(); + ImmutableList.Builder<String> labelPropertyNamesBuilder = new ImmutableList.Builder<>(); + for (String labelPropertyName : labelPropertyNames) { + if (I18N_PROPERTY_NAMES.contains(labelPropertyName)) { + if (libelle.endsWith(labelPropertyName)) { + labelPropertyName = PROPERTY_LABEL; + } else { + continue; + } + } + labelPropertyNamesBuilder.add(labelPropertyName); } - return index; + init(type, labelPropertyNamesBuilder.build()); } + } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceDtos.java similarity index 92% rename from observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelDtos.java rename to observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceDtos.java index 779b0fb..9702e7d 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceDtos.java @@ -49,7 +49,7 @@ import org.nuiton.util.beans.BinderFactory; import java.io.Serializable; import java.util.Map; -public class ReferentialLabelDtos extends AbstractReferentialLabelDtos { +public class ReferentialReferenceDtos extends AbstractReferentialReferenceDtos { /** * Les noms des propriétés à utiliser dans le label par type de référentiel. @@ -129,23 +129,20 @@ public class ReferentialLabelDtos extends AbstractReferentialLabelDtos { } - public static <R extends ReferentialDto> ReferentialLabelDto<R> newReferentialLabelDto(Class<R> type, ReferentialLocale referentialLocale) { + public static <R extends ReferentialDto> ReferentialReferenceDto<R> newReferentialReferenceDto(Class<R> type, + ReferentialLocale referentialLocale, + Object source) { String[] propertyNames = LABEL_PROPERTY_NAMES_MAPPING.get(type); - return new ReferentialLabelDto<>(type, referentialLocale, propertyNames); - } - public static <R extends ReferentialDto> ReferentialLabelDto<R> newReferentialLabelDto(Class<R> type, - ReferentialLocale referentialLocale, - Object source) { - String[] propertyNames = LABEL_PROPERTY_NAMES_MAPPING.get(type); - ReferentialLabelDto<R> dto = new ReferentialLabelDto<>(type, referentialLocale, propertyNames); + ReferentialReferenceDto<R> dto = new ReferentialReferenceDto<>(); + dto.init(type, referentialLocale, propertyNames); Binder binder = BinderFactory.newBinder(source.getClass()); Map<String, Object> properties = binder.obtainProperties(source, propertyNames); for (Map.Entry<String, Object> entry : properties.entrySet()) { String propertyName = entry.getKey(); Object propertyValue = entry.getValue(); - dto.setLabelPropertyValue(referentialLocale, propertyName, (Serializable) propertyValue); + dto.setPropertyValue(referentialLocale, propertyName, (Serializable) propertyValue); } return dto; } diff --git a/observe-services-model/src/main/xmi/observe-services-dto-common.properties b/observe-services-model/src/main/xmi/observe-services-dto-common.properties index e52b903..aa5d253 100644 --- a/observe-services-model/src/main/xmi/observe-services-dto-common.properties +++ b/observe-services-model/src/main/xmi/observe-services-dto-common.properties @@ -10,4 +10,4 @@ fr.ird.observe.services.dto.referential.Gear.attribute.gearCaracteristic.stereot fr.ird.observe.services.dto.referential.GearCaracteristic.attribute.gearCaracteristicType.stereotype=unique,ordered fr.ird.observe.services.dto.referential.Species.attribute.ocean.stereotype=unique,ordered fr.ird.observe.services.dto.referential.SpeciesList.attribute.species.stereotype=unique,ordered -fr.ird.observe.services.dto.referential.ReferentialLabelSet.attribute.referentialLabel.stereotype=unique,ordered +fr.ird.observe.services.dto.ReferenceSet.attribute.reference.stereotype=unique,ordered diff --git a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo index 862033a..89d3f35 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo differ diff --git a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo index 7208e8c..05c1fec 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo differ diff --git a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo index 4552de9..ac68371 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo differ diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/service/ReferentialServiceRest.java b/observe-services-rest/src/main/java/fr/ird/observe/services/service/ReferentialServiceRest.java index fe60d68..679c212 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/service/ReferentialServiceRest.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/service/ReferentialServiceRest.java @@ -2,9 +2,9 @@ package fr.ird.observe.services.service; import fr.ird.observe.services.ObserveServiceContext; import fr.ird.observe.services.ObserveServiceRest; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.referential.ReferentialLabelSetDto; import java.util.Collection; @@ -16,9 +16,9 @@ import java.util.Collection; public class ReferentialServiceRest extends ObserveServiceRest implements ReferentialService { @Override - public <R extends ReferentialDto> ReferentialLabelSetDto getReferentialLabelSet(Class<R> type) { + public <R extends ReferentialDto> ReferenceSetDto getReferentialReferenceSet(Class<R> type) { - return new ReferentialLabelSetDto(type); + return new ReferenceSetDto(type); } @Override diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/referential/ReferentialServiceRestTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/referential/ReferentialServiceRestTest.java index 9aa09e7..8dbaade 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/service/referential/ReferentialServiceRestTest.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/referential/ReferentialServiceRestTest.java @@ -2,7 +2,7 @@ package fr.ird.observe.services.service.referential; import fr.ird.observe.services.ObserveServiceContextRest; import fr.ird.observe.services.ObserveServiceMainFactory; -import fr.ird.observe.services.dto.referential.ReferentialLabelSetDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.service.ReferentialService; import org.junit.Assert; @@ -29,7 +29,7 @@ public class ReferentialServiceRestTest { @Test public void testGetReferentialLabelSet() throws Exception { - ReferentialLabelSetDto referentialLabelSet = service.getReferentialLabelSet(SexDto.class); + ReferenceSetDto referentialLabelSet = service.getReferentialReferenceSet(SexDto.class); Assert.assertNotNull(referentialLabelSet); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java index b373bca..1f24107 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java @@ -11,8 +11,8 @@ import fr.ird.observe.entities.constants.seine.SchoolType; import fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperation; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialLabelDto; -import fr.ird.observe.services.dto.referential.ReferentialLabelDtos; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDtos; import org.nuiton.topia.persistence.EntityVisitor; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.beans.Binder; @@ -120,10 +120,10 @@ public class ReferentialDtoBuilder<M extends ReferentialDto> implements Closeabl } - protected <R extends ReferentialDto> ReferentialLabelDto<R> entityToRef(Class<R> dtoType, TopiaEntity entityValue) { + protected <R extends ReferentialDto> ReferentialReferenceDto<R> entityToRef(Class<R> dtoType, TopiaEntity entityValue) { referentialDtoTypesBuilder.add(dtoType); - ReferentialLabelDto<R> label = ReferentialLabelDtos.newReferentialLabelDto(dtoType, referentialLocale, entityValue); + ReferentialReferenceDto<R> label = ReferentialReferenceDtos.newReferentialReferenceDto(dtoType, referentialLocale, entityValue); label.setId(entityValue.getTopiaId()); return label; @@ -182,7 +182,7 @@ public class ReferentialDtoBuilder<M extends ReferentialDto> implements Closeabl Class dtoType = ReferentialServiceTopia.entityToModelTypeCache.get(type); Collection<? extends TopiaEntity> topiaEntities = (Collection<? extends TopiaEntity>) value; - LinkedHashSet<ReferentialLabelDto> models = new LinkedHashSet<>(topiaEntities.size()); + LinkedHashSet<ReferentialReferenceDto> models = new LinkedHashSet<>(topiaEntities.size()); for (TopiaEntity entityValue : topiaEntities) { models.add(entityToRef(dtoType, entityValue)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java index ee9a73f..6983bdd 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java @@ -65,6 +65,8 @@ import fr.ird.observe.entities.referentiel.seine.Wind; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.FormDtos; +import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.services.dto.referential.FpaZoneDto; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; @@ -77,10 +79,8 @@ import fr.ird.observe.services.dto.referential.OrganismDto; import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialLabelDto; -import fr.ird.observe.services.dto.referential.ReferentialLabelDtos; -import fr.ird.observe.services.dto.referential.ReferentialLabelSetDto; -import fr.ird.observe.services.dto.referential.ReferentialLabelSetDtos; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDtos; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesGroupDto; @@ -226,25 +226,25 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe } @Override - public <D extends ReferentialDto> ReferentialLabelSetDto getReferentialLabelSet(Class<D> dtoType) { + public <D extends ReferentialDto> ReferenceSetDto getReferentialReferenceSet(Class<D> dtoType) { Class<TopiaEntity> entityType = getEntityType(dtoType); List<TopiaEntity> entities = loadEntities(entityType); - LinkedHashSet<ReferentialLabelDto<D>> labels = new LinkedHashSet<>(); + LinkedHashSet<ReferentialReferenceDto<D>> labels = new LinkedHashSet<>(); for (TopiaEntity entity : entities) { - ReferentialLabelDto<D> dto = ReferentialLabelDtos.newReferentialLabelDto(dtoType, serviceContext.getReferentialLocale(), entity); + ReferentialReferenceDto<D> dto = ReferentialReferenceDtos.newReferentialReferenceDto(dtoType, serviceContext.getReferentialLocale(), entity); labels.add(dto); } - ReferentialLabelSetDto labelSetDto = ReferentialLabelSetDtos.newReferentialLabelSetDto(dtoType, labels); + ReferenceSetDto labelSetDto = ReferenceSetDtos.newReferenceSetDto(dtoType, labels); return labelSetDto; } - public <D extends ReferentialDto> ReferentialLabelSetDto getReferentialLabelSet(Class<D> dtoType, String id) { + public <D extends ReferentialDto> ReferenceSetDto getReferentialLabelSet(Class<D> dtoType, String id) { Class<TopiaEntity> entityType = getEntityType(dtoType); TopiaEntity entity = loadEntity(dtoType, entityType, id); - LinkedHashSet<ReferentialLabelDto<D>> labels = new LinkedHashSet<>(1); - ReferentialLabelDto<D> dto = ReferentialLabelDtos.newReferentialLabelDto(dtoType, serviceContext.getReferentialLocale(), entity); + LinkedHashSet<ReferentialReferenceDto<D>> labels = new LinkedHashSet<>(1); + ReferentialReferenceDto<D> dto = ReferentialReferenceDtos.newReferentialReferenceDto(dtoType, serviceContext.getReferentialLocale(), entity); labels.add(dto); - ReferentialLabelSetDto labelSetDto = ReferentialLabelSetDtos.newReferentialLabelSetDto(dtoType, labels); + ReferenceSetDto labelSetDto = ReferenceSetDtos.newReferenceSetDto(dtoType, labels); return labelSetDto; } @@ -346,9 +346,9 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe // build label sets detected while copy ImmutableSet<Class<? extends ReferentialDto>> referentialDtoTypes = dtoBuilder.getReferentialDtoTypes(); - ImmutableSet.Builder<ReferentialLabelSetDto> labels = new ImmutableSet.Builder<>(); + ImmutableSet.Builder<ReferenceSetDto> labels = new ImmutableSet.Builder<>(); for (Class<? extends ReferentialDto> referenceDtoType : referentialDtoTypes) { - ReferentialLabelSetDto referentialLabelSet = getReferentialLabelSet(referenceDtoType); + ReferenceSetDto referentialLabelSet = getReferentialReferenceSet(referenceDtoType); labels.add(referentialLabelSet); } FormDto<D> form = FormDtos.newFormDto(dtoType, dto, labels.build()); @@ -366,10 +366,10 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe // build label sets detected while copy (keep the reference for each label, or nothing if value not set) ImmutableSet<Class<? extends ReferentialDto>> referentialDtoTypes = dtoBuilder.getReferentialDtoTypes(); - ImmutableSet.Builder<ReferentialLabelSetDto> labels = new ImmutableSet.Builder<>(); + ImmutableSet.Builder<ReferenceSetDto> labels = new ImmutableSet.Builder<>(); for (Class<? extends ReferentialDto> referentialDtoType : referentialDtoTypes) { - ReferentialLabelSetDto referentialLabelSet = ReferentialLabelSetDtos.newEmptyReferentialLabelSetDto(referentialDtoType); + ReferenceSetDto referentialLabelSet = ReferenceSetDtos.newEmptyReferenceSetDto(referentialDtoType); labels.add(referentialLabelSet); } diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java index 3e54fa1..94667cd 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java @@ -7,13 +7,14 @@ import fr.ird.observe.entities.referentiel.Organism; import fr.ird.observe.entities.referentiel.OrganismImpl; import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.entities.referentiel.ProgramImpl; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceValueNotFoundException; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.I18nReferentialDto; import fr.ird.observe.services.dto.referential.OrganismDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialLabelDto; -import fr.ird.observe.services.dto.referential.ReferentielLabelValueNotFoundException; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import org.junit.Assert; import org.junit.Test; import org.nuiton.util.DateUtil; @@ -89,11 +90,11 @@ public class ReferentialDtoBuilderTest { Assert.assertEquals(program.getTargetDiscardsObservation(), programDto.getTargetDiscardsObservation()); // On vérife que la référence sur l'organisme a bien été copiée - ReferentialLabelDto organismDto = programDto.getOrganism(); + ReferenceDto organismDto = programDto.getOrganism(); Assert.assertNotNull(organismDto); Assert.assertEquals(organism.getTopiaId(), organismDto.getId()); - Assert.assertEquals(organism.getCode(), organismDto.getLabelPropertyValue(ReferentialDto.PROPERTY_CODE)); - Assert.assertEquals(organism.getLabel2(), organismDto.getLabelPropertyValue(ReferentialLabelDto.PROPERTY_LABEL)); + Assert.assertEquals(organism.getCode(), organismDto.getPropertyValue(ReferentialDto.PROPERTY_CODE)); + Assert.assertEquals(organism.getLabel2(), organismDto.getPropertyValue(ReferentialReferenceDto.PROPERTY_LABEL)); assertPropertyNameDoesNotFound(organismDto, I18nReferentialDto.PROPERTY_LABEL1); assertPropertyNameDoesNotFound(organismDto, I18nReferentialDto.PROPERTY_LABEL2); @@ -106,12 +107,12 @@ public class ReferentialDtoBuilderTest { } - protected void assertPropertyNameDoesNotFound(ReferentialLabelDto dto, String propertyName) { + protected void assertPropertyNameDoesNotFound(ReferenceDto dto, String propertyName) { try { - dto.getLabelPropertyValue(propertyName); + dto.getPropertyValue(propertyName); Assert.fail(); - } catch (ReferentielLabelValueNotFoundException e) { + } catch (ReferenceValueNotFoundException e) { Assert.assertTrue(true); } diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java index cbcf107..0424d0e 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java @@ -11,7 +11,7 @@ import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.LengthWeightParameterDto; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialLabelSetDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -73,9 +73,9 @@ public class ReferentialServiceTopiaTest { log.info("Test referential of type: " + dtoType.getSimpleName() + " expected count: " + expectedCount); } - ReferentialLabelSetDto referentialLabelSet = service.getReferentialLabelSet(dtoType); + ReferenceSetDto referentialLabelSet = service.getReferentialReferenceSet(dtoType); Assert.assertNotNull(referentialLabelSet); - Assert.assertEquals(expectedCount, referentialLabelSet.sizeReferentialLabel()); + Assert.assertEquals(expectedCount, referentialLabelSet.sizeReference()); } @@ -144,8 +144,8 @@ public class ReferentialServiceTopiaTest { Assert.assertNotNull(form); Assert.assertEquals(o.getTopiaId(), form.getId()); - for (ReferentialLabelSetDto labelSetDto : formDto.getLabels()) { - Assert.assertTrue(labelSetDto.isReferentialLabelEmpty()); + for (ReferenceSetDto labelSetDto : formDto.getLabels()) { + Assert.assertTrue(labelSetDto.isReferenceEmpty()); } } @@ -173,11 +173,11 @@ public class ReferentialServiceTopiaTest { Assert.assertNotNull(form); Assert.assertEquals(o.getTopiaId(), form.getId()); - for (ReferentialLabelSetDto labelSetDto : formDto.getLabels()) { + for (ReferenceSetDto labelSetDto : formDto.getLabels()) { Class refEntityType = ReferentialServiceTopia.modelToEntityTypeCache.get(labelSetDto.getType()); long refExpected = dataSourceResource.getDataSource().getDAO(tx, refEntityType).count(); - Assert.assertEquals(refExpected, labelSetDto.sizeReferentialLabel()); + Assert.assertEquals(refExpected, labelSetDto.sizeReference()); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0