branch develop updated (7f5fa3a -> 99c1bb8)
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@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@codelutin.com> Date: Thu Aug 20 16:04:50 2015 +0200 fix merge commit 55176dba135b0a0198a6c720cd75edceb92c797d Author: Tony CHEMIT <chemit@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@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@codelutin.com> Date: Thu Aug 20 15:28:04 2015 +0200 Renommage du cache de type de services commit 28f01bfaa58fb2ee26234c028b65eebce70ebe87 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 20 11:55:58 2015 +0200 On repart sur du nommage plus classique... commit a1e44fa21d47b35682bccc31490696d943eddfaa Author: Tony CHEMIT <chemit@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@codelutin.com> Date: Thu Aug 20 11:24:21 2015 +0200 Renommage de l'application web commit d3dc43103ccee29617b65f80c65fc32ed6d93f5f Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 20 11:23:41 2015 +0200 renommage du module swing commit d7745fd4908285511c26864592cc313bf20fc935 Author: Tony CHEMIT <chemit@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@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@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@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@list.forge.codelutin.com>.
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 19bc788cf3cdde11ed220038c61b15c05cca2e6c Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 20 10:36:36 2015 +0200 Suppression d'un module obsolete --- .../rest/wm/ObserveRestApplicationContext.java | 42 --------------- .../rest/wm/ObserveRestApplicationListener.java | 42 --------------- .../rest/wm/ObserveRestWebMotionFilter.java | 62 ---------------------- observe-services-rest/src/main/resources/mapping | 28 ---------- .../src/main/webapp/WEB-INF/web.xml | 36 ------------- 5 files changed, 210 deletions(-) diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestApplicationContext.java b/observe-services-rest/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestApplicationContext.java deleted file mode 100644 index b950a16..0000000 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestApplicationContext.java +++ /dev/null @@ -1,42 +0,0 @@ -package fr.ird.observe.services.rest.wm; - -/** - * @author Tony Chemit : chemit@codelutin.com - */ -public class ObserveRestApplicationContext { - - public static final String APPLICATION_CONTEXT_PARAMETER = ObserveRestApplicationContext.class.getName(); - - public static final String MISSING_APPLICATION_CONTEXT = - ObserveRestApplicationContext.class.getSimpleName() + " not found. You probably forgot to" + - " register " + ObserveRestApplicationListener.class.getName() + " in your web.xml"; - -// protected ObserveServiceConfig serviceConfig; -// -// protected ObserveTopiaApplicationContext rootContext; - - public void init() { - -// ObserveServiceConfig config = new ObserveServiceConfig(null); -// serviceConfig = config; -// Properties rootProperties = serviceConfig.getFlatOptions(); -// rootProperties.setProperty(TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, ObserveEntityEnum.getImplementationClassesAsString()); -// -// rootContext = TopiaApplicationContextCache.getContext(rootProperties, ObserveConfigurationHelper.getCreateTopiaContextFunction(config)); - } - -// public ObserveServiceConfig getServiceConfig() { -// return serviceConfig; -// } - -// public ObserveTopiaPersistenceContext newTransaction() { -// ObserveTopiaPersistenceContext persistenceContext = rootContext.newPersistenceContext(); -// return persistenceContext; -// } - - public void close() { -// if (rootContext != null) { -// rootContext.closeContext(); -// } - } -} diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestApplicationListener.java b/observe-services-rest/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestApplicationListener.java deleted file mode 100644 index 9f0d70b..0000000 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestApplicationListener.java +++ /dev/null @@ -1,42 +0,0 @@ -package fr.ird.observe.services.rest.wm; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; - -/** - * @author Arnaud Thimel : thimel@codelutin.com - */ -public class ObserveRestApplicationListener implements ServletContextListener { - - private static final Log log = LogFactory.getLog(ObserveRestApplicationListener.class); - - protected ObserveRestApplicationContext context; - - @Override - public void contextInitialized(ServletContextEvent sce) { - - if (log.isInfoEnabled()) { - log.info("Initializing " + ObserveRestApplicationListener.class.getName()); - } - - context = new ObserveRestApplicationContext(); - context.init(); - - sce.getServletContext().setAttribute(ObserveRestApplicationContext.APPLICATION_CONTEXT_PARAMETER, context); - - } - - @Override - public void contextDestroyed(ServletContextEvent sce) { - - if (log.isInfoEnabled()) { - log.info("Destroying " + ObserveRestApplicationListener.class.getName()); - } - - context.close(); - } - -} diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionFilter.java b/observe-services-rest/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionFilter.java deleted file mode 100644 index 2f9c67a..0000000 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionFilter.java +++ /dev/null @@ -1,62 +0,0 @@ -package fr.ird.observe.services.rest.wm; - -import com.google.common.base.Preconditions; -import org.debux.webmotion.server.WebMotionFilter; -import org.debux.webmotion.server.call.HttpContext; - -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; - -/** - * @author Tony Chemit - chemit@codelutin.com - */ -public class ObserveRestWebMotionFilter extends WebMotionFilter { - -// protected ObserveTopiaPersistenceContext getTopiaContext(HttpContext context) { -// HttpServletRequest servletRequest = context.getRequest(); -// ObserveTopiaPersistenceContext result = (ObserveTopiaPersistenceContext) -// servletRequest -// .getAttribute(TopiaTransactionFilter.TOPIA_TRANSACTION_REQUEST_ATTRIBUTE); -// -// Preconditions.checkState(result != null, "TopiaContext not available"); -// -// return result; -// } - - protected ObserveRestApplicationContext getObserveApplicationContext(HttpContext context) { - - ServletContext servletContext = context.getServletContext(); - ObserveRestApplicationContext result = - (ObserveRestApplicationContext) servletContext - .getAttribute(ObserveRestApplicationContext.APPLICATION_CONTEXT_PARAMETER); - - Preconditions.checkState(result != null, ObserveRestApplicationContext.MISSING_APPLICATION_CONTEXT); - - return result; - - } - - public void inject(HttpContext context) { - -// final ObserveTopiaPersistenceContext persistenceContext = getTopiaContext(context); -// -// final ObserveRestApplicationContext applicationContext = getObserveApplicationContext(context); - - HttpServletRequest request = context.getRequest(); - String authenticationToken = request.getHeader("authenticationToken"); - -// DefaultServiceContext serviceContext = new DefaultServiceContext(applicationContext.getServiceConfig(), new Supplier<ObserveTopiaPersistenceContext>() { -// @Override -// public ObserveTopiaPersistenceContext get() { -// return persistenceContext; -// } -// }, authenticationToken); -// -// ServiceFactory serviceFactory = serviceContext.getServiceFactory(); -// request.setAttribute("serviceFactory", serviceFactory); - - doProcess(); - } - - -} diff --git a/observe-services-rest/src/main/resources/mapping b/observe-services-rest/src/main/resources/mapping deleted file mode 100644 index 7be48ba..0000000 --- a/observe-services-rest/src/main/resources/mapping +++ /dev/null @@ -1,28 +0,0 @@ -[config] -package.base=fr.inra.agrosyst.services.rest.wm -default.render=fr.inra.agrosyst.services.rest.wm.AgrosystJsonRender -server.controller.scope=request -server.listener.class=fr.inra.agrosyst.services.rest.wm.AgrosystServerListener - -[filters] -* /* AgrosystRestWebMotionFilter.inject - -[actions] -GET,POST /context/NavigationContextService/{method} action:NavigationContextServiceRest.{method} -GET,POST /domain/DomainService/{method} action:DomainServiceRest.{method} -GET,POST /generic/GenericEntityService/{method} action:GenericEntityServiceRest.{method} -GET,POST /growingplan/GrowingPlanService/{method} action:GrowingPlanServiceRest.{method} -GET,POST /growingsystem/GrowingSystemService/{method} action:GrowingSystemServiceRest.{method} -GET,POST /managementmode/ManagementModeService/{method} action:ManagementModeServiceRest.{method} -GET,POST /network/NetworkService/{method} action:NetworkServiceRest.{method} -GET,POST /plot/PlotService/{method} action:PlotServiceRest.{method} -GET,POST /practiced/PracticedCropCycleService/{method} action:PracticedCropCycleServiceRest.{method} -GET,POST /practiced/PracticedSystemService/{method} action:PracticedSystemServiceRest.{method} -GET,POST /effective/EffectiveCropCycleService/{method} action:EffectiveCropCycleServiceRest.{method} -GET,POST /referential/ImportService/{method} action:ImportServiceRest.{method} -GET,POST /referential/ExportService/{method} action:ExportServiceRest.{method} -GET,POST /referential/ReferentialService/{method} action:ReferentialServiceRest.{method} -GET,POST /security/AuthenticationService/{method} action:AuthenticationServiceRest.{method} -GET,POST /security/AuthorizationService/{method} action:AuthorizationServiceRest.{method} -GET,POST /security/BusinessAuthorizationService/{method} action:BusinessAuthorizationServiceRest.{method} -GET,POST /users/UserService/{method} action:UserServiceRest.{method} diff --git a/observe-services-rest/src/main/webapp/WEB-INF/web.xml b/observe-services-rest/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index d0c6b38..0000000 --- a/observe-services-rest/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,36 +0,0 @@ -<!-- - #%L - Agrosyst :: Services :: REST by WebMotion - $Id: web.xml 2774 2014-01-17 17:42:48Z athimel $ - $HeadURL: https://svn.codelutin.com/agrosyst/trunk/agrosyst-services-rest-webmotion/sr... $ - %% - Copyright (C) 2013 - 2014 INRA - %% - INRA - Tous droits réservés - #L% - --> -<web-app version="3.0" - xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee - http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" > - - <display-name>Agrosyst REST API by WebMotion</display-name> - - <filter> - <filter-name>topiaTransaction</filter-name> - <filter-class> - fr.inra.agrosyst.services.rest.wm.AgrosystRestTransactionFilter - </filter-class> - </filter> - - <filter-mapping> - <filter-name>topiaTransaction</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <listener> - <listener-class>fr.inra.agrosyst.services.rest.wm.AgrosystRestApplicationListener</listener-class> - </listener> - -</web-app> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 48bb23d3ffe15fa2cf64ed49e1f593fa14ffbc3b Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 20 11:07:14 2015 +0200 Introduction d'une API pour la configuration des services --- observe-services-api/pom.xml | 6 +++- observe-services-configuration-api/LICENSE.txt | 0 observe-services-configuration-api/README.txt | 0 .../pom.xml | 6 ++-- .../ObserveDataSourceConfiguration.java | 2 +- .../src/test/resources/log4j.properties | 32 ++++++++++++++++++++++ 6 files changed, 41 insertions(+), 5 deletions(-) diff --git a/observe-services-api/pom.xml b/observe-services-api/pom.xml index 590f6e8..1fdd594 100644 --- a/observe-services-api/pom.xml +++ b/observe-services-api/pom.xml @@ -23,7 +23,11 @@ <artifactId>observe-services-model</artifactId> <version>${project.version}</version> </dependency> - + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-services-configuration-api</artifactId> + <version>${project.version}</version> + </dependency> <!-- commons dependencies --> diff --git a/observe-services-configuration-api/LICENSE.txt b/observe-services-configuration-api/LICENSE.txt new file mode 100644 index 0000000..e69de29 diff --git a/observe-services-configuration-api/README.txt b/observe-services-configuration-api/README.txt new file mode 100644 index 0000000..e69de29 diff --git a/observe-services-api/pom.xml b/observe-services-configuration-api/pom.xml similarity index 90% copy from observe-services-api/pom.xml copy to observe-services-configuration-api/pom.xml index 590f6e8..dd4c065 100644 --- a/observe-services-api/pom.xml +++ b/observe-services-configuration-api/pom.xml @@ -10,10 +10,10 @@ <version>4.0.2-SNAPSHOT</version> </parent> - <artifactId>observe-services-api</artifactId> + <artifactId>observe-services-configuration-api</artifactId> - <name>ObServe :: Services API</name> - <description>ObServe services API module</description> + <name>ObServe :: Services Configuration API</name> + <description>ObServe services Configuration API module</description> <dependencies> diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveDataSourceConfiguration.java b/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfiguration.java similarity index 74% rename from observe-services-api/src/main/java/fr/ird/observe/services/ObserveDataSourceConfiguration.java rename to observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfiguration.java index ae1da54..b611428 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveDataSourceConfiguration.java +++ b/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfiguration.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services; +package fr.ird.observe.services.configuration; /** * Created on 19/08/15. diff --git a/observe-services-configuration-api/src/test/resources/log4j.properties b/observe-services-configuration-api/src/test/resources/log4j.properties new file mode 100644 index 0000000..0f21768 --- /dev/null +++ b/observe-services-configuration-api/src/test/resources/log4j.properties @@ -0,0 +1,32 @@ +### +# #%L +# ObServe :: Swing +# %% +# Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### + +# Global logging configuration +log4j.rootLogger=ERROR, stdout +#log4j.rootLogger=ERROR, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%c:%L) %M - %m%n +#log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n + +log4j.logger.fr.ird.observe=INFO -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 1cb472fde6e4fe900c96e414245b62c6bdc7ffe0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 20 11:13:45 2015 +0200 Introduction du module de configuration pour l'implantation ToPIA --- observe-services-configuration-topia/LICENSE.txt | 674 +++++++++++++++++++++ observe-services-configuration-topia/README.txt | 2 + .../pom.xml | 11 +- .../topia/ObserveTopiaDataSourceConfiguration.java | 4 +- .../fr.ird.observe.services.ObserveServiceFactory | 1 + .../src/test/resources/log4j.properties | 32 + observe-services-topia/pom.xml | 16 +- .../services/topia/ObserveTopiaServiceFactory.java | 2 +- 8 files changed, 732 insertions(+), 10 deletions(-) diff --git a/observe-services-configuration-topia/LICENSE.txt b/observe-services-configuration-topia/LICENSE.txt new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/observe-services-configuration-topia/LICENSE.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. diff --git a/observe-services-configuration-topia/README.txt b/observe-services-configuration-topia/README.txt new file mode 100644 index 0000000..d2e50d3 --- /dev/null +++ b/observe-services-configuration-topia/README.txt @@ -0,0 +1,2 @@ +To deploy new version of pom: mvn deploy +To install localy: mvn install diff --git a/observe-services-topia/pom.xml b/observe-services-configuration-topia/pom.xml similarity index 88% copy from observe-services-topia/pom.xml copy to observe-services-configuration-topia/pom.xml index f5560e2..6446501 100644 --- a/observe-services-topia/pom.xml +++ b/observe-services-configuration-topia/pom.xml @@ -10,10 +10,10 @@ <version>4.0.2-SNAPSHOT</version> </parent> - <artifactId>observe-services-topia</artifactId> + <artifactId>observe-services-configuration-topia</artifactId> - <name>ObServe :: Services (impl Topia)</name> - <description>ObServe services (Implementation Topia)</description> + <name>ObServe :: Services ToPIA Configuration</name> + <description>ObServe services ToPIA Configuration</description> <dependencies> @@ -25,6 +25,11 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>observe-services-configuration-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>observe-services-api</artifactId> <version>${project.version}</version> </dependency> diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaDataSourceConfiguration.java b/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/topia/ObserveTopiaDataSourceConfiguration.java similarity index 76% rename from observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaDataSourceConfiguration.java rename to observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/topia/ObserveTopiaDataSourceConfiguration.java index 33fe99e..8b95c3c 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaDataSourceConfiguration.java +++ b/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/topia/ObserveTopiaDataSourceConfiguration.java @@ -1,7 +1,7 @@ -package fr.ird.observe.services.topia; +package fr.ird.observe.services.configuration.topia; import fr.ird.observe.db.DataSource; -import fr.ird.observe.services.ObserveDataSourceConfiguration; +import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; /** * Created on 19/08/15. diff --git a/observe-services-configuration-topia/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory b/observe-services-configuration-topia/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory new file mode 100644 index 0000000..016fcd0 --- /dev/null +++ b/observe-services-configuration-topia/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory @@ -0,0 +1 @@ +fr.ird.observe.services.topia.ObserveTopiaServiceFactory \ No newline at end of file diff --git a/observe-services-configuration-topia/src/test/resources/log4j.properties b/observe-services-configuration-topia/src/test/resources/log4j.properties new file mode 100644 index 0000000..0f21768 --- /dev/null +++ b/observe-services-configuration-topia/src/test/resources/log4j.properties @@ -0,0 +1,32 @@ +### +# #%L +# ObServe :: Swing +# %% +# Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### + +# Global logging configuration +log4j.rootLogger=ERROR, stdout +#log4j.rootLogger=ERROR, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%c:%L) %M - %m%n +#log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n + +log4j.logger.fr.ird.observe=INFO diff --git a/observe-services-topia/pom.xml b/observe-services-topia/pom.xml index f5560e2..ecc1160 100644 --- a/observe-services-topia/pom.xml +++ b/observe-services-topia/pom.xml @@ -12,8 +12,8 @@ <artifactId>observe-services-topia</artifactId> - <name>ObServe :: Services (impl Topia)</name> - <description>ObServe services (Implementation Topia)</description> + <name>ObServe :: Services ToPIA Implementation</name> + <description>ObServe services ToPIA Implementation</description> <dependencies> @@ -25,11 +25,21 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>observe-services-configuration-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>observe-services-api</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>observe-services-configuration-topia</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>observe-entities</artifactId> <version>${project.version}</version> </dependency> @@ -38,7 +48,6 @@ <artifactId>observe-business</artifactId> <version>${project.version}</version> </dependency> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>observe-business</artifactId> @@ -46,7 +55,6 @@ <classifier>tests</classifier> </dependency> - <!-- commons dependencies --> <dependency> diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaServiceFactory.java b/observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaServiceFactory.java index fd5ce2d..155e35c 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaServiceFactory.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaServiceFactory.java @@ -5,7 +5,7 @@ import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableSet; import fr.ird.observe.db.DataSource; import fr.ird.observe.services.ObserveServiceApplicationContext; -import fr.ird.observe.services.ObserveDataSourceConfiguration; +import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.ObserveServiceFactorySupport; import fr.ird.observe.services.spi.NoDataAccess; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 d7745fd4908285511c26864592cc313bf20fc935 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 20 11:21:46 2015 +0200 Introduction du module de configuration pour l'implantation REST --- .../LICENSE.txt | 0 .../README.txt | 0 .../pom.xml | 11 ++++++++--- .../ObserveRestDataSourceConfiguration.java | 4 +--- .../fr.ird.observe.services.ObserveServiceFactory | 0 .../src/test/resources/log4j.properties | 0 .../LICENSE.txt | 0 .../README.txt | 0 .../pom.xml | 16 +++++++++++++--- .../services/rest/client/ObserveRestClientService.java | 0 .../rest/client/ObserveRestClientServiceContext.java | 0 .../rest/client/ObserveRestClientServiceFactory.java | 2 +- .../client/service/ReferentialServiceRestClient.java | 0 .../fr.ird.observe.services.ObserveServiceFactory | 0 .../rest/client/service/ReferentialServiceRestTest.java | 0 .../src/test/resources/log4j.properties | 0 16 files changed, 23 insertions(+), 10 deletions(-) diff --git a/observe-services-rest-client/LICENSE.txt b/observe-services-configuration-rest/LICENSE.txt similarity index 100% copy from observe-services-rest-client/LICENSE.txt copy to observe-services-configuration-rest/LICENSE.txt diff --git a/observe-services-rest-client/README.txt b/observe-services-configuration-rest/README.txt similarity index 100% copy from observe-services-rest-client/README.txt copy to observe-services-configuration-rest/README.txt diff --git a/observe-services-rest-client/pom.xml b/observe-services-configuration-rest/pom.xml similarity index 84% copy from observe-services-rest-client/pom.xml copy to observe-services-configuration-rest/pom.xml index ae97bff..b810ff3 100644 --- a/observe-services-rest-client/pom.xml +++ b/observe-services-configuration-rest/pom.xml @@ -10,10 +10,10 @@ <version>4.0.2-SNAPSHOT</version> </parent> - <artifactId>observe-services-rest-client</artifactId> + <artifactId>observe-services-configuration-rest</artifactId> - <name>ObServe :: Services (client REST)</name> - <description>ObServe services (client REST)</description> + <name>ObServe :: Services REST Configuration</name> + <description>ObServe services REST Configuration</description> <dependencies> @@ -25,6 +25,11 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>observe-services-configuration-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>observe-services-api</artifactId> <version>${project.version}</version> </dependency> diff --git a/observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientDataSourceConfiguration.java b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveRestDataSourceConfiguration.java similarity index 81% rename from observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientDataSourceConfiguration.java rename to observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveRestDataSourceConfiguration.java index 45a2074..818a12b 100644 --- a/observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientDataSourceConfiguration.java +++ b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveRestDataSourceConfiguration.java @@ -1,7 +1,5 @@ package fr.ird.observe.services.rest.client; -import fr.ird.observe.services.ObserveDataSourceConfiguration; - import java.net.URL; /** @@ -9,7 +7,7 @@ import java.net.URL; * * @author Tony Chemit - chemit@codelutin.com */ -public class ObserveRestClientDataSourceConfiguration implements ObserveDataSourceConfiguration { +public class ObserveRestDataSourceConfiguration implements ObserveDataSourceConfiguration { /** * L'url du serveur à utiliser. diff --git a/observe-services-rest-client/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory b/observe-services-configuration-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory similarity index 100% copy from observe-services-rest-client/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory copy to observe-services-configuration-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory diff --git a/observe-services-rest-client/src/test/resources/log4j.properties b/observe-services-configuration-rest/src/test/resources/log4j.properties similarity index 100% copy from observe-services-rest-client/src/test/resources/log4j.properties copy to observe-services-configuration-rest/src/test/resources/log4j.properties diff --git a/observe-services-rest-client/LICENSE.txt b/observe-services-rest/LICENSE.txt similarity index 100% rename from observe-services-rest-client/LICENSE.txt rename to observe-services-rest/LICENSE.txt diff --git a/observe-services-rest-client/README.txt b/observe-services-rest/README.txt similarity index 100% rename from observe-services-rest-client/README.txt rename to observe-services-rest/README.txt diff --git a/observe-services-rest-client/pom.xml b/observe-services-rest/pom.xml similarity index 78% rename from observe-services-rest-client/pom.xml rename to observe-services-rest/pom.xml index ae97bff..52b344e 100644 --- a/observe-services-rest-client/pom.xml +++ b/observe-services-rest/pom.xml @@ -10,10 +10,10 @@ <version>4.0.2-SNAPSHOT</version> </parent> - <artifactId>observe-services-rest-client</artifactId> + <artifactId>observe-services-rest</artifactId> - <name>ObServe :: Services (client REST)</name> - <description>ObServe services (client REST)</description> + <name>ObServe :: Services REST Implementation</name> + <description>ObServe services REST Implementation</description> <dependencies> @@ -25,9 +25,19 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>observe-services-configuration-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>observe-services-api</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-services-configuration-rest</artifactId> + <version>${project.version}</version> + </dependency> <!-- commons dependencies --> diff --git a/observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientService.java b/observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientService.java similarity index 100% rename from observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientService.java rename to observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientService.java diff --git a/observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceContext.java b/observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceContext.java similarity index 100% rename from observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceContext.java rename to observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceContext.java diff --git a/observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceFactory.java b/observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceFactory.java similarity index 96% rename from observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceFactory.java rename to observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceFactory.java index 054661c..00041f5 100644 --- a/observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceFactory.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceFactory.java @@ -2,7 +2,7 @@ package fr.ird.observe.services.rest.client; import com.google.common.base.Preconditions; import com.google.common.cache.LoadingCache; -import fr.ird.observe.services.ObserveDataSourceConfiguration; +import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.ObserveServiceApplicationContext; import fr.ird.observe.services.ObserveServiceFactorySupport; diff --git a/observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestClient.java b/observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestClient.java similarity index 100% rename from observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestClient.java rename to observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestClient.java diff --git a/observe-services-rest-client/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory b/observe-services-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory similarity index 100% rename from observe-services-rest-client/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory rename to observe-services-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory diff --git a/observe-services-rest-client/src/test/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestTest.java similarity index 100% rename from observe-services-rest-client/src/test/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestTest.java rename to observe-services-rest/src/test/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestTest.java diff --git a/observe-services-rest-client/src/test/resources/log4j.properties b/observe-services-rest/src/test/resources/log4j.properties similarity index 100% rename from observe-services-rest-client/src/test/resources/log4j.properties rename to observe-services-rest/src/test/resources/log4j.properties -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 d3dc43103ccee29617b65f80c65fc32ed6d93f5f Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 20 11:23:41 2015 +0200 renommage du module swing --- .../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 .../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 779 files changed, 23 insertions(+), 3 deletions(-) diff --git a/observe-swing/LICENSE.txt b/observe-application-swing/LICENSE.txt similarity index 100% rename from observe-swing/LICENSE.txt rename to observe-application-swing/LICENSE.txt diff --git a/observe-swing/README.txt b/observe-application-swing/README.txt similarity index 100% rename from observe-swing/README.txt rename to observe-application-swing/README.txt diff --git a/observe-swing/changelog.txt b/observe-application-swing/changelog.txt similarity index 100% rename from observe-swing/changelog.txt rename to observe-application-swing/changelog.txt diff --git a/observe-swing/pom.xml b/observe-application-swing/pom.xml similarity index 94% rename from observe-swing/pom.xml rename to observe-application-swing/pom.xml index 320bbca..9182473 100644 --- a/observe-swing/pom.xml +++ b/observe-application-swing/pom.xml @@ -29,10 +29,10 @@ <version>4.0.2-SNAPSHOT</version> </parent> - <artifactId>observe-swing</artifactId> + <artifactId>observe-application-swing</artifactId> - <name>ObServe :: Swing</name> - <description>ObServe Swing</description> + <name>ObServe :: Application Swing</name> + <description>ObServe Application Swing</description> <properties> @@ -95,6 +95,26 @@ <version>${project.version}</version> <scope>runtime</scope> </dependency> + <!--dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-services-model</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-services-configuration-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-services-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-services-runner</artifactId> + <version>${project.version}</version> + </dependency--> <!-- jaxx dependencies --> diff --git a/observe-swing/src/license/THIRD-PARTY.properties b/observe-application-swing/src/license/THIRD-PARTY.properties similarity index 100% rename from observe-swing/src/license/THIRD-PARTY.properties rename to observe-application-swing/src/license/THIRD-PARTY.properties diff --git a/observe-swing/src/main/assembly/bin.xml b/observe-application-swing/src/main/assembly/bin.xml similarity index 100% rename from observe-swing/src/main/assembly/bin.xml rename to observe-application-swing/src/main/assembly/bin.xml diff --git a/observe-swing/src/main/assembly/dist/doc/observe_manuel_administration.pdf b/observe-application-swing/src/main/assembly/dist/doc/observe_manuel_administration.pdf similarity index 100% rename from observe-swing/src/main/assembly/dist/doc/observe_manuel_administration.pdf rename to observe-application-swing/src/main/assembly/dist/doc/observe_manuel_administration.pdf diff --git a/observe-swing/src/main/assembly/dist/doc/observe_manuel_observateur.pdf b/observe-application-swing/src/main/assembly/dist/doc/observe_manuel_observateur.pdf similarity index 100% rename from observe-swing/src/main/assembly/dist/doc/observe_manuel_observateur.pdf rename to observe-application-swing/src/main/assembly/dist/doc/observe_manuel_observateur.pdf diff --git a/observe-swing/src/main/assembly/dist/go.bat b/observe-application-swing/src/main/assembly/dist/go.bat similarity index 100% rename from observe-swing/src/main/assembly/dist/go.bat rename to observe-application-swing/src/main/assembly/dist/go.bat diff --git a/observe-swing/src/main/assembly/dist/go.sh b/observe-application-swing/src/main/assembly/dist/go.sh similarity index 100% rename from observe-swing/src/main/assembly/dist/go.sh rename to observe-application-swing/src/main/assembly/dist/go.sh diff --git a/observe-swing/src/main/assembly/dist/obstuna-admin/README.txt b/observe-application-swing/src/main/assembly/dist/obstuna-admin/README.txt similarity index 100% rename from observe-swing/src/main/assembly/dist/obstuna-admin/README.txt rename to observe-application-swing/src/main/assembly/dist/obstuna-admin/README.txt diff --git a/observe-swing/src/main/assembly/dist/obstuna-admin/apply-extra.sh b/observe-application-swing/src/main/assembly/dist/obstuna-admin/apply-extra.sh similarity index 100% rename from observe-swing/src/main/assembly/dist/obstuna-admin/apply-extra.sh rename to observe-application-swing/src/main/assembly/dist/obstuna-admin/apply-extra.sh diff --git a/observe-swing/src/main/assembly/dist/obstuna-admin/create-obstuna.bat b/observe-application-swing/src/main/assembly/dist/obstuna-admin/create-obstuna.bat similarity index 100% rename from observe-swing/src/main/assembly/dist/obstuna-admin/create-obstuna.bat rename to observe-application-swing/src/main/assembly/dist/obstuna-admin/create-obstuna.bat diff --git a/observe-swing/src/main/assembly/dist/obstuna-admin/create-obstuna.sh b/observe-application-swing/src/main/assembly/dist/obstuna-admin/create-obstuna.sh similarity index 100% rename from observe-swing/src/main/assembly/dist/obstuna-admin/create-obstuna.sh rename to observe-application-swing/src/main/assembly/dist/obstuna-admin/create-obstuna.sh diff --git a/observe-swing/src/main/assembly/dist/obstuna-admin/createdb/create-empty-obstuna.sh b/observe-application-swing/src/main/assembly/dist/obstuna-admin/createdb/create-empty-obstuna.sh similarity index 100% rename from observe-swing/src/main/assembly/dist/obstuna-admin/createdb/create-empty-obstuna.sh rename to observe-application-swing/src/main/assembly/dist/obstuna-admin/createdb/create-empty-obstuna.sh diff --git a/observe-swing/src/main/assembly/dist/obstuna-admin/createdb/create-ird_obstuna.sh b/observe-application-swing/src/main/assembly/dist/obstuna-admin/createdb/create-ird_obstuna.sh similarity index 100% rename from observe-swing/src/main/assembly/dist/obstuna-admin/createdb/create-ird_obstuna.sh rename to observe-application-swing/src/main/assembly/dist/obstuna-admin/createdb/create-ird_obstuna.sh diff --git a/observe-swing/src/main/assembly/dist/obstuna-admin/createdb/create-test_obstuna.sh b/observe-application-swing/src/main/assembly/dist/obstuna-admin/createdb/create-test_obstuna.sh similarity index 100% rename from observe-swing/src/main/assembly/dist/obstuna-admin/createdb/create-test_obstuna.sh rename to observe-application-swing/src/main/assembly/dist/obstuna-admin/createdb/create-test_obstuna.sh diff --git a/observe-swing/src/main/assembly/dist/obstuna-admin/drop-obstuna.bat b/observe-application-swing/src/main/assembly/dist/obstuna-admin/drop-obstuna.bat similarity index 100% rename from observe-swing/src/main/assembly/dist/obstuna-admin/drop-obstuna.bat rename to observe-application-swing/src/main/assembly/dist/obstuna-admin/drop-obstuna.bat diff --git a/observe-swing/src/main/assembly/dist/obstuna-admin/drop-obstuna.sh b/observe-application-swing/src/main/assembly/dist/obstuna-admin/drop-obstuna.sh similarity index 100% rename from observe-swing/src/main/assembly/dist/obstuna-admin/drop-obstuna.sh rename to observe-application-swing/src/main/assembly/dist/obstuna-admin/drop-obstuna.sh diff --git a/observe-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-1-activity.sql b/observe-application-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-1-activity.sql similarity index 100% rename from observe-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-1-activity.sql rename to observe-application-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-1-activity.sql diff --git a/observe-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-2-harbour.sql b/observe-application-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-2-harbour.sql similarity index 100% rename from observe-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-2-harbour.sql rename to observe-application-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-2-harbour.sql diff --git a/observe-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-3-activity-seine.sql b/observe-application-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-3-activity-seine.sql similarity index 100% rename from observe-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-3-activity-seine.sql rename to observe-application-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-3-activity-seine.sql diff --git a/observe-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-4-activity-longine.sql b/observe-application-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-4-activity-longine.sql similarity index 100% rename from observe-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-4-activity-longine.sql rename to observe-application-swing/src/main/assembly/dist/obstuna-admin/extra/create-postgis-4-activity-longine.sql diff --git a/observe-swing/src/main/assembly/dist/obstuna-admin/extra/function_enhanced_sets_school_types.sql b/observe-application-swing/src/main/assembly/dist/obstuna-admin/extra/function_enhanced_sets_school_types.sql similarity index 100% rename from observe-swing/src/main/assembly/dist/obstuna-admin/extra/function_enhanced_sets_school_types.sql rename to observe-application-swing/src/main/assembly/dist/obstuna-admin/extra/function_enhanced_sets_school_types.sql diff --git a/observe-swing/src/main/assembly/dist/obstuna-admin/update-obstuna.bat b/observe-application-swing/src/main/assembly/dist/obstuna-admin/update-obstuna.bat similarity index 100% rename from observe-swing/src/main/assembly/dist/obstuna-admin/update-obstuna.bat rename to observe-application-swing/src/main/assembly/dist/obstuna-admin/update-obstuna.bat diff --git a/observe-swing/src/main/assembly/dist/obstuna-admin/update-obstuna.sh b/observe-application-swing/src/main/assembly/dist/obstuna-admin/update-obstuna.sh similarity index 100% rename from observe-swing/src/main/assembly/dist/obstuna-admin/update-obstuna.sh rename to observe-application-swing/src/main/assembly/dist/obstuna-admin/update-obstuna.sh diff --git a/observe-swing/src/main/assembly/dist/obstuna-admin/update-security-obstuna.bat b/observe-application-swing/src/main/assembly/dist/obstuna-admin/update-security-obstuna.bat similarity index 100% rename from observe-swing/src/main/assembly/dist/obstuna-admin/update-security-obstuna.bat rename to observe-application-swing/src/main/assembly/dist/obstuna-admin/update-security-obstuna.bat diff --git a/observe-swing/src/main/assembly/dist/obstuna-admin/update-security-obstuna.sh b/observe-application-swing/src/main/assembly/dist/obstuna-admin/update-security-obstuna.sh similarity index 100% rename from observe-swing/src/main/assembly/dist/obstuna-admin/update-security-obstuna.sh rename to observe-application-swing/src/main/assembly/dist/obstuna-admin/update-security-obstuna.sh diff --git a/observe-swing/src/main/assembly/dist/util/README.txt b/observe-application-swing/src/main/assembly/dist/util/README.txt similarity index 100% rename from observe-swing/src/main/assembly/dist/util/README.txt rename to observe-application-swing/src/main/assembly/dist/util/README.txt diff --git a/observe-swing/src/main/assembly/dist/util/backup-obstuna.sh b/observe-application-swing/src/main/assembly/dist/util/backup-obstuna.sh similarity index 100% rename from observe-swing/src/main/assembly/dist/util/backup-obstuna.sh rename to observe-application-swing/src/main/assembly/dist/util/backup-obstuna.sh diff --git a/observe-swing/src/main/assembly/dist/util/create-postgis.sh b/observe-application-swing/src/main/assembly/dist/util/create-postgis.sh similarity index 100% rename from observe-swing/src/main/assembly/dist/util/create-postgis.sh rename to observe-application-swing/src/main/assembly/dist/util/create-postgis.sh diff --git a/observe-swing/src/main/assembly/dist/util/generate-id.bat b/observe-application-swing/src/main/assembly/dist/util/generate-id.bat similarity index 100% rename from observe-swing/src/main/assembly/dist/util/generate-id.bat rename to observe-application-swing/src/main/assembly/dist/util/generate-id.bat diff --git a/observe-swing/src/main/assembly/dist/util/generate-id.sh b/observe-application-swing/src/main/assembly/dist/util/generate-id.sh similarity index 100% rename from observe-swing/src/main/assembly/dist/util/generate-id.sh rename to observe-application-swing/src/main/assembly/dist/util/generate-id.sh diff --git a/observe-swing/src/main/assembly/dist/util/tables/data-tables.txt b/observe-application-swing/src/main/assembly/dist/util/tables/data-tables.txt similarity index 100% rename from observe-swing/src/main/assembly/dist/util/tables/data-tables.txt rename to observe-application-swing/src/main/assembly/dist/util/tables/data-tables.txt diff --git a/observe-swing/src/main/assembly/dist/util/tables/referentiel-tables.txt b/observe-application-swing/src/main/assembly/dist/util/tables/referentiel-tables.txt similarity index 100% rename from observe-swing/src/main/assembly/dist/util/tables/referentiel-tables.txt rename to observe-application-swing/src/main/assembly/dist/util/tables/referentiel-tables.txt diff --git a/observe-swing/src/main/assembly/map.xml b/observe-application-swing/src/main/assembly/map.xml similarity index 100% rename from observe-swing/src/main/assembly/map.xml rename to observe-application-swing/src/main/assembly/map.xml diff --git a/observe-swing/src/main/assembly/sql/v1/README.txt b/observe-application-swing/src/main/assembly/sql/v1/README.txt similarity index 100% rename from observe-swing/src/main/assembly/sql/v1/README.txt rename to observe-application-swing/src/main/assembly/sql/v1/README.txt diff --git a/observe-swing/src/main/assembly/sql/v1/create-obstuna-linux.sh b/observe-application-swing/src/main/assembly/sql/v1/create-obstuna-linux.sh similarity index 100% rename from observe-swing/src/main/assembly/sql/v1/create-obstuna-linux.sh rename to observe-application-swing/src/main/assembly/sql/v1/create-obstuna-linux.sh diff --git a/observe-swing/src/main/assembly/sql/v1/create-obstuna-solaris.sh b/observe-application-swing/src/main/assembly/sql/v1/create-obstuna-solaris.sh similarity index 100% rename from observe-swing/src/main/assembly/sql/v1/create-obstuna-solaris.sh rename to observe-application-swing/src/main/assembly/sql/v1/create-obstuna-solaris.sh diff --git a/observe-swing/src/main/assembly/sql/v1/create-postgis.sh b/observe-application-swing/src/main/assembly/sql/v1/create-postgis.sh similarity index 100% rename from observe-swing/src/main/assembly/sql/v1/create-postgis.sh rename to observe-application-swing/src/main/assembly/sql/v1/create-postgis.sh diff --git a/observe-swing/src/main/assembly/sql/v1/createdb-script.sh b/observe-application-swing/src/main/assembly/sql/v1/createdb-script.sh similarity index 100% rename from observe-swing/src/main/assembly/sql/v1/createdb-script.sh rename to observe-application-swing/src/main/assembly/sql/v1/createdb-script.sh diff --git a/observe-swing/src/main/assembly/sql/v1/security/create-admin-security-script.sh b/observe-application-swing/src/main/assembly/sql/v1/security/create-admin-security-script.sh similarity index 100% rename from observe-swing/src/main/assembly/sql/v1/security/create-admin-security-script.sh rename to observe-application-swing/src/main/assembly/sql/v1/security/create-admin-security-script.sh diff --git a/observe-swing/src/main/assembly/sql/v1/security/create-default-security-script.sh b/observe-application-swing/src/main/assembly/sql/v1/security/create-default-security-script.sh similarity index 100% rename from observe-swing/src/main/assembly/sql/v1/security/create-default-security-script.sh rename to observe-application-swing/src/main/assembly/sql/v1/security/create-default-security-script.sh diff --git a/observe-swing/src/main/assembly/sql/v1/security/create-reader-security-script.sh b/observe-application-swing/src/main/assembly/sql/v1/security/create-reader-security-script.sh similarity index 100% rename from observe-swing/src/main/assembly/sql/v1/security/create-reader-security-script.sh rename to observe-application-swing/src/main/assembly/sql/v1/security/create-reader-security-script.sh diff --git a/observe-swing/src/main/assembly/sql/v1/security/create-security-script.sh b/observe-application-swing/src/main/assembly/sql/v1/security/create-security-script.sh similarity index 100% rename from observe-swing/src/main/assembly/sql/v1/security/create-security-script.sh rename to observe-application-swing/src/main/assembly/sql/v1/security/create-security-script.sh diff --git a/observe-swing/src/main/assembly/sql/v1/security/create-technicien-security-script.sh b/observe-application-swing/src/main/assembly/sql/v1/security/create-technicien-security-script.sh similarity index 100% rename from observe-swing/src/main/assembly/sql/v1/security/create-technicien-security-script.sh rename to observe-application-swing/src/main/assembly/sql/v1/security/create-technicien-security-script.sh diff --git a/observe-swing/src/main/assembly/sql/v1/security/tables.txt b/observe-application-swing/src/main/assembly/sql/v1/security/tables.txt similarity index 100% rename from observe-swing/src/main/assembly/sql/v1/security/tables.txt rename to observe-application-swing/src/main/assembly/sql/v1/security/tables.txt diff --git a/observe-swing/src/main/assembly/sql/v1/sql/obstuna.sql b/observe-application-swing/src/main/assembly/sql/v1/sql/obstuna.sql similarity index 100% rename from observe-swing/src/main/assembly/sql/v1/sql/obstuna.sql rename to observe-application-swing/src/main/assembly/sql/v1/sql/obstuna.sql diff --git a/observe-swing/src/main/assembly/sql/v2/README.txt b/observe-application-swing/src/main/assembly/sql/v2/README.txt similarity index 100% rename from observe-swing/src/main/assembly/sql/v2/README.txt rename to observe-application-swing/src/main/assembly/sql/v2/README.txt diff --git a/observe-swing/src/main/filters/observe-application.properties b/observe-application-swing/src/main/filters/observe-application.properties similarity index 100% rename from observe-swing/src/main/filters/observe-application.properties rename to observe-application-swing/src/main/filters/observe-application.properties diff --git a/observe-swing/src/main/filters/observe-ui.properties b/observe-application-swing/src/main/filters/observe-ui.properties similarity index 100% rename from observe-swing/src/main/filters/observe-ui.properties rename to observe-application-swing/src/main/filters/observe-ui.properties diff --git a/observe-swing/src/main/java/fr/ird/observe/ObserveActionExecutor.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveActionExecutor.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ObserveActionExecutor.java rename to observe-application-swing/src/main/java/fr/ird/observe/ObserveActionExecutor.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ObserveAdminCLI.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveAdminCLI.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ObserveAdminCLI.java rename to observe-application-swing/src/main/java/fr/ird/observe/ObserveAdminCLI.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ObserveApplicationConfigProvider.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveApplicationConfigProvider.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ObserveApplicationConfigProvider.java rename to observe-application-swing/src/main/java/fr/ird/observe/ObserveApplicationConfigProvider.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ObserveCLAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveCLAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ObserveCLAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ObserveCLAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ObserveConfig.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveConfig.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ObserveConfig.java rename to observe-application-swing/src/main/java/fr/ird/observe/ObserveConfig.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ObserveConfigOption.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveConfigOption.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ObserveConfigOption.java rename to observe-application-swing/src/main/java/fr/ird/observe/ObserveConfigOption.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ObserveContext.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveContext.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ObserveContext.java rename to observe-application-swing/src/main/java/fr/ird/observe/ObserveContext.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ObserveResourceManager.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveResourceManager.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ObserveResourceManager.java rename to observe-application-swing/src/main/java/fr/ird/observe/ObserveResourceManager.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ObserveRunner.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveRunner.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ObserveRunner.java rename to observe-application-swing/src/main/java/fr/ird/observe/ObserveRunner.java diff --git a/observe-swing/src/main/java/fr/ird/observe/package.html b/observe-application-swing/src/main/java/fr/ird/observe/package.html similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/package.html rename to observe-application-swing/src/main/java/fr/ird/observe/package.html diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/ObserveCommon.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveCommon.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/ObserveCommon.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveCommon.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/ObserveUICallback.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveUICallback.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/ObserveUICallback.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveUICallback.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/ObserveUIMode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveUIMode.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/ObserveUIMode.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveUIMode.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/UIHelper.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/UIHelper.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/UIHelper.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/UIHelper.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/ChangeApplicationLanguageAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ChangeApplicationLanguageAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/ChangeApplicationLanguageAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ChangeApplicationLanguageAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/ChangeDbLanguageAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ChangeDbLanguageAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/ChangeDbLanguageAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ChangeDbLanguageAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/ChangeStorageAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ChangeStorageAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/ChangeStorageAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ChangeStorageAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/CloseApplicationAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/CloseApplicationAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/CloseApplicationAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/CloseApplicationAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/CloseHelpAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/CloseHelpAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/CloseHelpAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/CloseHelpAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/CloseStorageAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/CloseStorageAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/CloseStorageAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/CloseStorageAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/GotoSiteAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/GotoSiteAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/GotoSiteAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/GotoSiteAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/ImportStorageFromFileAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ImportStorageFromFileAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/ImportStorageFromFileAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ImportStorageFromFileAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/LaunchAdminAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/LaunchAdminAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/LaunchAdminAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/LaunchAdminAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/ReloadApplicationAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ReloadApplicationAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/ReloadApplicationAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ReloadApplicationAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/ReloadDefaultConfigurationAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ReloadDefaultConfigurationAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/ReloadDefaultConfigurationAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ReloadDefaultConfigurationAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/ReloadResourcesAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ReloadResourcesAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/ReloadResourcesAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ReloadResourcesAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/ReloadStorageAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ReloadStorageAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/ReloadStorageAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ReloadStorageAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/SaveStorageToFileAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/SaveStorageToFileAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/SaveStorageToFileAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/SaveStorageToFileAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/ShowAboutAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowAboutAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/ShowAboutAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowAboutAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/ShowConfigAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowConfigAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/ShowConfigAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowConfigAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/ShowStorageInfoAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowStorageInfoAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/ShowStorageInfoAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowStorageInfoAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/StartH2WebServerAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StartH2WebServerAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/StartH2WebServerAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StartH2WebServerAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/StartServerModeAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StartServerModeAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/StartServerModeAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StartServerModeAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/StopH2WebServerAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StopH2WebServerAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/StopH2WebServerAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StopH2WebServerAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/StopServerModeAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StopServerModeAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/StopServerModeAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/StopServerModeAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/shared/AbstractUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/AbstractUIAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/shared/AbstractUIAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/AbstractUIAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/shared/CancelCreateUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/CancelCreateUIAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/shared/CancelCreateUIAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/CancelCreateUIAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/shared/CloseAndCreateUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/CloseAndCreateUIAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/shared/CloseAndCreateUIAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/CloseAndCreateUIAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/shared/CloseOpenUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/CloseOpenUIAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/shared/CloseOpenUIAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/CloseOpenUIAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/shared/DeleteDataUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/DeleteDataUIAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/shared/DeleteDataUIAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/DeleteDataUIAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/shared/DeleteReferenceUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/DeleteReferenceUIAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/shared/DeleteReferenceUIAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/DeleteReferenceUIAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/shared/GoDownUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/GoDownUIAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/shared/GoDownUIAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/GoDownUIAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/shared/GoUpUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/GoUpUIAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/shared/GoUpUIAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/GoUpUIAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/shared/ReOpenUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/ReOpenUIAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/shared/ReOpenUIAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/ReOpenUIAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/shared/ResetEditUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/ResetEditUIAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/shared/ResetEditUIAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/ResetEditUIAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/shared/SaveEditUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/SaveEditUIAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/shared/SaveEditUIAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/SaveEditUIAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/shared/SelectNodeUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/SelectNodeUIAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/shared/SelectNodeUIAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/SelectNodeUIAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/actions/shared/SelectOpenNodeUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/SelectOpenNodeUIAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/actions/shared/SelectOpenNodeUIAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/SelectOpenNodeUIAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminActionModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminActionModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminActionModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminActionModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminActionWorker.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminActionWorker.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminActionWorker.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminActionWorker.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminStep.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminStep.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminStep.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminStep.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminUILauncher.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUILauncher.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminUILauncher.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUILauncher.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/config/ConfigUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/ConfigUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/config/ConfigUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/ConfigUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/config/ConfigUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/ConfigUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/config/ConfigUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/ConfigUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/config/ConfigUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/ConfigUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/config/ConfigUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/ConfigUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/export/TripEntry.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/TripEntry.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/export/TripEntry.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/TripEntry.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/export/TripToExportTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/TripToExportTableModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/export/TripToExportTableModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/TripToExportTableModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/gps/GPSAbleTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/GPSAbleTableModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/gps/GPSAbleTableModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/GPSAbleTableModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/gps/GPSActivityTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/GPSActivityTableModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/gps/GPSActivityTableModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/GPSActivityTableModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSConfigUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSConfigUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSConfigUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSConfigUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSConfigUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSConfigUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSConfigUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSConfigUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportConfigUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportConfigUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportConfigUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportConfigUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportConfigUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportConfigUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportConfigUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportConfigUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ResultTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ResultTableModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ResultTableModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ResultTableModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/resume/ShowResumeUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/resume/ShowResumeUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/resume/ShowResumeUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/resume/ShowResumeUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/resume/ShowResumeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/resume/ShowResumeUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/resume/ShowResumeUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/resume/ShowResumeUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/resume/ShowResumeUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/resume/ShowResumeUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/resume/ShowResumeUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/resume/ShowResumeUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityListCellRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityListCellRenderer.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityListCellRenderer.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityListCellRenderer.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityTableModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityTableModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityTableModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateConfigUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateConfigUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateConfigUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateConfigUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateConfigUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateConfigUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateConfigUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateConfigUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateEntityListCellRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateEntityListCellRenderer.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateEntityListCellRenderer.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateEntityListCellRenderer.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/Common.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/Common.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/Common.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/Common.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentMode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentMode.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ContentMode.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentMode.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BasketsTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BasketsTableModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BasketsTableModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BasketsTableModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlinesTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlinesTableModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlinesTableModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlinesTableModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineCompositionTableModelSupport.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineCompositionTableModelSupport.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineCompositionTableModelSupport.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineCompositionTableModelSupport.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionTemplatesTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionTemplatesTableModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionTemplatesTableModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionTemplatesTableModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionsTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionsTableModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionsTableModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SectionsTableModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/package.html b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/package.html similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/package.html rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/package.html diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/CommonListUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/CommonListUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/CommonListUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/CommonListUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/CommonListUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/CommonListUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/CommonListUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/CommonListUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/package.html b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/package.html similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/list/package.html rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/package.html diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/package.html b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/package.html similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/package.html rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/package.html diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/UniqueKeyTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/UniqueKeyTableModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/UniqueKeyTableModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/UniqueKeyTableModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/CountryUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/CountryUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/CountryUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/CountryUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/CountryUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/CountryUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/CountryUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/CountryUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/CountryUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/CountryUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/CountryUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/CountryUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/FpaZoneUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/FpaZoneUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/FpaZoneUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/FpaZoneUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/FpaZoneUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/FpaZoneUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/FpaZoneUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/FpaZoneUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/FpaZoneUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/FpaZoneUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/FpaZoneUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/FpaZoneUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicTypeUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicTypeUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicTypeUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicTypeUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/HarbourUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/I18nReferenceEntity.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/I18nReferenceEntity.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/I18nReferenceEntity.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/I18nReferenceEntity.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/LengthWeightParameterUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/NeedCommentReferenceEntity.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/NeedCommentReferenceEntity.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/NeedCommentReferenceEntity.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/NeedCommentReferenceEntity.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/OceanUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/OceanUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/OceanUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/OceanUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/OceanUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/OceanUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/OceanUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/OceanUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/OrganismUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/OrganismUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/OrganismUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/OrganismUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/OrganismUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/OrganismUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/OrganismUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/OrganismUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/OrganismUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/OrganismUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/OrganismUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/OrganismUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/PersonUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/PersonUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/PersonUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/PersonUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/PersonUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/PersonUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/PersonUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/PersonUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/PersonUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/PersonUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/PersonUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/PersonUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramObservationEnum.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramObservationEnum.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramObservationEnum.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramObservationEnum.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ProgramUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ReferenceEntity.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ReferenceEntity.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ReferenceEntity.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/ReferenceEntity.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SexUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SexUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SexUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SexUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SexUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SexUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SexUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SexUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesGroupUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesGroupUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesGroupUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesGroupUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesGroupUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesGroupUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesGroupUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesGroupUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesGroupUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesGroupUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesGroupUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesGroupUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselSizeCategoryUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselSizeCategoryUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselSizeCategoryUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselSizeCategoryUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselSizeCategoryUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselSizeCategoryUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselSizeCategoryUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselSizeCategoryUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselSizeCategoryUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselSizeCategoryUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselSizeCategoryUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselSizeCategoryUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselTypeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselTypeUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselTypeUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselTypeUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselTypeUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselTypeUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselTypeUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselTypeUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/VesselUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitHaulingStatusUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitHaulingStatusUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitHaulingStatusUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitHaulingStatusUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitHaulingStatusUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitHaulingStatusUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitHaulingStatusUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitHaulingStatusUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitSettingStatusUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitSettingStatusUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitSettingStatusUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitSettingStatusUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitSettingStatusUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitSettingStatusUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitSettingStatusUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitSettingStatusUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitTypeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitTypeUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitTypeUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitTypeUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitTypeUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitTypeUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitTypeUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitTypeUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/CatchFateLonglineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/CatchFateLonglineUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/CatchFateLonglineUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/CatchFateLonglineUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/CatchFateLonglineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/CatchFateLonglineUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/CatchFateLonglineUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/CatchFateLonglineUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/EncounterTypeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/EncounterTypeUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/EncounterTypeUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/EncounterTypeUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/EncounterTypeUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/EncounterTypeUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/EncounterTypeUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/EncounterTypeUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HealthnessUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HealthnessUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HealthnessUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HealthnessUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HealthnessUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HealthnessUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HealthnessUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HealthnessUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookPositionUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookPositionUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookPositionUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookPositionUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookPositionUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookPositionUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookPositionUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookPositionUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookSizeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookSizeUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookSizeUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookSizeUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookSizeUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookSizeUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookSizeUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookSizeUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookTypeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookTypeUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookTypeUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookTypeUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookTypeUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookTypeUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookTypeUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookTypeUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/ItemHorizontalPositionUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/ItemHorizontalPositionUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/ItemHorizontalPositionUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/ItemHorizontalPositionUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/ItemHorizontalPositionUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/ItemHorizontalPositionUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/ItemHorizontalPositionUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/ItemHorizontalPositionUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/ItemVerticalPositionUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/ItemVerticalPositionUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/ItemVerticalPositionUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/ItemVerticalPositionUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/ItemVerticalPositionUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/ItemVerticalPositionUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/ItemVerticalPositionUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/ItemVerticalPositionUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LightsticksColorUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LightsticksColorUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LightsticksColorUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LightsticksColorUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LightsticksColorUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LightsticksColorUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LightsticksColorUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LightsticksColorUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LightsticksTypeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LightsticksTypeUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LightsticksTypeUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LightsticksTypeUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LightsticksTypeUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LightsticksTypeUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LightsticksTypeUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LightsticksTypeUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LineTypeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LineTypeUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LineTypeUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LineTypeUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LineTypeUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LineTypeUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LineTypeUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/LineTypeUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/MaturityStatusUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/MaturityStatusUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/MaturityStatusUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/MaturityStatusUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/MaturityStatusUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/MaturityStatusUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/MaturityStatusUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/MaturityStatusUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/MaturityStatusUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/MaturityStatusUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/MaturityStatusUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/MaturityStatusUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/MitigationTypeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/MitigationTypeUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/MitigationTypeUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/MitigationTypeUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/MitigationTypeUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/MitigationTypeUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/MitigationTypeUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/MitigationTypeUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorBrandUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorBrandUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorBrandUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorBrandUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorBrandUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorBrandUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorBrandUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorBrandUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorBrandUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorBrandUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorBrandUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorBrandUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorDataFormatUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorDataFormatUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorDataFormatUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorDataFormatUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorDataFormatUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorDataFormatUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorDataFormatUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorDataFormatUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorTypeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorTypeUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorTypeUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorTypeUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorTypeUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorTypeUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorTypeUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SensorTypeUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SettingShapeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SettingShapeUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SettingShapeUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SettingShapeUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SettingShapeUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SettingShapeUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SettingShapeUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SettingShapeUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SizeMeasureTypeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SizeMeasureTypeUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SizeMeasureTypeUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SizeMeasureTypeUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SizeMeasureTypeUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SizeMeasureTypeUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SizeMeasureTypeUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/SizeMeasureTypeUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/StomacFullnessUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/StomacFullnessUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/StomacFullnessUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/StomacFullnessUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/StomacFullnessUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/StomacFullnessUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/StomacFullnessUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/StomacFullnessUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/TripTypeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/TripTypeUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/TripTypeUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/TripTypeUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/TripTypeUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/TripTypeUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/TripTypeUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/TripTypeUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/VesselActivityLonglineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/VesselActivityLonglineUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/VesselActivityLonglineUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/VesselActivityLonglineUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/VesselActivityLonglineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/VesselActivityLonglineUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/VesselActivityLonglineUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/VesselActivityLonglineUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/WeightMeasureTypeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/WeightMeasureTypeUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/WeightMeasureTypeUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/WeightMeasureTypeUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/WeightMeasureTypeUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/WeightMeasureTypeUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/WeightMeasureTypeUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/WeightMeasureTypeUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/DetectionModeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/DetectionModeUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/DetectionModeUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/DetectionModeUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/DetectionModeUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/DetectionModeUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/DetectionModeUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/DetectionModeUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectFateUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectFateUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectFateUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectFateUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectFateUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectFateUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectFateUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectFateUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectOperationUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectOperationUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectOperationUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectOperationUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectOperationUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectOperationUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectOperationUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectOperationUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectTypeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectTypeUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectTypeUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectTypeUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectTypeUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectTypeUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectTypeUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObjectTypeUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObservedSystemUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObservedSystemUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObservedSystemUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObservedSystemUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObservedSystemUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObservedSystemUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObservedSystemUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObservedSystemUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObservedSystemUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObservedSystemUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObservedSystemUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ObservedSystemUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForDiscardUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForDiscardUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForDiscardUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForDiscardUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForDiscardUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForDiscardUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForDiscardUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForDiscardUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForNoFishingUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForNoFishingUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForNoFishingUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForNoFishingUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForNoFishingUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForNoFishingUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForNoFishingUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForNoFishingUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForNullSetUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForNullSetUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForNullSetUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForNullSetUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForNullSetUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForNullSetUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForNullSetUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/ReasonForNullSetUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SpeciesFateUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SpeciesFateUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SpeciesFateUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SpeciesFateUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SpeciesFateUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SpeciesFateUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SpeciesFateUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SpeciesFateUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SpeciesStatusUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SpeciesStatusUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SpeciesStatusUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SpeciesStatusUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SpeciesStatusUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SpeciesStatusUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SpeciesStatusUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SpeciesStatusUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SurroundingActivityUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SurroundingActivityUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SurroundingActivityUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SurroundingActivityUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SurroundingActivityUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SurroundingActivityUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SurroundingActivityUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/SurroundingActivityUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/TransmittingBuoyOperationUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/TransmittingBuoyOperationUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/TransmittingBuoyOperationUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/TransmittingBuoyOperationUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/TransmittingBuoyOperationUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/TransmittingBuoyOperationUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/TransmittingBuoyOperationUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/TransmittingBuoyOperationUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/TransmittingBuoyTypeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/TransmittingBuoyTypeUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/TransmittingBuoyTypeUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/TransmittingBuoyTypeUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/TransmittingBuoyTypeUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/TransmittingBuoyTypeUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/TransmittingBuoyTypeUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/TransmittingBuoyTypeUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/VesselActivitySeineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/VesselActivitySeineUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/VesselActivitySeineUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/VesselActivitySeineUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/VesselActivitySeineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/VesselActivitySeineUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/VesselActivitySeineUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/VesselActivitySeineUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WeightCategoryUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WeightCategoryUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WeightCategoryUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WeightCategoryUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WeightCategoryUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WeightCategoryUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WeightCategoryUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WeightCategoryUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WeightCategoryUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WeightCategoryUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WeightCategoryUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WeightCategoryUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WindUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WindUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WindUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WindUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WindUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WindUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WindUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WindUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WindUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WindUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WindUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/seine/WindUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/package.html b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/package.html similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/ref/package.html rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/package.html diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/CommonTable.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/CommonTable.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/CommonTable.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/CommonTable.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableMeta.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableMeta.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableMeta.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableMeta.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIInitializer.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIInitializer.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIInitializer.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/ObserveContentTableUI.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ObserveContentTableUI.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/ObserveContentTableUI.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ObserveContentTableUI.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchAcquisitionModeEnum.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchAcquisitionModeEnum.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchAcquisitionModeEnum.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchAcquisitionModeEnum.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineTableModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineTableModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineTableModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesMeasurementLonglinesTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesMeasurementLonglinesTableModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesMeasurementLonglinesTableModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesMeasurementLonglinesTableModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/LonglinePositionHelper.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/LonglinePositionHelper.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/LonglinePositionHelper.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/LonglinePositionHelper.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SizeMeasuresTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SizeMeasuresTableModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SizeMeasuresTableModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SizeMeasuresTableModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/WeightMeasuresTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/WeightMeasuresTableModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/WeightMeasuresTableModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/WeightMeasuresTableModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/AbstractSampleUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/AbstractSampleUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/AbstractSampleUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/AbstractSampleUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/CodeMesureEnum.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/CodeMesureEnum.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/CodeMesureEnum.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/CodeMesureEnum.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ModeSaisieEchantillonEnum.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ModeSaisieEchantillonEnum.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ModeSaisieEchantillonEnum.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ModeSaisieEchantillonEnum.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleCaptureUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleCaptureUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleCaptureUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleCaptureUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleCaptureUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleCaptureUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleCaptureUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleCaptureUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleRejeteUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleRejeteUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleRejeteUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleRejeteUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleRejeteUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleRejeteUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleRejeteUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleRejeteUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/package.html b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/package.html similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/content/table/package.html rename to observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/package.html diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/package.html b/observe-application-swing/src/main/java/fr/ird/observe/ui/package.html similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/package.html rename to observe-application-swing/src/main/java/fr/ird/observe/ui/package.html diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/ObstunaAdminAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/ObstunaAdminAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/ObstunaAdminAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/ObstunaAdminAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/RemoteUILauncher.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/RemoteUILauncher.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/RemoteUILauncher.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/RemoteUILauncher.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageBackupUILauncher.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageBackupUILauncher.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageBackupUILauncher.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageBackupUILauncher.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageStep.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageStep.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageStep.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageStep.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUILauncher.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUILauncher.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUILauncher.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUILauncher.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/package.html b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/package.html similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/package.html rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/package.html diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/BackupUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/BackupUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/BackupUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/BackupUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/BackupUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/BackupUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/BackupUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/BackupUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ChooseDbModeUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ChooseDbModeUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ChooseDbModeUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ChooseDbModeUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ChooseDbModeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ChooseDbModeUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ChooseDbModeUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ChooseDbModeUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigReferentielUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigReferentielUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigReferentielUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigReferentielUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigReferentielUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigReferentielUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigReferentielUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigReferentielUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfirmUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfirmUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfirmUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfirmUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfirmUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfirmUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfirmUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfirmUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/RolesTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/RolesTableModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/RolesTableModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/RolesTableModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/RolesUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/RolesUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/RolesUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/RolesUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/RolesUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/RolesUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/RolesUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/RolesUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/SelectDataUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/SelectDataUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/SelectDataUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/SelectDataUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/SelectDataUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/SelectDataUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/SelectDataUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/SelectDataUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/package.html b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/package.html similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/package.html rename to observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/package.html diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/DataSelectionTreeCellRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DataSelectionTreeCellRenderer.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/DataSelectionTreeCellRenderer.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DataSelectionTreeCellRenderer.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/DataSelectionTreeSelectionModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DataSelectionTreeSelectionModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/DataSelectionTreeSelectionModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DataSelectionTreeSelectionModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/EntityNodeSupport.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/EntityNodeSupport.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/EntityNodeSupport.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/EntityNodeSupport.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/NavigationTreeCellRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/NavigationTreeCellRenderer.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/NavigationTreeCellRenderer.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/NavigationTreeCellRenderer.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/NavigationTreeSelectionModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/NavigationTreeSelectionModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/NavigationTreeSelectionModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/NavigationTreeSelectionModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveDataProvider.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveDataProvider.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveDataProvider.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveDataProvider.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNode.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNode.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNode.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeBridge.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeBridge.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeBridge.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeBridge.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeTripProgramActionListener.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeTripProgramActionListener.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeTripProgramActionListener.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeTripProgramActionListener.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractNodeChildLoador.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractNodeChildLoador.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractNodeChildLoador.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeinesNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeinesNodeChildLoador.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeinesNodeChildLoador.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeinesNodeChildLoador.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUIHandler.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/BooleanEditor.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/BooleanEditor.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/util/BooleanEditor.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/util/BooleanEditor.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/JVetoableTabbedPane.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/JVetoableTabbedPane.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/util/JVetoableTabbedPane.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/util/JVetoableTabbedPane.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/ObserveSimpleValidatorMessageTableRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/ObserveSimpleValidatorMessageTableRenderer.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/util/ObserveSimpleValidatorMessageTableRenderer.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/util/ObserveSimpleValidatorMessageTableRenderer.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/ObserveSwingValidatorMessageTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/ObserveSwingValidatorMessageTableModel.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/util/ObserveSwingValidatorMessageTableModel.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/util/ObserveSwingValidatorMessageTableModel.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/ObserveValidatorMessageTableRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/ObserveValidatorMessageTableRenderer.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/util/ObserveValidatorMessageTableRenderer.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/util/ObserveValidatorMessageTableRenderer.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/SpringUtilities.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/SpringUtilities.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/util/SpringUtilities.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/util/SpringUtilities.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/table/AbstractSelectTableAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/AbstractSelectTableAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/util/table/AbstractSelectTableAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/AbstractSelectTableAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/table/AutotSelectRowAndShowPopupActionSupport.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/AutotSelectRowAndShowPopupActionSupport.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/util/table/AutotSelectRowAndShowPopupActionSupport.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/AutotSelectRowAndShowPopupActionSupport.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/table/EditableList.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableList.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/util/table/EditableList.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableList.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableModelSupport.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableModelSupport.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableModelSupport.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableModelSupport.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableWithCacheTableModelSupport.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableWithCacheTableModelSupport.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableWithCacheTableModelSupport.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/EditableTableWithCacheTableModelSupport.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToNextEditableCellAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToNextEditableCellAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToNextEditableCellAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToNextEditableCellAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToNextEditableRowAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToNextEditableRowAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToNextEditableRowAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToNextEditableRowAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToPreviousEditableCellAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToPreviousEditableCellAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToPreviousEditableCellAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToPreviousEditableCellAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToPreviousEditableRowAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToPreviousEditableRowAction.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToPreviousEditableRowAction.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/MoveToPreviousEditableRowAction.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/table/ObserveBooleanTableCellRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/ObserveBooleanTableCellRenderer.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/util/table/ObserveBooleanTableCellRenderer.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/util/table/ObserveBooleanTableCellRenderer.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/ObserveMapPane.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/ObserveMapPane.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/ObserveMapPane.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/ObserveMapPane.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/ObserveMapPaneLegendItem.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/ObserveMapPaneLegendItem.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/ObserveMapPaneLegendItem.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/ObserveMapPaneLegendItem.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/ObserverMapPanLegendDrawer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/ObserverMapPanLegendDrawer.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/ObserverMapPanLegendDrawer.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/ObserverMapPanLegendDrawer.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapContentBuilder.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapContentBuilder.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapContentBuilder.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapContentBuilder.java diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUI.css similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUI.css rename to observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUI.css diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUI.jaxx similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUI.jaxx rename to observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUI.jaxx diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java similarity index 100% rename from observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java diff --git a/observe-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.dbf b/observe-application-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.dbf similarity index 100% rename from observe-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.dbf rename to observe-application-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.dbf diff --git a/observe-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.prj b/observe-application-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.prj similarity index 100% rename from observe-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.prj rename to observe-application-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.prj diff --git a/observe-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.shp b/observe-application-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.shp similarity index 100% rename from observe-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.shp rename to observe-application-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.shp diff --git a/observe-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.shx b/observe-application-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.shx similarity index 100% rename from observe-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.shx rename to observe-application-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.shx diff --git a/observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.dbf b/observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.dbf similarity index 100% rename from observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.dbf rename to observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.dbf diff --git a/observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.prj b/observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.prj similarity index 100% rename from observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.prj rename to observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.prj diff --git a/observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.shp b/observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.shp similarity index 100% rename from observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.shp rename to observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.shp diff --git a/observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.shx b/observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.shx similarity index 100% rename from observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.shx rename to observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.shx diff --git a/observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.dbf b/observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.dbf similarity index 100% rename from observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.dbf rename to observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.dbf diff --git a/observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.prj b/observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.prj similarity index 100% rename from observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.prj rename to observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.prj diff --git a/observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.shp b/observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.shp similarity index 100% rename from observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.shp rename to observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.shp diff --git a/observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.shx b/observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.shx similarity index 100% rename from observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.shx rename to observe-application-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.shx diff --git a/observe-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.dbf b/observe-application-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.dbf similarity index 100% rename from observe-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.dbf rename to observe-application-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.dbf diff --git a/observe-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.prj b/observe-application-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.prj similarity index 100% rename from observe-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.prj rename to observe-application-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.prj diff --git a/observe-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp b/observe-application-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp similarity index 100% rename from observe-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp rename to observe-application-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp diff --git a/observe-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shx b/observe-application-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shx similarity index 100% rename from observe-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shx rename to observe-application-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shx diff --git a/observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.dbf b/observe-application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.dbf similarity index 100% rename from observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.dbf rename to observe-application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.dbf diff --git a/observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.prj b/observe-application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.prj similarity index 100% rename from observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.prj rename to observe-application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.prj diff --git a/observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbn b/observe-application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbn similarity index 100% rename from observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbn rename to observe-application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbn diff --git a/observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbx b/observe-application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbx similarity index 100% rename from observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbx rename to observe-application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbx diff --git a/observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp b/observe-application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp similarity index 100% rename from observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp rename to observe-application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp diff --git a/observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml b/observe-application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml similarity index 100% rename from observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml rename to observe-application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml diff --git a/observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shx b/observe-application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shx similarity index 100% rename from observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shx rename to observe-application-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shx diff --git a/observe-swing/src/main/map/style.xml b/observe-application-swing/src/main/map/style.xml similarity index 100% rename from observe-swing/src/main/map/style.xml rename to observe-application-swing/src/main/map/style.xml diff --git a/observe-swing/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider b/observe-application-swing/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider similarity index 100% rename from observe-swing/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider rename to observe-application-swing/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider diff --git a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-swing_en_GB.properties similarity index 100% rename from observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties rename to observe-application-swing/src/main/resources/i18n/observe-swing_en_GB.properties diff --git a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-swing_es_ES.properties similarity index 100% rename from observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties rename to observe-application-swing/src/main/resources/i18n/observe-swing_es_ES.properties diff --git a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-swing_fr_FR.properties similarity index 100% rename from observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties rename to observe-application-swing/src/main/resources/i18n/observe-swing_fr_FR.properties diff --git a/observe-swing/src/main/resources/icons/action-about.png b/observe-application-swing/src/main/resources/icons/action-about.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-about.png rename to observe-application-swing/src/main/resources/icons/action-about.png diff --git a/observe-swing/src/main/resources/icons/action-accept.png b/observe-application-swing/src/main/resources/icons/action-accept.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-accept.png rename to observe-application-swing/src/main/resources/icons/action-accept.png diff --git a/observe-swing/src/main/resources/icons/action-add.png b/observe-application-swing/src/main/resources/icons/action-add.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-add.png rename to observe-application-swing/src/main/resources/icons/action-add.png diff --git a/observe-swing/src/main/resources/icons/action-application-reload.png b/observe-application-swing/src/main/resources/icons/action-application-reload.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-application-reload.png rename to observe-application-swing/src/main/resources/icons/action-application-reload.png diff --git a/observe-swing/src/main/resources/icons/action-bean-sort-down.png b/observe-application-swing/src/main/resources/icons/action-bean-sort-down.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-bean-sort-down.png rename to observe-application-swing/src/main/resources/icons/action-bean-sort-down.png diff --git a/observe-swing/src/main/resources/icons/action-bean-sort-up.png b/observe-application-swing/src/main/resources/icons/action-bean-sort-up.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-bean-sort-up.png rename to observe-application-swing/src/main/resources/icons/action-bean-sort-up.png diff --git a/observe-swing/src/main/resources/icons/action-bean-sort.png b/observe-application-swing/src/main/resources/icons/action-bean-sort.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-bean-sort.png rename to observe-application-swing/src/main/resources/icons/action-bean-sort.png diff --git a/observe-swing/src/main/resources/icons/action-calculator.png b/observe-application-swing/src/main/resources/icons/action-calculator.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-calculator.png rename to observe-application-swing/src/main/resources/icons/action-calculator.png diff --git a/observe-swing/src/main/resources/icons/action-cancel.png b/observe-application-swing/src/main/resources/icons/action-cancel.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-cancel.png rename to observe-application-swing/src/main/resources/icons/action-cancel.png diff --git a/observe-swing/src/main/resources/icons/action-center.png b/observe-application-swing/src/main/resources/icons/action-center.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-center.png rename to observe-application-swing/src/main/resources/icons/action-center.png diff --git a/observe-swing/src/main/resources/icons/action-close.png b/observe-application-swing/src/main/resources/icons/action-close.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-close.png rename to observe-application-swing/src/main/resources/icons/action-close.png diff --git a/observe-swing/src/main/resources/icons/action-closeTab.png b/observe-application-swing/src/main/resources/icons/action-closeTab.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-closeTab.png rename to observe-application-swing/src/main/resources/icons/action-closeTab.png diff --git a/observe-swing/src/main/resources/icons/action-combobox-reset.png b/observe-application-swing/src/main/resources/icons/action-combobox-reset.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-combobox-reset.png rename to observe-application-swing/src/main/resources/icons/action-combobox-reset.png diff --git a/observe-swing/src/main/resources/icons/action-combobox-reset2.png b/observe-application-swing/src/main/resources/icons/action-combobox-reset2.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-combobox-reset2.png rename to observe-application-swing/src/main/resources/icons/action-combobox-reset2.png diff --git a/observe-swing/src/main/resources/icons/action-combobox-sort.png b/observe-application-swing/src/main/resources/icons/action-combobox-sort.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-combobox-sort.png rename to observe-application-swing/src/main/resources/icons/action-combobox-sort.png diff --git a/observe-swing/src/main/resources/icons/action-config.png b/observe-application-swing/src/main/resources/icons/action-config.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-config.png rename to observe-application-swing/src/main/resources/icons/action-config.png diff --git a/observe-swing/src/main/resources/icons/action-connect_creating.png b/observe-application-swing/src/main/resources/icons/action-connect_creating.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-connect_creating.png rename to observe-application-swing/src/main/resources/icons/action-connect_creating.png diff --git a/observe-swing/src/main/resources/icons/action-connect_no.png b/observe-application-swing/src/main/resources/icons/action-connect_no.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-connect_no.png rename to observe-application-swing/src/main/resources/icons/action-connect_no.png diff --git a/observe-swing/src/main/resources/icons/action-connect_ok.png b/observe-application-swing/src/main/resources/icons/action-connect_ok.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-connect_ok.png rename to observe-application-swing/src/main/resources/icons/action-connect_ok.png diff --git a/observe-swing/src/main/resources/icons/action-connect_untested.png b/observe-application-swing/src/main/resources/icons/action-connect_untested.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-connect_untested.png rename to observe-application-swing/src/main/resources/icons/action-connect_untested.png diff --git a/observe-swing/src/main/resources/icons/action-connected.png b/observe-application-swing/src/main/resources/icons/action-connected.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-connected.png rename to observe-application-swing/src/main/resources/icons/action-connected.png diff --git a/observe-swing/src/main/resources/icons/action-data-calcule.png b/observe-application-swing/src/main/resources/icons/action-data-calcule.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-data-calcule.png rename to observe-application-swing/src/main/resources/icons/action-data-calcule.png diff --git a/observe-swing/src/main/resources/icons/action-data-export.png b/observe-application-swing/src/main/resources/icons/action-data-export.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-data-export.png rename to observe-application-swing/src/main/resources/icons/action-data-export.png diff --git a/observe-swing/src/main/resources/icons/action-data-import.png b/observe-application-swing/src/main/resources/icons/action-data-import.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-data-import.png rename to observe-application-swing/src/main/resources/icons/action-data-import.png diff --git a/observe-swing/src/main/resources/icons/action-data-observe.png b/observe-application-swing/src/main/resources/icons/action-data-observe.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-data-observe.png rename to observe-application-swing/src/main/resources/icons/action-data-observe.png diff --git a/observe-swing/src/main/resources/icons/action-db-change.png b/observe-application-swing/src/main/resources/icons/action-db-change.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-db-change.png rename to observe-application-swing/src/main/resources/icons/action-db-change.png diff --git a/observe-swing/src/main/resources/icons/action-db-local.png b/observe-application-swing/src/main/resources/icons/action-db-local.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-db-local.png rename to observe-application-swing/src/main/resources/icons/action-db-local.png diff --git a/observe-swing/src/main/resources/icons/action-db-none.png b/observe-application-swing/src/main/resources/icons/action-db-none.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-db-none.png rename to observe-application-swing/src/main/resources/icons/action-db-none.png diff --git a/observe-swing/src/main/resources/icons/action-db-reload.png b/observe-application-swing/src/main/resources/icons/action-db-reload.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-db-reload.png rename to observe-application-swing/src/main/resources/icons/action-db-reload.png diff --git a/observe-swing/src/main/resources/icons/action-db-remote.png b/observe-application-swing/src/main/resources/icons/action-db-remote.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-db-remote.png rename to observe-application-swing/src/main/resources/icons/action-db-remote.png diff --git a/observe-swing/src/main/resources/icons/action-db-start-server.png b/observe-application-swing/src/main/resources/icons/action-db-start-server.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-db-start-server.png rename to observe-application-swing/src/main/resources/icons/action-db-start-server.png diff --git a/observe-swing/src/main/resources/icons/action-db-stop-server.png b/observe-application-swing/src/main/resources/icons/action-db-stop-server.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-db-stop-server.png rename to observe-application-swing/src/main/resources/icons/action-db-stop-server.png diff --git a/observe-swing/src/main/resources/icons/action-delete.png b/observe-application-swing/src/main/resources/icons/action-delete.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-delete.png rename to observe-application-swing/src/main/resources/icons/action-delete.png diff --git a/observe-swing/src/main/resources/icons/action-edit-measurements.png b/observe-application-swing/src/main/resources/icons/action-edit-measurements.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-edit-measurements.png rename to observe-application-swing/src/main/resources/icons/action-edit-measurements.png diff --git a/observe-swing/src/main/resources/icons/action-exit.png b/observe-application-swing/src/main/resources/icons/action-exit.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-exit.png rename to observe-application-swing/src/main/resources/icons/action-exit.png diff --git a/observe-swing/src/main/resources/icons/action-fileChooser.png b/observe-application-swing/src/main/resources/icons/action-fileChooser.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-fileChooser.png rename to observe-application-swing/src/main/resources/icons/action-fileChooser.png diff --git a/observe-swing/src/main/resources/icons/action-generate.png b/observe-application-swing/src/main/resources/icons/action-generate.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-generate.png rename to observe-application-swing/src/main/resources/icons/action-generate.png diff --git a/observe-swing/src/main/resources/icons/action-go-back.png b/observe-application-swing/src/main/resources/icons/action-go-back.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-go-back.png rename to observe-application-swing/src/main/resources/icons/action-go-back.png diff --git a/observe-swing/src/main/resources/icons/action-go-detail.png b/observe-application-swing/src/main/resources/icons/action-go-detail.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-go-detail.png rename to observe-application-swing/src/main/resources/icons/action-go-detail.png diff --git a/observe-swing/src/main/resources/icons/action-go-down.png b/observe-application-swing/src/main/resources/icons/action-go-down.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-go-down.png rename to observe-application-swing/src/main/resources/icons/action-go-down.png diff --git a/observe-swing/src/main/resources/icons/action-go-jump.png b/observe-application-swing/src/main/resources/icons/action-go-jump.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-go-jump.png rename to observe-application-swing/src/main/resources/icons/action-go-jump.png diff --git a/observe-swing/src/main/resources/icons/action-go-up.png b/observe-application-swing/src/main/resources/icons/action-go-up.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-go-up.png rename to observe-application-swing/src/main/resources/icons/action-go-up.png diff --git a/observe-swing/src/main/resources/icons/action-help.png b/observe-application-swing/src/main/resources/icons/action-help.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-help.png rename to observe-application-swing/src/main/resources/icons/action-help.png diff --git a/observe-swing/src/main/resources/icons/action-i18n-en.png b/observe-application-swing/src/main/resources/icons/action-i18n-en.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-i18n-en.png rename to observe-application-swing/src/main/resources/icons/action-i18n-en.png diff --git a/observe-swing/src/main/resources/icons/action-i18n-es.png b/observe-application-swing/src/main/resources/icons/action-i18n-es.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-i18n-es.png rename to observe-application-swing/src/main/resources/icons/action-i18n-es.png diff --git a/observe-swing/src/main/resources/icons/action-i18n-fr.png b/observe-application-swing/src/main/resources/icons/action-i18n-fr.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-i18n-fr.png rename to observe-application-swing/src/main/resources/icons/action-i18n-fr.png diff --git a/observe-swing/src/main/resources/icons/action-i18n-uk.png b/observe-application-swing/src/main/resources/icons/action-i18n-uk.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-i18n-uk.png rename to observe-application-swing/src/main/resources/icons/action-i18n-uk.png diff --git a/observe-swing/src/main/resources/icons/action-import-gps.png b/observe-application-swing/src/main/resources/icons/action-import-gps.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-import-gps.png rename to observe-application-swing/src/main/resources/icons/action-import-gps.png diff --git a/observe-swing/src/main/resources/icons/action-information.png b/observe-application-swing/src/main/resources/icons/action-information.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-information.png rename to observe-application-swing/src/main/resources/icons/action-information.png diff --git a/observe-swing/src/main/resources/icons/action-insert-after.png b/observe-application-swing/src/main/resources/icons/action-insert-after.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-insert-after.png rename to observe-application-swing/src/main/resources/icons/action-insert-after.png diff --git a/observe-swing/src/main/resources/icons/action-insert-before.png b/observe-application-swing/src/main/resources/icons/action-insert-before.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-insert-before.png rename to observe-application-swing/src/main/resources/icons/action-insert-before.png diff --git a/observe-swing/src/main/resources/icons/action-local-export.png b/observe-application-swing/src/main/resources/icons/action-local-export.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-local-export.png rename to observe-application-swing/src/main/resources/icons/action-local-export.png diff --git a/observe-swing/src/main/resources/icons/action-local-import.png b/observe-application-swing/src/main/resources/icons/action-local-import.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-local-import.png rename to observe-application-swing/src/main/resources/icons/action-local-import.png diff --git a/observe-swing/src/main/resources/icons/action-mode-create.png b/observe-application-swing/src/main/resources/icons/action-mode-create.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-mode-create.png rename to observe-application-swing/src/main/resources/icons/action-mode-create.png diff --git a/observe-swing/src/main/resources/icons/action-mode-read.png b/observe-application-swing/src/main/resources/icons/action-mode-read.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-mode-read.png rename to observe-application-swing/src/main/resources/icons/action-mode-read.png diff --git a/observe-swing/src/main/resources/icons/action-mode-update.png b/observe-application-swing/src/main/resources/icons/action-mode-update.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-mode-update.png rename to observe-application-swing/src/main/resources/icons/action-mode-update.png diff --git a/observe-swing/src/main/resources/icons/action-next-step.png b/observe-application-swing/src/main/resources/icons/action-next-step.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-next-step.png rename to observe-application-swing/src/main/resources/icons/action-next-step.png diff --git a/observe-swing/src/main/resources/icons/action-openLink.png b/observe-application-swing/src/main/resources/icons/action-openLink.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-openLink.png rename to observe-application-swing/src/main/resources/icons/action-openLink.png diff --git a/observe-swing/src/main/resources/icons/action-previous-step.png b/observe-application-swing/src/main/resources/icons/action-previous-step.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-previous-step.png rename to observe-application-swing/src/main/resources/icons/action-previous-step.png diff --git a/observe-swing/src/main/resources/icons/action-remote-export.png b/observe-application-swing/src/main/resources/icons/action-remote-export.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-remote-export.png rename to observe-application-swing/src/main/resources/icons/action-remote-export.png diff --git a/observe-swing/src/main/resources/icons/action-remote-import.png b/observe-application-swing/src/main/resources/icons/action-remote-import.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-remote-import.png rename to observe-application-swing/src/main/resources/icons/action-remote-import.png diff --git a/observe-swing/src/main/resources/icons/action-reopen.png b/observe-application-swing/src/main/resources/icons/action-reopen.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-reopen.png rename to observe-application-swing/src/main/resources/icons/action-reopen.png diff --git a/observe-swing/src/main/resources/icons/action-report-copy.png b/observe-application-swing/src/main/resources/icons/action-report-copy.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-report-copy.png rename to observe-application-swing/src/main/resources/icons/action-report-copy.png diff --git a/observe-swing/src/main/resources/icons/action-report-run.png b/observe-application-swing/src/main/resources/icons/action-report-run.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-report-run.png rename to observe-application-swing/src/main/resources/icons/action-report-run.png diff --git a/observe-swing/src/main/resources/icons/action-report.png b/observe-application-swing/src/main/resources/icons/action-report.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-report.png rename to observe-application-swing/src/main/resources/icons/action-report.png diff --git a/observe-swing/src/main/resources/icons/action-revert.png b/observe-application-swing/src/main/resources/icons/action-revert.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-revert.png rename to observe-application-swing/src/main/resources/icons/action-revert.png diff --git a/observe-swing/src/main/resources/icons/action-save.png b/observe-application-swing/src/main/resources/icons/action-save.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-save.png rename to observe-application-swing/src/main/resources/icons/action-save.png diff --git a/observe-swing/src/main/resources/icons/action-select-ssl-cert.png b/observe-application-swing/src/main/resources/icons/action-select-ssl-cert.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-select-ssl-cert.png rename to observe-application-swing/src/main/resources/icons/action-select-ssl-cert.png diff --git a/observe-swing/src/main/resources/icons/action-show-help.png b/observe-application-swing/src/main/resources/icons/action-show-help.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-show-help.png rename to observe-application-swing/src/main/resources/icons/action-show-help.png diff --git a/observe-swing/src/main/resources/icons/action-show-informations.png b/observe-application-swing/src/main/resources/icons/action-show-informations.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-show-informations.png rename to observe-application-swing/src/main/resources/icons/action-show-informations.png diff --git a/observe-swing/src/main/resources/icons/action-show-keys.png b/observe-application-swing/src/main/resources/icons/action-show-keys.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-show-keys.png rename to observe-application-swing/src/main/resources/icons/action-show-keys.png diff --git a/observe-swing/src/main/resources/icons/action-show-usages.png b/observe-application-swing/src/main/resources/icons/action-show-usages.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-show-usages.png rename to observe-application-swing/src/main/resources/icons/action-show-usages.png diff --git a/observe-swing/src/main/resources/icons/action-site.png b/observe-application-swing/src/main/resources/icons/action-site.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-site.png rename to observe-application-swing/src/main/resources/icons/action-site.png diff --git a/observe-swing/src/main/resources/icons/action-synch.png b/observe-application-swing/src/main/resources/icons/action-synch.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-synch.png rename to observe-application-swing/src/main/resources/icons/action-synch.png diff --git a/observe-swing/src/main/resources/icons/action-synchro-pause.png b/observe-application-swing/src/main/resources/icons/action-synchro-pause.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-synchro-pause.png rename to observe-application-swing/src/main/resources/icons/action-synchro-pause.png diff --git a/observe-swing/src/main/resources/icons/action-synchro-start.png b/observe-application-swing/src/main/resources/icons/action-synchro-start.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-synchro-start.png rename to observe-application-swing/src/main/resources/icons/action-synchro-start.png diff --git a/observe-swing/src/main/resources/icons/action-synchro-stop.png b/observe-application-swing/src/main/resources/icons/action-synchro-stop.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-synchro-stop.png rename to observe-application-swing/src/main/resources/icons/action-synchro-stop.png diff --git a/observe-swing/src/main/resources/icons/action-translate.png b/observe-application-swing/src/main/resources/icons/action-translate.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-translate.png rename to observe-application-swing/src/main/resources/icons/action-translate.png diff --git a/observe-swing/src/main/resources/icons/action-ui-reload.png b/observe-application-swing/src/main/resources/icons/action-ui-reload.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-ui-reload.png rename to observe-application-swing/src/main/resources/icons/action-ui-reload.png diff --git a/observe-swing/src/main/resources/icons/action-unconnected.png b/observe-application-swing/src/main/resources/icons/action-unconnected.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-unconnected.png rename to observe-application-swing/src/main/resources/icons/action-unconnected.png diff --git a/observe-swing/src/main/resources/icons/action-validate.png b/observe-application-swing/src/main/resources/icons/action-validate.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-validate.png rename to observe-application-swing/src/main/resources/icons/action-validate.png diff --git a/observe-swing/src/main/resources/icons/action-verify-equation.png b/observe-application-swing/src/main/resources/icons/action-verify-equation.png similarity index 100% rename from observe-swing/src/main/resources/icons/action-verify-equation.png rename to observe-application-swing/src/main/resources/icons/action-verify-equation.png diff --git a/observe-swing/src/main/resources/icons/logo OT_rvb.png b/observe-application-swing/src/main/resources/icons/logo OT_rvb.png similarity index 100% rename from observe-swing/src/main/resources/icons/logo OT_rvb.png rename to observe-application-swing/src/main/resources/icons/logo OT_rvb.png diff --git a/observe-swing/src/main/resources/icons/logo-OT_web.png b/observe-application-swing/src/main/resources/icons/logo-OT_web.png similarity index 100% rename from observe-swing/src/main/resources/icons/logo-OT_web.png rename to observe-application-swing/src/main/resources/icons/logo-OT_web.png diff --git a/observe-swing/src/main/resources/icons/logo_ird.png b/observe-application-swing/src/main/resources/icons/logo_ird.png similarity index 100% rename from observe-swing/src/main/resources/icons/logo_ird.png rename to observe-application-swing/src/main/resources/icons/logo_ird.png diff --git a/observe-swing/src/main/resources/icons/navigation/activite.png b/observe-application-swing/src/main/resources/icons/navigation/activite.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/activite.png rename to observe-application-swing/src/main/resources/icons/navigation/activite.png diff --git a/observe-swing/src/main/resources/icons/navigation/bateau.png b/observe-application-swing/src/main/resources/icons/navigation/bateau.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/bateau.png rename to observe-application-swing/src/main/resources/icons/navigation/bateau.png diff --git a/observe-swing/src/main/resources/icons/navigation/calee.png b/observe-application-swing/src/main/resources/icons/navigation/calee.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/calee.png rename to observe-application-swing/src/main/resources/icons/navigation/calee.png diff --git a/observe-swing/src/main/resources/icons/navigation/ird/activity16.png b/observe-application-swing/src/main/resources/icons/navigation/ird/activity16.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/ird/activity16.png rename to observe-application-swing/src/main/resources/icons/navigation/ird/activity16.png diff --git a/observe-swing/src/main/resources/icons/navigation/ird/activity24.png b/observe-application-swing/src/main/resources/icons/navigation/ird/activity24.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/ird/activity24.png rename to observe-application-swing/src/main/resources/icons/navigation/ird/activity24.png diff --git a/observe-swing/src/main/resources/icons/navigation/ird/floatingObject16.png b/observe-application-swing/src/main/resources/icons/navigation/ird/floatingObject16.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/ird/floatingObject16.png rename to observe-application-swing/src/main/resources/icons/navigation/ird/floatingObject16.png diff --git a/observe-swing/src/main/resources/icons/navigation/ird/floatingObject24.png b/observe-application-swing/src/main/resources/icons/navigation/ird/floatingObject24.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/ird/floatingObject24.png rename to observe-application-swing/src/main/resources/icons/navigation/ird/floatingObject24.png diff --git a/observe-swing/src/main/resources/icons/navigation/ird/observedSystem16.png b/observe-application-swing/src/main/resources/icons/navigation/ird/observedSystem16.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/ird/observedSystem16.png rename to observe-application-swing/src/main/resources/icons/navigation/ird/observedSystem16.png diff --git a/observe-swing/src/main/resources/icons/navigation/ird/observedSystem24.png b/observe-application-swing/src/main/resources/icons/navigation/ird/observedSystem24.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/ird/observedSystem24.png rename to observe-application-swing/src/main/resources/icons/navigation/ird/observedSystem24.png diff --git a/observe-swing/src/main/resources/icons/navigation/ird/program16.png b/observe-application-swing/src/main/resources/icons/navigation/ird/program16.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/ird/program16.png rename to observe-application-swing/src/main/resources/icons/navigation/ird/program16.png diff --git a/observe-swing/src/main/resources/icons/navigation/ird/program24.png b/observe-application-swing/src/main/resources/icons/navigation/ird/program24.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/ird/program24.png rename to observe-application-swing/src/main/resources/icons/navigation/ird/program24.png diff --git a/observe-swing/src/main/resources/icons/navigation/ird/referentiel16.png b/observe-application-swing/src/main/resources/icons/navigation/ird/referentiel16.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/ird/referentiel16.png rename to observe-application-swing/src/main/resources/icons/navigation/ird/referentiel16.png diff --git a/observe-swing/src/main/resources/icons/navigation/ird/referentiel24.png b/observe-application-swing/src/main/resources/icons/navigation/ird/referentiel24.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/ird/referentiel24.png rename to observe-application-swing/src/main/resources/icons/navigation/ird/referentiel24.png diff --git a/observe-swing/src/main/resources/icons/navigation/ird/route16.png b/observe-application-swing/src/main/resources/icons/navigation/ird/route16.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/ird/route16.png rename to observe-application-swing/src/main/resources/icons/navigation/ird/route16.png diff --git a/observe-swing/src/main/resources/icons/navigation/ird/route24.png b/observe-application-swing/src/main/resources/icons/navigation/ird/route24.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/ird/route24.png rename to observe-application-swing/src/main/resources/icons/navigation/ird/route24.png diff --git a/observe-swing/src/main/resources/icons/navigation/ird/set16.png b/observe-application-swing/src/main/resources/icons/navigation/ird/set16.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/ird/set16.png rename to observe-application-swing/src/main/resources/icons/navigation/ird/set16.png diff --git a/observe-swing/src/main/resources/icons/navigation/ird/set24.png b/observe-application-swing/src/main/resources/icons/navigation/ird/set24.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/ird/set24.png rename to observe-application-swing/src/main/resources/icons/navigation/ird/set24.png diff --git a/observe-swing/src/main/resources/icons/navigation/ird/sub_floatingObject16.png b/observe-application-swing/src/main/resources/icons/navigation/ird/sub_floatingObject16.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/ird/sub_floatingObject16.png rename to observe-application-swing/src/main/resources/icons/navigation/ird/sub_floatingObject16.png diff --git a/observe-swing/src/main/resources/icons/navigation/ird/sub_floatingObject24.png b/observe-application-swing/src/main/resources/icons/navigation/ird/sub_floatingObject24.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/ird/sub_floatingObject24.png rename to observe-application-swing/src/main/resources/icons/navigation/ird/sub_floatingObject24.png diff --git a/observe-swing/src/main/resources/icons/navigation/ird/sub_referentiel16.png b/observe-application-swing/src/main/resources/icons/navigation/ird/sub_referentiel16.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/ird/sub_referentiel16.png rename to observe-application-swing/src/main/resources/icons/navigation/ird/sub_referentiel16.png diff --git a/observe-swing/src/main/resources/icons/navigation/ird/sub_set16.png b/observe-application-swing/src/main/resources/icons/navigation/ird/sub_set16.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/ird/sub_set16.png rename to observe-application-swing/src/main/resources/icons/navigation/ird/sub_set16.png diff --git a/observe-swing/src/main/resources/icons/navigation/ird/sub_set24.png b/observe-application-swing/src/main/resources/icons/navigation/ird/sub_set24.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/ird/sub_set24.png rename to observe-application-swing/src/main/resources/icons/navigation/ird/sub_set24.png diff --git a/observe-swing/src/main/resources/icons/navigation/ird/trip16.png b/observe-application-swing/src/main/resources/icons/navigation/ird/trip16.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/ird/trip16.png rename to observe-application-swing/src/main/resources/icons/navigation/ird/trip16.png diff --git a/observe-swing/src/main/resources/icons/navigation/ird/trip24.png b/observe-application-swing/src/main/resources/icons/navigation/ird/trip24.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/ird/trip24.png rename to observe-application-swing/src/main/resources/icons/navigation/ird/trip24.png diff --git a/observe-swing/src/main/resources/icons/navigation/maree.png b/observe-application-swing/src/main/resources/icons/navigation/maree.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/maree.png rename to observe-application-swing/src/main/resources/icons/navigation/maree.png diff --git a/observe-swing/src/main/resources/icons/navigation/objetFlottant.png b/observe-application-swing/src/main/resources/icons/navigation/objetFlottant.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/objetFlottant.png rename to observe-application-swing/src/main/resources/icons/navigation/objetFlottant.png diff --git a/observe-swing/src/main/resources/icons/navigation/observateur.png b/observe-application-swing/src/main/resources/icons/navigation/observateur.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/observateur.png rename to observe-application-swing/src/main/resources/icons/navigation/observateur.png diff --git a/observe-swing/src/main/resources/icons/navigation/ocean.png b/observe-application-swing/src/main/resources/icons/navigation/ocean.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/ocean.png rename to observe-application-swing/src/main/resources/icons/navigation/ocean.png diff --git a/observe-swing/src/main/resources/icons/navigation/picto_a 24.png b/observe-application-swing/src/main/resources/icons/navigation/picto_a 24.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/picto_a 24.png rename to observe-application-swing/src/main/resources/icons/navigation/picto_a 24.png diff --git a/observe-swing/src/main/resources/icons/navigation/picto_b 16.png b/observe-application-swing/src/main/resources/icons/navigation/picto_b 16.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/picto_b 16.png rename to observe-application-swing/src/main/resources/icons/navigation/picto_b 16.png diff --git a/observe-swing/src/main/resources/icons/navigation/picto_b 24.png b/observe-application-swing/src/main/resources/icons/navigation/picto_b 24.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/picto_b 24.png rename to observe-application-swing/src/main/resources/icons/navigation/picto_b 24.png diff --git a/observe-swing/src/main/resources/icons/navigation/picto_c 16.png b/observe-application-swing/src/main/resources/icons/navigation/picto_c 16.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/picto_c 16.png rename to observe-application-swing/src/main/resources/icons/navigation/picto_c 16.png diff --git a/observe-swing/src/main/resources/icons/navigation/picto_c 24.png b/observe-application-swing/src/main/resources/icons/navigation/picto_c 24.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/picto_c 24.png rename to observe-application-swing/src/main/resources/icons/navigation/picto_c 24.png diff --git a/observe-swing/src/main/resources/icons/navigation/picto_d 16.png b/observe-application-swing/src/main/resources/icons/navigation/picto_d 16.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/picto_d 16.png rename to observe-application-swing/src/main/resources/icons/navigation/picto_d 16.png diff --git a/observe-swing/src/main/resources/icons/navigation/picto_d 24.png b/observe-application-swing/src/main/resources/icons/navigation/picto_d 24.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/picto_d 24.png rename to observe-application-swing/src/main/resources/icons/navigation/picto_d 24.png diff --git a/observe-swing/src/main/resources/icons/navigation/picto_e 24.png b/observe-application-swing/src/main/resources/icons/navigation/picto_e 24.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/picto_e 24.png rename to observe-application-swing/src/main/resources/icons/navigation/picto_e 24.png diff --git a/observe-swing/src/main/resources/icons/navigation/picto_f 16.png b/observe-application-swing/src/main/resources/icons/navigation/picto_f 16.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/picto_f 16.png rename to observe-application-swing/src/main/resources/icons/navigation/picto_f 16.png diff --git a/observe-swing/src/main/resources/icons/navigation/picto_f 24.png b/observe-application-swing/src/main/resources/icons/navigation/picto_f 24.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/picto_f 24.png rename to observe-application-swing/src/main/resources/icons/navigation/picto_f 24.png diff --git a/observe-swing/src/main/resources/icons/navigation/programme.png b/observe-application-swing/src/main/resources/icons/navigation/programme.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/programme.png rename to observe-application-swing/src/main/resources/icons/navigation/programme.png diff --git a/observe-swing/src/main/resources/icons/navigation/route.png b/observe-application-swing/src/main/resources/icons/navigation/route.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/route.png rename to observe-application-swing/src/main/resources/icons/navigation/route.png diff --git a/observe-swing/src/main/resources/icons/navigation/senne.png b/observe-application-swing/src/main/resources/icons/navigation/senne.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/senne.png rename to observe-application-swing/src/main/resources/icons/navigation/senne.png diff --git a/observe-swing/src/main/resources/icons/navigation/systemeObserve.png b/observe-application-swing/src/main/resources/icons/navigation/systemeObserve.png similarity index 100% rename from observe-swing/src/main/resources/icons/navigation/systemeObserve.png rename to observe-application-swing/src/main/resources/icons/navigation/systemeObserve.png diff --git a/observe-swing/src/main/resources/log4j.properties b/observe-application-swing/src/main/resources/log4j.properties similarity index 100% rename from observe-swing/src/main/resources/log4j.properties rename to observe-application-swing/src/main/resources/log4j.properties diff --git a/observe-swing/src/main/resources/observe-log4j.properties b/observe-application-swing/src/main/resources/observe-log4j.properties similarity index 100% rename from observe-swing/src/main/resources/observe-log4j.properties rename to observe-application-swing/src/main/resources/observe-log4j.properties diff --git a/observe-swing/src/main/ssl/cacert.jks b/observe-application-swing/src/main/ssl/cacert.jks similarity index 100% rename from observe-swing/src/main/ssl/cacert.jks rename to observe-application-swing/src/main/ssl/cacert.jks diff --git a/observe-swing/src/main/ssl/server.crt b/observe-application-swing/src/main/ssl/server.crt similarity index 100% rename from observe-swing/src/main/ssl/server.crt rename to observe-application-swing/src/main/ssl/server.crt diff --git a/observe-swing/src/main/ssl/server.key b/observe-application-swing/src/main/ssl/server.key similarity index 100% rename from observe-swing/src/main/ssl/server.key rename to observe-application-swing/src/main/ssl/server.key diff --git a/observe-swing/src/test/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java b/observe-application-swing/src/test/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java similarity index 100% rename from observe-swing/src/test/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java rename to observe-application-swing/src/test/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java diff --git a/observe-swing/src/test/resources/log4j.properties b/observe-application-swing/src/test/resources/log4j.properties similarity index 100% rename from observe-swing/src/test/resources/log4j.properties rename to observe-application-swing/src/test/resources/log4j.properties -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 bca4151830c75f63126c01500b10c35df30eadf4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 20 11:24:21 2015 +0200 Renommage de l'application web --- .../LICENSE.txt | 0 .../README.txt | 0 .../pom.xml | 13 +++++++++---- .../rest/wm/ObserveRestWebMotionApplicationContext.java | 0 .../rest/wm/ObserveRestWebMotionApplicationListener.java | 0 .../services/rest/wm/ObserveRestWebMotionController.java | 0 .../services/rest/wm/ObserveRestWebMotionFilter.java | 0 .../services/rest/wm/ObserveRestWebMotionJsonHelper.java | 0 .../services/rest/wm/ObserveRestWebMotionRender.java | 0 .../services/rest/wm/service/ReferentialServiceRest.java | 0 .../src/main/resources/mapping | 0 .../src/main/webapp/WEB-INF/web.xml | 0 12 files changed, 9 insertions(+), 4 deletions(-) diff --git a/observe-services-rest-wm/LICENSE.txt b/observe-application-web/LICENSE.txt similarity index 100% rename from observe-services-rest-wm/LICENSE.txt rename to observe-application-web/LICENSE.txt diff --git a/observe-services-rest-wm/README.txt b/observe-application-web/README.txt similarity index 100% rename from observe-services-rest-wm/README.txt rename to observe-application-web/README.txt diff --git a/observe-services-rest-wm/pom.xml b/observe-application-web/pom.xml similarity index 89% rename from observe-services-rest-wm/pom.xml rename to observe-application-web/pom.xml index bf01c47..de1c0da 100644 --- a/observe-services-rest-wm/pom.xml +++ b/observe-application-web/pom.xml @@ -10,10 +10,10 @@ <version>4.0.2-SNAPSHOT</version> </parent> - <artifactId>observe-services-rest-wn</artifactId> + <artifactId>observe-application-web</artifactId> - <name>ObServe :: Services (impl WebMotion)</name> - <description>ObServe services (impl WebMotion)</description> + <name>ObServe :: Application Web</name> + <description>ObServe Application Web</description> <dependencies> @@ -25,12 +25,17 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>observe-services-configuration-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>observe-services-api</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-topia</artifactId> + <artifactId>observe-services-runner</artifactId> <version>${project.version}</version> </dependency> diff --git a/observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionApplicationContext.java b/observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionApplicationContext.java similarity index 100% rename from observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionApplicationContext.java rename to observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionApplicationContext.java diff --git a/observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionApplicationListener.java b/observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionApplicationListener.java similarity index 100% rename from observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionApplicationListener.java rename to observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionApplicationListener.java diff --git a/observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionController.java b/observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionController.java similarity index 100% rename from observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionController.java rename to observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionController.java diff --git a/observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionFilter.java b/observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionFilter.java similarity index 100% rename from observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionFilter.java rename to observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionFilter.java diff --git a/observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionJsonHelper.java b/observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionJsonHelper.java similarity index 100% rename from observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionJsonHelper.java rename to observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionJsonHelper.java diff --git a/observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionRender.java b/observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionRender.java similarity index 100% rename from observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionRender.java rename to observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionRender.java diff --git a/observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/service/ReferentialServiceRest.java b/observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/service/ReferentialServiceRest.java similarity index 100% rename from observe-services-rest-wm/src/main/java/fr/ird/observe/services/rest/wm/service/ReferentialServiceRest.java rename to observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/service/ReferentialServiceRest.java diff --git a/observe-services-rest-wm/src/main/resources/mapping b/observe-application-web/src/main/resources/mapping similarity index 100% rename from observe-services-rest-wm/src/main/resources/mapping rename to observe-application-web/src/main/resources/mapping diff --git a/observe-services-rest-wm/src/main/webapp/WEB-INF/web.xml b/observe-application-web/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from observe-services-rest-wm/src/main/webapp/WEB-INF/web.xml rename to observe-application-web/src/main/webapp/WEB-INF/web.xml -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 a1e44fa21d47b35682bccc31490696d943eddfaa Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 20 11:25:03 2015 +0200 Ajout du module d'utilisation des services (à utiliser dans chaque application) --- observe-services-runner/LICENSE.txt | 0 observe-services-runner/README.txt | 0 observe-services-runner/pom.xml | 114 +++++++++++++++++++++ .../src/test/resources/log4j.properties | 32 ++++++ 4 files changed, 146 insertions(+) diff --git a/observe-services-runner/LICENSE.txt b/observe-services-runner/LICENSE.txt new file mode 100644 index 0000000..e69de29 diff --git a/observe-services-runner/README.txt b/observe-services-runner/README.txt new file mode 100644 index 0000000..e69de29 diff --git a/observe-services-runner/pom.xml b/observe-services-runner/pom.xml new file mode 100644 index 0000000..354853d --- /dev/null +++ b/observe-services-runner/pom.xml @@ -0,0 +1,114 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>fr.ird.observe</groupId> + <artifactId>observe</artifactId> + <version>4.0.2-SNAPSHOT</version> + </parent> + + <artifactId>observe-services-runner</artifactId> + + <name>ObServe :: Services Runner</name> + <description>ObServe services runner</description> + + <dependencies> + + <!-- sibling dependencies --> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-services-model</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-services-configuration-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-services-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-services-configuration-rest-client</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-services-rest-client</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-services-configuration-topia</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-services-topia</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + + <!-- commons dependencies --> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <!-- Logging --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jcl</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> + + <!-- test dependencies --> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + </dependencies> + + <build> + + <plugins> + <plugin> + <groupId>com.thoughtworks.paranamer</groupId> + <artifactId>paranamer-maven-plugin</artifactId> + <executions> + <execution> + <id>extract-paranamer</id> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + + </build> + +</project> \ No newline at end of file diff --git a/observe-services-runner/src/test/resources/log4j.properties b/observe-services-runner/src/test/resources/log4j.properties new file mode 100644 index 0000000..0f21768 --- /dev/null +++ b/observe-services-runner/src/test/resources/log4j.properties @@ -0,0 +1,32 @@ +### +# #%L +# ObServe :: Swing +# %% +# Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### + +# Global logging configuration +log4j.rootLogger=ERROR, stdout +#log4j.rootLogger=ERROR, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%c:%L) %M - %m%n +#log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n + +log4j.logger.fr.ird.observe=INFO -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 28f01bfaa58fb2ee26234c028b65eebce70ebe87 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 20 11:55:58 2015 +0200 On repart sur du nommage plus classique... --- .../observe-application-swing_en_GB.properties | 2154 ++++++++++++++++++++ .../observe-application-swing_es_ES.properties | 2154 ++++++++++++++++++++ .../observe-application-swing_fr_FR.properties | 2154 ++++++++++++++++++++ .../web/ObserveWebApplicationContext.java} | 38 +- .../web/ObserveWebApplicationListener.java | 42 + .../web/ObserveWebMotionFilter.java} | 10 +- .../web/ObserveWebMotionJsonHelper.java} | 6 +- .../web/ObserveWebMotionRender.java} | 12 +- .../controller/ObserveWebMotionController.java} | 4 +- .../controller/ReferentialServiceController.java} | 5 +- .../ObserveRestWebMotionApplicationListener.java | 42 - observe-application-web/src/main/resources/mapping | 10 +- .../src/main/webapp/WEB-INF/web.xml | 4 +- .../observe/services/ObserveServiceFactory.java | 2 + observe-services-configuration-api/pom.xml | 11 + ...ava => ObserveDataSourceConfigurationRest.java} | 4 +- .../fr.ird.observe.services.ObserveServiceFactory | 2 +- ...va => ObserveDataSourceConfigurationTopia.java} | 5 +- .../fr.ird.observe.services.ObserveServiceFactory | 1 - ...Context.java => ObserveServiceContextRest.java} | 11 +- ...Factory.java => ObserveServiceFactoryRest.java} | 18 +- .../ird/observe/services/ObserveServiceRest.java | 20 + .../rest/client/ObserveRestClientService.java | 23 - .../ReferentialServiceRest.java} | 7 +- .../fr.ird.observe.services.ObserveServiceFactory | 2 +- .../service/ReferentialServiceRestTest.java | 11 +- .../services/ObserveServiceMainFactory.java | 1 + .../observe/services/AbstractObserveService.java | 5 +- ...ontext.java => ObserveServiceContextTopia.java} | 9 +- ...actory.java => ObserveServiceFactoryTopia.java} | 24 +- .../services/{topia => }/ObserveServiceTopia.java | 11 +- .../{topia => }/builder/DtoToEntityBuilder.java | 6 +- .../{topia => }/builder/EntityToDtoBuilder.java | 6 +- .../builder/EntityToReferenceDtoBuilder.java | 4 +- .../EntityToReferentialReferenceDtoBuilder.java | 4 +- .../services/{topia => dto}/ObserveDtoBinders.java | 3 +- .../{topia => dto}/ObserveDtosInitializer.java | 64 +- .../service/ReferentialServiceTopia.java | 9 +- .../ActivitySeineObservedSystemServiceTopia.java | 5 +- .../service/seine/ActivitySeineServiceTopia.java | 4 +- .../service/seine/FloatingObjectServiceTopia.java | 4 +- .../fr.ird.observe.services.ObserveServiceFactory | 2 +- .../builder/DtoToEntityBuilderTest.java | 4 +- .../builder/EntityToDtoBuilderTest.java | 5 +- .../{topia => }/ApplicationContextResource.java | 11 +- .../service/{topia => }/DataSourceResource.java | 2 +- .../service => }/ReferentialServiceTopiaTest.java | 15 +- pom.xml | 10 +- 48 files changed, 6678 insertions(+), 282 deletions(-) diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties new file mode 100644 index 0000000..437f02e --- /dev/null +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -0,0 +1,2154 @@ +observe.about.message= +observe.about.translate.content= +observe.about.translate.title= +observe.action.about= +observe.action.about.tip= +observe.action.add.floatingObject= +observe.action.add.floatingObject.tip= +observe.action.add.set= +observe.action.add.set.tip= +observe.action.add.setLongline= +observe.action.add.setLongline.tip= +observe.action.admin.cancel= +observe.action.admin.close= +observe.action.apply= +observe.action.auto.copy.to.clipboard= +observe.action.auto.copy.to.clipboard.tip= +observe.action.back.to.list= +observe.action.back.to.list.tip= +observe.action.baitHaulingStatus.create.tip= +observe.action.baitHaulingStatus.delete.tip= +observe.action.baitHaulingStatus.detail.tip= +observe.action.baitHaulingStatus.modify.tip= +observe.action.baitHaulingStatus.save.tip= +observe.action.baitSettingStatus.create.tip= +observe.action.baitSettingStatus.delete.tip= +observe.action.baitSettingStatus.detail.tip= +observe.action.baitSettingStatus.modify.tip= +observe.action.baitSettingStatus.save.tip= +observe.action.baitType.create.tip= +observe.action.baitType.delete.tip= +observe.action.baitType.detail.tip= +observe.action.baitType.modify.tip= +observe.action.baitType.save.tip= +observe.action.cancel= +observe.action.cancel.create.tip= +observe.action.catchFateLongline.create.tip= +observe.action.catchFateLongline.delete.tip= +observe.action.catchFateLongline.detail.tip= +observe.action.catchFateLongline.modify.tip= +observe.action.catchFateLongline.save.tip= +observe.action.change.storage= +observe.action.change.storage.tip= +observe.action.choose.db.dump= +observe.action.choose.db.dump.description= +observe.action.choose.db.dump.directory= +observe.action.choose.importGPS= +observe.action.choose.importGPS.description= +observe.action.choose.report.directory= +observe.action.choose.reportFile= +observe.action.choose.reportFile.description= +observe.action.choose.sensorUsed.exportData= +observe.action.choose.sensorUsed.importData= +observe.action.choose.tdr.exportData= +observe.action.choose.tdr.importData= +observe.action.close= +observe.action.close.activity.tip= +observe.action.close.maree.tip= +observe.action.close.open= +observe.action.close.open.tip= +observe.action.close.route.tip= +observe.action.close.storage= +observe.action.close.storage.tip= +observe.action.close.synchro.tip= +observe.action.closeAndCreate= +observe.action.closeAndCreate.activity= +observe.action.closeAndCreate.activity.tip= +observe.action.closeAndCreate.maree= +observe.action.closeAndCreate.maree.tip= +observe.action.closeAndCreate.route= +observe.action.closeAndCreate.route.tip= +observe.action.closeAndCreate.tip= +observe.action.commandline.configure.ui= +observe.action.commandline.create.id= +observe.action.commandline.disable.main.ui= +observe.action.commandline.help= +observe.action.commandline.help.ui= +observe.action.commandline.launch.admin.ui= +observe.action.commandline.launch.h2.server.mode= +observe.action.commandline.launch.obstuna.admin.ui= +observe.action.commandline.use.jmx= +observe.action.configuration= +observe.action.configuration.tip= +observe.action.configure= +observe.action.continue= +observe.action.copy= +observe.action.copy.column.headers= +observe.action.copy.column.headers.tip= +observe.action.copy.row.headers= +observe.action.copy.row.headers.tip= +observe.action.country.create.tip= +observe.action.country.delete.tip= +observe.action.country.detail.tip= +observe.action.country.modify.tip= +observe.action.country.save.tip= +observe.action.create= +observe.action.create.activity= +observe.action.create.activity.tip= +observe.action.create.entry.tip= +observe.action.create.gearUseFeaturesLongline= +observe.action.create.gearUseFeaturesLongline.tip= +observe.action.create.gearUseFeaturesSeine= +observe.action.create.gearUseFeaturesSeine.tip= +observe.action.create.maree= +observe.action.create.maree.tip= +observe.action.create.nonTargetCatch= +observe.action.create.nonTargetCatch.tip= +observe.action.create.nonTargetSample= +observe.action.create.nonTargetSample.tip= +observe.action.create.objectObservedSpecies= +observe.action.create.objectObservedSpecies.tip= +observe.action.create.route= +observe.action.create.route.tip= +observe.action.create.schoolEstimate= +observe.action.create.schoolEstimate.tip= +observe.action.create.targetCatch= +observe.action.create.targetCatch.tip= +observe.action.create.targetDiscarded= +observe.action.create.targetDiscarded.tip= +observe.action.create.targetSample= +observe.action.create.targetSample.tip= +observe.action.create.targetSampleCapture= +observe.action.create.targetSampleCapture.tip= +observe.action.db.locale.es.tip= +observe.action.db.locale.fr.tip= +observe.action.db.locale.uk.tip= +observe.action.delete= +observe.action.delete.activity.tip= +observe.action.delete.entry.tip= +observe.action.delete.floatingObject.tip= +observe.action.delete.maree.tip= +observe.action.delete.route.tip= +observe.action.delete.set.tip= +observe.action.delete.tip= +observe.action.detail= +observe.action.detectionMode.create.tip= +observe.action.detectionMode.delete.tip= +observe.action.detectionMode.detail.tip= +observe.action.detectionMode.modify.tip= +observe.action.detectionMode.save.tip= +observe.action.do.backup= +observe.action.do.backup.tip= +observe.action.encounterType.create.tip= +observe.action.encounterType.delete.tip= +observe.action.encounterType.detail.tip= +observe.action.encounterType.modify.tip= +observe.action.encounterType.save.tip= +observe.action.exit= +observe.action.exit.tip= +observe.action.fpaZone.create.tip= +observe.action.fpaZone.delete.tip= +observe.action.fpaZone.detail.tip= +observe.action.fpaZone.modify.tip= +observe.action.fpaZone.save.tip= +observe.action.gear.create.tip= +observe.action.gear.delete.tip= +observe.action.gear.detail.tip= +observe.action.gear.modify.tip= +observe.action.gear.save.tip= +observe.action.gearCaracteristic.create.tip= +observe.action.gearCaracteristic.delete.tip= +observe.action.gearCaracteristic.detail.tip= +observe.action.gearCaracteristic.modify.tip= +observe.action.gearCaracteristic.save.tip= +observe.action.gearCaracteristicType.create.tip= +observe.action.gearCaracteristicType.delete.tip= +observe.action.gearCaracteristicType.detail.tip= +observe.action.gearCaracteristicType.modify.tip= +observe.action.gearCaracteristicType.save.tip= +observe.action.goDown= +observe.action.goDown.tip= +observe.action.goUp= +observe.action.goUp.tip= +observe.action.goto.next.stage= +observe.action.goto.next.stage.tip= +observe.action.goto.open.activity= +observe.action.goto.open.activity.short= +observe.action.goto.open.activity.tip= +observe.action.goto.open.maree= +observe.action.goto.open.other.activity= +observe.action.goto.open.other.activity.tip= +observe.action.goto.open.other.maree= +observe.action.goto.open.other.maree.tip= +observe.action.goto.open.other.route= +observe.action.goto.open.other.route.tip= +observe.action.goto.open.program.short= +observe.action.goto.open.program.tip= +observe.action.goto.open.route= +observe.action.goto.open.route.short= +observe.action.goto.open.route.tip= +observe.action.goto.open.set.short= +observe.action.goto.open.set.tip= +observe.action.goto.open.trip.short= +observe.action.goto.open.trip.tip= +observe.action.goto.previous.stage= +observe.action.goto.previous.stage.tip= +observe.action.goto.referentiel.short= +observe.action.goto.referentiel.tip= +observe.action.goto.selected.activity= +observe.action.goto.selected.activity.tip= +observe.action.goto.selected.maree= +observe.action.goto.selected.maree.tip= +observe.action.goto.selected.route= +observe.action.goto.selected.route.tip= +observe.action.harbour.create.tip= +observe.action.harbour.delete.tip= +observe.action.harbour.detail.tip= +observe.action.harbour.modify.tip= +observe.action.harbour.save.tip= +observe.action.healthness.create.tip= +observe.action.healthness.delete.tip= +observe.action.healthness.detail.tip= +observe.action.healthness.modify.tip= +observe.action.healthness.save.tip= +observe.action.hookPosition.create.tip= +observe.action.hookPosition.delete.tip= +observe.action.hookPosition.detail.tip= +observe.action.hookPosition.modify.tip= +observe.action.hookPosition.save.tip= +observe.action.hookSize.create.tip= +observe.action.hookSize.delete.tip= +observe.action.hookSize.detail.tip= +observe.action.hookSize.modify.tip= +observe.action.hookSize.save.tip= +observe.action.hookType.create.tip= +observe.action.hookType.delete.tip= +observe.action.hookType.detail.tip= +observe.action.hookType.modify.tip= +observe.action.hookType.save.tip= +observe.action.info.storage= +observe.action.info.storage.tip= +observe.action.itemHorizontalPosition.create.tip= +observe.action.itemHorizontalPosition.delete.tip= +observe.action.itemHorizontalPosition.detail.tip= +observe.action.itemHorizontalPosition.modify.tip= +observe.action.itemHorizontalPosition.save.tip= +observe.action.itemVerticalPosition.create.tip= +observe.action.itemVerticalPosition.delete.tip= +observe.action.itemVerticalPosition.detail.tip= +observe.action.itemVerticalPosition.modify.tip= +observe.action.itemVerticalPosition.save.tip= +observe.action.lengthWeightParameter.create.tip= +observe.action.lengthWeightParameter.delete.tip= +observe.action.lengthWeightParameter.detail.tip= +observe.action.lengthWeightParameter.modify.tip= +observe.action.lengthWeightParameter.save.tip= +observe.action.lightsticksColor.create.tip= +observe.action.lightsticksColor.delete.tip= +observe.action.lightsticksColor.detail.tip= +observe.action.lightsticksColor.modify.tip= +observe.action.lightsticksColor.save.tip= +observe.action.lightsticksType.create.tip= +observe.action.lightsticksType.delete.tip= +observe.action.lightsticksType.detail.tip= +observe.action.lightsticksType.modify.tip= +observe.action.lightsticksType.save.tip= +observe.action.lineType.create.tip= +observe.action.lineType.delete.tip= +observe.action.lineType.detail.tip= +observe.action.lineType.modify.tip= +observe.action.lineType.save.tip= +observe.action.load.from.file= +observe.action.load.from.file.tip= +observe.action.locale.es= +observe.action.locale.es.tip= +observe.action.locale.fr= +observe.action.locale.fr.tip= +observe.action.locale.uk= +observe.action.locale.uk.tip= +observe.action.maturityStatus.create.tip= +observe.action.maturityStatus.delete.tip= +observe.action.maturityStatus.detail.tip= +observe.action.maturityStatus.modify.tip= +observe.action.maturityStatus.save.tip= +observe.action.mitigationType.create.tip= +observe.action.mitigationType.delete.tip= +observe.action.mitigationType.detail.tip= +observe.action.mitigationType.modify.tip= +observe.action.mitigationType.save.tip= +observe.action.modify= +observe.action.new.entry= +observe.action.new.entry.tip= +observe.action.objectFate.create.tip= +observe.action.objectFate.delete.tip= +observe.action.objectFate.detail.tip= +observe.action.objectFate.modify.tip= +observe.action.objectFate.save.tip= +observe.action.objectOperation.create.tip= +observe.action.objectOperation.delete.tip= +observe.action.objectOperation.detail.tip= +observe.action.objectOperation.modify.tip= +observe.action.objectOperation.save.tip= +observe.action.objectType.create.tip= +observe.action.objectType.delete.tip= +observe.action.objectType.detail.tip= +observe.action.objectType.modify.tip= +observe.action.objectType.save.tip= +observe.action.observedSystem.create.tip= +observe.action.observedSystem.delete.tip= +observe.action.observedSystem.detail.tip= +observe.action.observedSystem.modify.tip= +observe.action.observedSystem.save.tip= +observe.action.ocean.create.tip= +observe.action.ocean.delete.tip= +observe.action.ocean.detail.tip= +observe.action.ocean.modify.tip= +observe.action.ocean.save.tip= +observe.action.open.screen= +observe.action.openLink.formsUrl.tip= +observe.action.openLink.reportsUrl.tip= +observe.action.organism.create.tip= +observe.action.organism.delete.tip= +observe.action.organism.detail.tip= +observe.action.organism.modify.tip= +observe.action.organism.save.tip= +observe.action.person.create.tip= +observe.action.person.delete.tip= +observe.action.person.detail.tip= +observe.action.person.modify.tip= +observe.action.person.save.tip= +observe.action.program.create.tip= +observe.action.program.delete.tip= +observe.action.program.detail.tip= +observe.action.program.modify.tip= +observe.action.program.save.tip= +observe.action.quitHelp.tip= +observe.action.reasonForDiscard.create.tip= +observe.action.reasonForDiscard.delete.tip= +observe.action.reasonForDiscard.detail.tip= +observe.action.reasonForDiscard.modify.tip= +observe.action.reasonForDiscard.save.tip= +observe.action.reasonForNoFishing.create.tip= +observe.action.reasonForNoFishing.delete.tip= +observe.action.reasonForNoFishing.detail.tip= +observe.action.reasonForNoFishing.modify.tip= +observe.action.reasonForNoFishing.save.tip= +observe.action.reasonForNullSet.create.tip= +observe.action.reasonForNullSet.delete.tip= +observe.action.reasonForNullSet.detail.tip= +observe.action.reasonForNullSet.modify.tip= +observe.action.reasonForNullSet.save.tip= +observe.action.reload.application= +observe.action.reload.storage= +observe.action.reload.storage.tip= +observe.action.reload.ui= +observe.action.reloadDefaultConfiguration= +observe.action.reloadDefaultConfiguration.tip= +observe.action.reloadResources= +observe.action.reloadResources.tip= +observe.action.reopen= +observe.action.reopen.activity.tip= +observe.action.reopen.maree.tip= +observe.action.reopen.route.tip= +observe.action.reopen.selected.activity= +observe.action.reopen.selected.activity.tip= +observe.action.reopen.selected.maree= +observe.action.reopen.selected.maree.tip= +observe.action.reopen.selected.route= +observe.action.reopen.selected.route.tip= +observe.action.reopen.tip= +observe.action.reset= +observe.action.reset.entry.tip= +observe.action.reset.ersId.tip= +observe.action.reset.formsUrl.tip= +observe.action.reset.homeId.tip= +observe.action.reset.new.entry.tip= +observe.action.reset.picturesReferences.tip= +observe.action.reset.reportsUrl.tip= +observe.action.reset.supportVesselName.tip= +observe.action.reset.tip= +observe.action.reset.well.tip= +observe.action.restart.application= +observe.action.restart.application.tip= +observe.action.save= +observe.action.save.all.tip= +observe.action.save.entry.tip= +observe.action.save.tip= +observe.action.save.to.file= +observe.action.save.to.file.tip= +observe.action.selectNode= +observe.action.selectNode.tip= +observe.action.sensorBrand.create.tip= +observe.action.sensorBrand.delete.tip= +observe.action.sensorBrand.detail.tip= +observe.action.sensorBrand.modify.tip= +observe.action.sensorBrand.save.tip= +observe.action.sensorDataFormat.create.tip= +observe.action.sensorDataFormat.delete.tip= +observe.action.sensorDataFormat.detail.tip= +observe.action.sensorDataFormat.modify.tip= +observe.action.sensorDataFormat.save.tip= +observe.action.sensorType.create.tip= +observe.action.sensorType.delete.tip= +observe.action.sensorType.detail.tip= +observe.action.sensorType.modify.tip= +observe.action.sensorType.save.tip= +observe.action.settingShape.create.tip= +observe.action.settingShape.delete.tip= +observe.action.settingShape.detail.tip= +observe.action.settingShape.modify.tip= +observe.action.settingShape.save.tip= +observe.action.sex.create.tip= +observe.action.sex.delete.tip= +observe.action.sex.detail.tip= +observe.action.sex.modify.tip= +observe.action.sex.save.tip= +observe.action.show.technical.informations.tip= +observe.action.show.unique.keys.tip= +observe.action.show.usages.tip= +observe.action.showConfig.title= +observe.action.site= +observe.action.site.tip= +observe.action.sizeMeasureType.create.tip= +observe.action.sizeMeasureType.delete.tip= +observe.action.sizeMeasureType.detail.tip= +observe.action.sizeMeasureType.modify.tip= +observe.action.sizeMeasureType.save.tip= +observe.action.species.create.tip= +observe.action.species.delete.tip= +observe.action.species.detail.tip= +observe.action.species.modify.tip= +observe.action.species.save.tip= +observe.action.speciesFate.create.tip= +observe.action.speciesFate.delete.tip= +observe.action.speciesFate.detail.tip= +observe.action.speciesFate.modify.tip= +observe.action.speciesFate.save.tip= +observe.action.speciesGroupSpecies.create.tip= +observe.action.speciesGroupSpecies.delete.tip= +observe.action.speciesGroupSpecies.detail.tip= +observe.action.speciesGroupSpecies.modify.tip= +observe.action.speciesGroupSpecies.save.tip= +observe.action.speciesList.create.tip= +observe.action.speciesList.delete.tip= +observe.action.speciesList.detail.tip= +observe.action.speciesList.modify.tip= +observe.action.speciesStatus.create.tip= +observe.action.speciesStatus.delete.tip= +observe.action.speciesStatus.detail.tip= +observe.action.speciesStatus.modify.tip= +observe.action.speciesStatus.save.tip= +observe.action.start.h2.web.server= +observe.action.start.h2.web.server.tip= +observe.action.start.server.mode= +observe.action.start.server.mode.tip= +observe.action.stomacFullness.create.tip= +observe.action.stomacFullness.delete.tip= +observe.action.stomacFullness.detail.tip= +observe.action.stomacFullness.modify.tip= +observe.action.stomacFullness.save.tip= +observe.action.stop.h2.web.server= +observe.action.stop.h2.web.server.tip= +observe.action.stop.server.mode= +observe.action.stop.server.mode.tip= +observe.action.storage.apply= +observe.action.storage.apply.tip= +observe.action.storage.applyAction= +observe.action.storage.cancel= +observe.action.storage.cancel.tip= +observe.action.surroundingActivity.create.tip= +observe.action.surroundingActivity.delete.tip= +observe.action.surroundingActivity.detail.tip= +observe.action.surroundingActivity.modify.tip= +observe.action.surroundingActivity.save.tip= +observe.action.synchro.apply.modifications= +observe.action.synchro.cancel.tip= +observe.action.synchro.copy.tip= +observe.action.synchro.launch.operation= +observe.action.synchro.prepare.operation= +observe.action.synchro.report.reset.tip= +observe.action.test.remote= +observe.action.test.remote.tip= +observe.action.transmittingBuoyOperation.create.tip= +observe.action.transmittingBuoyOperation.delete.tip= +observe.action.transmittingBuoyOperation.detail.tip= +observe.action.transmittingBuoyOperation.modify.tip= +observe.action.transmittingBuoyOperation.save.tip= +observe.action.transmittingBuoyType.create.tip= +observe.action.transmittingBuoyType.delete.tip= +observe.action.transmittingBuoyType.detail.tip= +observe.action.transmittingBuoyType.modify.tip= +observe.action.transmittingBuoyType.save.tip= +observe.action.tripType.create.tip= +observe.action.tripType.delete.tip= +observe.action.tripType.detail.tip= +observe.action.tripType.modify.tip= +observe.action.tripType.save.tip= +observe.action.vessel.create.tip= +observe.action.vessel.delete.tip= +observe.action.vessel.detail.tip= +observe.action.vessel.modify.tip= +observe.action.vessel.save.tip= +observe.action.vesselActivityLongline.create.tip= +observe.action.vesselActivityLongline.delete.tip= +observe.action.vesselActivityLongline.detail.tip= +observe.action.vesselActivityLongline.modify.tip= +observe.action.vesselActivityLongline.save.tip= +observe.action.vesselActivitySeine.create.tip= +observe.action.vesselActivitySeine.delete.tip= +observe.action.vesselActivitySeine.detail.tip= +observe.action.vesselActivitySeine.modify.tip= +observe.action.vesselActivitySeine.save.tip= +observe.action.vesselSizeCategory.create.tip= +observe.action.vesselSizeCategory.delete.tip= +observe.action.vesselSizeCategory.detail.tip= +observe.action.vesselSizeCategory.modify.tip= +observe.action.vesselSizeCategory.save.tip= +observe.action.vesselType.create.tip= +observe.action.vesselType.delete.tip= +observe.action.vesselType.detail.tip= +observe.action.vesselType.modify.tip= +observe.action.vesselType.save.tip= +observe.action.weightCategory.create.tip= +observe.action.weightCategory.delete.tip= +observe.action.weightCategory.detail.tip= +observe.action.weightCategory.modify.tip= +observe.action.weightCategory.save.tip= +observe.action.weightMeasureType.create.tip= +observe.action.weightMeasureType.delete.tip= +observe.action.weightMeasureType.detail.tip= +observe.action.weightMeasureType.modify.tip= +observe.action.weightMeasureType.save.tip= +observe.action.wind.create.tip= +observe.action.wind.delete.tip= +observe.action.wind.detail.tip= +observe.action.wind.modify.tip= +observe.action.wind.save.tip= +observe.activityLongline.coordinate= +observe.activityLongline.fpaZone= +observe.activityLongline.message.active.found= +observe.activityLongline.message.active.found.for.other.trip= +observe.activityLongline.message.creating= +observe.activityLongline.message.no.active.found= +observe.activityLongline.message.no.active.found.for.other.trip= +observe.activityLongline.message.not.open= +observe.activityLongline.message.updating= +observe.activityLongline.seaSurfaceTemperature= +observe.activityLongline.timeStamp= +observe.activityLongline.title= +observe.activityLongline.vesselActivityLongline= +observe.activityLonglines.title= +observe.activityObservedSystem.availableObservedSystem= +observe.activityObservedSystem.selectedObservedSystem= +observe.activitySeine.message.active.found= +observe.activitySeine.message.active.found.for.other.route= +observe.activitySeine.message.creating= +observe.activitySeine.message.no.active.found= +observe.activitySeine.message.no.active.found.for.other.route= +observe.activitySeine.message.not.open= +observe.activitySeine.message.updating= +observe.activitySeine.tab.general= +observe.activitySeine.tab.measurements= +observe.activitySeine.title= +observe.activitySeineObservedSystem.title= +observe.activitySeines.title= +observe.admin.resume.no.operation.done= +observe.admin.resume.operation.canceled= +observe.admin.resume.operation.done= +observe.admin.resume.operation.failed= +observe.admin.resume.operation.need.fix= +observe.admin.resume.operation.not.started= +observe.admin.resume.operation.running= +observe.application.config= +observe.baitsComposition.action.create= +observe.baitsComposition.action.create.tip= +observe.baitsComposition.baitSettingStatus= +observe.baitsComposition.baitType= +observe.baitsComposition.individualSize= +observe.baitsComposition.individualWeight= +observe.baitsComposition.proportion= +observe.baitsComposition.proportionSum= +observe.baitsComposition.table.baitSettingStatus= +observe.baitsComposition.table.baitSettingStatus.tip= +observe.baitsComposition.table.baitType= +observe.baitsComposition.table.baitType.tip= +observe.baitsComposition.table.individualSize= +observe.baitsComposition.table.individualSize.tip= +observe.baitsComposition.table.individualWeight= +observe.baitsComposition.table.individualWeight.tip= +observe.baitsComposition.table.proportion= +observe.baitsComposition.table.proportion.tip= +observe.baitsComposition.title= +observe.basket.cant.delete.message= +observe.basket.cant.delete.title= +observe.basket.invalid.nextFloatline1Length= +observe.branchLine.cant.delete.message= +observe.branchLine.cant.delete.title= +observe.branchline.baitHaulingStatus= +observe.branchline.baitSettingStatus= +observe.branchline.baitType= +observe.branchline.comment= +observe.branchline.depthRecorder= +observe.branchline.hookLost= +observe.branchline.hookOffset= +observe.branchline.hookSize= +observe.branchline.hookType= +observe.branchline.message.modified= +observe.branchline.message.modified.but.invalid= +observe.branchline.snapWeight= +observe.branchline.swivelWeight= +observe.branchline.tab.general= +observe.branchline.tab.hookAndBait= +observe.branchline.timeSinceContact= +observe.branchline.timer= +observe.branchline.timerTimeOnBoard= +observe.branchline.title= +observe.branchline.topType= +observe.branchline.traceCutOff= +observe.branchline.tracelineType= +observe.branchline.weightedSnap= +observe.branchline.weightedSwivel= +observe.branchlinesComposition.action.create= +observe.branchlinesComposition.action.create.tip= +observe.branchlinesComposition.length= +observe.branchlinesComposition.proportion= +observe.branchlinesComposition.proportionSum= +observe.branchlinesComposition.table.length= +observe.branchlinesComposition.table.length.tip= +observe.branchlinesComposition.table.proportion= +observe.branchlinesComposition.table.proportion.tip= +observe.branchlinesComposition.table.topType= +observe.branchlinesComposition.table.topType.tip= +observe.branchlinesComposition.table.tracelineType= +observe.branchlinesComposition.table.tracelineType.tip= +observe.branchlinesComposition.title= +observe.branchlinesComposition.topType= +observe.branchlinesComposition.tracelineType= +observe.broughtOnDeck.comment= +observe.catchLongline.acquisitionMode= +observe.catchLongline.acquisitionMode.grouped= +observe.catchLongline.acquisitionMode.individual= +observe.catchLongline.action.create= +observe.catchLongline.action.create.tip= +observe.catchLongline.action.new= +observe.catchLongline.action.new.tip= +observe.catchLongline.action.reset.photoReferences.tip= +observe.catchLongline.availablePredator= +observe.catchLongline.basket= +observe.catchLongline.beatDiameter= +observe.catchLongline.branchline= +observe.catchLongline.catchFateLongline= +observe.catchLongline.catchHealthness= +observe.catchLongline.comment= +observe.catchLongline.count= +observe.catchLongline.depredated= +observe.catchLongline.discardHealthness= +observe.catchLongline.gonadeWeight= +observe.catchLongline.hookPosition= +observe.catchLongline.hookWhenDiscarded= +observe.catchLongline.locationOnLongline= +observe.catchLongline.maturityStatus= +observe.catchLongline.photoReferences= +observe.catchLongline.predator= +observe.catchLongline.resetBranchline= +observe.catchLongline.resetBranchline.tip= +observe.catchLongline.saveBranchline= +observe.catchLongline.saveBranchline.tip= +observe.catchLongline.section= +observe.catchLongline.selectedPredator= +observe.catchLongline.sex= +observe.catchLongline.speciesCatch= +observe.catchLongline.stomacFullness= +observe.catchLongline.tab.branchline= +observe.catchLongline.tab.caracteristics= +observe.catchLongline.tab.depredated= +observe.catchLongline.tab.foodAndSexual= +observe.catchLongline.tab.sizeMeasures= +observe.catchLongline.tab.weightMeasures= +observe.catchLongline.title= +observe.catchLongline.totalWeight= +observe.catchlongline.table.acquisitionMode= +observe.catchlongline.table.acquisitionMode.tip= +observe.catchlongline.table.basketHaulingId= +observe.catchlongline.table.basketHaulingId.tip= +observe.catchlongline.table.branchlineHaulingId= +observe.catchlongline.table.branchlineHaulingId.tip= +observe.catchlongline.table.catchFateLongline= +observe.catchlongline.table.catchFateLongline.tip= +observe.catchlongline.table.catchHealthness= +observe.catchlongline.table.catchHealthness.tip= +observe.catchlongline.table.comment= +observe.catchlongline.table.comment.tip= +observe.catchlongline.table.count= +observe.catchlongline.table.count.tip= +observe.catchlongline.table.depredated= +observe.catchlongline.table.depredated.tip= +observe.catchlongline.table.discardHealthness= +observe.catchlongline.table.discardHealthness.tip= +observe.catchlongline.table.sectionHaulingId= +observe.catchlongline.table.sectionHaulingId.tip= +observe.catchlongline.table.size= +observe.catchlongline.table.size.tip= +observe.catchlongline.table.sizeMeasureType= +observe.catchlongline.table.sizeMeasureType.tip= +observe.catchlongline.table.speciesCatch= +observe.catchlongline.table.speciesCatch.tip= +observe.catchlongline.table.weight= +observe.catchlongline.table.weight.tip= +observe.catchlongline.table.weightMeasureType= +observe.catchlongline.table.weightMeasureType.tip= +observe.choice.cancel= +observe.choice.confirm.delete= +observe.choice.continue= +observe.choice.create.fin.veille.activity= +observe.choice.create.fin.veille.activity.and.continue= +observe.choice.createLocalStorage= +observe.choice.doNotSave= +observe.choice.doNothing= +observe.choice.not.create.fin.veille.activity.and.continue= +observe.choice.quit= +observe.choice.save= +observe.choice.useRemoteStorage= +observe.common.acquisitionMode= +observe.common.acquisitionMode.count= +observe.common.acquisitionMode.individu= +observe.common.activities= +observe.common.activities.list= +observe.common.activity= +observe.common.baitObservation= +observe.common.birdsObservation= +observe.common.boolean.false= +observe.common.boolean.null= +observe.common.boolean.true= +observe.common.brand= +observe.common.brandName= +observe.common.broughtOnDeck= +observe.common.capacity= +observe.common.capacityLabel= +observe.common.captain= +observe.common.caracteristics= +observe.common.catchWeight= +observe.common.catchWeightComputed.computed.tip= +observe.common.catchWeightComputed.observed.tip= +observe.common.changeDate= +observe.common.code= +observe.common.codeAndStatus= +observe.common.coefficients= +observe.common.comment= +observe.common.comment.activity= +observe.common.comment.floatingObject= +observe.common.comment.nonTargetCatch= +observe.common.comment.nonTargetSample= +observe.common.comment.set= +observe.common.comment.targetCatch= +observe.common.comment.targetDiscarded= +observe.common.comment.targetSample= +observe.common.count= +observe.common.country= +observe.common.currentFpaZone= +observe.common.dataEntryOperator= +observe.common.date= +observe.common.daysAtSeaCount= +observe.common.departureHarbour= +observe.common.description= +observe.common.detailledActivitiesObservation= +observe.common.detectionMode= +observe.common.directory= +observe.common.endDate= +observe.common.endLogValue= +observe.common.equation= +observe.common.ersId= +observe.common.file= +observe.common.firstName= +observe.common.flagCountry= +observe.common.formsUrl= +observe.common.gaugeLabel= +observe.common.gearType= +observe.common.generateReport= +observe.common.global.progression.description= +observe.common.heureobservation= +observe.common.homeIdFAOWormsId= +observe.common.iso2Code= +observe.common.iso3Code= +observe.common.keelCodeFlotte= +observe.common.label1= +observe.common.label2= +observe.common.label3= +observe.common.label4= +observe.common.label5= +observe.common.label6= +observe.common.label7= +observe.common.label8= +observe.common.landingHarbour= +observe.common.lastName= +observe.common.latitude= +observe.common.length= +observe.common.length.computed.tip= +observe.common.length.inf= +observe.common.length.observed.tip= +observe.common.lengthMeasureType= +observe.common.lengthWeightFormula= +observe.common.libelles= +observe.common.longitude= +observe.common.lowerValueUpperValue= +observe.common.mammalsObservation= +observe.common.meanLength= +observe.common.meanLengthComputed.computed.tip= +observe.common.meanLengthComputed.observed.tip= +observe.common.meanValues= +observe.common.meanWeight= +observe.common.meanWeightComputed.computed.tip= +observe.common.meanWeightComputed.observed.tip= +observe.common.measureType= +observe.common.measureType.ld1= +observe.common.measureType.lf= +observe.common.measureType.unknown= +observe.common.minLengthMax= +observe.common.minWeightMax= +observe.common.needComment= +observe.common.nextFpaZone= +observe.common.no.balise= +observe.common.nonCoupSenne= +observe.common.nonTargetCatch= +observe.common.nonTargetObservation= +observe.common.nonTargetSample= +observe.common.objectFate= +observe.common.objectObservedSpecies= +observe.common.objectOperation= +observe.common.objectType= +observe.common.objectsObservation= +observe.common.observedSystem= +observe.common.observedSystemDistance= +observe.common.observer= +observe.common.obsolete.entity= +observe.common.ocean= +observe.common.oceanForSpecies= +observe.common.operation.resume= +observe.common.organism= +observe.common.ownership= +observe.common.picturesReferences= +observe.common.power= +observe.common.previousFpaZone= +observe.common.program.observation.value.0= +observe.common.program.observation.value.1= +observe.common.program.observation.value.2= +observe.common.program.observation.value.3= +observe.common.program.observation.value.4= +observe.common.program.observation.value.5= +observe.common.program.observation.value.6= +observe.common.program.observation.value.7= +observe.common.program.observation.value.8= +observe.common.program.observation.value.9= +observe.common.reasonForDiscard= +observe.common.reportsUrl= +observe.common.resume= +observe.common.routes.list= +observe.common.samplesObservation= +observe.common.schoolEstimate= +observe.common.schoolType= +observe.common.scientificLabel= +observe.common.seaSurfaceTemperature= +observe.common.searchMaximum= +observe.common.select.gps.import.file= +observe.common.select.gps.import.file.tip= +observe.common.select.gps.maxDelay= +observe.common.select.gps.maxDelay.tip= +observe.common.select.gps.maxSpeed= +observe.common.select.gps.maxSpeed.tip= +observe.common.select.report.file= +observe.common.select.report.file.tip= +observe.common.select.validate.context= +observe.common.select.validate.context.tip= +observe.common.select.validate.mode= +observe.common.select.validate.mode.tip= +observe.common.select.validate.scope= +observe.common.select.validate.scope.tip= +observe.common.selected.validators= +observe.common.sex= +observe.common.species= +observe.common.speciesFate= +observe.common.speciesFaune= +observe.common.speciesGroup= +observe.common.speciesStatus= +observe.common.speciesThon= +observe.common.speedRange= +observe.common.startDate= +observe.common.startDateFinProgram= +observe.common.startDateFinValidite= +observe.common.startLogValue= +observe.common.status= +observe.common.step.description= +observe.common.storage.not.valid= +observe.common.supportVesselName= +observe.common.surroundingActivity= +observe.common.taille= +observe.common.taillePoids.caracteristics= +observe.common.targetCatch= +observe.common.targetDiscarded= +observe.common.targetDiscardsObservation= +observe.common.targetSample= +observe.common.targetSampleCapture= +observe.common.topiaCreateDate= +observe.common.topiaId= +observe.common.topiaVersion= +observe.common.totalCount= +observe.common.totalCountComputed.computed.tip= +observe.common.totalCountComputed.observed.tip= +observe.common.totalWeight= +observe.common.transmittingBuoyOperation= +observe.common.transmittingBuoyType= +observe.common.trips.list= +observe.common.typeTransmittingBuoyOperation= +observe.common.undefined= +observe.common.undefined.tip= +observe.common.uri= +observe.common.vessel= +observe.common.vesselActivitySeine= +observe.common.vesselActivitySeine.comment= +observe.common.vesselSizeCategory= +observe.common.vesselSpeed= +observe.common.vesselType= +observe.common.waveHeight= +observe.common.weight= +observe.common.weight.computed.tip= +observe.common.weight.ind= +observe.common.weight.observed.tip= +observe.common.weightCategory= +observe.common.weightLengthFormula= +observe.common.well= +observe.common.wind= +observe.common.yearService= +observe.comon.exist.on.remote= +observe.config.category.changeStorage= +observe.config.category.changeStorage.description= +observe.config.category.directories= +observe.config.category.directories.description= +observe.config.category.gps= +observe.config.category.gps.description= +observe.config.category.h2= +observe.config.category.h2.description= +observe.config.category.map= +observe.config.category.map.description= +observe.config.category.observation= +observe.config.category.observation.description= +observe.config.category.obstuna= +observe.config.category.obstuna.description= +observe.config.category.other= +observe.config.category.other.description= +observe.config.category.speciesList.longline= +observe.config.category.speciesList.longline.description= +observe.config.category.speciesList.seine= +observe.config.category.speciesList.seine.description= +observe.config.category.synchro= +observe.config.category.synchro.description= +observe.config.configFileName.description= +observe.config.db.locale= +observe.config.defaultBackupDirectory.description= +observe.config.defaultCreationMode= +observe.config.defaultDataDirectory.description= +observe.config.defaultDbMode= +observe.config.defaultGpsMaxDelay= +observe.config.defaultGpsMaxSpeed= +observe.config.defaultI18nDirectory.description= +observe.config.defaultInitialDbDump.description= +observe.config.defaultLocalDbDirectory.description= +observe.config.defaultMapDirectory.description= +observe.config.defaultReportDirectory.description= +observe.config.defaultResourcesDirectory.description= +observe.config.defaultTmpDirectory.description= +observe.config.defaultValidationReportDirectory.description= +observe.config.devMode= +observe.config.h2.can.migrate.description= +observe.config.h2.login.description= +observe.config.h2.password.description= +observe.config.h2.serverPort.description= +observe.config.logConfigurationFile.description= +observe.config.map.background.description= +observe.config.map.layer1.description= +observe.config.map.layer10.description= +observe.config.map.layer2.description= +observe.config.map.layer3.description= +observe.config.map.layer4.description= +observe.config.map.layer5.description= +observe.config.map.layer6.description= +observe.config.map.layer7.description= +observe.config.map.layer8.description= +observe.config.map.layer9.description= +observe.config.map.style.description= +observe.config.observation.activitysDetaillees= +observe.config.observation.fauneAssociee= +observe.config.observation.floatingObject= +observe.config.observation.gleure= +observe.config.observation.mammiferes= +observe.config.observation.mensurations= +observe.config.observation.oiseaux= +observe.config.observation.rejetsThons= +observe.config.obstuna.login.description= +observe.config.obstuna.password.description= +observe.config.obstuna.url.description= +observe.config.obstuna.useSsl.description= +observe.config.pg.can.migrate.description= +observe.config.showMigrationProgression= +observe.config.showMigrationSql= +observe.config.showSql= +observe.config.speciesList.longline.catch= +observe.config.speciesList.longline.encounter= +observe.config.speciesList.seine.nonTargetCatch= +observe.config.speciesList.seine.objectObservedSpecies= +observe.config.speciesList.seine.objectSchoolEstimate= +observe.config.speciesList.seine.schoolEstimate= +observe.config.speciesList.seine.targetCatch= +observe.config.ui.autoPopupNumberEditor= +observe.config.ui.changeSynchroSrc= +observe.config.ui.fullscreen= +observe.config.ui.loadLocalStorage= +observe.config.ui.locale= +observe.config.ui.showNumberEditorButton= +observe.config.ui.showTimeEditorSlider= +observe.config.ui.storeRemoteStorage= +observe.content.mode.create.tip= +observe.content.mode.read.tip= +observe.content.mode.update.tip= +observe.encounter.action.create= +observe.encounter.action.create.tip= +observe.encounter.count= +observe.encounter.distance= +observe.encounter.encounterType= +observe.encounter.species= +observe.encounter.table.count= +observe.encounter.table.count.tip= +observe.encounter.table.distance= +observe.encounter.table.distance.tip= +observe.encounter.table.encouterType= +observe.encounter.table.encouterType.tip= +observe.encounter.table.species= +observe.encounter.table.species.tip= +observe.encounter.title= +observe.entity.message.updating= +observe.error.can.not.create.directory= +observe.error.no.activity.6= +observe.error.open.first.db= +observe.error.speciesList.longline.catch.notFound= +observe.error.speciesList.longline.depredator.notFound= +observe.error.speciesList.longline.encounter.notFound= +observe.error.speciesList.seine.objectObservedSpecies.notFound= +observe.error.speciesList.seine.objectSchoolEstimate.notFound= +observe.error.speciesList.seine.targetCatch.notFound= +observe.error.storage.could.not.backup.unsane.local.db= +observe.error.storage.could.not.load.local.db= +observe.floatingObject.message.creating= +observe.floatingObject.message.updating= +observe.floatingObject.title= +observe.floatingObjectTransmittingBuoyOperation.title= +observe.floatlinesComposition.action.create= +observe.floatlinesComposition.action.create.tip= +observe.floatlinesComposition.length= +observe.floatlinesComposition.lineType= +observe.floatlinesComposition.proportion= +observe.floatlinesComposition.proportionSum= +observe.floatlinesComposition.table.length= +observe.floatlinesComposition.table.length.tip= +observe.floatlinesComposition.table.lineType= +observe.floatlinesComposition.table.lineType.tip= +observe.floatlinesComposition.table.proportion= +observe.floatlinesComposition.table.proportion.tip= +observe.floatlinesComposition.title= +observe.gear.availableGearCaracteristic= +observe.gear.gearCaracteristic= +observe.gear.gearCaracteristicType= +observe.gear.selectedGearCaracteristic= +observe.gear.tab.gearCaracteristic= +observe.gear.tab.general= +observe.gear.unit= +observe.gearUseFeaturesLongline.action.deleteSelectedMeasurement= +observe.gearUseFeaturesLongline.action.deleteSelectedMeasurement.tip= +observe.gearUseFeaturesLongline.comment= +observe.gearUseFeaturesLongline.gear= +observe.gearUseFeaturesLongline.number= +observe.gearUseFeaturesLongline.tab.general= +observe.gearUseFeaturesLongline.tab.measurements= +observe.gearUseFeaturesLongline.table.comment= +observe.gearUseFeaturesLongline.table.comment.tip= +observe.gearUseFeaturesLongline.table.gear= +observe.gearUseFeaturesLongline.table.gear.tip= +observe.gearUseFeaturesLongline.table.gearCaracteristic= +observe.gearUseFeaturesLongline.table.gearCaracteristic.tip= +observe.gearUseFeaturesLongline.table.number= +observe.gearUseFeaturesLongline.table.number.tip= +observe.gearUseFeaturesLongline.table.usedInTrip= +observe.gearUseFeaturesLongline.table.usedInTrip.tip= +observe.gearUseFeaturesLongline.table.value= +observe.gearUseFeaturesLongline.table.value.tip= +observe.gearUseFeaturesLongline.title= +observe.gearUseFeaturesLongline.usedInTrip= +observe.gearUseFeaturesSeine.action.deleteSelectedMeasurement= +observe.gearUseFeaturesSeine.action.deleteSelectedMeasurement.tip= +observe.gearUseFeaturesSeine.comment= +observe.gearUseFeaturesSeine.gear= +observe.gearUseFeaturesSeine.number= +observe.gearUseFeaturesSeine.tab.general= +observe.gearUseFeaturesSeine.tab.measurements= +observe.gearUseFeaturesSeine.table.comment= +observe.gearUseFeaturesSeine.table.comment.tip= +observe.gearUseFeaturesSeine.table.gear= +observe.gearUseFeaturesSeine.table.gear.tip= +observe.gearUseFeaturesSeine.table.gearCaracteristic= +observe.gearUseFeaturesSeine.table.gearCaracteristic.tip= +observe.gearUseFeaturesSeine.table.number= +observe.gearUseFeaturesSeine.table.number.tip= +observe.gearUseFeaturesSeine.table.usedInTrip= +observe.gearUseFeaturesSeine.table.usedInTrip.tip= +observe.gearUseFeaturesSeine.table.value= +observe.gearUseFeaturesSeine.table.value.tip= +observe.gearUseFeaturesSeine.title= +observe.gearUseFeaturesSeine.usedInTrip= +observe.harbour.coordinates= +observe.harbour.locode= +observe.harbour.name= +observe.hooksComposition.action.create= +observe.hooksComposition.action.create.tip= +observe.hooksComposition.hookOffset= +observe.hooksComposition.hookSize= +observe.hooksComposition.hookType= +observe.hooksComposition.proportion= +observe.hooksComposition.proportionSum= +observe.hooksComposition.table.hookOffset= +observe.hooksComposition.table.hookOffset.tip= +observe.hooksComposition.table.hookSize= +observe.hooksComposition.table.hookSize.tip= +observe.hooksComposition.table.hookType= +observe.hooksComposition.table.hookType.tip= +observe.hooksComposition.table.proportion= +observe.hooksComposition.table.proportion.tip= +observe.hooksComposition.title= +observe.info.selected.validators= +observe.info.validation.credentials= +observe.init.local.db.detected= +observe.init.no.initial.dump.detected= +observe.init.no.local.db.detected= +observe.init.storage.done= +observe.label.coefficients.info= +observe.label.lengthWeightFormula.info= +observe.label.usage.data.title= +observe.label.usage.referentiel.title= +observe.label.weightLengthFormula.info= +observe.lengthWeightParameter.tab.general= +observe.lengthWeightParameter.tab.other= +observe.list.baitHaulingStatus= +observe.list.baitSettingStatus= +observe.list.baitType= +observe.list.catchFateLongline= +observe.list.country= +observe.list.detectionMode= +observe.list.encounterType= +observe.list.fpaZone= +observe.list.gear= +observe.list.gearCaracteristic= +observe.list.gearCaracteristicType= +observe.list.harbour= +observe.list.healthness= +observe.list.hookPosition= +observe.list.hookSize= +observe.list.hookType= +observe.list.itemHorizontalPosition= +observe.list.itemVerticalPosition= +observe.list.lengthWeightParameter= +observe.list.lightsticksColor= +observe.list.lightsticksType= +observe.list.lineType= +observe.list.maturityStatus= +observe.list.mitigationType= +observe.list.objectFate= +observe.list.objectOperation= +observe.list.objectType= +observe.list.observedSystem= +observe.list.ocean= +observe.list.operation= +observe.list.organism= +observe.list.person= +observe.list.program= +observe.list.reasonForDiscard= +observe.list.reasonForNoFishing= +observe.list.reasonForNullSet= +observe.list.sensorBrand= +observe.list.sensorDataFormat= +observe.list.sensorType= +observe.list.settingShape= +observe.list.sex= +observe.list.sizeMeasureType= +observe.list.speciesFate= +observe.list.speciesFaune= +observe.list.speciesGroupSpecies= +observe.list.speciesList= +observe.list.speciesStatus= +observe.list.stomacFullness= +observe.list.surroundingActivity= +observe.list.transmittingBuoyType= +observe.list.tripType= +observe.list.vessel= +observe.list.vesselActivityLongline= +observe.list.vesselActivitySeine= +observe.list.vesselSizeCategory= +observe.list.vesselType= +observe.list.weightCategory= +observe.list.weightMeasureType= +observe.list.wind= +observe.longlineDetailComposition.action.deleteAllSections= +observe.longlineDetailComposition.action.deleteAllSections.tip= +observe.longlineDetailComposition.action.deleteSelectedBasket= +observe.longlineDetailComposition.action.deleteSelectedBasket.tip= +observe.longlineDetailComposition.action.deleteSelectedBranchline= +observe.longlineDetailComposition.action.deleteSelectedBranchline.tip= +observe.longlineDetailComposition.action.deleteSelectedSection= +observe.longlineDetailComposition.action.deleteSelectedSection.tip= +observe.longlineDetailComposition.action.deleteSelectedSectionTemplate= +observe.longlineDetailComposition.action.deleteSelectedSectionTemplate.tip= +observe.longlineDetailComposition.action.generateAllSections= +observe.longlineDetailComposition.action.generateAllSections.tip= +observe.longlineDetailComposition.action.insertAfterSelectedBasket= +observe.longlineDetailComposition.action.insertAfterSelectedBasket.tip= +observe.longlineDetailComposition.action.insertAfterSelectedBranchline= +observe.longlineDetailComposition.action.insertAfterSelectedBranchline.tip= +observe.longlineDetailComposition.action.insertAfterSelectedSection= +observe.longlineDetailComposition.action.insertAfterSelectedSection.tip= +observe.longlineDetailComposition.action.insertBeforeSelectedBasket= +observe.longlineDetailComposition.action.insertBeforeSelectedBasket.tip= +observe.longlineDetailComposition.action.insertBeforeSelectedBranchline= +observe.longlineDetailComposition.action.insertBeforeSelectedBranchline.tip= +observe.longlineDetailComposition.action.insertBeforeSelectedSection= +observe.longlineDetailComposition.action.insertBeforeSelectedSection.tip= +observe.longlineDetailComposition.baskets= +observe.longlineDetailComposition.basketsTable.floatline1Length= +observe.longlineDetailComposition.basketsTable.floatline1Length.tip= +observe.longlineDetailComposition.basketsTable.floatline2Length= +observe.longlineDetailComposition.basketsTable.floatline2Length.tip= +observe.longlineDetailComposition.basketsTable.haulingIdentifier= +observe.longlineDetailComposition.basketsTable.haulingIdentifier.tip= +observe.longlineDetailComposition.basketsTable.settingIdentifier= +observe.longlineDetailComposition.basketsTable.settingIdentifier.tip= +observe.longlineDetailComposition.branchlines= +observe.longlineDetailComposition.branchlinesTable.branchlineLength= +observe.longlineDetailComposition.branchlinesTable.branchlineLength.tip= +observe.longlineDetailComposition.branchlinesTable.haulingIdentifier= +observe.longlineDetailComposition.branchlinesTable.haulingIdentifier.tip= +observe.longlineDetailComposition.branchlinesTable.settingIdentifier= +observe.longlineDetailComposition.branchlinesTable.settingIdentifier.tip= +observe.longlineDetailComposition.branchlinesTable.tracelineLength= +observe.longlineDetailComposition.branchlinesTable.tracelineLength.tip= +observe.longlineDetailComposition.canGenerate= +observe.longlineDetailComposition.firstTemplate.template.notCompilant.basketCount= +observe.longlineDetailComposition.message.updating= +observe.longlineDetailComposition.sectionTemplatesTable.identifier= +observe.longlineDetailComposition.sectionTemplatesTable.identifier.tip= +observe.longlineDetailComposition.sectionTemplatesTable.value= +observe.longlineDetailComposition.sectionTemplatesTable.value.tip= +observe.longlineDetailComposition.sections= +observe.longlineDetailComposition.sectionsTable.haulingIdentifier= +observe.longlineDetailComposition.sectionsTable.haulingIdentifier.tip= +observe.longlineDetailComposition.sectionsTable.settingIdentifier= +observe.longlineDetailComposition.sectionsTable.settingIdentifier.tip= +observe.longlineDetailComposition.sectionsTable.template= +observe.longlineDetailComposition.sectionsTable.template.tip= +observe.longlineDetailComposition.tab.branchlineDetail= +observe.longlineDetailComposition.tab.composition= +observe.longlineDetailComposition.tab.generate= +observe.longlineDetailComposition.title= +observe.longlineDetailComposition.title.section.cant.use.firstTemplate= +observe.longlineGlobalComposition.availableMitigationType= +observe.longlineGlobalComposition.message.updating= +observe.longlineGlobalComposition.mitigationType= +observe.longlineGlobalComposition.selectedMitigationType= +observe.longlineGlobalComposition.tab.baitsComposition= +observe.longlineGlobalComposition.tab.branchlinesComposition= +observe.longlineGlobalComposition.tab.floatlinesComposition= +observe.longlineGlobalComposition.tab.hooksComposition= +observe.longlineGlobalComposition.tab.mitigationType= +observe.longlineGlobalComposition.title= +observe.map.action.exportPng= +observe.map.action.exportPng.tip= +observe.map.action.zoomIt= +observe.map.action.zoomIt.tip= +observe.map.east= +observe.map.export.chooseFile.ok= +observe.map.export.chooseFile.png= +observe.map.export.chooseFile.title= +observe.map.export.overwrite= +observe.map.export.overwrite.cancel= +observe.map.export.overwrite.ok= +observe.map.export.overwrite.title= +observe.map.export.success= +observe.map.legend.hauling= +observe.map.legend.setting= +observe.map.legend.tripBetweenTwoDays= +observe.map.legend.tripDay= +observe.map.miles= +observe.map.north= +observe.map.south= +observe.map.waitLoading= +observe.map.west= +observe.measurement.delete.message= +observe.menu.actions= +observe.menu.application.locale= +observe.menu.configuration= +observe.menu.configuration.tip= +observe.menu.db.locale= +observe.menu.file= +observe.menu.help= +observe.menu.locale= +observe.menu.navigation= +observe.menu.storage= +observe.message.can.not.write.data= +observe.message.cant.add.echantillonRejetThon= +observe.message.cant.add.echantillonTargetCatch= +observe.message.cant.add.nonTargetSample= +observe.message.consolidate.operation.done= +observe.message.consolidate.save.changes= +observe.message.creating.referentiel= +observe.message.db.closed= +observe.message.db.loaded= +observe.message.db.loading= +observe.message.db.none.loaded= +observe.message.db.none.loaded.tip= +observe.message.delete= +observe.message.delete.directory= +observe.message.delete.new= +observe.message.detected.accepted.interval= +observe.message.detected.rejected.interval= +observe.message.exportData.delete.remote.maree= +observe.message.exportData.not.possible= +observe.message.exportData.operation.needFix= +observe.message.exportData.prepare.data= +observe.message.exportData.replicate.maree= +observe.message.goto.site= +observe.message.h2.server.login= +observe.message.h2.server.password= +observe.message.h2.server.url= +observe.message.help.usage= +observe.message.historical.data= +observe.message.importGPS.apply.point= +observe.message.importGPS.apply.points= +observe.message.importGPS.detect.point= +observe.message.importGPS.detect.points= +observe.message.importGPS.detected.point= +observe.message.importGPS.no.activity.selected= +observe.message.importGPS.no.detected.point= +observe.message.importGPS.no.invalid.interval= +observe.message.importGPS.nothing.to.do= +observe.message.importGPS.operation.needFix= +observe.message.importGPS.prepare.importFile= +observe.message.loaded.tip= +observe.message.need.fin.veille.activity= +observe.message.no.accepted.intervalle.detected= +observe.message.no.activity.detected= +observe.message.no.activity.for.route= +observe.message.no.activity.for.trip= +observe.message.no.local.db.found= +observe.message.no.open.maree.detected= +observe.message.no.report.selected= +observe.message.no.route.detected= +observe.message.no.route.for.maree= +observe.message.no.species.selected= +observe.message.no.trip.for.program= +observe.message.no.usage.for.entity= +observe.message.no.validation.detected= +observe.message.quit.invalid.edit= +observe.message.quit.valid.edit= +observe.message.referentiel.editable= +observe.message.referentiel.home= +observe.message.referentiel.no.editable= +observe.message.save.configuration= +observe.message.select.report= +observe.message.server.info= +observe.message.show.usage.for.delete= +observe.message.show.usage.for.delete2= +observe.message.show.usage.for.desactivated= +observe.message.show.usage.for.desactivated2= +observe.message.show.usage.for.desactivated3= +observe.message.show.usages= +observe.message.synchro.build.diff= +observe.message.synchro.create.temporary.db.to.resolve.obsoletes= +observe.message.synchro.local.modification= +observe.message.synchro.no.local.modification= +observe.message.synchro.no.referentiel.conflict= +observe.message.synchro.obsolete.data.to.duplicate= +observe.message.synchro.operation.canceled= +observe.message.synchro.operation.done= +observe.message.synchro.operation.failed= +observe.message.synchro.operation.needFix= +observe.message.synchro.ref.is.updtodate= +observe.message.synchro.referentiel.was.added= +observe.message.synchro.referentiel.was.modified= +observe.message.synchro.referentiel.was.removed= +observe.message.table.editBean.modified= +observe.message.table.editBean.modified.but.invalid= +observe.message.updating.floatingObject= +observe.message.updating.referentiel= +observe.message.validation.detected= +observe.message.validation.not.save.report= +observe.message.validation.nothing.to.do= +observe.message.validation.operation.done= +observe.message.validation.operation.needFix= +observe.message.validation.prepare.validators= +observe.message.validation.save.report= +observe.message.validation.start.maree= +observe.message.validation.start.referentiel= +observe.message.validation.use.storage= +observe.message.warning.will.be.delete= +observe.navigationMenu.moveTrip= +observe.navigationMenu.noAction= +observe.nonTargetCatch.message.table.will.delete.nonTargetSample= +observe.nonTargetCatch.table.catchWeight= +observe.nonTargetCatch.table.catchWeight.tip= +observe.nonTargetCatch.table.comment= +observe.nonTargetCatch.table.comment.tip= +observe.nonTargetCatch.table.deleteExtraMessage= +observe.nonTargetCatch.table.meanLength= +observe.nonTargetCatch.table.meanLength.tip= +observe.nonTargetCatch.table.meanWeight= +observe.nonTargetCatch.table.meanWeight.tip= +observe.nonTargetCatch.table.reasonForDiscard= +observe.nonTargetCatch.table.reasonForDiscard.tip= +observe.nonTargetCatch.table.speciesFate= +observe.nonTargetCatch.table.speciesFate.tip= +observe.nonTargetCatch.table.speciesFaune= +observe.nonTargetCatch.table.speciesFaune.tip= +observe.nonTargetCatch.table.totalCount= +observe.nonTargetCatch.table.totalCount.tip= +observe.nonTargetSample.table.count= +observe.nonTargetSample.table.count.tip= +observe.nonTargetSample.table.gender= +observe.nonTargetSample.table.gender.tip= +observe.nonTargetSample.table.length= +observe.nonTargetSample.table.length.tip= +observe.nonTargetSample.table.meanWeight= +observe.nonTargetSample.table.meanWeight.tip= +observe.nonTargetSample.table.picturesReferences= +observe.nonTargetSample.table.picturesReferences.tip= +observe.nonTargetSample.table.speciesFaune= +observe.nonTargetSample.table.speciesFaune.tip= +observe.objectObservedSpecies.table.count= +observe.objectObservedSpecies.table.count.tip= +observe.objectObservedSpecies.table.speciesFaune= +observe.objectObservedSpecies.table.speciesFaune.tip= +observe.objectObservedSpecies.table.speciesStatus= +observe.objectObservedSpecies.table.speciesStatus.tip= +observe.obstuna.action.create= +observe.obstuna.action.create.description= +observe.obstuna.action.drop= +observe.obstuna.action.drop.description= +observe.obstuna.action.security= +observe.obstuna.action.security.description= +observe.obstuna.action.update= +observe.obstuna.action.update.description= +observe.person.country= +observe.program.tab.general= +observe.program.tab.observations= +observe.route.message.active.found= +observe.route.message.active.found.for.other.trip= +observe.route.message.creating= +observe.route.message.no.active.found= +observe.route.message.no.active.found.for.other.trip= +observe.route.message.not.open= +observe.route.message.updating= +observe.route.title= +observe.routes.title= +observe.runner.config.loaded= +observe.runner.config.migrate.file= +observe.runner.context.loaded= +observe.runner.copy.default.logConfigurationFile.file= +observe.runner.copy.default.map.file= +observe.runner.copy.default.report.file= +observe.runner.copy.default.ui.file= +observe.runner.create.directory= +observe.runner.exists.directory= +observe.runner.i18n.loaded= +observe.runner.init= +observe.runner.load.database= +observe.runner.loaded= +observe.runner.loading.ui.configuration= +observe.runner.quit.withno.ui= +observe.runner.start= +observe.runner.ui.loaded= +observe.runner.user.directories.loaded= +observe.schoolEstimate.table.meanWeight= +observe.schoolEstimate.table.meanWeight.tip= +observe.schoolEstimate.table.speciesThon= +observe.schoolEstimate.table.speciesThon.tip= +observe.schoolEstimate.table.weight= +observe.schoolEstimate.table.weight.tip= +observe.section.cant.delete.message= +observe.section.cant.delete.title= +observe.sectionTemplate.delete.message= +observe.sections.delete.message= +observe.security.referentiel= +observe.security.referentiel.tip= +observe.security.role= +observe.security.role.tip= +observe.security.technicien= +observe.security.technicien.tip= +observe.security.unused= +observe.security.unused.tip= +observe.security.utilisateur= +observe.security.utilisateur.tip= +observe.sensorUsed.action.create= +observe.sensorUsed.action.create.tip= +observe.sensorUsed.action.reset.dataLocation.tip= +observe.sensorUsed.action.reset.sensorSerialNo.tip= +observe.sensorUsed.data= +observe.sensorUsed.dataLocation= +observe.sensorUsed.dataLocation.tip= +observe.sensorUsed.delete.data.message= +observe.sensorUsed.deleteData= +observe.sensorUsed.deleteData.tip= +observe.sensorUsed.exportData= +observe.sensorUsed.exportData.tip= +observe.sensorUsed.importData= +observe.sensorUsed.importData.tip= +observe.sensorUsed.message.data.exported= +observe.sensorUsed.message.data.imported= +observe.sensorUsed.sensorBrand= +observe.sensorUsed.sensorDataFormat= +observe.sensorUsed.sensorSerialNo= +observe.sensorUsed.sensorType= +observe.sensorUsed.table.data= +observe.sensorUsed.table.data.tip= +observe.sensorUsed.table.dataLocation= +observe.sensorUsed.table.dataLocation.tip= +observe.sensorUsed.table.sensorBrand= +observe.sensorUsed.table.sensorBrand.tip= +observe.sensorUsed.table.sensorDataFormat= +observe.sensorUsed.table.sensorDataFormat.tip= +observe.sensorUsed.table.sensorSerialNo= +observe.sensorUsed.table.sensorSerialNo.tip= +observe.sensorUsed.table.sensorType= +observe.sensorUsed.table.sensorType.tip= +observe.sensorUsed.title= +observe.setLongline.action.reset.homeId.tip= +observe.setLongline.basketsPerSectionCount= +observe.setLongline.branchlinesPerBasketCount= +observe.setLongline.haulingBreaks= +observe.setLongline.haulingDirectionSameAsSetting= +observe.setLongline.haulingEndCoordinates= +observe.setLongline.haulingEndTimeStamp= +observe.setLongline.haulingStartCoordinates= +observe.setLongline.haulingStartTimeStamp= +observe.setLongline.homeId= +observe.setLongline.lightsticksColor= +observe.setLongline.lightsticksPerBasketCount= +observe.setLongline.lightsticksType= +observe.setLongline.lineType= +observe.setLongline.maxDepthTargeted= +observe.setLongline.message.creating= +observe.setLongline.message.updating= +observe.setLongline.monitored= +observe.setLongline.number= +observe.setLongline.settingEndCoordinates= +observe.setLongline.settingEndTimeStamp= +observe.setLongline.settingShape= +observe.setLongline.settingStartCoordinates= +observe.setLongline.settingStartTimeStamp= +observe.setLongline.settingVesselSpeed= +observe.setLongline.shooterSpeed= +observe.setLongline.shooterUsed= +observe.setLongline.snapWeight= +observe.setLongline.swivelWeight= +observe.setLongline.tab.hauling= +observe.setLongline.tab.setting= +observe.setLongline.tab.settingCaracteristics= +observe.setLongline.timeBetweenHooks= +observe.setLongline.title= +observe.setLongline.totalBasketsCount= +observe.setLongline.totalHooksCount= +observe.setLongline.totalSectionsCount= +observe.setLongline.weightedSnap= +observe.setLongline.weightedSwivel= +observe.setSeine.currentDirection= +observe.setSeine.currentMeasureDepth= +observe.setSeine.currentSpeed= +observe.setSeine.endPursingTimeStamp= +observe.setSeine.endSetTimeStamp= +observe.setSeine.maxGearDepth= +observe.setSeine.message.creating= +observe.setSeine.message.information.schoolType= +observe.setSeine.message.no.nonTargetDiscarded= +observe.setSeine.message.no.targetCatch= +observe.setSeine.message.no.targetDiscarded= +observe.setSeine.message.updating= +observe.setSeine.nonTargetDiscarded= +observe.setSeine.reasonForNullSet= +observe.setSeine.schoolMeanDepth= +observe.setSeine.schoolThickness= +observe.setSeine.schoolTopDepth= +observe.setSeine.schoolType= +observe.setSeine.schoolType.not.fill= +observe.setSeine.sonarUsed= +observe.setSeine.sonarUsedAvantSet= +observe.setSeine.startTime= +observe.setSeine.supportVesselName= +observe.setSeine.tab.general= +observe.setSeine.tab.measurements= +observe.setSeine.targetDiscarded= +observe.setSeine.title= +observe.species.availableOcean= +observe.species.selectedOcean= +observe.species.tab.general= +observe.species.tab.other= +observe.speciesList.availableSpecies= +observe.speciesList.selectedSpecies= +observe.speciesList.tab.general= +observe.speciesList.tab.species= +observe.storage.action.canMigrate= +observe.storage.error.dbVersionMismatch= +observe.storage.importExternalDump.config= +observe.storage.importExternalDump.description= +observe.storage.importExternalDumpData.config= +observe.storage.importExternalDumpReferentiel.config= +observe.storage.importRemoteStorage.config= +observe.storage.importRemoteStorage.description= +observe.storage.importRemoteStorageData.config= +observe.storage.importRemoteStorageReferentiel.config= +observe.storage.internalDump.last.modified= +observe.storage.internalDump.not.exist= +observe.storage.label.backup= +observe.storage.label.data.import.db= +observe.storage.label.db.to.create= +observe.storage.label.db.to.drop= +observe.storage.label.db.to.update= +observe.storage.label.db.to.update.security= +observe.storage.label.import.data= +observe.storage.label.import.local= +observe.storage.label.import.referentiel= +observe.storage.label.import.remote= +observe.storage.label.local= +observe.storage.label.reference.import.db= +observe.storage.label.remote= +observe.storage.label.synchro= +observe.storage.label.synchro.incoming= +observe.storage.label.synchro.referentiel= +observe.storage.locale.db= +observe.storage.no.creationMode= +observe.storage.no.creationMode.required= +observe.storage.no.dbMode= +observe.storage.noImportData.config= +observe.storage.noImportReferentiel.config= +observe.storage.remote.db= +observe.storage.remote.login= +observe.storage.remote.password= +observe.storage.remote.url= +observe.storage.remote.useSll= +observe.storage.report.action.backup.local= +observe.storage.report.action.backup.remote= +observe.storage.report.action.connect.local= +observe.storage.report.action.connect.remote= +observe.storage.report.action.create.local= +observe.storage.report.action.data.import.backup= +observe.storage.report.action.import.backup= +observe.storage.report.action.import.internal= +observe.storage.report.action.import.remote.data= +observe.storage.report.action.import.remote.referentiel= +observe.storage.report.action.migrate= +observe.storage.report.action.no.data.import= +observe.storage.report.action.no.referentiel.import= +observe.storage.report.action.referentiel.import.backup= +observe.storage.report.can.migrate= +observe.storage.report.can.not.migrate= +observe.storage.report.no.create.mode= +observe.storage.report.security.owner= +observe.storage.report.security.readers= +observe.storage.report.security.referentiels= +observe.storage.report.security.techniciens= +observe.storage.report.selected.all.data= +observe.storage.report.selected.all.data.to.import= +observe.storage.report.selected.backup.file= +observe.storage.report.selected.data= +observe.storage.report.selected.data.for.import= +observe.storage.report.selected.data.referentiel= +observe.storage.report.selected.data.to.export= +observe.storage.report.selected.data.to.import= +observe.storage.report.selected.localStorageFile= +observe.storage.report.selected.no.data= +observe.storage.report.selected.no.data.to.import= +observe.storage.report.selected.remoteStorage= +observe.storage.report.selected.security= +observe.storage.required.rw.on.data= +observe.storage.security.administrateur= +observe.storage.selected.dbMode= +observe.storage.selectedCreationMode= +observe.storage.showMigrationProgression= +observe.storage.showMigrationSql= +observe.storage.step.backup= +observe.storage.step.backup.description= +observe.storage.step.config= +observe.storage.step.config.description= +observe.storage.step.configData= +observe.storage.step.configData.description= +observe.storage.step.configReferentiel= +observe.storage.step.configReferentiel.description= +observe.storage.step.confirm= +observe.storage.step.confirm.description= +observe.storage.step.creationMode= +observe.storage.step.dbMode= +observe.storage.step.dbMode.description= +observe.storage.step.dbMode.detail= +observe.storage.step.label= +observe.storage.step.roles= +observe.storage.step.roles.description= +observe.storage.step.selectData= +observe.storage.step.selectData.description= +observe.storage.store.remote.config= +observe.storage.store.remote.config.tip= +observe.storage.useRemoteStorage.config= +observe.storage.useRemoteStorage.description= +observe.synchro.add.object= +observe.synchro.common.activity= +observe.synchro.common.latitude= +observe.synchro.common.longitude= +observe.synchro.common.quadrant= +observe.synchro.common.reference= +observe.synchro.common.select= +observe.synchro.common.vitesse= +observe.synchro.config.data.mode= +observe.synchro.config.data.storage= +observe.synchro.config.export.required.read.data= +observe.synchro.config.export.required.read.referentiel= +observe.synchro.config.export.required.write.data= +observe.synchro.config.importGPS= +observe.synchro.config.referentiel.mode= +observe.synchro.config.referentiel.storage= +observe.synchro.config.report= +observe.synchro.config.source.storage= +observe.synchro.config.validate= +observe.synchro.config.validation.report= +observe.synchro.configuration= +observe.synchro.continue.with.no.save.report= +observe.synchro.import.data.fromBackup= +observe.synchro.import.data.fromRemoteStorage= +observe.synchro.importGPS.invalidIntervals.list= +observe.synchro.message.all.obsolete.entities.fixed= +observe.synchro.message.need.save.for.synchro.operation= +observe.synchro.message.need.save.for.validation.operation= +observe.synchro.message.obsolete.entities.fixed= +observe.synchro.message.obsolote.entity.ref.found= +observe.synchro.message.obsolote.entity.refs.found= +observe.synchro.message.saveLocal.skip= +observe.synchro.no.data.import= +observe.synchro.no.local.storage= +observe.synchro.no.referentiel.import= +observe.synchro.no.remote.storage= +observe.synchro.obsolete.entities.list= +observe.synchro.obsolete.entity.fix= +observe.synchro.obsolete.entity.label= +observe.synchro.obsolete.entity.to.change.label= +observe.synchro.operation.canceled= +observe.synchro.operation.consolidate= +observe.synchro.operation.consolidate.description= +observe.synchro.operation.exportData= +observe.synchro.operation.exportData.description= +observe.synchro.operation.failed= +observe.synchro.operation.importGPS= +observe.synchro.operation.importGPS.description= +observe.synchro.operation.needFix= +observe.synchro.operation.report= +observe.synchro.operation.report.description= +observe.synchro.operation.running= +observe.synchro.operation.saveLocal= +observe.synchro.operation.saveLocal.description= +observe.synchro.operation.successed= +observe.synchro.operation.synchronize= +observe.synchro.operation.synchronize.description= +observe.synchro.operation.validate= +observe.synchro.operation.validate.description= +observe.synchro.operations= +observe.synchro.remove.object= +observe.synchro.replaceObsolete.object= +observe.synchro.report.copy.options= +observe.synchro.report.report.description= +observe.synchro.report.result= +observe.synchro.report.select= +observe.synchro.report.variables= +observe.synchro.safe.entity.to.choose.label= +observe.synchro.save.report= +observe.synchro.step.config= +observe.synchro.step.config.description= +observe.synchro.step.consolidate= +observe.synchro.step.consolidate.description= +observe.synchro.step.exportData= +observe.synchro.step.exportData.description= +observe.synchro.step.importGPS= +observe.synchro.step.importGPS.description= +observe.synchro.step.report= +observe.synchro.step.report.description= +observe.synchro.step.saveLocal= +observe.synchro.step.saveLocal.description= +observe.synchro.step.selectData= +observe.synchro.step.selectData.description= +observe.synchro.step.showResume= +observe.synchro.step.showResume.description= +observe.synchro.step.synchronize= +observe.synchro.step.synchronize.description= +observe.synchro.step.validate= +observe.synchro.step.validate.description= +observe.synchro.table.exportData.exist.label= +observe.synchro.table.exportData.exist.label.tip= +observe.synchro.table.exportData.program.label= +observe.synchro.table.exportData.program.label.tip= +observe.synchro.table.exportData.selected= +observe.synchro.table.exportData.selected.tip= +observe.synchro.table.exportData.trip.label= +observe.synchro.table.exportData.trip.label.tip= +observe.synchro.table.importGPS.activity.label= +observe.synchro.table.importGPS.activity.label.tip= +observe.synchro.table.importGPS.activity.latitude= +observe.synchro.table.importGPS.activity.latitude.tip= +observe.synchro.table.importGPS.activity.longitude= +observe.synchro.table.importGPS.activity.longitude.tip= +observe.synchro.table.importGPS.activity.quadrant= +observe.synchro.table.importGPS.activity.quadrant.tip= +observe.synchro.table.importGPS.activity.select= +observe.synchro.table.importGPS.activity.select.tip= +observe.synchro.table.importGPS.activity.vitesse= +observe.synchro.table.importGPS.activity.vitesse.tip= +observe.synchro.table.importGPS.computed.label= +observe.synchro.table.importGPS.computed.label.tip= +observe.synchro.table.importGPS.data.label= +observe.synchro.table.importGPS.data.label.tip= +observe.synchro.table.obsolete.entity.label= +observe.synchro.table.obsolete.entity.label.tip= +observe.synchro.table.obsolete.entity.select= +observe.synchro.table.obsolete.entity.select.tip= +observe.synchro.update.object= +observe.synchro.validate.invalid.data.list= +observe.synchro.validate.message.list= +observe.synchro.validate.save.reportFile= +observe.targetCatch.table.comment= +observe.targetCatch.table.comment.tip= +observe.targetCatch.table.deleteExtraMessage= +observe.targetCatch.table.speciesThon= +observe.targetCatch.table.speciesThon.tip= +observe.targetCatch.table.weight= +observe.targetCatch.table.weight.tip= +observe.targetCatch.table.weightCategory= +observe.targetCatch.table.weightCategory.tip= +observe.targetCatch.table.well= +observe.targetCatch.table.well.tip= +observe.targetDiscarded.message.table.will.delete.targetLength= +observe.targetDiscarded.table.broughtOnDeck= +observe.targetDiscarded.table.broughtOnDeck.tip= +observe.targetDiscarded.table.comment= +observe.targetDiscarded.table.comment.tip= +observe.targetDiscarded.table.deleteExtraMessage= +observe.targetDiscarded.table.reasonForDiscard= +observe.targetDiscarded.table.reasonForDiscard.tip= +observe.targetDiscarded.table.speciesThon= +observe.targetDiscarded.table.speciesThon.tip= +observe.targetDiscarded.table.weight= +observe.targetDiscarded.table.weight.tip= +observe.targetDiscarded.table.weightCategory= +observe.targetDiscarded.table.weightCategory.tip= +observe.targetSample.table.count= +observe.targetSample.table.count.tip= +observe.targetSample.table.length= +observe.targetSample.table.length.tip= +observe.targetSample.table.meanWeight= +observe.targetSample.table.meanWeight.tip= +observe.targetSample.table.measureType= +observe.targetSample.table.measureType.tip= +observe.targetSample.table.speciesThon= +observe.targetSample.table.speciesThon.tip= +observe.targetSample.table.totalWeight= +observe.targetSample.table.totalWeight.tip= +observe.tdr.action.create= +observe.tdr.action.create.tip= +observe.tdr.action.reset.dataLocation.tip= +observe.tdr.action.reset.homeId.tip= +observe.tdr.action.reset.serialNo.tip= +observe.tdr.availableSpecies= +observe.tdr.basket= +observe.tdr.branchline= +observe.tdr.data= +observe.tdr.dataLocation= +observe.tdr.dataLocation.tip= +observe.tdr.delete.data.message= +observe.tdr.deleteData= +observe.tdr.deleteData.tip= +observe.tdr.deployementEnd= +observe.tdr.deployementStart= +observe.tdr.enableTimestamp= +observe.tdr.enableTimestamp.tip= +observe.tdr.exportData= +observe.tdr.exportData.tip= +observe.tdr.fishingEnd= +observe.tdr.fishingEndDepth= +observe.tdr.fishingStart= +observe.tdr.fishingStartDepth= +observe.tdr.floatline1Length= +observe.tdr.floatline2Length= +observe.tdr.homeId= +observe.tdr.importData= +observe.tdr.importData.tip= +observe.tdr.itemHorizontalPosition= +observe.tdr.itemVerticalPosition= +observe.tdr.locationOnLongline= +observe.tdr.maxFishingDepth= +observe.tdr.meanDeployementDepth= +observe.tdr.meanFishingDepth= +observe.tdr.medianDeployementDepth= +observe.tdr.medianFishingDepth= +observe.tdr.message.data.imported= +observe.tdr.minFishingDepth= +observe.tdr.section= +observe.tdr.selectedSpecies= +observe.tdr.sensorBrand= +observe.tdr.serialNo= +observe.tdr.species= +observe.tdr.tab.caracteristics= +observe.tdr.tab.keyData= +observe.tdr.tab.localisation= +observe.tdr.tab.species= +observe.tdr.tab.timestamp= +observe.tdr.table.data= +observe.tdr.table.homeId= +observe.tdr.table.homeId.tip= +observe.tdr.table.sensorBrand= +observe.tdr.table.sensorBrand.tip= +observe.tdr.table.serialNo= +observe.tdr.table.serialNo.tip= +observe.tdr.title= +observe.title.about= +observe.title.can.not.delete.referentiel= +observe.title.can.not.export.obstuna= +observe.title.change.storage= +observe.title.choose.db.dump= +observe.title.choose.db.dump.directory= +observe.title.choose.importGPS= +observe.title.choose.report.directory= +observe.title.choose.reportFile= +observe.title.choose.sensorUsed.exportData= +observe.title.choose.sensorUsed.importData= +observe.title.choose.tdr.exportData= +observe.title.choose.tdr.importData= +observe.title.config.migrate= +observe.title.connect.existingDB= +observe.title.connect.localDB= +observe.title.connect.remoteDB= +observe.title.consolidate= +observe.title.consolidate.tip= +observe.title.content.baitHaulingStatuss= +observe.title.content.baitSettingStatuss= +observe.title.content.baitTypes= +observe.title.content.catchFateLonglines= +observe.title.content.country= +observe.title.content.detectionModes= +observe.title.content.encounterTypes= +observe.title.content.fpaZones= +observe.title.content.gearCaracteristicTypes= +observe.title.content.gearCaracteristics= +observe.title.content.gears= +observe.title.content.harbours= +observe.title.content.healthnesss= +observe.title.content.hookPositions= +observe.title.content.hookSizes= +observe.title.content.hookTypes= +observe.title.content.itemHorizontalPositions= +observe.title.content.itemVerticalPositions= +observe.title.content.lengthWeightParameters= +observe.title.content.lightsticksColors= +observe.title.content.lightsticksTypes= +observe.title.content.lineTypes= +observe.title.content.maturityStatuss= +observe.title.content.mitigationTypes= +observe.title.content.objectFates= +observe.title.content.objectOperations= +observe.title.content.objectTypes= +observe.title.content.observedSystems= +observe.title.content.oceans= +observe.title.content.organisms= +observe.title.content.persons= +observe.title.content.programs= +observe.title.content.reasonForDiscards= +observe.title.content.reasonForNoFishings= +observe.title.content.reasonForNullSets= +observe.title.content.sensorBrands= +observe.title.content.sensorDataFormats= +observe.title.content.sensorTypes= +observe.title.content.settingShapes= +observe.title.content.sexx= +observe.title.content.sizeMeasureTypes= +observe.title.content.speciesFates= +observe.title.content.speciesGroupSpeciess= +observe.title.content.speciesLists= +observe.title.content.speciesStatuss= +observe.title.content.speciess= +observe.title.content.stomacFullnesss= +observe.title.content.surroundingActivitys= +observe.title.content.transmittingBuoyOperations= +observe.title.content.transmittingBuoyTypes= +observe.title.content.tripTypes= +observe.title.content.vesselActivityLonglines= +observe.title.content.vesselActivitySeines= +observe.title.content.vesselSizeCategoryx= +observe.title.content.vesselTypex= +observe.title.content.vesselx= +observe.title.content.weightCategory= +observe.title.content.weightMeasureTypes= +observe.title.content.windSpeeds= +observe.title.create.local.db= +observe.title.delete= +observe.title.error.dialog= +observe.title.exportData= +observe.title.exportData.tip= +observe.title.h2.server.parameters= +observe.title.import.localDB= +observe.title.importGPS= +observe.title.importGPS.tip= +observe.title.load.remote.db= +observe.title.need.confirm= +observe.title.need.confirm.to.desactivate.referentiel= +observe.title.no.local.db.found= +observe.title.report= +observe.title.report.tip= +observe.title.save.localDB= +observe.title.save.remoteDB= +observe.title.show.usage= +observe.title.speciesList.not.found= +observe.title.storage.info= +observe.title.synchronize= +observe.title.synchronize.tip= +observe.title.technical.informations= +observe.title.unique.key= +observe.title.validate= +observe.title.validate.tip= +observe.title.welcome.admin= +observe.tree.activityLongline= +observe.tree.activityLongline.unsaved= +observe.tree.activitySeine= +observe.tree.activitySeine.unsaved= +observe.tree.baitHaulingStatus= +observe.tree.baitSettingStatus= +observe.tree.baitType= +observe.tree.catchFateLongline= +observe.tree.catchLongline= +observe.tree.country= +observe.tree.detectionMode= +observe.tree.encounter= +observe.tree.encounterType= +observe.tree.floatingObject.unsaved= +observe.tree.fpaZone= +observe.tree.gear= +observe.tree.gearCaracteristic= +observe.tree.gearCaracteristicType= +observe.tree.gearUseFeaturesLongline= +observe.tree.gearUseFeaturesSeine= +observe.tree.harbour= +observe.tree.healthness= +observe.tree.hookPosition= +observe.tree.hookSize= +observe.tree.hookType= +observe.tree.itemHorizontalPosition= +observe.tree.itemVerticalPosition= +observe.tree.lengthWeightParameter= +observe.tree.lightsticksColor= +observe.tree.lightsticksType= +observe.tree.lineType= +observe.tree.longlineDetailComposition= +observe.tree.longlineGlobalComposition= +observe.tree.maturityStatus= +observe.tree.mitigationType= +observe.tree.nonTargetCatch= +observe.tree.nonTargetSample= +observe.tree.objectFate= +observe.tree.objectObservedSpecies= +observe.tree.objectOperation= +observe.tree.objectSchoolEstimate= +observe.tree.objectType= +observe.tree.observedSystem= +observe.tree.ocean= +observe.tree.organism= +observe.tree.person= +observe.tree.program= +observe.tree.reasonForDiscard= +observe.tree.reasonForNoFishing= +observe.tree.reasonForNullSet= +observe.tree.reference.common= +observe.tree.reference.longline= +observe.tree.reference.seine= +observe.tree.route= +observe.tree.route.unsaved= +observe.tree.schoolEstimate= +observe.tree.sensorBrand= +observe.tree.sensorDataFormat= +observe.tree.sensorType= +observe.tree.sensorUsed= +observe.tree.setLongline= +observe.tree.setLongline.unsaved= +observe.tree.setSeine= +observe.tree.setSeine.unsaved= +observe.tree.settingShape= +observe.tree.sex= +observe.tree.sizeMeasureType= +observe.tree.species= +observe.tree.speciesFate= +observe.tree.speciesGroup= +observe.tree.speciesList= +observe.tree.speciesStatus= +observe.tree.stomacFullness= +observe.tree.surroundingActivity= +observe.tree.targetCatch= +observe.tree.targetDiscarded= +observe.tree.targetSample= +observe.tree.targetSampleCapture= +observe.tree.tdr= +observe.tree.transmittingBuoyOperation= +observe.tree.transmittingBuoyType= +observe.tree.tripLongline.unsaved= +observe.tree.tripSeine.unsaved= +observe.tree.tripType= +observe.tree.vessel= +observe.tree.vesselActivityLongline= +observe.tree.vesselActivitySeine= +observe.tree.vesselSizeCategory= +observe.tree.vesselType= +observe.tree.weightCategory= +observe.tree.weightMeasureType= +observe.tree.wind= +observe.tripLongline.captain= +observe.tripLongline.dataEntryOperator= +observe.tripLongline.endDate= +observe.tripLongline.homeId= +observe.tripLongline.message.active.found= +observe.tripLongline.message.active.found.for.other.program= +observe.tripLongline.message.creating= +observe.tripLongline.message.no.active.found= +observe.tripLongline.message.not.open= +observe.tripLongline.message.updating= +observe.tripLongline.observer= +observe.tripLongline.ocean= +observe.tripLongline.startDate= +observe.tripLongline.tab.general= +observe.tripLongline.tab.map= +observe.tripLongline.title= +observe.tripLongline.totalFishingOperationsNumber= +observe.tripLongline.tripType= +observe.tripLongline.vessel= +observe.tripSeine.message.active.found= +observe.tripSeine.message.active.found.for.other.program= +observe.tripSeine.message.creating= +observe.tripSeine.message.no.active.found= +observe.tripSeine.message.not.open= +observe.tripSeine.message.updating= +observe.tripSeine.tab.general= +observe.tripSeine.tab.map= +observe.tripSeine.title= +observe.validation.report.contextName= +observe.validation.report.entities.with.messages= +observe.validation.report.entity= +observe.validation.report.scopes= +observe.validation.report.title= +observe.vessel.tab.general= +observe.vessel.tab.other= +observe.view.message= +observe.view.navigation= +observe.view.server= +observe.warning.nimbus.landf= +observe.warning.no.ui= +ui.main.body.synchro.action.copy.to.clipBoard= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties new file mode 100644 index 0000000..437f02e --- /dev/null +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -0,0 +1,2154 @@ +observe.about.message= +observe.about.translate.content= +observe.about.translate.title= +observe.action.about= +observe.action.about.tip= +observe.action.add.floatingObject= +observe.action.add.floatingObject.tip= +observe.action.add.set= +observe.action.add.set.tip= +observe.action.add.setLongline= +observe.action.add.setLongline.tip= +observe.action.admin.cancel= +observe.action.admin.close= +observe.action.apply= +observe.action.auto.copy.to.clipboard= +observe.action.auto.copy.to.clipboard.tip= +observe.action.back.to.list= +observe.action.back.to.list.tip= +observe.action.baitHaulingStatus.create.tip= +observe.action.baitHaulingStatus.delete.tip= +observe.action.baitHaulingStatus.detail.tip= +observe.action.baitHaulingStatus.modify.tip= +observe.action.baitHaulingStatus.save.tip= +observe.action.baitSettingStatus.create.tip= +observe.action.baitSettingStatus.delete.tip= +observe.action.baitSettingStatus.detail.tip= +observe.action.baitSettingStatus.modify.tip= +observe.action.baitSettingStatus.save.tip= +observe.action.baitType.create.tip= +observe.action.baitType.delete.tip= +observe.action.baitType.detail.tip= +observe.action.baitType.modify.tip= +observe.action.baitType.save.tip= +observe.action.cancel= +observe.action.cancel.create.tip= +observe.action.catchFateLongline.create.tip= +observe.action.catchFateLongline.delete.tip= +observe.action.catchFateLongline.detail.tip= +observe.action.catchFateLongline.modify.tip= +observe.action.catchFateLongline.save.tip= +observe.action.change.storage= +observe.action.change.storage.tip= +observe.action.choose.db.dump= +observe.action.choose.db.dump.description= +observe.action.choose.db.dump.directory= +observe.action.choose.importGPS= +observe.action.choose.importGPS.description= +observe.action.choose.report.directory= +observe.action.choose.reportFile= +observe.action.choose.reportFile.description= +observe.action.choose.sensorUsed.exportData= +observe.action.choose.sensorUsed.importData= +observe.action.choose.tdr.exportData= +observe.action.choose.tdr.importData= +observe.action.close= +observe.action.close.activity.tip= +observe.action.close.maree.tip= +observe.action.close.open= +observe.action.close.open.tip= +observe.action.close.route.tip= +observe.action.close.storage= +observe.action.close.storage.tip= +observe.action.close.synchro.tip= +observe.action.closeAndCreate= +observe.action.closeAndCreate.activity= +observe.action.closeAndCreate.activity.tip= +observe.action.closeAndCreate.maree= +observe.action.closeAndCreate.maree.tip= +observe.action.closeAndCreate.route= +observe.action.closeAndCreate.route.tip= +observe.action.closeAndCreate.tip= +observe.action.commandline.configure.ui= +observe.action.commandline.create.id= +observe.action.commandline.disable.main.ui= +observe.action.commandline.help= +observe.action.commandline.help.ui= +observe.action.commandline.launch.admin.ui= +observe.action.commandline.launch.h2.server.mode= +observe.action.commandline.launch.obstuna.admin.ui= +observe.action.commandline.use.jmx= +observe.action.configuration= +observe.action.configuration.tip= +observe.action.configure= +observe.action.continue= +observe.action.copy= +observe.action.copy.column.headers= +observe.action.copy.column.headers.tip= +observe.action.copy.row.headers= +observe.action.copy.row.headers.tip= +observe.action.country.create.tip= +observe.action.country.delete.tip= +observe.action.country.detail.tip= +observe.action.country.modify.tip= +observe.action.country.save.tip= +observe.action.create= +observe.action.create.activity= +observe.action.create.activity.tip= +observe.action.create.entry.tip= +observe.action.create.gearUseFeaturesLongline= +observe.action.create.gearUseFeaturesLongline.tip= +observe.action.create.gearUseFeaturesSeine= +observe.action.create.gearUseFeaturesSeine.tip= +observe.action.create.maree= +observe.action.create.maree.tip= +observe.action.create.nonTargetCatch= +observe.action.create.nonTargetCatch.tip= +observe.action.create.nonTargetSample= +observe.action.create.nonTargetSample.tip= +observe.action.create.objectObservedSpecies= +observe.action.create.objectObservedSpecies.tip= +observe.action.create.route= +observe.action.create.route.tip= +observe.action.create.schoolEstimate= +observe.action.create.schoolEstimate.tip= +observe.action.create.targetCatch= +observe.action.create.targetCatch.tip= +observe.action.create.targetDiscarded= +observe.action.create.targetDiscarded.tip= +observe.action.create.targetSample= +observe.action.create.targetSample.tip= +observe.action.create.targetSampleCapture= +observe.action.create.targetSampleCapture.tip= +observe.action.db.locale.es.tip= +observe.action.db.locale.fr.tip= +observe.action.db.locale.uk.tip= +observe.action.delete= +observe.action.delete.activity.tip= +observe.action.delete.entry.tip= +observe.action.delete.floatingObject.tip= +observe.action.delete.maree.tip= +observe.action.delete.route.tip= +observe.action.delete.set.tip= +observe.action.delete.tip= +observe.action.detail= +observe.action.detectionMode.create.tip= +observe.action.detectionMode.delete.tip= +observe.action.detectionMode.detail.tip= +observe.action.detectionMode.modify.tip= +observe.action.detectionMode.save.tip= +observe.action.do.backup= +observe.action.do.backup.tip= +observe.action.encounterType.create.tip= +observe.action.encounterType.delete.tip= +observe.action.encounterType.detail.tip= +observe.action.encounterType.modify.tip= +observe.action.encounterType.save.tip= +observe.action.exit= +observe.action.exit.tip= +observe.action.fpaZone.create.tip= +observe.action.fpaZone.delete.tip= +observe.action.fpaZone.detail.tip= +observe.action.fpaZone.modify.tip= +observe.action.fpaZone.save.tip= +observe.action.gear.create.tip= +observe.action.gear.delete.tip= +observe.action.gear.detail.tip= +observe.action.gear.modify.tip= +observe.action.gear.save.tip= +observe.action.gearCaracteristic.create.tip= +observe.action.gearCaracteristic.delete.tip= +observe.action.gearCaracteristic.detail.tip= +observe.action.gearCaracteristic.modify.tip= +observe.action.gearCaracteristic.save.tip= +observe.action.gearCaracteristicType.create.tip= +observe.action.gearCaracteristicType.delete.tip= +observe.action.gearCaracteristicType.detail.tip= +observe.action.gearCaracteristicType.modify.tip= +observe.action.gearCaracteristicType.save.tip= +observe.action.goDown= +observe.action.goDown.tip= +observe.action.goUp= +observe.action.goUp.tip= +observe.action.goto.next.stage= +observe.action.goto.next.stage.tip= +observe.action.goto.open.activity= +observe.action.goto.open.activity.short= +observe.action.goto.open.activity.tip= +observe.action.goto.open.maree= +observe.action.goto.open.other.activity= +observe.action.goto.open.other.activity.tip= +observe.action.goto.open.other.maree= +observe.action.goto.open.other.maree.tip= +observe.action.goto.open.other.route= +observe.action.goto.open.other.route.tip= +observe.action.goto.open.program.short= +observe.action.goto.open.program.tip= +observe.action.goto.open.route= +observe.action.goto.open.route.short= +observe.action.goto.open.route.tip= +observe.action.goto.open.set.short= +observe.action.goto.open.set.tip= +observe.action.goto.open.trip.short= +observe.action.goto.open.trip.tip= +observe.action.goto.previous.stage= +observe.action.goto.previous.stage.tip= +observe.action.goto.referentiel.short= +observe.action.goto.referentiel.tip= +observe.action.goto.selected.activity= +observe.action.goto.selected.activity.tip= +observe.action.goto.selected.maree= +observe.action.goto.selected.maree.tip= +observe.action.goto.selected.route= +observe.action.goto.selected.route.tip= +observe.action.harbour.create.tip= +observe.action.harbour.delete.tip= +observe.action.harbour.detail.tip= +observe.action.harbour.modify.tip= +observe.action.harbour.save.tip= +observe.action.healthness.create.tip= +observe.action.healthness.delete.tip= +observe.action.healthness.detail.tip= +observe.action.healthness.modify.tip= +observe.action.healthness.save.tip= +observe.action.hookPosition.create.tip= +observe.action.hookPosition.delete.tip= +observe.action.hookPosition.detail.tip= +observe.action.hookPosition.modify.tip= +observe.action.hookPosition.save.tip= +observe.action.hookSize.create.tip= +observe.action.hookSize.delete.tip= +observe.action.hookSize.detail.tip= +observe.action.hookSize.modify.tip= +observe.action.hookSize.save.tip= +observe.action.hookType.create.tip= +observe.action.hookType.delete.tip= +observe.action.hookType.detail.tip= +observe.action.hookType.modify.tip= +observe.action.hookType.save.tip= +observe.action.info.storage= +observe.action.info.storage.tip= +observe.action.itemHorizontalPosition.create.tip= +observe.action.itemHorizontalPosition.delete.tip= +observe.action.itemHorizontalPosition.detail.tip= +observe.action.itemHorizontalPosition.modify.tip= +observe.action.itemHorizontalPosition.save.tip= +observe.action.itemVerticalPosition.create.tip= +observe.action.itemVerticalPosition.delete.tip= +observe.action.itemVerticalPosition.detail.tip= +observe.action.itemVerticalPosition.modify.tip= +observe.action.itemVerticalPosition.save.tip= +observe.action.lengthWeightParameter.create.tip= +observe.action.lengthWeightParameter.delete.tip= +observe.action.lengthWeightParameter.detail.tip= +observe.action.lengthWeightParameter.modify.tip= +observe.action.lengthWeightParameter.save.tip= +observe.action.lightsticksColor.create.tip= +observe.action.lightsticksColor.delete.tip= +observe.action.lightsticksColor.detail.tip= +observe.action.lightsticksColor.modify.tip= +observe.action.lightsticksColor.save.tip= +observe.action.lightsticksType.create.tip= +observe.action.lightsticksType.delete.tip= +observe.action.lightsticksType.detail.tip= +observe.action.lightsticksType.modify.tip= +observe.action.lightsticksType.save.tip= +observe.action.lineType.create.tip= +observe.action.lineType.delete.tip= +observe.action.lineType.detail.tip= +observe.action.lineType.modify.tip= +observe.action.lineType.save.tip= +observe.action.load.from.file= +observe.action.load.from.file.tip= +observe.action.locale.es= +observe.action.locale.es.tip= +observe.action.locale.fr= +observe.action.locale.fr.tip= +observe.action.locale.uk= +observe.action.locale.uk.tip= +observe.action.maturityStatus.create.tip= +observe.action.maturityStatus.delete.tip= +observe.action.maturityStatus.detail.tip= +observe.action.maturityStatus.modify.tip= +observe.action.maturityStatus.save.tip= +observe.action.mitigationType.create.tip= +observe.action.mitigationType.delete.tip= +observe.action.mitigationType.detail.tip= +observe.action.mitigationType.modify.tip= +observe.action.mitigationType.save.tip= +observe.action.modify= +observe.action.new.entry= +observe.action.new.entry.tip= +observe.action.objectFate.create.tip= +observe.action.objectFate.delete.tip= +observe.action.objectFate.detail.tip= +observe.action.objectFate.modify.tip= +observe.action.objectFate.save.tip= +observe.action.objectOperation.create.tip= +observe.action.objectOperation.delete.tip= +observe.action.objectOperation.detail.tip= +observe.action.objectOperation.modify.tip= +observe.action.objectOperation.save.tip= +observe.action.objectType.create.tip= +observe.action.objectType.delete.tip= +observe.action.objectType.detail.tip= +observe.action.objectType.modify.tip= +observe.action.objectType.save.tip= +observe.action.observedSystem.create.tip= +observe.action.observedSystem.delete.tip= +observe.action.observedSystem.detail.tip= +observe.action.observedSystem.modify.tip= +observe.action.observedSystem.save.tip= +observe.action.ocean.create.tip= +observe.action.ocean.delete.tip= +observe.action.ocean.detail.tip= +observe.action.ocean.modify.tip= +observe.action.ocean.save.tip= +observe.action.open.screen= +observe.action.openLink.formsUrl.tip= +observe.action.openLink.reportsUrl.tip= +observe.action.organism.create.tip= +observe.action.organism.delete.tip= +observe.action.organism.detail.tip= +observe.action.organism.modify.tip= +observe.action.organism.save.tip= +observe.action.person.create.tip= +observe.action.person.delete.tip= +observe.action.person.detail.tip= +observe.action.person.modify.tip= +observe.action.person.save.tip= +observe.action.program.create.tip= +observe.action.program.delete.tip= +observe.action.program.detail.tip= +observe.action.program.modify.tip= +observe.action.program.save.tip= +observe.action.quitHelp.tip= +observe.action.reasonForDiscard.create.tip= +observe.action.reasonForDiscard.delete.tip= +observe.action.reasonForDiscard.detail.tip= +observe.action.reasonForDiscard.modify.tip= +observe.action.reasonForDiscard.save.tip= +observe.action.reasonForNoFishing.create.tip= +observe.action.reasonForNoFishing.delete.tip= +observe.action.reasonForNoFishing.detail.tip= +observe.action.reasonForNoFishing.modify.tip= +observe.action.reasonForNoFishing.save.tip= +observe.action.reasonForNullSet.create.tip= +observe.action.reasonForNullSet.delete.tip= +observe.action.reasonForNullSet.detail.tip= +observe.action.reasonForNullSet.modify.tip= +observe.action.reasonForNullSet.save.tip= +observe.action.reload.application= +observe.action.reload.storage= +observe.action.reload.storage.tip= +observe.action.reload.ui= +observe.action.reloadDefaultConfiguration= +observe.action.reloadDefaultConfiguration.tip= +observe.action.reloadResources= +observe.action.reloadResources.tip= +observe.action.reopen= +observe.action.reopen.activity.tip= +observe.action.reopen.maree.tip= +observe.action.reopen.route.tip= +observe.action.reopen.selected.activity= +observe.action.reopen.selected.activity.tip= +observe.action.reopen.selected.maree= +observe.action.reopen.selected.maree.tip= +observe.action.reopen.selected.route= +observe.action.reopen.selected.route.tip= +observe.action.reopen.tip= +observe.action.reset= +observe.action.reset.entry.tip= +observe.action.reset.ersId.tip= +observe.action.reset.formsUrl.tip= +observe.action.reset.homeId.tip= +observe.action.reset.new.entry.tip= +observe.action.reset.picturesReferences.tip= +observe.action.reset.reportsUrl.tip= +observe.action.reset.supportVesselName.tip= +observe.action.reset.tip= +observe.action.reset.well.tip= +observe.action.restart.application= +observe.action.restart.application.tip= +observe.action.save= +observe.action.save.all.tip= +observe.action.save.entry.tip= +observe.action.save.tip= +observe.action.save.to.file= +observe.action.save.to.file.tip= +observe.action.selectNode= +observe.action.selectNode.tip= +observe.action.sensorBrand.create.tip= +observe.action.sensorBrand.delete.tip= +observe.action.sensorBrand.detail.tip= +observe.action.sensorBrand.modify.tip= +observe.action.sensorBrand.save.tip= +observe.action.sensorDataFormat.create.tip= +observe.action.sensorDataFormat.delete.tip= +observe.action.sensorDataFormat.detail.tip= +observe.action.sensorDataFormat.modify.tip= +observe.action.sensorDataFormat.save.tip= +observe.action.sensorType.create.tip= +observe.action.sensorType.delete.tip= +observe.action.sensorType.detail.tip= +observe.action.sensorType.modify.tip= +observe.action.sensorType.save.tip= +observe.action.settingShape.create.tip= +observe.action.settingShape.delete.tip= +observe.action.settingShape.detail.tip= +observe.action.settingShape.modify.tip= +observe.action.settingShape.save.tip= +observe.action.sex.create.tip= +observe.action.sex.delete.tip= +observe.action.sex.detail.tip= +observe.action.sex.modify.tip= +observe.action.sex.save.tip= +observe.action.show.technical.informations.tip= +observe.action.show.unique.keys.tip= +observe.action.show.usages.tip= +observe.action.showConfig.title= +observe.action.site= +observe.action.site.tip= +observe.action.sizeMeasureType.create.tip= +observe.action.sizeMeasureType.delete.tip= +observe.action.sizeMeasureType.detail.tip= +observe.action.sizeMeasureType.modify.tip= +observe.action.sizeMeasureType.save.tip= +observe.action.species.create.tip= +observe.action.species.delete.tip= +observe.action.species.detail.tip= +observe.action.species.modify.tip= +observe.action.species.save.tip= +observe.action.speciesFate.create.tip= +observe.action.speciesFate.delete.tip= +observe.action.speciesFate.detail.tip= +observe.action.speciesFate.modify.tip= +observe.action.speciesFate.save.tip= +observe.action.speciesGroupSpecies.create.tip= +observe.action.speciesGroupSpecies.delete.tip= +observe.action.speciesGroupSpecies.detail.tip= +observe.action.speciesGroupSpecies.modify.tip= +observe.action.speciesGroupSpecies.save.tip= +observe.action.speciesList.create.tip= +observe.action.speciesList.delete.tip= +observe.action.speciesList.detail.tip= +observe.action.speciesList.modify.tip= +observe.action.speciesStatus.create.tip= +observe.action.speciesStatus.delete.tip= +observe.action.speciesStatus.detail.tip= +observe.action.speciesStatus.modify.tip= +observe.action.speciesStatus.save.tip= +observe.action.start.h2.web.server= +observe.action.start.h2.web.server.tip= +observe.action.start.server.mode= +observe.action.start.server.mode.tip= +observe.action.stomacFullness.create.tip= +observe.action.stomacFullness.delete.tip= +observe.action.stomacFullness.detail.tip= +observe.action.stomacFullness.modify.tip= +observe.action.stomacFullness.save.tip= +observe.action.stop.h2.web.server= +observe.action.stop.h2.web.server.tip= +observe.action.stop.server.mode= +observe.action.stop.server.mode.tip= +observe.action.storage.apply= +observe.action.storage.apply.tip= +observe.action.storage.applyAction= +observe.action.storage.cancel= +observe.action.storage.cancel.tip= +observe.action.surroundingActivity.create.tip= +observe.action.surroundingActivity.delete.tip= +observe.action.surroundingActivity.detail.tip= +observe.action.surroundingActivity.modify.tip= +observe.action.surroundingActivity.save.tip= +observe.action.synchro.apply.modifications= +observe.action.synchro.cancel.tip= +observe.action.synchro.copy.tip= +observe.action.synchro.launch.operation= +observe.action.synchro.prepare.operation= +observe.action.synchro.report.reset.tip= +observe.action.test.remote= +observe.action.test.remote.tip= +observe.action.transmittingBuoyOperation.create.tip= +observe.action.transmittingBuoyOperation.delete.tip= +observe.action.transmittingBuoyOperation.detail.tip= +observe.action.transmittingBuoyOperation.modify.tip= +observe.action.transmittingBuoyOperation.save.tip= +observe.action.transmittingBuoyType.create.tip= +observe.action.transmittingBuoyType.delete.tip= +observe.action.transmittingBuoyType.detail.tip= +observe.action.transmittingBuoyType.modify.tip= +observe.action.transmittingBuoyType.save.tip= +observe.action.tripType.create.tip= +observe.action.tripType.delete.tip= +observe.action.tripType.detail.tip= +observe.action.tripType.modify.tip= +observe.action.tripType.save.tip= +observe.action.vessel.create.tip= +observe.action.vessel.delete.tip= +observe.action.vessel.detail.tip= +observe.action.vessel.modify.tip= +observe.action.vessel.save.tip= +observe.action.vesselActivityLongline.create.tip= +observe.action.vesselActivityLongline.delete.tip= +observe.action.vesselActivityLongline.detail.tip= +observe.action.vesselActivityLongline.modify.tip= +observe.action.vesselActivityLongline.save.tip= +observe.action.vesselActivitySeine.create.tip= +observe.action.vesselActivitySeine.delete.tip= +observe.action.vesselActivitySeine.detail.tip= +observe.action.vesselActivitySeine.modify.tip= +observe.action.vesselActivitySeine.save.tip= +observe.action.vesselSizeCategory.create.tip= +observe.action.vesselSizeCategory.delete.tip= +observe.action.vesselSizeCategory.detail.tip= +observe.action.vesselSizeCategory.modify.tip= +observe.action.vesselSizeCategory.save.tip= +observe.action.vesselType.create.tip= +observe.action.vesselType.delete.tip= +observe.action.vesselType.detail.tip= +observe.action.vesselType.modify.tip= +observe.action.vesselType.save.tip= +observe.action.weightCategory.create.tip= +observe.action.weightCategory.delete.tip= +observe.action.weightCategory.detail.tip= +observe.action.weightCategory.modify.tip= +observe.action.weightCategory.save.tip= +observe.action.weightMeasureType.create.tip= +observe.action.weightMeasureType.delete.tip= +observe.action.weightMeasureType.detail.tip= +observe.action.weightMeasureType.modify.tip= +observe.action.weightMeasureType.save.tip= +observe.action.wind.create.tip= +observe.action.wind.delete.tip= +observe.action.wind.detail.tip= +observe.action.wind.modify.tip= +observe.action.wind.save.tip= +observe.activityLongline.coordinate= +observe.activityLongline.fpaZone= +observe.activityLongline.message.active.found= +observe.activityLongline.message.active.found.for.other.trip= +observe.activityLongline.message.creating= +observe.activityLongline.message.no.active.found= +observe.activityLongline.message.no.active.found.for.other.trip= +observe.activityLongline.message.not.open= +observe.activityLongline.message.updating= +observe.activityLongline.seaSurfaceTemperature= +observe.activityLongline.timeStamp= +observe.activityLongline.title= +observe.activityLongline.vesselActivityLongline= +observe.activityLonglines.title= +observe.activityObservedSystem.availableObservedSystem= +observe.activityObservedSystem.selectedObservedSystem= +observe.activitySeine.message.active.found= +observe.activitySeine.message.active.found.for.other.route= +observe.activitySeine.message.creating= +observe.activitySeine.message.no.active.found= +observe.activitySeine.message.no.active.found.for.other.route= +observe.activitySeine.message.not.open= +observe.activitySeine.message.updating= +observe.activitySeine.tab.general= +observe.activitySeine.tab.measurements= +observe.activitySeine.title= +observe.activitySeineObservedSystem.title= +observe.activitySeines.title= +observe.admin.resume.no.operation.done= +observe.admin.resume.operation.canceled= +observe.admin.resume.operation.done= +observe.admin.resume.operation.failed= +observe.admin.resume.operation.need.fix= +observe.admin.resume.operation.not.started= +observe.admin.resume.operation.running= +observe.application.config= +observe.baitsComposition.action.create= +observe.baitsComposition.action.create.tip= +observe.baitsComposition.baitSettingStatus= +observe.baitsComposition.baitType= +observe.baitsComposition.individualSize= +observe.baitsComposition.individualWeight= +observe.baitsComposition.proportion= +observe.baitsComposition.proportionSum= +observe.baitsComposition.table.baitSettingStatus= +observe.baitsComposition.table.baitSettingStatus.tip= +observe.baitsComposition.table.baitType= +observe.baitsComposition.table.baitType.tip= +observe.baitsComposition.table.individualSize= +observe.baitsComposition.table.individualSize.tip= +observe.baitsComposition.table.individualWeight= +observe.baitsComposition.table.individualWeight.tip= +observe.baitsComposition.table.proportion= +observe.baitsComposition.table.proportion.tip= +observe.baitsComposition.title= +observe.basket.cant.delete.message= +observe.basket.cant.delete.title= +observe.basket.invalid.nextFloatline1Length= +observe.branchLine.cant.delete.message= +observe.branchLine.cant.delete.title= +observe.branchline.baitHaulingStatus= +observe.branchline.baitSettingStatus= +observe.branchline.baitType= +observe.branchline.comment= +observe.branchline.depthRecorder= +observe.branchline.hookLost= +observe.branchline.hookOffset= +observe.branchline.hookSize= +observe.branchline.hookType= +observe.branchline.message.modified= +observe.branchline.message.modified.but.invalid= +observe.branchline.snapWeight= +observe.branchline.swivelWeight= +observe.branchline.tab.general= +observe.branchline.tab.hookAndBait= +observe.branchline.timeSinceContact= +observe.branchline.timer= +observe.branchline.timerTimeOnBoard= +observe.branchline.title= +observe.branchline.topType= +observe.branchline.traceCutOff= +observe.branchline.tracelineType= +observe.branchline.weightedSnap= +observe.branchline.weightedSwivel= +observe.branchlinesComposition.action.create= +observe.branchlinesComposition.action.create.tip= +observe.branchlinesComposition.length= +observe.branchlinesComposition.proportion= +observe.branchlinesComposition.proportionSum= +observe.branchlinesComposition.table.length= +observe.branchlinesComposition.table.length.tip= +observe.branchlinesComposition.table.proportion= +observe.branchlinesComposition.table.proportion.tip= +observe.branchlinesComposition.table.topType= +observe.branchlinesComposition.table.topType.tip= +observe.branchlinesComposition.table.tracelineType= +observe.branchlinesComposition.table.tracelineType.tip= +observe.branchlinesComposition.title= +observe.branchlinesComposition.topType= +observe.branchlinesComposition.tracelineType= +observe.broughtOnDeck.comment= +observe.catchLongline.acquisitionMode= +observe.catchLongline.acquisitionMode.grouped= +observe.catchLongline.acquisitionMode.individual= +observe.catchLongline.action.create= +observe.catchLongline.action.create.tip= +observe.catchLongline.action.new= +observe.catchLongline.action.new.tip= +observe.catchLongline.action.reset.photoReferences.tip= +observe.catchLongline.availablePredator= +observe.catchLongline.basket= +observe.catchLongline.beatDiameter= +observe.catchLongline.branchline= +observe.catchLongline.catchFateLongline= +observe.catchLongline.catchHealthness= +observe.catchLongline.comment= +observe.catchLongline.count= +observe.catchLongline.depredated= +observe.catchLongline.discardHealthness= +observe.catchLongline.gonadeWeight= +observe.catchLongline.hookPosition= +observe.catchLongline.hookWhenDiscarded= +observe.catchLongline.locationOnLongline= +observe.catchLongline.maturityStatus= +observe.catchLongline.photoReferences= +observe.catchLongline.predator= +observe.catchLongline.resetBranchline= +observe.catchLongline.resetBranchline.tip= +observe.catchLongline.saveBranchline= +observe.catchLongline.saveBranchline.tip= +observe.catchLongline.section= +observe.catchLongline.selectedPredator= +observe.catchLongline.sex= +observe.catchLongline.speciesCatch= +observe.catchLongline.stomacFullness= +observe.catchLongline.tab.branchline= +observe.catchLongline.tab.caracteristics= +observe.catchLongline.tab.depredated= +observe.catchLongline.tab.foodAndSexual= +observe.catchLongline.tab.sizeMeasures= +observe.catchLongline.tab.weightMeasures= +observe.catchLongline.title= +observe.catchLongline.totalWeight= +observe.catchlongline.table.acquisitionMode= +observe.catchlongline.table.acquisitionMode.tip= +observe.catchlongline.table.basketHaulingId= +observe.catchlongline.table.basketHaulingId.tip= +observe.catchlongline.table.branchlineHaulingId= +observe.catchlongline.table.branchlineHaulingId.tip= +observe.catchlongline.table.catchFateLongline= +observe.catchlongline.table.catchFateLongline.tip= +observe.catchlongline.table.catchHealthness= +observe.catchlongline.table.catchHealthness.tip= +observe.catchlongline.table.comment= +observe.catchlongline.table.comment.tip= +observe.catchlongline.table.count= +observe.catchlongline.table.count.tip= +observe.catchlongline.table.depredated= +observe.catchlongline.table.depredated.tip= +observe.catchlongline.table.discardHealthness= +observe.catchlongline.table.discardHealthness.tip= +observe.catchlongline.table.sectionHaulingId= +observe.catchlongline.table.sectionHaulingId.tip= +observe.catchlongline.table.size= +observe.catchlongline.table.size.tip= +observe.catchlongline.table.sizeMeasureType= +observe.catchlongline.table.sizeMeasureType.tip= +observe.catchlongline.table.speciesCatch= +observe.catchlongline.table.speciesCatch.tip= +observe.catchlongline.table.weight= +observe.catchlongline.table.weight.tip= +observe.catchlongline.table.weightMeasureType= +observe.catchlongline.table.weightMeasureType.tip= +observe.choice.cancel= +observe.choice.confirm.delete= +observe.choice.continue= +observe.choice.create.fin.veille.activity= +observe.choice.create.fin.veille.activity.and.continue= +observe.choice.createLocalStorage= +observe.choice.doNotSave= +observe.choice.doNothing= +observe.choice.not.create.fin.veille.activity.and.continue= +observe.choice.quit= +observe.choice.save= +observe.choice.useRemoteStorage= +observe.common.acquisitionMode= +observe.common.acquisitionMode.count= +observe.common.acquisitionMode.individu= +observe.common.activities= +observe.common.activities.list= +observe.common.activity= +observe.common.baitObservation= +observe.common.birdsObservation= +observe.common.boolean.false= +observe.common.boolean.null= +observe.common.boolean.true= +observe.common.brand= +observe.common.brandName= +observe.common.broughtOnDeck= +observe.common.capacity= +observe.common.capacityLabel= +observe.common.captain= +observe.common.caracteristics= +observe.common.catchWeight= +observe.common.catchWeightComputed.computed.tip= +observe.common.catchWeightComputed.observed.tip= +observe.common.changeDate= +observe.common.code= +observe.common.codeAndStatus= +observe.common.coefficients= +observe.common.comment= +observe.common.comment.activity= +observe.common.comment.floatingObject= +observe.common.comment.nonTargetCatch= +observe.common.comment.nonTargetSample= +observe.common.comment.set= +observe.common.comment.targetCatch= +observe.common.comment.targetDiscarded= +observe.common.comment.targetSample= +observe.common.count= +observe.common.country= +observe.common.currentFpaZone= +observe.common.dataEntryOperator= +observe.common.date= +observe.common.daysAtSeaCount= +observe.common.departureHarbour= +observe.common.description= +observe.common.detailledActivitiesObservation= +observe.common.detectionMode= +observe.common.directory= +observe.common.endDate= +observe.common.endLogValue= +observe.common.equation= +observe.common.ersId= +observe.common.file= +observe.common.firstName= +observe.common.flagCountry= +observe.common.formsUrl= +observe.common.gaugeLabel= +observe.common.gearType= +observe.common.generateReport= +observe.common.global.progression.description= +observe.common.heureobservation= +observe.common.homeIdFAOWormsId= +observe.common.iso2Code= +observe.common.iso3Code= +observe.common.keelCodeFlotte= +observe.common.label1= +observe.common.label2= +observe.common.label3= +observe.common.label4= +observe.common.label5= +observe.common.label6= +observe.common.label7= +observe.common.label8= +observe.common.landingHarbour= +observe.common.lastName= +observe.common.latitude= +observe.common.length= +observe.common.length.computed.tip= +observe.common.length.inf= +observe.common.length.observed.tip= +observe.common.lengthMeasureType= +observe.common.lengthWeightFormula= +observe.common.libelles= +observe.common.longitude= +observe.common.lowerValueUpperValue= +observe.common.mammalsObservation= +observe.common.meanLength= +observe.common.meanLengthComputed.computed.tip= +observe.common.meanLengthComputed.observed.tip= +observe.common.meanValues= +observe.common.meanWeight= +observe.common.meanWeightComputed.computed.tip= +observe.common.meanWeightComputed.observed.tip= +observe.common.measureType= +observe.common.measureType.ld1= +observe.common.measureType.lf= +observe.common.measureType.unknown= +observe.common.minLengthMax= +observe.common.minWeightMax= +observe.common.needComment= +observe.common.nextFpaZone= +observe.common.no.balise= +observe.common.nonCoupSenne= +observe.common.nonTargetCatch= +observe.common.nonTargetObservation= +observe.common.nonTargetSample= +observe.common.objectFate= +observe.common.objectObservedSpecies= +observe.common.objectOperation= +observe.common.objectType= +observe.common.objectsObservation= +observe.common.observedSystem= +observe.common.observedSystemDistance= +observe.common.observer= +observe.common.obsolete.entity= +observe.common.ocean= +observe.common.oceanForSpecies= +observe.common.operation.resume= +observe.common.organism= +observe.common.ownership= +observe.common.picturesReferences= +observe.common.power= +observe.common.previousFpaZone= +observe.common.program.observation.value.0= +observe.common.program.observation.value.1= +observe.common.program.observation.value.2= +observe.common.program.observation.value.3= +observe.common.program.observation.value.4= +observe.common.program.observation.value.5= +observe.common.program.observation.value.6= +observe.common.program.observation.value.7= +observe.common.program.observation.value.8= +observe.common.program.observation.value.9= +observe.common.reasonForDiscard= +observe.common.reportsUrl= +observe.common.resume= +observe.common.routes.list= +observe.common.samplesObservation= +observe.common.schoolEstimate= +observe.common.schoolType= +observe.common.scientificLabel= +observe.common.seaSurfaceTemperature= +observe.common.searchMaximum= +observe.common.select.gps.import.file= +observe.common.select.gps.import.file.tip= +observe.common.select.gps.maxDelay= +observe.common.select.gps.maxDelay.tip= +observe.common.select.gps.maxSpeed= +observe.common.select.gps.maxSpeed.tip= +observe.common.select.report.file= +observe.common.select.report.file.tip= +observe.common.select.validate.context= +observe.common.select.validate.context.tip= +observe.common.select.validate.mode= +observe.common.select.validate.mode.tip= +observe.common.select.validate.scope= +observe.common.select.validate.scope.tip= +observe.common.selected.validators= +observe.common.sex= +observe.common.species= +observe.common.speciesFate= +observe.common.speciesFaune= +observe.common.speciesGroup= +observe.common.speciesStatus= +observe.common.speciesThon= +observe.common.speedRange= +observe.common.startDate= +observe.common.startDateFinProgram= +observe.common.startDateFinValidite= +observe.common.startLogValue= +observe.common.status= +observe.common.step.description= +observe.common.storage.not.valid= +observe.common.supportVesselName= +observe.common.surroundingActivity= +observe.common.taille= +observe.common.taillePoids.caracteristics= +observe.common.targetCatch= +observe.common.targetDiscarded= +observe.common.targetDiscardsObservation= +observe.common.targetSample= +observe.common.targetSampleCapture= +observe.common.topiaCreateDate= +observe.common.topiaId= +observe.common.topiaVersion= +observe.common.totalCount= +observe.common.totalCountComputed.computed.tip= +observe.common.totalCountComputed.observed.tip= +observe.common.totalWeight= +observe.common.transmittingBuoyOperation= +observe.common.transmittingBuoyType= +observe.common.trips.list= +observe.common.typeTransmittingBuoyOperation= +observe.common.undefined= +observe.common.undefined.tip= +observe.common.uri= +observe.common.vessel= +observe.common.vesselActivitySeine= +observe.common.vesselActivitySeine.comment= +observe.common.vesselSizeCategory= +observe.common.vesselSpeed= +observe.common.vesselType= +observe.common.waveHeight= +observe.common.weight= +observe.common.weight.computed.tip= +observe.common.weight.ind= +observe.common.weight.observed.tip= +observe.common.weightCategory= +observe.common.weightLengthFormula= +observe.common.well= +observe.common.wind= +observe.common.yearService= +observe.comon.exist.on.remote= +observe.config.category.changeStorage= +observe.config.category.changeStorage.description= +observe.config.category.directories= +observe.config.category.directories.description= +observe.config.category.gps= +observe.config.category.gps.description= +observe.config.category.h2= +observe.config.category.h2.description= +observe.config.category.map= +observe.config.category.map.description= +observe.config.category.observation= +observe.config.category.observation.description= +observe.config.category.obstuna= +observe.config.category.obstuna.description= +observe.config.category.other= +observe.config.category.other.description= +observe.config.category.speciesList.longline= +observe.config.category.speciesList.longline.description= +observe.config.category.speciesList.seine= +observe.config.category.speciesList.seine.description= +observe.config.category.synchro= +observe.config.category.synchro.description= +observe.config.configFileName.description= +observe.config.db.locale= +observe.config.defaultBackupDirectory.description= +observe.config.defaultCreationMode= +observe.config.defaultDataDirectory.description= +observe.config.defaultDbMode= +observe.config.defaultGpsMaxDelay= +observe.config.defaultGpsMaxSpeed= +observe.config.defaultI18nDirectory.description= +observe.config.defaultInitialDbDump.description= +observe.config.defaultLocalDbDirectory.description= +observe.config.defaultMapDirectory.description= +observe.config.defaultReportDirectory.description= +observe.config.defaultResourcesDirectory.description= +observe.config.defaultTmpDirectory.description= +observe.config.defaultValidationReportDirectory.description= +observe.config.devMode= +observe.config.h2.can.migrate.description= +observe.config.h2.login.description= +observe.config.h2.password.description= +observe.config.h2.serverPort.description= +observe.config.logConfigurationFile.description= +observe.config.map.background.description= +observe.config.map.layer1.description= +observe.config.map.layer10.description= +observe.config.map.layer2.description= +observe.config.map.layer3.description= +observe.config.map.layer4.description= +observe.config.map.layer5.description= +observe.config.map.layer6.description= +observe.config.map.layer7.description= +observe.config.map.layer8.description= +observe.config.map.layer9.description= +observe.config.map.style.description= +observe.config.observation.activitysDetaillees= +observe.config.observation.fauneAssociee= +observe.config.observation.floatingObject= +observe.config.observation.gleure= +observe.config.observation.mammiferes= +observe.config.observation.mensurations= +observe.config.observation.oiseaux= +observe.config.observation.rejetsThons= +observe.config.obstuna.login.description= +observe.config.obstuna.password.description= +observe.config.obstuna.url.description= +observe.config.obstuna.useSsl.description= +observe.config.pg.can.migrate.description= +observe.config.showMigrationProgression= +observe.config.showMigrationSql= +observe.config.showSql= +observe.config.speciesList.longline.catch= +observe.config.speciesList.longline.encounter= +observe.config.speciesList.seine.nonTargetCatch= +observe.config.speciesList.seine.objectObservedSpecies= +observe.config.speciesList.seine.objectSchoolEstimate= +observe.config.speciesList.seine.schoolEstimate= +observe.config.speciesList.seine.targetCatch= +observe.config.ui.autoPopupNumberEditor= +observe.config.ui.changeSynchroSrc= +observe.config.ui.fullscreen= +observe.config.ui.loadLocalStorage= +observe.config.ui.locale= +observe.config.ui.showNumberEditorButton= +observe.config.ui.showTimeEditorSlider= +observe.config.ui.storeRemoteStorage= +observe.content.mode.create.tip= +observe.content.mode.read.tip= +observe.content.mode.update.tip= +observe.encounter.action.create= +observe.encounter.action.create.tip= +observe.encounter.count= +observe.encounter.distance= +observe.encounter.encounterType= +observe.encounter.species= +observe.encounter.table.count= +observe.encounter.table.count.tip= +observe.encounter.table.distance= +observe.encounter.table.distance.tip= +observe.encounter.table.encouterType= +observe.encounter.table.encouterType.tip= +observe.encounter.table.species= +observe.encounter.table.species.tip= +observe.encounter.title= +observe.entity.message.updating= +observe.error.can.not.create.directory= +observe.error.no.activity.6= +observe.error.open.first.db= +observe.error.speciesList.longline.catch.notFound= +observe.error.speciesList.longline.depredator.notFound= +observe.error.speciesList.longline.encounter.notFound= +observe.error.speciesList.seine.objectObservedSpecies.notFound= +observe.error.speciesList.seine.objectSchoolEstimate.notFound= +observe.error.speciesList.seine.targetCatch.notFound= +observe.error.storage.could.not.backup.unsane.local.db= +observe.error.storage.could.not.load.local.db= +observe.floatingObject.message.creating= +observe.floatingObject.message.updating= +observe.floatingObject.title= +observe.floatingObjectTransmittingBuoyOperation.title= +observe.floatlinesComposition.action.create= +observe.floatlinesComposition.action.create.tip= +observe.floatlinesComposition.length= +observe.floatlinesComposition.lineType= +observe.floatlinesComposition.proportion= +observe.floatlinesComposition.proportionSum= +observe.floatlinesComposition.table.length= +observe.floatlinesComposition.table.length.tip= +observe.floatlinesComposition.table.lineType= +observe.floatlinesComposition.table.lineType.tip= +observe.floatlinesComposition.table.proportion= +observe.floatlinesComposition.table.proportion.tip= +observe.floatlinesComposition.title= +observe.gear.availableGearCaracteristic= +observe.gear.gearCaracteristic= +observe.gear.gearCaracteristicType= +observe.gear.selectedGearCaracteristic= +observe.gear.tab.gearCaracteristic= +observe.gear.tab.general= +observe.gear.unit= +observe.gearUseFeaturesLongline.action.deleteSelectedMeasurement= +observe.gearUseFeaturesLongline.action.deleteSelectedMeasurement.tip= +observe.gearUseFeaturesLongline.comment= +observe.gearUseFeaturesLongline.gear= +observe.gearUseFeaturesLongline.number= +observe.gearUseFeaturesLongline.tab.general= +observe.gearUseFeaturesLongline.tab.measurements= +observe.gearUseFeaturesLongline.table.comment= +observe.gearUseFeaturesLongline.table.comment.tip= +observe.gearUseFeaturesLongline.table.gear= +observe.gearUseFeaturesLongline.table.gear.tip= +observe.gearUseFeaturesLongline.table.gearCaracteristic= +observe.gearUseFeaturesLongline.table.gearCaracteristic.tip= +observe.gearUseFeaturesLongline.table.number= +observe.gearUseFeaturesLongline.table.number.tip= +observe.gearUseFeaturesLongline.table.usedInTrip= +observe.gearUseFeaturesLongline.table.usedInTrip.tip= +observe.gearUseFeaturesLongline.table.value= +observe.gearUseFeaturesLongline.table.value.tip= +observe.gearUseFeaturesLongline.title= +observe.gearUseFeaturesLongline.usedInTrip= +observe.gearUseFeaturesSeine.action.deleteSelectedMeasurement= +observe.gearUseFeaturesSeine.action.deleteSelectedMeasurement.tip= +observe.gearUseFeaturesSeine.comment= +observe.gearUseFeaturesSeine.gear= +observe.gearUseFeaturesSeine.number= +observe.gearUseFeaturesSeine.tab.general= +observe.gearUseFeaturesSeine.tab.measurements= +observe.gearUseFeaturesSeine.table.comment= +observe.gearUseFeaturesSeine.table.comment.tip= +observe.gearUseFeaturesSeine.table.gear= +observe.gearUseFeaturesSeine.table.gear.tip= +observe.gearUseFeaturesSeine.table.gearCaracteristic= +observe.gearUseFeaturesSeine.table.gearCaracteristic.tip= +observe.gearUseFeaturesSeine.table.number= +observe.gearUseFeaturesSeine.table.number.tip= +observe.gearUseFeaturesSeine.table.usedInTrip= +observe.gearUseFeaturesSeine.table.usedInTrip.tip= +observe.gearUseFeaturesSeine.table.value= +observe.gearUseFeaturesSeine.table.value.tip= +observe.gearUseFeaturesSeine.title= +observe.gearUseFeaturesSeine.usedInTrip= +observe.harbour.coordinates= +observe.harbour.locode= +observe.harbour.name= +observe.hooksComposition.action.create= +observe.hooksComposition.action.create.tip= +observe.hooksComposition.hookOffset= +observe.hooksComposition.hookSize= +observe.hooksComposition.hookType= +observe.hooksComposition.proportion= +observe.hooksComposition.proportionSum= +observe.hooksComposition.table.hookOffset= +observe.hooksComposition.table.hookOffset.tip= +observe.hooksComposition.table.hookSize= +observe.hooksComposition.table.hookSize.tip= +observe.hooksComposition.table.hookType= +observe.hooksComposition.table.hookType.tip= +observe.hooksComposition.table.proportion= +observe.hooksComposition.table.proportion.tip= +observe.hooksComposition.title= +observe.info.selected.validators= +observe.info.validation.credentials= +observe.init.local.db.detected= +observe.init.no.initial.dump.detected= +observe.init.no.local.db.detected= +observe.init.storage.done= +observe.label.coefficients.info= +observe.label.lengthWeightFormula.info= +observe.label.usage.data.title= +observe.label.usage.referentiel.title= +observe.label.weightLengthFormula.info= +observe.lengthWeightParameter.tab.general= +observe.lengthWeightParameter.tab.other= +observe.list.baitHaulingStatus= +observe.list.baitSettingStatus= +observe.list.baitType= +observe.list.catchFateLongline= +observe.list.country= +observe.list.detectionMode= +observe.list.encounterType= +observe.list.fpaZone= +observe.list.gear= +observe.list.gearCaracteristic= +observe.list.gearCaracteristicType= +observe.list.harbour= +observe.list.healthness= +observe.list.hookPosition= +observe.list.hookSize= +observe.list.hookType= +observe.list.itemHorizontalPosition= +observe.list.itemVerticalPosition= +observe.list.lengthWeightParameter= +observe.list.lightsticksColor= +observe.list.lightsticksType= +observe.list.lineType= +observe.list.maturityStatus= +observe.list.mitigationType= +observe.list.objectFate= +observe.list.objectOperation= +observe.list.objectType= +observe.list.observedSystem= +observe.list.ocean= +observe.list.operation= +observe.list.organism= +observe.list.person= +observe.list.program= +observe.list.reasonForDiscard= +observe.list.reasonForNoFishing= +observe.list.reasonForNullSet= +observe.list.sensorBrand= +observe.list.sensorDataFormat= +observe.list.sensorType= +observe.list.settingShape= +observe.list.sex= +observe.list.sizeMeasureType= +observe.list.speciesFate= +observe.list.speciesFaune= +observe.list.speciesGroupSpecies= +observe.list.speciesList= +observe.list.speciesStatus= +observe.list.stomacFullness= +observe.list.surroundingActivity= +observe.list.transmittingBuoyType= +observe.list.tripType= +observe.list.vessel= +observe.list.vesselActivityLongline= +observe.list.vesselActivitySeine= +observe.list.vesselSizeCategory= +observe.list.vesselType= +observe.list.weightCategory= +observe.list.weightMeasureType= +observe.list.wind= +observe.longlineDetailComposition.action.deleteAllSections= +observe.longlineDetailComposition.action.deleteAllSections.tip= +observe.longlineDetailComposition.action.deleteSelectedBasket= +observe.longlineDetailComposition.action.deleteSelectedBasket.tip= +observe.longlineDetailComposition.action.deleteSelectedBranchline= +observe.longlineDetailComposition.action.deleteSelectedBranchline.tip= +observe.longlineDetailComposition.action.deleteSelectedSection= +observe.longlineDetailComposition.action.deleteSelectedSection.tip= +observe.longlineDetailComposition.action.deleteSelectedSectionTemplate= +observe.longlineDetailComposition.action.deleteSelectedSectionTemplate.tip= +observe.longlineDetailComposition.action.generateAllSections= +observe.longlineDetailComposition.action.generateAllSections.tip= +observe.longlineDetailComposition.action.insertAfterSelectedBasket= +observe.longlineDetailComposition.action.insertAfterSelectedBasket.tip= +observe.longlineDetailComposition.action.insertAfterSelectedBranchline= +observe.longlineDetailComposition.action.insertAfterSelectedBranchline.tip= +observe.longlineDetailComposition.action.insertAfterSelectedSection= +observe.longlineDetailComposition.action.insertAfterSelectedSection.tip= +observe.longlineDetailComposition.action.insertBeforeSelectedBasket= +observe.longlineDetailComposition.action.insertBeforeSelectedBasket.tip= +observe.longlineDetailComposition.action.insertBeforeSelectedBranchline= +observe.longlineDetailComposition.action.insertBeforeSelectedBranchline.tip= +observe.longlineDetailComposition.action.insertBeforeSelectedSection= +observe.longlineDetailComposition.action.insertBeforeSelectedSection.tip= +observe.longlineDetailComposition.baskets= +observe.longlineDetailComposition.basketsTable.floatline1Length= +observe.longlineDetailComposition.basketsTable.floatline1Length.tip= +observe.longlineDetailComposition.basketsTable.floatline2Length= +observe.longlineDetailComposition.basketsTable.floatline2Length.tip= +observe.longlineDetailComposition.basketsTable.haulingIdentifier= +observe.longlineDetailComposition.basketsTable.haulingIdentifier.tip= +observe.longlineDetailComposition.basketsTable.settingIdentifier= +observe.longlineDetailComposition.basketsTable.settingIdentifier.tip= +observe.longlineDetailComposition.branchlines= +observe.longlineDetailComposition.branchlinesTable.branchlineLength= +observe.longlineDetailComposition.branchlinesTable.branchlineLength.tip= +observe.longlineDetailComposition.branchlinesTable.haulingIdentifier= +observe.longlineDetailComposition.branchlinesTable.haulingIdentifier.tip= +observe.longlineDetailComposition.branchlinesTable.settingIdentifier= +observe.longlineDetailComposition.branchlinesTable.settingIdentifier.tip= +observe.longlineDetailComposition.branchlinesTable.tracelineLength= +observe.longlineDetailComposition.branchlinesTable.tracelineLength.tip= +observe.longlineDetailComposition.canGenerate= +observe.longlineDetailComposition.firstTemplate.template.notCompilant.basketCount= +observe.longlineDetailComposition.message.updating= +observe.longlineDetailComposition.sectionTemplatesTable.identifier= +observe.longlineDetailComposition.sectionTemplatesTable.identifier.tip= +observe.longlineDetailComposition.sectionTemplatesTable.value= +observe.longlineDetailComposition.sectionTemplatesTable.value.tip= +observe.longlineDetailComposition.sections= +observe.longlineDetailComposition.sectionsTable.haulingIdentifier= +observe.longlineDetailComposition.sectionsTable.haulingIdentifier.tip= +observe.longlineDetailComposition.sectionsTable.settingIdentifier= +observe.longlineDetailComposition.sectionsTable.settingIdentifier.tip= +observe.longlineDetailComposition.sectionsTable.template= +observe.longlineDetailComposition.sectionsTable.template.tip= +observe.longlineDetailComposition.tab.branchlineDetail= +observe.longlineDetailComposition.tab.composition= +observe.longlineDetailComposition.tab.generate= +observe.longlineDetailComposition.title= +observe.longlineDetailComposition.title.section.cant.use.firstTemplate= +observe.longlineGlobalComposition.availableMitigationType= +observe.longlineGlobalComposition.message.updating= +observe.longlineGlobalComposition.mitigationType= +observe.longlineGlobalComposition.selectedMitigationType= +observe.longlineGlobalComposition.tab.baitsComposition= +observe.longlineGlobalComposition.tab.branchlinesComposition= +observe.longlineGlobalComposition.tab.floatlinesComposition= +observe.longlineGlobalComposition.tab.hooksComposition= +observe.longlineGlobalComposition.tab.mitigationType= +observe.longlineGlobalComposition.title= +observe.map.action.exportPng= +observe.map.action.exportPng.tip= +observe.map.action.zoomIt= +observe.map.action.zoomIt.tip= +observe.map.east= +observe.map.export.chooseFile.ok= +observe.map.export.chooseFile.png= +observe.map.export.chooseFile.title= +observe.map.export.overwrite= +observe.map.export.overwrite.cancel= +observe.map.export.overwrite.ok= +observe.map.export.overwrite.title= +observe.map.export.success= +observe.map.legend.hauling= +observe.map.legend.setting= +observe.map.legend.tripBetweenTwoDays= +observe.map.legend.tripDay= +observe.map.miles= +observe.map.north= +observe.map.south= +observe.map.waitLoading= +observe.map.west= +observe.measurement.delete.message= +observe.menu.actions= +observe.menu.application.locale= +observe.menu.configuration= +observe.menu.configuration.tip= +observe.menu.db.locale= +observe.menu.file= +observe.menu.help= +observe.menu.locale= +observe.menu.navigation= +observe.menu.storage= +observe.message.can.not.write.data= +observe.message.cant.add.echantillonRejetThon= +observe.message.cant.add.echantillonTargetCatch= +observe.message.cant.add.nonTargetSample= +observe.message.consolidate.operation.done= +observe.message.consolidate.save.changes= +observe.message.creating.referentiel= +observe.message.db.closed= +observe.message.db.loaded= +observe.message.db.loading= +observe.message.db.none.loaded= +observe.message.db.none.loaded.tip= +observe.message.delete= +observe.message.delete.directory= +observe.message.delete.new= +observe.message.detected.accepted.interval= +observe.message.detected.rejected.interval= +observe.message.exportData.delete.remote.maree= +observe.message.exportData.not.possible= +observe.message.exportData.operation.needFix= +observe.message.exportData.prepare.data= +observe.message.exportData.replicate.maree= +observe.message.goto.site= +observe.message.h2.server.login= +observe.message.h2.server.password= +observe.message.h2.server.url= +observe.message.help.usage= +observe.message.historical.data= +observe.message.importGPS.apply.point= +observe.message.importGPS.apply.points= +observe.message.importGPS.detect.point= +observe.message.importGPS.detect.points= +observe.message.importGPS.detected.point= +observe.message.importGPS.no.activity.selected= +observe.message.importGPS.no.detected.point= +observe.message.importGPS.no.invalid.interval= +observe.message.importGPS.nothing.to.do= +observe.message.importGPS.operation.needFix= +observe.message.importGPS.prepare.importFile= +observe.message.loaded.tip= +observe.message.need.fin.veille.activity= +observe.message.no.accepted.intervalle.detected= +observe.message.no.activity.detected= +observe.message.no.activity.for.route= +observe.message.no.activity.for.trip= +observe.message.no.local.db.found= +observe.message.no.open.maree.detected= +observe.message.no.report.selected= +observe.message.no.route.detected= +observe.message.no.route.for.maree= +observe.message.no.species.selected= +observe.message.no.trip.for.program= +observe.message.no.usage.for.entity= +observe.message.no.validation.detected= +observe.message.quit.invalid.edit= +observe.message.quit.valid.edit= +observe.message.referentiel.editable= +observe.message.referentiel.home= +observe.message.referentiel.no.editable= +observe.message.save.configuration= +observe.message.select.report= +observe.message.server.info= +observe.message.show.usage.for.delete= +observe.message.show.usage.for.delete2= +observe.message.show.usage.for.desactivated= +observe.message.show.usage.for.desactivated2= +observe.message.show.usage.for.desactivated3= +observe.message.show.usages= +observe.message.synchro.build.diff= +observe.message.synchro.create.temporary.db.to.resolve.obsoletes= +observe.message.synchro.local.modification= +observe.message.synchro.no.local.modification= +observe.message.synchro.no.referentiel.conflict= +observe.message.synchro.obsolete.data.to.duplicate= +observe.message.synchro.operation.canceled= +observe.message.synchro.operation.done= +observe.message.synchro.operation.failed= +observe.message.synchro.operation.needFix= +observe.message.synchro.ref.is.updtodate= +observe.message.synchro.referentiel.was.added= +observe.message.synchro.referentiel.was.modified= +observe.message.synchro.referentiel.was.removed= +observe.message.table.editBean.modified= +observe.message.table.editBean.modified.but.invalid= +observe.message.updating.floatingObject= +observe.message.updating.referentiel= +observe.message.validation.detected= +observe.message.validation.not.save.report= +observe.message.validation.nothing.to.do= +observe.message.validation.operation.done= +observe.message.validation.operation.needFix= +observe.message.validation.prepare.validators= +observe.message.validation.save.report= +observe.message.validation.start.maree= +observe.message.validation.start.referentiel= +observe.message.validation.use.storage= +observe.message.warning.will.be.delete= +observe.navigationMenu.moveTrip= +observe.navigationMenu.noAction= +observe.nonTargetCatch.message.table.will.delete.nonTargetSample= +observe.nonTargetCatch.table.catchWeight= +observe.nonTargetCatch.table.catchWeight.tip= +observe.nonTargetCatch.table.comment= +observe.nonTargetCatch.table.comment.tip= +observe.nonTargetCatch.table.deleteExtraMessage= +observe.nonTargetCatch.table.meanLength= +observe.nonTargetCatch.table.meanLength.tip= +observe.nonTargetCatch.table.meanWeight= +observe.nonTargetCatch.table.meanWeight.tip= +observe.nonTargetCatch.table.reasonForDiscard= +observe.nonTargetCatch.table.reasonForDiscard.tip= +observe.nonTargetCatch.table.speciesFate= +observe.nonTargetCatch.table.speciesFate.tip= +observe.nonTargetCatch.table.speciesFaune= +observe.nonTargetCatch.table.speciesFaune.tip= +observe.nonTargetCatch.table.totalCount= +observe.nonTargetCatch.table.totalCount.tip= +observe.nonTargetSample.table.count= +observe.nonTargetSample.table.count.tip= +observe.nonTargetSample.table.gender= +observe.nonTargetSample.table.gender.tip= +observe.nonTargetSample.table.length= +observe.nonTargetSample.table.length.tip= +observe.nonTargetSample.table.meanWeight= +observe.nonTargetSample.table.meanWeight.tip= +observe.nonTargetSample.table.picturesReferences= +observe.nonTargetSample.table.picturesReferences.tip= +observe.nonTargetSample.table.speciesFaune= +observe.nonTargetSample.table.speciesFaune.tip= +observe.objectObservedSpecies.table.count= +observe.objectObservedSpecies.table.count.tip= +observe.objectObservedSpecies.table.speciesFaune= +observe.objectObservedSpecies.table.speciesFaune.tip= +observe.objectObservedSpecies.table.speciesStatus= +observe.objectObservedSpecies.table.speciesStatus.tip= +observe.obstuna.action.create= +observe.obstuna.action.create.description= +observe.obstuna.action.drop= +observe.obstuna.action.drop.description= +observe.obstuna.action.security= +observe.obstuna.action.security.description= +observe.obstuna.action.update= +observe.obstuna.action.update.description= +observe.person.country= +observe.program.tab.general= +observe.program.tab.observations= +observe.route.message.active.found= +observe.route.message.active.found.for.other.trip= +observe.route.message.creating= +observe.route.message.no.active.found= +observe.route.message.no.active.found.for.other.trip= +observe.route.message.not.open= +observe.route.message.updating= +observe.route.title= +observe.routes.title= +observe.runner.config.loaded= +observe.runner.config.migrate.file= +observe.runner.context.loaded= +observe.runner.copy.default.logConfigurationFile.file= +observe.runner.copy.default.map.file= +observe.runner.copy.default.report.file= +observe.runner.copy.default.ui.file= +observe.runner.create.directory= +observe.runner.exists.directory= +observe.runner.i18n.loaded= +observe.runner.init= +observe.runner.load.database= +observe.runner.loaded= +observe.runner.loading.ui.configuration= +observe.runner.quit.withno.ui= +observe.runner.start= +observe.runner.ui.loaded= +observe.runner.user.directories.loaded= +observe.schoolEstimate.table.meanWeight= +observe.schoolEstimate.table.meanWeight.tip= +observe.schoolEstimate.table.speciesThon= +observe.schoolEstimate.table.speciesThon.tip= +observe.schoolEstimate.table.weight= +observe.schoolEstimate.table.weight.tip= +observe.section.cant.delete.message= +observe.section.cant.delete.title= +observe.sectionTemplate.delete.message= +observe.sections.delete.message= +observe.security.referentiel= +observe.security.referentiel.tip= +observe.security.role= +observe.security.role.tip= +observe.security.technicien= +observe.security.technicien.tip= +observe.security.unused= +observe.security.unused.tip= +observe.security.utilisateur= +observe.security.utilisateur.tip= +observe.sensorUsed.action.create= +observe.sensorUsed.action.create.tip= +observe.sensorUsed.action.reset.dataLocation.tip= +observe.sensorUsed.action.reset.sensorSerialNo.tip= +observe.sensorUsed.data= +observe.sensorUsed.dataLocation= +observe.sensorUsed.dataLocation.tip= +observe.sensorUsed.delete.data.message= +observe.sensorUsed.deleteData= +observe.sensorUsed.deleteData.tip= +observe.sensorUsed.exportData= +observe.sensorUsed.exportData.tip= +observe.sensorUsed.importData= +observe.sensorUsed.importData.tip= +observe.sensorUsed.message.data.exported= +observe.sensorUsed.message.data.imported= +observe.sensorUsed.sensorBrand= +observe.sensorUsed.sensorDataFormat= +observe.sensorUsed.sensorSerialNo= +observe.sensorUsed.sensorType= +observe.sensorUsed.table.data= +observe.sensorUsed.table.data.tip= +observe.sensorUsed.table.dataLocation= +observe.sensorUsed.table.dataLocation.tip= +observe.sensorUsed.table.sensorBrand= +observe.sensorUsed.table.sensorBrand.tip= +observe.sensorUsed.table.sensorDataFormat= +observe.sensorUsed.table.sensorDataFormat.tip= +observe.sensorUsed.table.sensorSerialNo= +observe.sensorUsed.table.sensorSerialNo.tip= +observe.sensorUsed.table.sensorType= +observe.sensorUsed.table.sensorType.tip= +observe.sensorUsed.title= +observe.setLongline.action.reset.homeId.tip= +observe.setLongline.basketsPerSectionCount= +observe.setLongline.branchlinesPerBasketCount= +observe.setLongline.haulingBreaks= +observe.setLongline.haulingDirectionSameAsSetting= +observe.setLongline.haulingEndCoordinates= +observe.setLongline.haulingEndTimeStamp= +observe.setLongline.haulingStartCoordinates= +observe.setLongline.haulingStartTimeStamp= +observe.setLongline.homeId= +observe.setLongline.lightsticksColor= +observe.setLongline.lightsticksPerBasketCount= +observe.setLongline.lightsticksType= +observe.setLongline.lineType= +observe.setLongline.maxDepthTargeted= +observe.setLongline.message.creating= +observe.setLongline.message.updating= +observe.setLongline.monitored= +observe.setLongline.number= +observe.setLongline.settingEndCoordinates= +observe.setLongline.settingEndTimeStamp= +observe.setLongline.settingShape= +observe.setLongline.settingStartCoordinates= +observe.setLongline.settingStartTimeStamp= +observe.setLongline.settingVesselSpeed= +observe.setLongline.shooterSpeed= +observe.setLongline.shooterUsed= +observe.setLongline.snapWeight= +observe.setLongline.swivelWeight= +observe.setLongline.tab.hauling= +observe.setLongline.tab.setting= +observe.setLongline.tab.settingCaracteristics= +observe.setLongline.timeBetweenHooks= +observe.setLongline.title= +observe.setLongline.totalBasketsCount= +observe.setLongline.totalHooksCount= +observe.setLongline.totalSectionsCount= +observe.setLongline.weightedSnap= +observe.setLongline.weightedSwivel= +observe.setSeine.currentDirection= +observe.setSeine.currentMeasureDepth= +observe.setSeine.currentSpeed= +observe.setSeine.endPursingTimeStamp= +observe.setSeine.endSetTimeStamp= +observe.setSeine.maxGearDepth= +observe.setSeine.message.creating= +observe.setSeine.message.information.schoolType= +observe.setSeine.message.no.nonTargetDiscarded= +observe.setSeine.message.no.targetCatch= +observe.setSeine.message.no.targetDiscarded= +observe.setSeine.message.updating= +observe.setSeine.nonTargetDiscarded= +observe.setSeine.reasonForNullSet= +observe.setSeine.schoolMeanDepth= +observe.setSeine.schoolThickness= +observe.setSeine.schoolTopDepth= +observe.setSeine.schoolType= +observe.setSeine.schoolType.not.fill= +observe.setSeine.sonarUsed= +observe.setSeine.sonarUsedAvantSet= +observe.setSeine.startTime= +observe.setSeine.supportVesselName= +observe.setSeine.tab.general= +observe.setSeine.tab.measurements= +observe.setSeine.targetDiscarded= +observe.setSeine.title= +observe.species.availableOcean= +observe.species.selectedOcean= +observe.species.tab.general= +observe.species.tab.other= +observe.speciesList.availableSpecies= +observe.speciesList.selectedSpecies= +observe.speciesList.tab.general= +observe.speciesList.tab.species= +observe.storage.action.canMigrate= +observe.storage.error.dbVersionMismatch= +observe.storage.importExternalDump.config= +observe.storage.importExternalDump.description= +observe.storage.importExternalDumpData.config= +observe.storage.importExternalDumpReferentiel.config= +observe.storage.importRemoteStorage.config= +observe.storage.importRemoteStorage.description= +observe.storage.importRemoteStorageData.config= +observe.storage.importRemoteStorageReferentiel.config= +observe.storage.internalDump.last.modified= +observe.storage.internalDump.not.exist= +observe.storage.label.backup= +observe.storage.label.data.import.db= +observe.storage.label.db.to.create= +observe.storage.label.db.to.drop= +observe.storage.label.db.to.update= +observe.storage.label.db.to.update.security= +observe.storage.label.import.data= +observe.storage.label.import.local= +observe.storage.label.import.referentiel= +observe.storage.label.import.remote= +observe.storage.label.local= +observe.storage.label.reference.import.db= +observe.storage.label.remote= +observe.storage.label.synchro= +observe.storage.label.synchro.incoming= +observe.storage.label.synchro.referentiel= +observe.storage.locale.db= +observe.storage.no.creationMode= +observe.storage.no.creationMode.required= +observe.storage.no.dbMode= +observe.storage.noImportData.config= +observe.storage.noImportReferentiel.config= +observe.storage.remote.db= +observe.storage.remote.login= +observe.storage.remote.password= +observe.storage.remote.url= +observe.storage.remote.useSll= +observe.storage.report.action.backup.local= +observe.storage.report.action.backup.remote= +observe.storage.report.action.connect.local= +observe.storage.report.action.connect.remote= +observe.storage.report.action.create.local= +observe.storage.report.action.data.import.backup= +observe.storage.report.action.import.backup= +observe.storage.report.action.import.internal= +observe.storage.report.action.import.remote.data= +observe.storage.report.action.import.remote.referentiel= +observe.storage.report.action.migrate= +observe.storage.report.action.no.data.import= +observe.storage.report.action.no.referentiel.import= +observe.storage.report.action.referentiel.import.backup= +observe.storage.report.can.migrate= +observe.storage.report.can.not.migrate= +observe.storage.report.no.create.mode= +observe.storage.report.security.owner= +observe.storage.report.security.readers= +observe.storage.report.security.referentiels= +observe.storage.report.security.techniciens= +observe.storage.report.selected.all.data= +observe.storage.report.selected.all.data.to.import= +observe.storage.report.selected.backup.file= +observe.storage.report.selected.data= +observe.storage.report.selected.data.for.import= +observe.storage.report.selected.data.referentiel= +observe.storage.report.selected.data.to.export= +observe.storage.report.selected.data.to.import= +observe.storage.report.selected.localStorageFile= +observe.storage.report.selected.no.data= +observe.storage.report.selected.no.data.to.import= +observe.storage.report.selected.remoteStorage= +observe.storage.report.selected.security= +observe.storage.required.rw.on.data= +observe.storage.security.administrateur= +observe.storage.selected.dbMode= +observe.storage.selectedCreationMode= +observe.storage.showMigrationProgression= +observe.storage.showMigrationSql= +observe.storage.step.backup= +observe.storage.step.backup.description= +observe.storage.step.config= +observe.storage.step.config.description= +observe.storage.step.configData= +observe.storage.step.configData.description= +observe.storage.step.configReferentiel= +observe.storage.step.configReferentiel.description= +observe.storage.step.confirm= +observe.storage.step.confirm.description= +observe.storage.step.creationMode= +observe.storage.step.dbMode= +observe.storage.step.dbMode.description= +observe.storage.step.dbMode.detail= +observe.storage.step.label= +observe.storage.step.roles= +observe.storage.step.roles.description= +observe.storage.step.selectData= +observe.storage.step.selectData.description= +observe.storage.store.remote.config= +observe.storage.store.remote.config.tip= +observe.storage.useRemoteStorage.config= +observe.storage.useRemoteStorage.description= +observe.synchro.add.object= +observe.synchro.common.activity= +observe.synchro.common.latitude= +observe.synchro.common.longitude= +observe.synchro.common.quadrant= +observe.synchro.common.reference= +observe.synchro.common.select= +observe.synchro.common.vitesse= +observe.synchro.config.data.mode= +observe.synchro.config.data.storage= +observe.synchro.config.export.required.read.data= +observe.synchro.config.export.required.read.referentiel= +observe.synchro.config.export.required.write.data= +observe.synchro.config.importGPS= +observe.synchro.config.referentiel.mode= +observe.synchro.config.referentiel.storage= +observe.synchro.config.report= +observe.synchro.config.source.storage= +observe.synchro.config.validate= +observe.synchro.config.validation.report= +observe.synchro.configuration= +observe.synchro.continue.with.no.save.report= +observe.synchro.import.data.fromBackup= +observe.synchro.import.data.fromRemoteStorage= +observe.synchro.importGPS.invalidIntervals.list= +observe.synchro.message.all.obsolete.entities.fixed= +observe.synchro.message.need.save.for.synchro.operation= +observe.synchro.message.need.save.for.validation.operation= +observe.synchro.message.obsolete.entities.fixed= +observe.synchro.message.obsolote.entity.ref.found= +observe.synchro.message.obsolote.entity.refs.found= +observe.synchro.message.saveLocal.skip= +observe.synchro.no.data.import= +observe.synchro.no.local.storage= +observe.synchro.no.referentiel.import= +observe.synchro.no.remote.storage= +observe.synchro.obsolete.entities.list= +observe.synchro.obsolete.entity.fix= +observe.synchro.obsolete.entity.label= +observe.synchro.obsolete.entity.to.change.label= +observe.synchro.operation.canceled= +observe.synchro.operation.consolidate= +observe.synchro.operation.consolidate.description= +observe.synchro.operation.exportData= +observe.synchro.operation.exportData.description= +observe.synchro.operation.failed= +observe.synchro.operation.importGPS= +observe.synchro.operation.importGPS.description= +observe.synchro.operation.needFix= +observe.synchro.operation.report= +observe.synchro.operation.report.description= +observe.synchro.operation.running= +observe.synchro.operation.saveLocal= +observe.synchro.operation.saveLocal.description= +observe.synchro.operation.successed= +observe.synchro.operation.synchronize= +observe.synchro.operation.synchronize.description= +observe.synchro.operation.validate= +observe.synchro.operation.validate.description= +observe.synchro.operations= +observe.synchro.remove.object= +observe.synchro.replaceObsolete.object= +observe.synchro.report.copy.options= +observe.synchro.report.report.description= +observe.synchro.report.result= +observe.synchro.report.select= +observe.synchro.report.variables= +observe.synchro.safe.entity.to.choose.label= +observe.synchro.save.report= +observe.synchro.step.config= +observe.synchro.step.config.description= +observe.synchro.step.consolidate= +observe.synchro.step.consolidate.description= +observe.synchro.step.exportData= +observe.synchro.step.exportData.description= +observe.synchro.step.importGPS= +observe.synchro.step.importGPS.description= +observe.synchro.step.report= +observe.synchro.step.report.description= +observe.synchro.step.saveLocal= +observe.synchro.step.saveLocal.description= +observe.synchro.step.selectData= +observe.synchro.step.selectData.description= +observe.synchro.step.showResume= +observe.synchro.step.showResume.description= +observe.synchro.step.synchronize= +observe.synchro.step.synchronize.description= +observe.synchro.step.validate= +observe.synchro.step.validate.description= +observe.synchro.table.exportData.exist.label= +observe.synchro.table.exportData.exist.label.tip= +observe.synchro.table.exportData.program.label= +observe.synchro.table.exportData.program.label.tip= +observe.synchro.table.exportData.selected= +observe.synchro.table.exportData.selected.tip= +observe.synchro.table.exportData.trip.label= +observe.synchro.table.exportData.trip.label.tip= +observe.synchro.table.importGPS.activity.label= +observe.synchro.table.importGPS.activity.label.tip= +observe.synchro.table.importGPS.activity.latitude= +observe.synchro.table.importGPS.activity.latitude.tip= +observe.synchro.table.importGPS.activity.longitude= +observe.synchro.table.importGPS.activity.longitude.tip= +observe.synchro.table.importGPS.activity.quadrant= +observe.synchro.table.importGPS.activity.quadrant.tip= +observe.synchro.table.importGPS.activity.select= +observe.synchro.table.importGPS.activity.select.tip= +observe.synchro.table.importGPS.activity.vitesse= +observe.synchro.table.importGPS.activity.vitesse.tip= +observe.synchro.table.importGPS.computed.label= +observe.synchro.table.importGPS.computed.label.tip= +observe.synchro.table.importGPS.data.label= +observe.synchro.table.importGPS.data.label.tip= +observe.synchro.table.obsolete.entity.label= +observe.synchro.table.obsolete.entity.label.tip= +observe.synchro.table.obsolete.entity.select= +observe.synchro.table.obsolete.entity.select.tip= +observe.synchro.update.object= +observe.synchro.validate.invalid.data.list= +observe.synchro.validate.message.list= +observe.synchro.validate.save.reportFile= +observe.targetCatch.table.comment= +observe.targetCatch.table.comment.tip= +observe.targetCatch.table.deleteExtraMessage= +observe.targetCatch.table.speciesThon= +observe.targetCatch.table.speciesThon.tip= +observe.targetCatch.table.weight= +observe.targetCatch.table.weight.tip= +observe.targetCatch.table.weightCategory= +observe.targetCatch.table.weightCategory.tip= +observe.targetCatch.table.well= +observe.targetCatch.table.well.tip= +observe.targetDiscarded.message.table.will.delete.targetLength= +observe.targetDiscarded.table.broughtOnDeck= +observe.targetDiscarded.table.broughtOnDeck.tip= +observe.targetDiscarded.table.comment= +observe.targetDiscarded.table.comment.tip= +observe.targetDiscarded.table.deleteExtraMessage= +observe.targetDiscarded.table.reasonForDiscard= +observe.targetDiscarded.table.reasonForDiscard.tip= +observe.targetDiscarded.table.speciesThon= +observe.targetDiscarded.table.speciesThon.tip= +observe.targetDiscarded.table.weight= +observe.targetDiscarded.table.weight.tip= +observe.targetDiscarded.table.weightCategory= +observe.targetDiscarded.table.weightCategory.tip= +observe.targetSample.table.count= +observe.targetSample.table.count.tip= +observe.targetSample.table.length= +observe.targetSample.table.length.tip= +observe.targetSample.table.meanWeight= +observe.targetSample.table.meanWeight.tip= +observe.targetSample.table.measureType= +observe.targetSample.table.measureType.tip= +observe.targetSample.table.speciesThon= +observe.targetSample.table.speciesThon.tip= +observe.targetSample.table.totalWeight= +observe.targetSample.table.totalWeight.tip= +observe.tdr.action.create= +observe.tdr.action.create.tip= +observe.tdr.action.reset.dataLocation.tip= +observe.tdr.action.reset.homeId.tip= +observe.tdr.action.reset.serialNo.tip= +observe.tdr.availableSpecies= +observe.tdr.basket= +observe.tdr.branchline= +observe.tdr.data= +observe.tdr.dataLocation= +observe.tdr.dataLocation.tip= +observe.tdr.delete.data.message= +observe.tdr.deleteData= +observe.tdr.deleteData.tip= +observe.tdr.deployementEnd= +observe.tdr.deployementStart= +observe.tdr.enableTimestamp= +observe.tdr.enableTimestamp.tip= +observe.tdr.exportData= +observe.tdr.exportData.tip= +observe.tdr.fishingEnd= +observe.tdr.fishingEndDepth= +observe.tdr.fishingStart= +observe.tdr.fishingStartDepth= +observe.tdr.floatline1Length= +observe.tdr.floatline2Length= +observe.tdr.homeId= +observe.tdr.importData= +observe.tdr.importData.tip= +observe.tdr.itemHorizontalPosition= +observe.tdr.itemVerticalPosition= +observe.tdr.locationOnLongline= +observe.tdr.maxFishingDepth= +observe.tdr.meanDeployementDepth= +observe.tdr.meanFishingDepth= +observe.tdr.medianDeployementDepth= +observe.tdr.medianFishingDepth= +observe.tdr.message.data.imported= +observe.tdr.minFishingDepth= +observe.tdr.section= +observe.tdr.selectedSpecies= +observe.tdr.sensorBrand= +observe.tdr.serialNo= +observe.tdr.species= +observe.tdr.tab.caracteristics= +observe.tdr.tab.keyData= +observe.tdr.tab.localisation= +observe.tdr.tab.species= +observe.tdr.tab.timestamp= +observe.tdr.table.data= +observe.tdr.table.homeId= +observe.tdr.table.homeId.tip= +observe.tdr.table.sensorBrand= +observe.tdr.table.sensorBrand.tip= +observe.tdr.table.serialNo= +observe.tdr.table.serialNo.tip= +observe.tdr.title= +observe.title.about= +observe.title.can.not.delete.referentiel= +observe.title.can.not.export.obstuna= +observe.title.change.storage= +observe.title.choose.db.dump= +observe.title.choose.db.dump.directory= +observe.title.choose.importGPS= +observe.title.choose.report.directory= +observe.title.choose.reportFile= +observe.title.choose.sensorUsed.exportData= +observe.title.choose.sensorUsed.importData= +observe.title.choose.tdr.exportData= +observe.title.choose.tdr.importData= +observe.title.config.migrate= +observe.title.connect.existingDB= +observe.title.connect.localDB= +observe.title.connect.remoteDB= +observe.title.consolidate= +observe.title.consolidate.tip= +observe.title.content.baitHaulingStatuss= +observe.title.content.baitSettingStatuss= +observe.title.content.baitTypes= +observe.title.content.catchFateLonglines= +observe.title.content.country= +observe.title.content.detectionModes= +observe.title.content.encounterTypes= +observe.title.content.fpaZones= +observe.title.content.gearCaracteristicTypes= +observe.title.content.gearCaracteristics= +observe.title.content.gears= +observe.title.content.harbours= +observe.title.content.healthnesss= +observe.title.content.hookPositions= +observe.title.content.hookSizes= +observe.title.content.hookTypes= +observe.title.content.itemHorizontalPositions= +observe.title.content.itemVerticalPositions= +observe.title.content.lengthWeightParameters= +observe.title.content.lightsticksColors= +observe.title.content.lightsticksTypes= +observe.title.content.lineTypes= +observe.title.content.maturityStatuss= +observe.title.content.mitigationTypes= +observe.title.content.objectFates= +observe.title.content.objectOperations= +observe.title.content.objectTypes= +observe.title.content.observedSystems= +observe.title.content.oceans= +observe.title.content.organisms= +observe.title.content.persons= +observe.title.content.programs= +observe.title.content.reasonForDiscards= +observe.title.content.reasonForNoFishings= +observe.title.content.reasonForNullSets= +observe.title.content.sensorBrands= +observe.title.content.sensorDataFormats= +observe.title.content.sensorTypes= +observe.title.content.settingShapes= +observe.title.content.sexx= +observe.title.content.sizeMeasureTypes= +observe.title.content.speciesFates= +observe.title.content.speciesGroupSpeciess= +observe.title.content.speciesLists= +observe.title.content.speciesStatuss= +observe.title.content.speciess= +observe.title.content.stomacFullnesss= +observe.title.content.surroundingActivitys= +observe.title.content.transmittingBuoyOperations= +observe.title.content.transmittingBuoyTypes= +observe.title.content.tripTypes= +observe.title.content.vesselActivityLonglines= +observe.title.content.vesselActivitySeines= +observe.title.content.vesselSizeCategoryx= +observe.title.content.vesselTypex= +observe.title.content.vesselx= +observe.title.content.weightCategory= +observe.title.content.weightMeasureTypes= +observe.title.content.windSpeeds= +observe.title.create.local.db= +observe.title.delete= +observe.title.error.dialog= +observe.title.exportData= +observe.title.exportData.tip= +observe.title.h2.server.parameters= +observe.title.import.localDB= +observe.title.importGPS= +observe.title.importGPS.tip= +observe.title.load.remote.db= +observe.title.need.confirm= +observe.title.need.confirm.to.desactivate.referentiel= +observe.title.no.local.db.found= +observe.title.report= +observe.title.report.tip= +observe.title.save.localDB= +observe.title.save.remoteDB= +observe.title.show.usage= +observe.title.speciesList.not.found= +observe.title.storage.info= +observe.title.synchronize= +observe.title.synchronize.tip= +observe.title.technical.informations= +observe.title.unique.key= +observe.title.validate= +observe.title.validate.tip= +observe.title.welcome.admin= +observe.tree.activityLongline= +observe.tree.activityLongline.unsaved= +observe.tree.activitySeine= +observe.tree.activitySeine.unsaved= +observe.tree.baitHaulingStatus= +observe.tree.baitSettingStatus= +observe.tree.baitType= +observe.tree.catchFateLongline= +observe.tree.catchLongline= +observe.tree.country= +observe.tree.detectionMode= +observe.tree.encounter= +observe.tree.encounterType= +observe.tree.floatingObject.unsaved= +observe.tree.fpaZone= +observe.tree.gear= +observe.tree.gearCaracteristic= +observe.tree.gearCaracteristicType= +observe.tree.gearUseFeaturesLongline= +observe.tree.gearUseFeaturesSeine= +observe.tree.harbour= +observe.tree.healthness= +observe.tree.hookPosition= +observe.tree.hookSize= +observe.tree.hookType= +observe.tree.itemHorizontalPosition= +observe.tree.itemVerticalPosition= +observe.tree.lengthWeightParameter= +observe.tree.lightsticksColor= +observe.tree.lightsticksType= +observe.tree.lineType= +observe.tree.longlineDetailComposition= +observe.tree.longlineGlobalComposition= +observe.tree.maturityStatus= +observe.tree.mitigationType= +observe.tree.nonTargetCatch= +observe.tree.nonTargetSample= +observe.tree.objectFate= +observe.tree.objectObservedSpecies= +observe.tree.objectOperation= +observe.tree.objectSchoolEstimate= +observe.tree.objectType= +observe.tree.observedSystem= +observe.tree.ocean= +observe.tree.organism= +observe.tree.person= +observe.tree.program= +observe.tree.reasonForDiscard= +observe.tree.reasonForNoFishing= +observe.tree.reasonForNullSet= +observe.tree.reference.common= +observe.tree.reference.longline= +observe.tree.reference.seine= +observe.tree.route= +observe.tree.route.unsaved= +observe.tree.schoolEstimate= +observe.tree.sensorBrand= +observe.tree.sensorDataFormat= +observe.tree.sensorType= +observe.tree.sensorUsed= +observe.tree.setLongline= +observe.tree.setLongline.unsaved= +observe.tree.setSeine= +observe.tree.setSeine.unsaved= +observe.tree.settingShape= +observe.tree.sex= +observe.tree.sizeMeasureType= +observe.tree.species= +observe.tree.speciesFate= +observe.tree.speciesGroup= +observe.tree.speciesList= +observe.tree.speciesStatus= +observe.tree.stomacFullness= +observe.tree.surroundingActivity= +observe.tree.targetCatch= +observe.tree.targetDiscarded= +observe.tree.targetSample= +observe.tree.targetSampleCapture= +observe.tree.tdr= +observe.tree.transmittingBuoyOperation= +observe.tree.transmittingBuoyType= +observe.tree.tripLongline.unsaved= +observe.tree.tripSeine.unsaved= +observe.tree.tripType= +observe.tree.vessel= +observe.tree.vesselActivityLongline= +observe.tree.vesselActivitySeine= +observe.tree.vesselSizeCategory= +observe.tree.vesselType= +observe.tree.weightCategory= +observe.tree.weightMeasureType= +observe.tree.wind= +observe.tripLongline.captain= +observe.tripLongline.dataEntryOperator= +observe.tripLongline.endDate= +observe.tripLongline.homeId= +observe.tripLongline.message.active.found= +observe.tripLongline.message.active.found.for.other.program= +observe.tripLongline.message.creating= +observe.tripLongline.message.no.active.found= +observe.tripLongline.message.not.open= +observe.tripLongline.message.updating= +observe.tripLongline.observer= +observe.tripLongline.ocean= +observe.tripLongline.startDate= +observe.tripLongline.tab.general= +observe.tripLongline.tab.map= +observe.tripLongline.title= +observe.tripLongline.totalFishingOperationsNumber= +observe.tripLongline.tripType= +observe.tripLongline.vessel= +observe.tripSeine.message.active.found= +observe.tripSeine.message.active.found.for.other.program= +observe.tripSeine.message.creating= +observe.tripSeine.message.no.active.found= +observe.tripSeine.message.not.open= +observe.tripSeine.message.updating= +observe.tripSeine.tab.general= +observe.tripSeine.tab.map= +observe.tripSeine.title= +observe.validation.report.contextName= +observe.validation.report.entities.with.messages= +observe.validation.report.entity= +observe.validation.report.scopes= +observe.validation.report.title= +observe.vessel.tab.general= +observe.vessel.tab.other= +observe.view.message= +observe.view.navigation= +observe.view.server= +observe.warning.nimbus.landf= +observe.warning.no.ui= +ui.main.body.synchro.action.copy.to.clipBoard= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties new file mode 100644 index 0000000..437f02e --- /dev/null +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -0,0 +1,2154 @@ +observe.about.message= +observe.about.translate.content= +observe.about.translate.title= +observe.action.about= +observe.action.about.tip= +observe.action.add.floatingObject= +observe.action.add.floatingObject.tip= +observe.action.add.set= +observe.action.add.set.tip= +observe.action.add.setLongline= +observe.action.add.setLongline.tip= +observe.action.admin.cancel= +observe.action.admin.close= +observe.action.apply= +observe.action.auto.copy.to.clipboard= +observe.action.auto.copy.to.clipboard.tip= +observe.action.back.to.list= +observe.action.back.to.list.tip= +observe.action.baitHaulingStatus.create.tip= +observe.action.baitHaulingStatus.delete.tip= +observe.action.baitHaulingStatus.detail.tip= +observe.action.baitHaulingStatus.modify.tip= +observe.action.baitHaulingStatus.save.tip= +observe.action.baitSettingStatus.create.tip= +observe.action.baitSettingStatus.delete.tip= +observe.action.baitSettingStatus.detail.tip= +observe.action.baitSettingStatus.modify.tip= +observe.action.baitSettingStatus.save.tip= +observe.action.baitType.create.tip= +observe.action.baitType.delete.tip= +observe.action.baitType.detail.tip= +observe.action.baitType.modify.tip= +observe.action.baitType.save.tip= +observe.action.cancel= +observe.action.cancel.create.tip= +observe.action.catchFateLongline.create.tip= +observe.action.catchFateLongline.delete.tip= +observe.action.catchFateLongline.detail.tip= +observe.action.catchFateLongline.modify.tip= +observe.action.catchFateLongline.save.tip= +observe.action.change.storage= +observe.action.change.storage.tip= +observe.action.choose.db.dump= +observe.action.choose.db.dump.description= +observe.action.choose.db.dump.directory= +observe.action.choose.importGPS= +observe.action.choose.importGPS.description= +observe.action.choose.report.directory= +observe.action.choose.reportFile= +observe.action.choose.reportFile.description= +observe.action.choose.sensorUsed.exportData= +observe.action.choose.sensorUsed.importData= +observe.action.choose.tdr.exportData= +observe.action.choose.tdr.importData= +observe.action.close= +observe.action.close.activity.tip= +observe.action.close.maree.tip= +observe.action.close.open= +observe.action.close.open.tip= +observe.action.close.route.tip= +observe.action.close.storage= +observe.action.close.storage.tip= +observe.action.close.synchro.tip= +observe.action.closeAndCreate= +observe.action.closeAndCreate.activity= +observe.action.closeAndCreate.activity.tip= +observe.action.closeAndCreate.maree= +observe.action.closeAndCreate.maree.tip= +observe.action.closeAndCreate.route= +observe.action.closeAndCreate.route.tip= +observe.action.closeAndCreate.tip= +observe.action.commandline.configure.ui= +observe.action.commandline.create.id= +observe.action.commandline.disable.main.ui= +observe.action.commandline.help= +observe.action.commandline.help.ui= +observe.action.commandline.launch.admin.ui= +observe.action.commandline.launch.h2.server.mode= +observe.action.commandline.launch.obstuna.admin.ui= +observe.action.commandline.use.jmx= +observe.action.configuration= +observe.action.configuration.tip= +observe.action.configure= +observe.action.continue= +observe.action.copy= +observe.action.copy.column.headers= +observe.action.copy.column.headers.tip= +observe.action.copy.row.headers= +observe.action.copy.row.headers.tip= +observe.action.country.create.tip= +observe.action.country.delete.tip= +observe.action.country.detail.tip= +observe.action.country.modify.tip= +observe.action.country.save.tip= +observe.action.create= +observe.action.create.activity= +observe.action.create.activity.tip= +observe.action.create.entry.tip= +observe.action.create.gearUseFeaturesLongline= +observe.action.create.gearUseFeaturesLongline.tip= +observe.action.create.gearUseFeaturesSeine= +observe.action.create.gearUseFeaturesSeine.tip= +observe.action.create.maree= +observe.action.create.maree.tip= +observe.action.create.nonTargetCatch= +observe.action.create.nonTargetCatch.tip= +observe.action.create.nonTargetSample= +observe.action.create.nonTargetSample.tip= +observe.action.create.objectObservedSpecies= +observe.action.create.objectObservedSpecies.tip= +observe.action.create.route= +observe.action.create.route.tip= +observe.action.create.schoolEstimate= +observe.action.create.schoolEstimate.tip= +observe.action.create.targetCatch= +observe.action.create.targetCatch.tip= +observe.action.create.targetDiscarded= +observe.action.create.targetDiscarded.tip= +observe.action.create.targetSample= +observe.action.create.targetSample.tip= +observe.action.create.targetSampleCapture= +observe.action.create.targetSampleCapture.tip= +observe.action.db.locale.es.tip= +observe.action.db.locale.fr.tip= +observe.action.db.locale.uk.tip= +observe.action.delete= +observe.action.delete.activity.tip= +observe.action.delete.entry.tip= +observe.action.delete.floatingObject.tip= +observe.action.delete.maree.tip= +observe.action.delete.route.tip= +observe.action.delete.set.tip= +observe.action.delete.tip= +observe.action.detail= +observe.action.detectionMode.create.tip= +observe.action.detectionMode.delete.tip= +observe.action.detectionMode.detail.tip= +observe.action.detectionMode.modify.tip= +observe.action.detectionMode.save.tip= +observe.action.do.backup= +observe.action.do.backup.tip= +observe.action.encounterType.create.tip= +observe.action.encounterType.delete.tip= +observe.action.encounterType.detail.tip= +observe.action.encounterType.modify.tip= +observe.action.encounterType.save.tip= +observe.action.exit= +observe.action.exit.tip= +observe.action.fpaZone.create.tip= +observe.action.fpaZone.delete.tip= +observe.action.fpaZone.detail.tip= +observe.action.fpaZone.modify.tip= +observe.action.fpaZone.save.tip= +observe.action.gear.create.tip= +observe.action.gear.delete.tip= +observe.action.gear.detail.tip= +observe.action.gear.modify.tip= +observe.action.gear.save.tip= +observe.action.gearCaracteristic.create.tip= +observe.action.gearCaracteristic.delete.tip= +observe.action.gearCaracteristic.detail.tip= +observe.action.gearCaracteristic.modify.tip= +observe.action.gearCaracteristic.save.tip= +observe.action.gearCaracteristicType.create.tip= +observe.action.gearCaracteristicType.delete.tip= +observe.action.gearCaracteristicType.detail.tip= +observe.action.gearCaracteristicType.modify.tip= +observe.action.gearCaracteristicType.save.tip= +observe.action.goDown= +observe.action.goDown.tip= +observe.action.goUp= +observe.action.goUp.tip= +observe.action.goto.next.stage= +observe.action.goto.next.stage.tip= +observe.action.goto.open.activity= +observe.action.goto.open.activity.short= +observe.action.goto.open.activity.tip= +observe.action.goto.open.maree= +observe.action.goto.open.other.activity= +observe.action.goto.open.other.activity.tip= +observe.action.goto.open.other.maree= +observe.action.goto.open.other.maree.tip= +observe.action.goto.open.other.route= +observe.action.goto.open.other.route.tip= +observe.action.goto.open.program.short= +observe.action.goto.open.program.tip= +observe.action.goto.open.route= +observe.action.goto.open.route.short= +observe.action.goto.open.route.tip= +observe.action.goto.open.set.short= +observe.action.goto.open.set.tip= +observe.action.goto.open.trip.short= +observe.action.goto.open.trip.tip= +observe.action.goto.previous.stage= +observe.action.goto.previous.stage.tip= +observe.action.goto.referentiel.short= +observe.action.goto.referentiel.tip= +observe.action.goto.selected.activity= +observe.action.goto.selected.activity.tip= +observe.action.goto.selected.maree= +observe.action.goto.selected.maree.tip= +observe.action.goto.selected.route= +observe.action.goto.selected.route.tip= +observe.action.harbour.create.tip= +observe.action.harbour.delete.tip= +observe.action.harbour.detail.tip= +observe.action.harbour.modify.tip= +observe.action.harbour.save.tip= +observe.action.healthness.create.tip= +observe.action.healthness.delete.tip= +observe.action.healthness.detail.tip= +observe.action.healthness.modify.tip= +observe.action.healthness.save.tip= +observe.action.hookPosition.create.tip= +observe.action.hookPosition.delete.tip= +observe.action.hookPosition.detail.tip= +observe.action.hookPosition.modify.tip= +observe.action.hookPosition.save.tip= +observe.action.hookSize.create.tip= +observe.action.hookSize.delete.tip= +observe.action.hookSize.detail.tip= +observe.action.hookSize.modify.tip= +observe.action.hookSize.save.tip= +observe.action.hookType.create.tip= +observe.action.hookType.delete.tip= +observe.action.hookType.detail.tip= +observe.action.hookType.modify.tip= +observe.action.hookType.save.tip= +observe.action.info.storage= +observe.action.info.storage.tip= +observe.action.itemHorizontalPosition.create.tip= +observe.action.itemHorizontalPosition.delete.tip= +observe.action.itemHorizontalPosition.detail.tip= +observe.action.itemHorizontalPosition.modify.tip= +observe.action.itemHorizontalPosition.save.tip= +observe.action.itemVerticalPosition.create.tip= +observe.action.itemVerticalPosition.delete.tip= +observe.action.itemVerticalPosition.detail.tip= +observe.action.itemVerticalPosition.modify.tip= +observe.action.itemVerticalPosition.save.tip= +observe.action.lengthWeightParameter.create.tip= +observe.action.lengthWeightParameter.delete.tip= +observe.action.lengthWeightParameter.detail.tip= +observe.action.lengthWeightParameter.modify.tip= +observe.action.lengthWeightParameter.save.tip= +observe.action.lightsticksColor.create.tip= +observe.action.lightsticksColor.delete.tip= +observe.action.lightsticksColor.detail.tip= +observe.action.lightsticksColor.modify.tip= +observe.action.lightsticksColor.save.tip= +observe.action.lightsticksType.create.tip= +observe.action.lightsticksType.delete.tip= +observe.action.lightsticksType.detail.tip= +observe.action.lightsticksType.modify.tip= +observe.action.lightsticksType.save.tip= +observe.action.lineType.create.tip= +observe.action.lineType.delete.tip= +observe.action.lineType.detail.tip= +observe.action.lineType.modify.tip= +observe.action.lineType.save.tip= +observe.action.load.from.file= +observe.action.load.from.file.tip= +observe.action.locale.es= +observe.action.locale.es.tip= +observe.action.locale.fr= +observe.action.locale.fr.tip= +observe.action.locale.uk= +observe.action.locale.uk.tip= +observe.action.maturityStatus.create.tip= +observe.action.maturityStatus.delete.tip= +observe.action.maturityStatus.detail.tip= +observe.action.maturityStatus.modify.tip= +observe.action.maturityStatus.save.tip= +observe.action.mitigationType.create.tip= +observe.action.mitigationType.delete.tip= +observe.action.mitigationType.detail.tip= +observe.action.mitigationType.modify.tip= +observe.action.mitigationType.save.tip= +observe.action.modify= +observe.action.new.entry= +observe.action.new.entry.tip= +observe.action.objectFate.create.tip= +observe.action.objectFate.delete.tip= +observe.action.objectFate.detail.tip= +observe.action.objectFate.modify.tip= +observe.action.objectFate.save.tip= +observe.action.objectOperation.create.tip= +observe.action.objectOperation.delete.tip= +observe.action.objectOperation.detail.tip= +observe.action.objectOperation.modify.tip= +observe.action.objectOperation.save.tip= +observe.action.objectType.create.tip= +observe.action.objectType.delete.tip= +observe.action.objectType.detail.tip= +observe.action.objectType.modify.tip= +observe.action.objectType.save.tip= +observe.action.observedSystem.create.tip= +observe.action.observedSystem.delete.tip= +observe.action.observedSystem.detail.tip= +observe.action.observedSystem.modify.tip= +observe.action.observedSystem.save.tip= +observe.action.ocean.create.tip= +observe.action.ocean.delete.tip= +observe.action.ocean.detail.tip= +observe.action.ocean.modify.tip= +observe.action.ocean.save.tip= +observe.action.open.screen= +observe.action.openLink.formsUrl.tip= +observe.action.openLink.reportsUrl.tip= +observe.action.organism.create.tip= +observe.action.organism.delete.tip= +observe.action.organism.detail.tip= +observe.action.organism.modify.tip= +observe.action.organism.save.tip= +observe.action.person.create.tip= +observe.action.person.delete.tip= +observe.action.person.detail.tip= +observe.action.person.modify.tip= +observe.action.person.save.tip= +observe.action.program.create.tip= +observe.action.program.delete.tip= +observe.action.program.detail.tip= +observe.action.program.modify.tip= +observe.action.program.save.tip= +observe.action.quitHelp.tip= +observe.action.reasonForDiscard.create.tip= +observe.action.reasonForDiscard.delete.tip= +observe.action.reasonForDiscard.detail.tip= +observe.action.reasonForDiscard.modify.tip= +observe.action.reasonForDiscard.save.tip= +observe.action.reasonForNoFishing.create.tip= +observe.action.reasonForNoFishing.delete.tip= +observe.action.reasonForNoFishing.detail.tip= +observe.action.reasonForNoFishing.modify.tip= +observe.action.reasonForNoFishing.save.tip= +observe.action.reasonForNullSet.create.tip= +observe.action.reasonForNullSet.delete.tip= +observe.action.reasonForNullSet.detail.tip= +observe.action.reasonForNullSet.modify.tip= +observe.action.reasonForNullSet.save.tip= +observe.action.reload.application= +observe.action.reload.storage= +observe.action.reload.storage.tip= +observe.action.reload.ui= +observe.action.reloadDefaultConfiguration= +observe.action.reloadDefaultConfiguration.tip= +observe.action.reloadResources= +observe.action.reloadResources.tip= +observe.action.reopen= +observe.action.reopen.activity.tip= +observe.action.reopen.maree.tip= +observe.action.reopen.route.tip= +observe.action.reopen.selected.activity= +observe.action.reopen.selected.activity.tip= +observe.action.reopen.selected.maree= +observe.action.reopen.selected.maree.tip= +observe.action.reopen.selected.route= +observe.action.reopen.selected.route.tip= +observe.action.reopen.tip= +observe.action.reset= +observe.action.reset.entry.tip= +observe.action.reset.ersId.tip= +observe.action.reset.formsUrl.tip= +observe.action.reset.homeId.tip= +observe.action.reset.new.entry.tip= +observe.action.reset.picturesReferences.tip= +observe.action.reset.reportsUrl.tip= +observe.action.reset.supportVesselName.tip= +observe.action.reset.tip= +observe.action.reset.well.tip= +observe.action.restart.application= +observe.action.restart.application.tip= +observe.action.save= +observe.action.save.all.tip= +observe.action.save.entry.tip= +observe.action.save.tip= +observe.action.save.to.file= +observe.action.save.to.file.tip= +observe.action.selectNode= +observe.action.selectNode.tip= +observe.action.sensorBrand.create.tip= +observe.action.sensorBrand.delete.tip= +observe.action.sensorBrand.detail.tip= +observe.action.sensorBrand.modify.tip= +observe.action.sensorBrand.save.tip= +observe.action.sensorDataFormat.create.tip= +observe.action.sensorDataFormat.delete.tip= +observe.action.sensorDataFormat.detail.tip= +observe.action.sensorDataFormat.modify.tip= +observe.action.sensorDataFormat.save.tip= +observe.action.sensorType.create.tip= +observe.action.sensorType.delete.tip= +observe.action.sensorType.detail.tip= +observe.action.sensorType.modify.tip= +observe.action.sensorType.save.tip= +observe.action.settingShape.create.tip= +observe.action.settingShape.delete.tip= +observe.action.settingShape.detail.tip= +observe.action.settingShape.modify.tip= +observe.action.settingShape.save.tip= +observe.action.sex.create.tip= +observe.action.sex.delete.tip= +observe.action.sex.detail.tip= +observe.action.sex.modify.tip= +observe.action.sex.save.tip= +observe.action.show.technical.informations.tip= +observe.action.show.unique.keys.tip= +observe.action.show.usages.tip= +observe.action.showConfig.title= +observe.action.site= +observe.action.site.tip= +observe.action.sizeMeasureType.create.tip= +observe.action.sizeMeasureType.delete.tip= +observe.action.sizeMeasureType.detail.tip= +observe.action.sizeMeasureType.modify.tip= +observe.action.sizeMeasureType.save.tip= +observe.action.species.create.tip= +observe.action.species.delete.tip= +observe.action.species.detail.tip= +observe.action.species.modify.tip= +observe.action.species.save.tip= +observe.action.speciesFate.create.tip= +observe.action.speciesFate.delete.tip= +observe.action.speciesFate.detail.tip= +observe.action.speciesFate.modify.tip= +observe.action.speciesFate.save.tip= +observe.action.speciesGroupSpecies.create.tip= +observe.action.speciesGroupSpecies.delete.tip= +observe.action.speciesGroupSpecies.detail.tip= +observe.action.speciesGroupSpecies.modify.tip= +observe.action.speciesGroupSpecies.save.tip= +observe.action.speciesList.create.tip= +observe.action.speciesList.delete.tip= +observe.action.speciesList.detail.tip= +observe.action.speciesList.modify.tip= +observe.action.speciesStatus.create.tip= +observe.action.speciesStatus.delete.tip= +observe.action.speciesStatus.detail.tip= +observe.action.speciesStatus.modify.tip= +observe.action.speciesStatus.save.tip= +observe.action.start.h2.web.server= +observe.action.start.h2.web.server.tip= +observe.action.start.server.mode= +observe.action.start.server.mode.tip= +observe.action.stomacFullness.create.tip= +observe.action.stomacFullness.delete.tip= +observe.action.stomacFullness.detail.tip= +observe.action.stomacFullness.modify.tip= +observe.action.stomacFullness.save.tip= +observe.action.stop.h2.web.server= +observe.action.stop.h2.web.server.tip= +observe.action.stop.server.mode= +observe.action.stop.server.mode.tip= +observe.action.storage.apply= +observe.action.storage.apply.tip= +observe.action.storage.applyAction= +observe.action.storage.cancel= +observe.action.storage.cancel.tip= +observe.action.surroundingActivity.create.tip= +observe.action.surroundingActivity.delete.tip= +observe.action.surroundingActivity.detail.tip= +observe.action.surroundingActivity.modify.tip= +observe.action.surroundingActivity.save.tip= +observe.action.synchro.apply.modifications= +observe.action.synchro.cancel.tip= +observe.action.synchro.copy.tip= +observe.action.synchro.launch.operation= +observe.action.synchro.prepare.operation= +observe.action.synchro.report.reset.tip= +observe.action.test.remote= +observe.action.test.remote.tip= +observe.action.transmittingBuoyOperation.create.tip= +observe.action.transmittingBuoyOperation.delete.tip= +observe.action.transmittingBuoyOperation.detail.tip= +observe.action.transmittingBuoyOperation.modify.tip= +observe.action.transmittingBuoyOperation.save.tip= +observe.action.transmittingBuoyType.create.tip= +observe.action.transmittingBuoyType.delete.tip= +observe.action.transmittingBuoyType.detail.tip= +observe.action.transmittingBuoyType.modify.tip= +observe.action.transmittingBuoyType.save.tip= +observe.action.tripType.create.tip= +observe.action.tripType.delete.tip= +observe.action.tripType.detail.tip= +observe.action.tripType.modify.tip= +observe.action.tripType.save.tip= +observe.action.vessel.create.tip= +observe.action.vessel.delete.tip= +observe.action.vessel.detail.tip= +observe.action.vessel.modify.tip= +observe.action.vessel.save.tip= +observe.action.vesselActivityLongline.create.tip= +observe.action.vesselActivityLongline.delete.tip= +observe.action.vesselActivityLongline.detail.tip= +observe.action.vesselActivityLongline.modify.tip= +observe.action.vesselActivityLongline.save.tip= +observe.action.vesselActivitySeine.create.tip= +observe.action.vesselActivitySeine.delete.tip= +observe.action.vesselActivitySeine.detail.tip= +observe.action.vesselActivitySeine.modify.tip= +observe.action.vesselActivitySeine.save.tip= +observe.action.vesselSizeCategory.create.tip= +observe.action.vesselSizeCategory.delete.tip= +observe.action.vesselSizeCategory.detail.tip= +observe.action.vesselSizeCategory.modify.tip= +observe.action.vesselSizeCategory.save.tip= +observe.action.vesselType.create.tip= +observe.action.vesselType.delete.tip= +observe.action.vesselType.detail.tip= +observe.action.vesselType.modify.tip= +observe.action.vesselType.save.tip= +observe.action.weightCategory.create.tip= +observe.action.weightCategory.delete.tip= +observe.action.weightCategory.detail.tip= +observe.action.weightCategory.modify.tip= +observe.action.weightCategory.save.tip= +observe.action.weightMeasureType.create.tip= +observe.action.weightMeasureType.delete.tip= +observe.action.weightMeasureType.detail.tip= +observe.action.weightMeasureType.modify.tip= +observe.action.weightMeasureType.save.tip= +observe.action.wind.create.tip= +observe.action.wind.delete.tip= +observe.action.wind.detail.tip= +observe.action.wind.modify.tip= +observe.action.wind.save.tip= +observe.activityLongline.coordinate= +observe.activityLongline.fpaZone= +observe.activityLongline.message.active.found= +observe.activityLongline.message.active.found.for.other.trip= +observe.activityLongline.message.creating= +observe.activityLongline.message.no.active.found= +observe.activityLongline.message.no.active.found.for.other.trip= +observe.activityLongline.message.not.open= +observe.activityLongline.message.updating= +observe.activityLongline.seaSurfaceTemperature= +observe.activityLongline.timeStamp= +observe.activityLongline.title= +observe.activityLongline.vesselActivityLongline= +observe.activityLonglines.title= +observe.activityObservedSystem.availableObservedSystem= +observe.activityObservedSystem.selectedObservedSystem= +observe.activitySeine.message.active.found= +observe.activitySeine.message.active.found.for.other.route= +observe.activitySeine.message.creating= +observe.activitySeine.message.no.active.found= +observe.activitySeine.message.no.active.found.for.other.route= +observe.activitySeine.message.not.open= +observe.activitySeine.message.updating= +observe.activitySeine.tab.general= +observe.activitySeine.tab.measurements= +observe.activitySeine.title= +observe.activitySeineObservedSystem.title= +observe.activitySeines.title= +observe.admin.resume.no.operation.done= +observe.admin.resume.operation.canceled= +observe.admin.resume.operation.done= +observe.admin.resume.operation.failed= +observe.admin.resume.operation.need.fix= +observe.admin.resume.operation.not.started= +observe.admin.resume.operation.running= +observe.application.config= +observe.baitsComposition.action.create= +observe.baitsComposition.action.create.tip= +observe.baitsComposition.baitSettingStatus= +observe.baitsComposition.baitType= +observe.baitsComposition.individualSize= +observe.baitsComposition.individualWeight= +observe.baitsComposition.proportion= +observe.baitsComposition.proportionSum= +observe.baitsComposition.table.baitSettingStatus= +observe.baitsComposition.table.baitSettingStatus.tip= +observe.baitsComposition.table.baitType= +observe.baitsComposition.table.baitType.tip= +observe.baitsComposition.table.individualSize= +observe.baitsComposition.table.individualSize.tip= +observe.baitsComposition.table.individualWeight= +observe.baitsComposition.table.individualWeight.tip= +observe.baitsComposition.table.proportion= +observe.baitsComposition.table.proportion.tip= +observe.baitsComposition.title= +observe.basket.cant.delete.message= +observe.basket.cant.delete.title= +observe.basket.invalid.nextFloatline1Length= +observe.branchLine.cant.delete.message= +observe.branchLine.cant.delete.title= +observe.branchline.baitHaulingStatus= +observe.branchline.baitSettingStatus= +observe.branchline.baitType= +observe.branchline.comment= +observe.branchline.depthRecorder= +observe.branchline.hookLost= +observe.branchline.hookOffset= +observe.branchline.hookSize= +observe.branchline.hookType= +observe.branchline.message.modified= +observe.branchline.message.modified.but.invalid= +observe.branchline.snapWeight= +observe.branchline.swivelWeight= +observe.branchline.tab.general= +observe.branchline.tab.hookAndBait= +observe.branchline.timeSinceContact= +observe.branchline.timer= +observe.branchline.timerTimeOnBoard= +observe.branchline.title= +observe.branchline.topType= +observe.branchline.traceCutOff= +observe.branchline.tracelineType= +observe.branchline.weightedSnap= +observe.branchline.weightedSwivel= +observe.branchlinesComposition.action.create= +observe.branchlinesComposition.action.create.tip= +observe.branchlinesComposition.length= +observe.branchlinesComposition.proportion= +observe.branchlinesComposition.proportionSum= +observe.branchlinesComposition.table.length= +observe.branchlinesComposition.table.length.tip= +observe.branchlinesComposition.table.proportion= +observe.branchlinesComposition.table.proportion.tip= +observe.branchlinesComposition.table.topType= +observe.branchlinesComposition.table.topType.tip= +observe.branchlinesComposition.table.tracelineType= +observe.branchlinesComposition.table.tracelineType.tip= +observe.branchlinesComposition.title= +observe.branchlinesComposition.topType= +observe.branchlinesComposition.tracelineType= +observe.broughtOnDeck.comment= +observe.catchLongline.acquisitionMode= +observe.catchLongline.acquisitionMode.grouped= +observe.catchLongline.acquisitionMode.individual= +observe.catchLongline.action.create= +observe.catchLongline.action.create.tip= +observe.catchLongline.action.new= +observe.catchLongline.action.new.tip= +observe.catchLongline.action.reset.photoReferences.tip= +observe.catchLongline.availablePredator= +observe.catchLongline.basket= +observe.catchLongline.beatDiameter= +observe.catchLongline.branchline= +observe.catchLongline.catchFateLongline= +observe.catchLongline.catchHealthness= +observe.catchLongline.comment= +observe.catchLongline.count= +observe.catchLongline.depredated= +observe.catchLongline.discardHealthness= +observe.catchLongline.gonadeWeight= +observe.catchLongline.hookPosition= +observe.catchLongline.hookWhenDiscarded= +observe.catchLongline.locationOnLongline= +observe.catchLongline.maturityStatus= +observe.catchLongline.photoReferences= +observe.catchLongline.predator= +observe.catchLongline.resetBranchline= +observe.catchLongline.resetBranchline.tip= +observe.catchLongline.saveBranchline= +observe.catchLongline.saveBranchline.tip= +observe.catchLongline.section= +observe.catchLongline.selectedPredator= +observe.catchLongline.sex= +observe.catchLongline.speciesCatch= +observe.catchLongline.stomacFullness= +observe.catchLongline.tab.branchline= +observe.catchLongline.tab.caracteristics= +observe.catchLongline.tab.depredated= +observe.catchLongline.tab.foodAndSexual= +observe.catchLongline.tab.sizeMeasures= +observe.catchLongline.tab.weightMeasures= +observe.catchLongline.title= +observe.catchLongline.totalWeight= +observe.catchlongline.table.acquisitionMode= +observe.catchlongline.table.acquisitionMode.tip= +observe.catchlongline.table.basketHaulingId= +observe.catchlongline.table.basketHaulingId.tip= +observe.catchlongline.table.branchlineHaulingId= +observe.catchlongline.table.branchlineHaulingId.tip= +observe.catchlongline.table.catchFateLongline= +observe.catchlongline.table.catchFateLongline.tip= +observe.catchlongline.table.catchHealthness= +observe.catchlongline.table.catchHealthness.tip= +observe.catchlongline.table.comment= +observe.catchlongline.table.comment.tip= +observe.catchlongline.table.count= +observe.catchlongline.table.count.tip= +observe.catchlongline.table.depredated= +observe.catchlongline.table.depredated.tip= +observe.catchlongline.table.discardHealthness= +observe.catchlongline.table.discardHealthness.tip= +observe.catchlongline.table.sectionHaulingId= +observe.catchlongline.table.sectionHaulingId.tip= +observe.catchlongline.table.size= +observe.catchlongline.table.size.tip= +observe.catchlongline.table.sizeMeasureType= +observe.catchlongline.table.sizeMeasureType.tip= +observe.catchlongline.table.speciesCatch= +observe.catchlongline.table.speciesCatch.tip= +observe.catchlongline.table.weight= +observe.catchlongline.table.weight.tip= +observe.catchlongline.table.weightMeasureType= +observe.catchlongline.table.weightMeasureType.tip= +observe.choice.cancel= +observe.choice.confirm.delete= +observe.choice.continue= +observe.choice.create.fin.veille.activity= +observe.choice.create.fin.veille.activity.and.continue= +observe.choice.createLocalStorage= +observe.choice.doNotSave= +observe.choice.doNothing= +observe.choice.not.create.fin.veille.activity.and.continue= +observe.choice.quit= +observe.choice.save= +observe.choice.useRemoteStorage= +observe.common.acquisitionMode= +observe.common.acquisitionMode.count= +observe.common.acquisitionMode.individu= +observe.common.activities= +observe.common.activities.list= +observe.common.activity= +observe.common.baitObservation= +observe.common.birdsObservation= +observe.common.boolean.false= +observe.common.boolean.null= +observe.common.boolean.true= +observe.common.brand= +observe.common.brandName= +observe.common.broughtOnDeck= +observe.common.capacity= +observe.common.capacityLabel= +observe.common.captain= +observe.common.caracteristics= +observe.common.catchWeight= +observe.common.catchWeightComputed.computed.tip= +observe.common.catchWeightComputed.observed.tip= +observe.common.changeDate= +observe.common.code= +observe.common.codeAndStatus= +observe.common.coefficients= +observe.common.comment= +observe.common.comment.activity= +observe.common.comment.floatingObject= +observe.common.comment.nonTargetCatch= +observe.common.comment.nonTargetSample= +observe.common.comment.set= +observe.common.comment.targetCatch= +observe.common.comment.targetDiscarded= +observe.common.comment.targetSample= +observe.common.count= +observe.common.country= +observe.common.currentFpaZone= +observe.common.dataEntryOperator= +observe.common.date= +observe.common.daysAtSeaCount= +observe.common.departureHarbour= +observe.common.description= +observe.common.detailledActivitiesObservation= +observe.common.detectionMode= +observe.common.directory= +observe.common.endDate= +observe.common.endLogValue= +observe.common.equation= +observe.common.ersId= +observe.common.file= +observe.common.firstName= +observe.common.flagCountry= +observe.common.formsUrl= +observe.common.gaugeLabel= +observe.common.gearType= +observe.common.generateReport= +observe.common.global.progression.description= +observe.common.heureobservation= +observe.common.homeIdFAOWormsId= +observe.common.iso2Code= +observe.common.iso3Code= +observe.common.keelCodeFlotte= +observe.common.label1= +observe.common.label2= +observe.common.label3= +observe.common.label4= +observe.common.label5= +observe.common.label6= +observe.common.label7= +observe.common.label8= +observe.common.landingHarbour= +observe.common.lastName= +observe.common.latitude= +observe.common.length= +observe.common.length.computed.tip= +observe.common.length.inf= +observe.common.length.observed.tip= +observe.common.lengthMeasureType= +observe.common.lengthWeightFormula= +observe.common.libelles= +observe.common.longitude= +observe.common.lowerValueUpperValue= +observe.common.mammalsObservation= +observe.common.meanLength= +observe.common.meanLengthComputed.computed.tip= +observe.common.meanLengthComputed.observed.tip= +observe.common.meanValues= +observe.common.meanWeight= +observe.common.meanWeightComputed.computed.tip= +observe.common.meanWeightComputed.observed.tip= +observe.common.measureType= +observe.common.measureType.ld1= +observe.common.measureType.lf= +observe.common.measureType.unknown= +observe.common.minLengthMax= +observe.common.minWeightMax= +observe.common.needComment= +observe.common.nextFpaZone= +observe.common.no.balise= +observe.common.nonCoupSenne= +observe.common.nonTargetCatch= +observe.common.nonTargetObservation= +observe.common.nonTargetSample= +observe.common.objectFate= +observe.common.objectObservedSpecies= +observe.common.objectOperation= +observe.common.objectType= +observe.common.objectsObservation= +observe.common.observedSystem= +observe.common.observedSystemDistance= +observe.common.observer= +observe.common.obsolete.entity= +observe.common.ocean= +observe.common.oceanForSpecies= +observe.common.operation.resume= +observe.common.organism= +observe.common.ownership= +observe.common.picturesReferences= +observe.common.power= +observe.common.previousFpaZone= +observe.common.program.observation.value.0= +observe.common.program.observation.value.1= +observe.common.program.observation.value.2= +observe.common.program.observation.value.3= +observe.common.program.observation.value.4= +observe.common.program.observation.value.5= +observe.common.program.observation.value.6= +observe.common.program.observation.value.7= +observe.common.program.observation.value.8= +observe.common.program.observation.value.9= +observe.common.reasonForDiscard= +observe.common.reportsUrl= +observe.common.resume= +observe.common.routes.list= +observe.common.samplesObservation= +observe.common.schoolEstimate= +observe.common.schoolType= +observe.common.scientificLabel= +observe.common.seaSurfaceTemperature= +observe.common.searchMaximum= +observe.common.select.gps.import.file= +observe.common.select.gps.import.file.tip= +observe.common.select.gps.maxDelay= +observe.common.select.gps.maxDelay.tip= +observe.common.select.gps.maxSpeed= +observe.common.select.gps.maxSpeed.tip= +observe.common.select.report.file= +observe.common.select.report.file.tip= +observe.common.select.validate.context= +observe.common.select.validate.context.tip= +observe.common.select.validate.mode= +observe.common.select.validate.mode.tip= +observe.common.select.validate.scope= +observe.common.select.validate.scope.tip= +observe.common.selected.validators= +observe.common.sex= +observe.common.species= +observe.common.speciesFate= +observe.common.speciesFaune= +observe.common.speciesGroup= +observe.common.speciesStatus= +observe.common.speciesThon= +observe.common.speedRange= +observe.common.startDate= +observe.common.startDateFinProgram= +observe.common.startDateFinValidite= +observe.common.startLogValue= +observe.common.status= +observe.common.step.description= +observe.common.storage.not.valid= +observe.common.supportVesselName= +observe.common.surroundingActivity= +observe.common.taille= +observe.common.taillePoids.caracteristics= +observe.common.targetCatch= +observe.common.targetDiscarded= +observe.common.targetDiscardsObservation= +observe.common.targetSample= +observe.common.targetSampleCapture= +observe.common.topiaCreateDate= +observe.common.topiaId= +observe.common.topiaVersion= +observe.common.totalCount= +observe.common.totalCountComputed.computed.tip= +observe.common.totalCountComputed.observed.tip= +observe.common.totalWeight= +observe.common.transmittingBuoyOperation= +observe.common.transmittingBuoyType= +observe.common.trips.list= +observe.common.typeTransmittingBuoyOperation= +observe.common.undefined= +observe.common.undefined.tip= +observe.common.uri= +observe.common.vessel= +observe.common.vesselActivitySeine= +observe.common.vesselActivitySeine.comment= +observe.common.vesselSizeCategory= +observe.common.vesselSpeed= +observe.common.vesselType= +observe.common.waveHeight= +observe.common.weight= +observe.common.weight.computed.tip= +observe.common.weight.ind= +observe.common.weight.observed.tip= +observe.common.weightCategory= +observe.common.weightLengthFormula= +observe.common.well= +observe.common.wind= +observe.common.yearService= +observe.comon.exist.on.remote= +observe.config.category.changeStorage= +observe.config.category.changeStorage.description= +observe.config.category.directories= +observe.config.category.directories.description= +observe.config.category.gps= +observe.config.category.gps.description= +observe.config.category.h2= +observe.config.category.h2.description= +observe.config.category.map= +observe.config.category.map.description= +observe.config.category.observation= +observe.config.category.observation.description= +observe.config.category.obstuna= +observe.config.category.obstuna.description= +observe.config.category.other= +observe.config.category.other.description= +observe.config.category.speciesList.longline= +observe.config.category.speciesList.longline.description= +observe.config.category.speciesList.seine= +observe.config.category.speciesList.seine.description= +observe.config.category.synchro= +observe.config.category.synchro.description= +observe.config.configFileName.description= +observe.config.db.locale= +observe.config.defaultBackupDirectory.description= +observe.config.defaultCreationMode= +observe.config.defaultDataDirectory.description= +observe.config.defaultDbMode= +observe.config.defaultGpsMaxDelay= +observe.config.defaultGpsMaxSpeed= +observe.config.defaultI18nDirectory.description= +observe.config.defaultInitialDbDump.description= +observe.config.defaultLocalDbDirectory.description= +observe.config.defaultMapDirectory.description= +observe.config.defaultReportDirectory.description= +observe.config.defaultResourcesDirectory.description= +observe.config.defaultTmpDirectory.description= +observe.config.defaultValidationReportDirectory.description= +observe.config.devMode= +observe.config.h2.can.migrate.description= +observe.config.h2.login.description= +observe.config.h2.password.description= +observe.config.h2.serverPort.description= +observe.config.logConfigurationFile.description= +observe.config.map.background.description= +observe.config.map.layer1.description= +observe.config.map.layer10.description= +observe.config.map.layer2.description= +observe.config.map.layer3.description= +observe.config.map.layer4.description= +observe.config.map.layer5.description= +observe.config.map.layer6.description= +observe.config.map.layer7.description= +observe.config.map.layer8.description= +observe.config.map.layer9.description= +observe.config.map.style.description= +observe.config.observation.activitysDetaillees= +observe.config.observation.fauneAssociee= +observe.config.observation.floatingObject= +observe.config.observation.gleure= +observe.config.observation.mammiferes= +observe.config.observation.mensurations= +observe.config.observation.oiseaux= +observe.config.observation.rejetsThons= +observe.config.obstuna.login.description= +observe.config.obstuna.password.description= +observe.config.obstuna.url.description= +observe.config.obstuna.useSsl.description= +observe.config.pg.can.migrate.description= +observe.config.showMigrationProgression= +observe.config.showMigrationSql= +observe.config.showSql= +observe.config.speciesList.longline.catch= +observe.config.speciesList.longline.encounter= +observe.config.speciesList.seine.nonTargetCatch= +observe.config.speciesList.seine.objectObservedSpecies= +observe.config.speciesList.seine.objectSchoolEstimate= +observe.config.speciesList.seine.schoolEstimate= +observe.config.speciesList.seine.targetCatch= +observe.config.ui.autoPopupNumberEditor= +observe.config.ui.changeSynchroSrc= +observe.config.ui.fullscreen= +observe.config.ui.loadLocalStorage= +observe.config.ui.locale= +observe.config.ui.showNumberEditorButton= +observe.config.ui.showTimeEditorSlider= +observe.config.ui.storeRemoteStorage= +observe.content.mode.create.tip= +observe.content.mode.read.tip= +observe.content.mode.update.tip= +observe.encounter.action.create= +observe.encounter.action.create.tip= +observe.encounter.count= +observe.encounter.distance= +observe.encounter.encounterType= +observe.encounter.species= +observe.encounter.table.count= +observe.encounter.table.count.tip= +observe.encounter.table.distance= +observe.encounter.table.distance.tip= +observe.encounter.table.encouterType= +observe.encounter.table.encouterType.tip= +observe.encounter.table.species= +observe.encounter.table.species.tip= +observe.encounter.title= +observe.entity.message.updating= +observe.error.can.not.create.directory= +observe.error.no.activity.6= +observe.error.open.first.db= +observe.error.speciesList.longline.catch.notFound= +observe.error.speciesList.longline.depredator.notFound= +observe.error.speciesList.longline.encounter.notFound= +observe.error.speciesList.seine.objectObservedSpecies.notFound= +observe.error.speciesList.seine.objectSchoolEstimate.notFound= +observe.error.speciesList.seine.targetCatch.notFound= +observe.error.storage.could.not.backup.unsane.local.db= +observe.error.storage.could.not.load.local.db= +observe.floatingObject.message.creating= +observe.floatingObject.message.updating= +observe.floatingObject.title= +observe.floatingObjectTransmittingBuoyOperation.title= +observe.floatlinesComposition.action.create= +observe.floatlinesComposition.action.create.tip= +observe.floatlinesComposition.length= +observe.floatlinesComposition.lineType= +observe.floatlinesComposition.proportion= +observe.floatlinesComposition.proportionSum= +observe.floatlinesComposition.table.length= +observe.floatlinesComposition.table.length.tip= +observe.floatlinesComposition.table.lineType= +observe.floatlinesComposition.table.lineType.tip= +observe.floatlinesComposition.table.proportion= +observe.floatlinesComposition.table.proportion.tip= +observe.floatlinesComposition.title= +observe.gear.availableGearCaracteristic= +observe.gear.gearCaracteristic= +observe.gear.gearCaracteristicType= +observe.gear.selectedGearCaracteristic= +observe.gear.tab.gearCaracteristic= +observe.gear.tab.general= +observe.gear.unit= +observe.gearUseFeaturesLongline.action.deleteSelectedMeasurement= +observe.gearUseFeaturesLongline.action.deleteSelectedMeasurement.tip= +observe.gearUseFeaturesLongline.comment= +observe.gearUseFeaturesLongline.gear= +observe.gearUseFeaturesLongline.number= +observe.gearUseFeaturesLongline.tab.general= +observe.gearUseFeaturesLongline.tab.measurements= +observe.gearUseFeaturesLongline.table.comment= +observe.gearUseFeaturesLongline.table.comment.tip= +observe.gearUseFeaturesLongline.table.gear= +observe.gearUseFeaturesLongline.table.gear.tip= +observe.gearUseFeaturesLongline.table.gearCaracteristic= +observe.gearUseFeaturesLongline.table.gearCaracteristic.tip= +observe.gearUseFeaturesLongline.table.number= +observe.gearUseFeaturesLongline.table.number.tip= +observe.gearUseFeaturesLongline.table.usedInTrip= +observe.gearUseFeaturesLongline.table.usedInTrip.tip= +observe.gearUseFeaturesLongline.table.value= +observe.gearUseFeaturesLongline.table.value.tip= +observe.gearUseFeaturesLongline.title= +observe.gearUseFeaturesLongline.usedInTrip= +observe.gearUseFeaturesSeine.action.deleteSelectedMeasurement= +observe.gearUseFeaturesSeine.action.deleteSelectedMeasurement.tip= +observe.gearUseFeaturesSeine.comment= +observe.gearUseFeaturesSeine.gear= +observe.gearUseFeaturesSeine.number= +observe.gearUseFeaturesSeine.tab.general= +observe.gearUseFeaturesSeine.tab.measurements= +observe.gearUseFeaturesSeine.table.comment= +observe.gearUseFeaturesSeine.table.comment.tip= +observe.gearUseFeaturesSeine.table.gear= +observe.gearUseFeaturesSeine.table.gear.tip= +observe.gearUseFeaturesSeine.table.gearCaracteristic= +observe.gearUseFeaturesSeine.table.gearCaracteristic.tip= +observe.gearUseFeaturesSeine.table.number= +observe.gearUseFeaturesSeine.table.number.tip= +observe.gearUseFeaturesSeine.table.usedInTrip= +observe.gearUseFeaturesSeine.table.usedInTrip.tip= +observe.gearUseFeaturesSeine.table.value= +observe.gearUseFeaturesSeine.table.value.tip= +observe.gearUseFeaturesSeine.title= +observe.gearUseFeaturesSeine.usedInTrip= +observe.harbour.coordinates= +observe.harbour.locode= +observe.harbour.name= +observe.hooksComposition.action.create= +observe.hooksComposition.action.create.tip= +observe.hooksComposition.hookOffset= +observe.hooksComposition.hookSize= +observe.hooksComposition.hookType= +observe.hooksComposition.proportion= +observe.hooksComposition.proportionSum= +observe.hooksComposition.table.hookOffset= +observe.hooksComposition.table.hookOffset.tip= +observe.hooksComposition.table.hookSize= +observe.hooksComposition.table.hookSize.tip= +observe.hooksComposition.table.hookType= +observe.hooksComposition.table.hookType.tip= +observe.hooksComposition.table.proportion= +observe.hooksComposition.table.proportion.tip= +observe.hooksComposition.title= +observe.info.selected.validators= +observe.info.validation.credentials= +observe.init.local.db.detected= +observe.init.no.initial.dump.detected= +observe.init.no.local.db.detected= +observe.init.storage.done= +observe.label.coefficients.info= +observe.label.lengthWeightFormula.info= +observe.label.usage.data.title= +observe.label.usage.referentiel.title= +observe.label.weightLengthFormula.info= +observe.lengthWeightParameter.tab.general= +observe.lengthWeightParameter.tab.other= +observe.list.baitHaulingStatus= +observe.list.baitSettingStatus= +observe.list.baitType= +observe.list.catchFateLongline= +observe.list.country= +observe.list.detectionMode= +observe.list.encounterType= +observe.list.fpaZone= +observe.list.gear= +observe.list.gearCaracteristic= +observe.list.gearCaracteristicType= +observe.list.harbour= +observe.list.healthness= +observe.list.hookPosition= +observe.list.hookSize= +observe.list.hookType= +observe.list.itemHorizontalPosition= +observe.list.itemVerticalPosition= +observe.list.lengthWeightParameter= +observe.list.lightsticksColor= +observe.list.lightsticksType= +observe.list.lineType= +observe.list.maturityStatus= +observe.list.mitigationType= +observe.list.objectFate= +observe.list.objectOperation= +observe.list.objectType= +observe.list.observedSystem= +observe.list.ocean= +observe.list.operation= +observe.list.organism= +observe.list.person= +observe.list.program= +observe.list.reasonForDiscard= +observe.list.reasonForNoFishing= +observe.list.reasonForNullSet= +observe.list.sensorBrand= +observe.list.sensorDataFormat= +observe.list.sensorType= +observe.list.settingShape= +observe.list.sex= +observe.list.sizeMeasureType= +observe.list.speciesFate= +observe.list.speciesFaune= +observe.list.speciesGroupSpecies= +observe.list.speciesList= +observe.list.speciesStatus= +observe.list.stomacFullness= +observe.list.surroundingActivity= +observe.list.transmittingBuoyType= +observe.list.tripType= +observe.list.vessel= +observe.list.vesselActivityLongline= +observe.list.vesselActivitySeine= +observe.list.vesselSizeCategory= +observe.list.vesselType= +observe.list.weightCategory= +observe.list.weightMeasureType= +observe.list.wind= +observe.longlineDetailComposition.action.deleteAllSections= +observe.longlineDetailComposition.action.deleteAllSections.tip= +observe.longlineDetailComposition.action.deleteSelectedBasket= +observe.longlineDetailComposition.action.deleteSelectedBasket.tip= +observe.longlineDetailComposition.action.deleteSelectedBranchline= +observe.longlineDetailComposition.action.deleteSelectedBranchline.tip= +observe.longlineDetailComposition.action.deleteSelectedSection= +observe.longlineDetailComposition.action.deleteSelectedSection.tip= +observe.longlineDetailComposition.action.deleteSelectedSectionTemplate= +observe.longlineDetailComposition.action.deleteSelectedSectionTemplate.tip= +observe.longlineDetailComposition.action.generateAllSections= +observe.longlineDetailComposition.action.generateAllSections.tip= +observe.longlineDetailComposition.action.insertAfterSelectedBasket= +observe.longlineDetailComposition.action.insertAfterSelectedBasket.tip= +observe.longlineDetailComposition.action.insertAfterSelectedBranchline= +observe.longlineDetailComposition.action.insertAfterSelectedBranchline.tip= +observe.longlineDetailComposition.action.insertAfterSelectedSection= +observe.longlineDetailComposition.action.insertAfterSelectedSection.tip= +observe.longlineDetailComposition.action.insertBeforeSelectedBasket= +observe.longlineDetailComposition.action.insertBeforeSelectedBasket.tip= +observe.longlineDetailComposition.action.insertBeforeSelectedBranchline= +observe.longlineDetailComposition.action.insertBeforeSelectedBranchline.tip= +observe.longlineDetailComposition.action.insertBeforeSelectedSection= +observe.longlineDetailComposition.action.insertBeforeSelectedSection.tip= +observe.longlineDetailComposition.baskets= +observe.longlineDetailComposition.basketsTable.floatline1Length= +observe.longlineDetailComposition.basketsTable.floatline1Length.tip= +observe.longlineDetailComposition.basketsTable.floatline2Length= +observe.longlineDetailComposition.basketsTable.floatline2Length.tip= +observe.longlineDetailComposition.basketsTable.haulingIdentifier= +observe.longlineDetailComposition.basketsTable.haulingIdentifier.tip= +observe.longlineDetailComposition.basketsTable.settingIdentifier= +observe.longlineDetailComposition.basketsTable.settingIdentifier.tip= +observe.longlineDetailComposition.branchlines= +observe.longlineDetailComposition.branchlinesTable.branchlineLength= +observe.longlineDetailComposition.branchlinesTable.branchlineLength.tip= +observe.longlineDetailComposition.branchlinesTable.haulingIdentifier= +observe.longlineDetailComposition.branchlinesTable.haulingIdentifier.tip= +observe.longlineDetailComposition.branchlinesTable.settingIdentifier= +observe.longlineDetailComposition.branchlinesTable.settingIdentifier.tip= +observe.longlineDetailComposition.branchlinesTable.tracelineLength= +observe.longlineDetailComposition.branchlinesTable.tracelineLength.tip= +observe.longlineDetailComposition.canGenerate= +observe.longlineDetailComposition.firstTemplate.template.notCompilant.basketCount= +observe.longlineDetailComposition.message.updating= +observe.longlineDetailComposition.sectionTemplatesTable.identifier= +observe.longlineDetailComposition.sectionTemplatesTable.identifier.tip= +observe.longlineDetailComposition.sectionTemplatesTable.value= +observe.longlineDetailComposition.sectionTemplatesTable.value.tip= +observe.longlineDetailComposition.sections= +observe.longlineDetailComposition.sectionsTable.haulingIdentifier= +observe.longlineDetailComposition.sectionsTable.haulingIdentifier.tip= +observe.longlineDetailComposition.sectionsTable.settingIdentifier= +observe.longlineDetailComposition.sectionsTable.settingIdentifier.tip= +observe.longlineDetailComposition.sectionsTable.template= +observe.longlineDetailComposition.sectionsTable.template.tip= +observe.longlineDetailComposition.tab.branchlineDetail= +observe.longlineDetailComposition.tab.composition= +observe.longlineDetailComposition.tab.generate= +observe.longlineDetailComposition.title= +observe.longlineDetailComposition.title.section.cant.use.firstTemplate= +observe.longlineGlobalComposition.availableMitigationType= +observe.longlineGlobalComposition.message.updating= +observe.longlineGlobalComposition.mitigationType= +observe.longlineGlobalComposition.selectedMitigationType= +observe.longlineGlobalComposition.tab.baitsComposition= +observe.longlineGlobalComposition.tab.branchlinesComposition= +observe.longlineGlobalComposition.tab.floatlinesComposition= +observe.longlineGlobalComposition.tab.hooksComposition= +observe.longlineGlobalComposition.tab.mitigationType= +observe.longlineGlobalComposition.title= +observe.map.action.exportPng= +observe.map.action.exportPng.tip= +observe.map.action.zoomIt= +observe.map.action.zoomIt.tip= +observe.map.east= +observe.map.export.chooseFile.ok= +observe.map.export.chooseFile.png= +observe.map.export.chooseFile.title= +observe.map.export.overwrite= +observe.map.export.overwrite.cancel= +observe.map.export.overwrite.ok= +observe.map.export.overwrite.title= +observe.map.export.success= +observe.map.legend.hauling= +observe.map.legend.setting= +observe.map.legend.tripBetweenTwoDays= +observe.map.legend.tripDay= +observe.map.miles= +observe.map.north= +observe.map.south= +observe.map.waitLoading= +observe.map.west= +observe.measurement.delete.message= +observe.menu.actions= +observe.menu.application.locale= +observe.menu.configuration= +observe.menu.configuration.tip= +observe.menu.db.locale= +observe.menu.file= +observe.menu.help= +observe.menu.locale= +observe.menu.navigation= +observe.menu.storage= +observe.message.can.not.write.data= +observe.message.cant.add.echantillonRejetThon= +observe.message.cant.add.echantillonTargetCatch= +observe.message.cant.add.nonTargetSample= +observe.message.consolidate.operation.done= +observe.message.consolidate.save.changes= +observe.message.creating.referentiel= +observe.message.db.closed= +observe.message.db.loaded= +observe.message.db.loading= +observe.message.db.none.loaded= +observe.message.db.none.loaded.tip= +observe.message.delete= +observe.message.delete.directory= +observe.message.delete.new= +observe.message.detected.accepted.interval= +observe.message.detected.rejected.interval= +observe.message.exportData.delete.remote.maree= +observe.message.exportData.not.possible= +observe.message.exportData.operation.needFix= +observe.message.exportData.prepare.data= +observe.message.exportData.replicate.maree= +observe.message.goto.site= +observe.message.h2.server.login= +observe.message.h2.server.password= +observe.message.h2.server.url= +observe.message.help.usage= +observe.message.historical.data= +observe.message.importGPS.apply.point= +observe.message.importGPS.apply.points= +observe.message.importGPS.detect.point= +observe.message.importGPS.detect.points= +observe.message.importGPS.detected.point= +observe.message.importGPS.no.activity.selected= +observe.message.importGPS.no.detected.point= +observe.message.importGPS.no.invalid.interval= +observe.message.importGPS.nothing.to.do= +observe.message.importGPS.operation.needFix= +observe.message.importGPS.prepare.importFile= +observe.message.loaded.tip= +observe.message.need.fin.veille.activity= +observe.message.no.accepted.intervalle.detected= +observe.message.no.activity.detected= +observe.message.no.activity.for.route= +observe.message.no.activity.for.trip= +observe.message.no.local.db.found= +observe.message.no.open.maree.detected= +observe.message.no.report.selected= +observe.message.no.route.detected= +observe.message.no.route.for.maree= +observe.message.no.species.selected= +observe.message.no.trip.for.program= +observe.message.no.usage.for.entity= +observe.message.no.validation.detected= +observe.message.quit.invalid.edit= +observe.message.quit.valid.edit= +observe.message.referentiel.editable= +observe.message.referentiel.home= +observe.message.referentiel.no.editable= +observe.message.save.configuration= +observe.message.select.report= +observe.message.server.info= +observe.message.show.usage.for.delete= +observe.message.show.usage.for.delete2= +observe.message.show.usage.for.desactivated= +observe.message.show.usage.for.desactivated2= +observe.message.show.usage.for.desactivated3= +observe.message.show.usages= +observe.message.synchro.build.diff= +observe.message.synchro.create.temporary.db.to.resolve.obsoletes= +observe.message.synchro.local.modification= +observe.message.synchro.no.local.modification= +observe.message.synchro.no.referentiel.conflict= +observe.message.synchro.obsolete.data.to.duplicate= +observe.message.synchro.operation.canceled= +observe.message.synchro.operation.done= +observe.message.synchro.operation.failed= +observe.message.synchro.operation.needFix= +observe.message.synchro.ref.is.updtodate= +observe.message.synchro.referentiel.was.added= +observe.message.synchro.referentiel.was.modified= +observe.message.synchro.referentiel.was.removed= +observe.message.table.editBean.modified= +observe.message.table.editBean.modified.but.invalid= +observe.message.updating.floatingObject= +observe.message.updating.referentiel= +observe.message.validation.detected= +observe.message.validation.not.save.report= +observe.message.validation.nothing.to.do= +observe.message.validation.operation.done= +observe.message.validation.operation.needFix= +observe.message.validation.prepare.validators= +observe.message.validation.save.report= +observe.message.validation.start.maree= +observe.message.validation.start.referentiel= +observe.message.validation.use.storage= +observe.message.warning.will.be.delete= +observe.navigationMenu.moveTrip= +observe.navigationMenu.noAction= +observe.nonTargetCatch.message.table.will.delete.nonTargetSample= +observe.nonTargetCatch.table.catchWeight= +observe.nonTargetCatch.table.catchWeight.tip= +observe.nonTargetCatch.table.comment= +observe.nonTargetCatch.table.comment.tip= +observe.nonTargetCatch.table.deleteExtraMessage= +observe.nonTargetCatch.table.meanLength= +observe.nonTargetCatch.table.meanLength.tip= +observe.nonTargetCatch.table.meanWeight= +observe.nonTargetCatch.table.meanWeight.tip= +observe.nonTargetCatch.table.reasonForDiscard= +observe.nonTargetCatch.table.reasonForDiscard.tip= +observe.nonTargetCatch.table.speciesFate= +observe.nonTargetCatch.table.speciesFate.tip= +observe.nonTargetCatch.table.speciesFaune= +observe.nonTargetCatch.table.speciesFaune.tip= +observe.nonTargetCatch.table.totalCount= +observe.nonTargetCatch.table.totalCount.tip= +observe.nonTargetSample.table.count= +observe.nonTargetSample.table.count.tip= +observe.nonTargetSample.table.gender= +observe.nonTargetSample.table.gender.tip= +observe.nonTargetSample.table.length= +observe.nonTargetSample.table.length.tip= +observe.nonTargetSample.table.meanWeight= +observe.nonTargetSample.table.meanWeight.tip= +observe.nonTargetSample.table.picturesReferences= +observe.nonTargetSample.table.picturesReferences.tip= +observe.nonTargetSample.table.speciesFaune= +observe.nonTargetSample.table.speciesFaune.tip= +observe.objectObservedSpecies.table.count= +observe.objectObservedSpecies.table.count.tip= +observe.objectObservedSpecies.table.speciesFaune= +observe.objectObservedSpecies.table.speciesFaune.tip= +observe.objectObservedSpecies.table.speciesStatus= +observe.objectObservedSpecies.table.speciesStatus.tip= +observe.obstuna.action.create= +observe.obstuna.action.create.description= +observe.obstuna.action.drop= +observe.obstuna.action.drop.description= +observe.obstuna.action.security= +observe.obstuna.action.security.description= +observe.obstuna.action.update= +observe.obstuna.action.update.description= +observe.person.country= +observe.program.tab.general= +observe.program.tab.observations= +observe.route.message.active.found= +observe.route.message.active.found.for.other.trip= +observe.route.message.creating= +observe.route.message.no.active.found= +observe.route.message.no.active.found.for.other.trip= +observe.route.message.not.open= +observe.route.message.updating= +observe.route.title= +observe.routes.title= +observe.runner.config.loaded= +observe.runner.config.migrate.file= +observe.runner.context.loaded= +observe.runner.copy.default.logConfigurationFile.file= +observe.runner.copy.default.map.file= +observe.runner.copy.default.report.file= +observe.runner.copy.default.ui.file= +observe.runner.create.directory= +observe.runner.exists.directory= +observe.runner.i18n.loaded= +observe.runner.init= +observe.runner.load.database= +observe.runner.loaded= +observe.runner.loading.ui.configuration= +observe.runner.quit.withno.ui= +observe.runner.start= +observe.runner.ui.loaded= +observe.runner.user.directories.loaded= +observe.schoolEstimate.table.meanWeight= +observe.schoolEstimate.table.meanWeight.tip= +observe.schoolEstimate.table.speciesThon= +observe.schoolEstimate.table.speciesThon.tip= +observe.schoolEstimate.table.weight= +observe.schoolEstimate.table.weight.tip= +observe.section.cant.delete.message= +observe.section.cant.delete.title= +observe.sectionTemplate.delete.message= +observe.sections.delete.message= +observe.security.referentiel= +observe.security.referentiel.tip= +observe.security.role= +observe.security.role.tip= +observe.security.technicien= +observe.security.technicien.tip= +observe.security.unused= +observe.security.unused.tip= +observe.security.utilisateur= +observe.security.utilisateur.tip= +observe.sensorUsed.action.create= +observe.sensorUsed.action.create.tip= +observe.sensorUsed.action.reset.dataLocation.tip= +observe.sensorUsed.action.reset.sensorSerialNo.tip= +observe.sensorUsed.data= +observe.sensorUsed.dataLocation= +observe.sensorUsed.dataLocation.tip= +observe.sensorUsed.delete.data.message= +observe.sensorUsed.deleteData= +observe.sensorUsed.deleteData.tip= +observe.sensorUsed.exportData= +observe.sensorUsed.exportData.tip= +observe.sensorUsed.importData= +observe.sensorUsed.importData.tip= +observe.sensorUsed.message.data.exported= +observe.sensorUsed.message.data.imported= +observe.sensorUsed.sensorBrand= +observe.sensorUsed.sensorDataFormat= +observe.sensorUsed.sensorSerialNo= +observe.sensorUsed.sensorType= +observe.sensorUsed.table.data= +observe.sensorUsed.table.data.tip= +observe.sensorUsed.table.dataLocation= +observe.sensorUsed.table.dataLocation.tip= +observe.sensorUsed.table.sensorBrand= +observe.sensorUsed.table.sensorBrand.tip= +observe.sensorUsed.table.sensorDataFormat= +observe.sensorUsed.table.sensorDataFormat.tip= +observe.sensorUsed.table.sensorSerialNo= +observe.sensorUsed.table.sensorSerialNo.tip= +observe.sensorUsed.table.sensorType= +observe.sensorUsed.table.sensorType.tip= +observe.sensorUsed.title= +observe.setLongline.action.reset.homeId.tip= +observe.setLongline.basketsPerSectionCount= +observe.setLongline.branchlinesPerBasketCount= +observe.setLongline.haulingBreaks= +observe.setLongline.haulingDirectionSameAsSetting= +observe.setLongline.haulingEndCoordinates= +observe.setLongline.haulingEndTimeStamp= +observe.setLongline.haulingStartCoordinates= +observe.setLongline.haulingStartTimeStamp= +observe.setLongline.homeId= +observe.setLongline.lightsticksColor= +observe.setLongline.lightsticksPerBasketCount= +observe.setLongline.lightsticksType= +observe.setLongline.lineType= +observe.setLongline.maxDepthTargeted= +observe.setLongline.message.creating= +observe.setLongline.message.updating= +observe.setLongline.monitored= +observe.setLongline.number= +observe.setLongline.settingEndCoordinates= +observe.setLongline.settingEndTimeStamp= +observe.setLongline.settingShape= +observe.setLongline.settingStartCoordinates= +observe.setLongline.settingStartTimeStamp= +observe.setLongline.settingVesselSpeed= +observe.setLongline.shooterSpeed= +observe.setLongline.shooterUsed= +observe.setLongline.snapWeight= +observe.setLongline.swivelWeight= +observe.setLongline.tab.hauling= +observe.setLongline.tab.setting= +observe.setLongline.tab.settingCaracteristics= +observe.setLongline.timeBetweenHooks= +observe.setLongline.title= +observe.setLongline.totalBasketsCount= +observe.setLongline.totalHooksCount= +observe.setLongline.totalSectionsCount= +observe.setLongline.weightedSnap= +observe.setLongline.weightedSwivel= +observe.setSeine.currentDirection= +observe.setSeine.currentMeasureDepth= +observe.setSeine.currentSpeed= +observe.setSeine.endPursingTimeStamp= +observe.setSeine.endSetTimeStamp= +observe.setSeine.maxGearDepth= +observe.setSeine.message.creating= +observe.setSeine.message.information.schoolType= +observe.setSeine.message.no.nonTargetDiscarded= +observe.setSeine.message.no.targetCatch= +observe.setSeine.message.no.targetDiscarded= +observe.setSeine.message.updating= +observe.setSeine.nonTargetDiscarded= +observe.setSeine.reasonForNullSet= +observe.setSeine.schoolMeanDepth= +observe.setSeine.schoolThickness= +observe.setSeine.schoolTopDepth= +observe.setSeine.schoolType= +observe.setSeine.schoolType.not.fill= +observe.setSeine.sonarUsed= +observe.setSeine.sonarUsedAvantSet= +observe.setSeine.startTime= +observe.setSeine.supportVesselName= +observe.setSeine.tab.general= +observe.setSeine.tab.measurements= +observe.setSeine.targetDiscarded= +observe.setSeine.title= +observe.species.availableOcean= +observe.species.selectedOcean= +observe.species.tab.general= +observe.species.tab.other= +observe.speciesList.availableSpecies= +observe.speciesList.selectedSpecies= +observe.speciesList.tab.general= +observe.speciesList.tab.species= +observe.storage.action.canMigrate= +observe.storage.error.dbVersionMismatch= +observe.storage.importExternalDump.config= +observe.storage.importExternalDump.description= +observe.storage.importExternalDumpData.config= +observe.storage.importExternalDumpReferentiel.config= +observe.storage.importRemoteStorage.config= +observe.storage.importRemoteStorage.description= +observe.storage.importRemoteStorageData.config= +observe.storage.importRemoteStorageReferentiel.config= +observe.storage.internalDump.last.modified= +observe.storage.internalDump.not.exist= +observe.storage.label.backup= +observe.storage.label.data.import.db= +observe.storage.label.db.to.create= +observe.storage.label.db.to.drop= +observe.storage.label.db.to.update= +observe.storage.label.db.to.update.security= +observe.storage.label.import.data= +observe.storage.label.import.local= +observe.storage.label.import.referentiel= +observe.storage.label.import.remote= +observe.storage.label.local= +observe.storage.label.reference.import.db= +observe.storage.label.remote= +observe.storage.label.synchro= +observe.storage.label.synchro.incoming= +observe.storage.label.synchro.referentiel= +observe.storage.locale.db= +observe.storage.no.creationMode= +observe.storage.no.creationMode.required= +observe.storage.no.dbMode= +observe.storage.noImportData.config= +observe.storage.noImportReferentiel.config= +observe.storage.remote.db= +observe.storage.remote.login= +observe.storage.remote.password= +observe.storage.remote.url= +observe.storage.remote.useSll= +observe.storage.report.action.backup.local= +observe.storage.report.action.backup.remote= +observe.storage.report.action.connect.local= +observe.storage.report.action.connect.remote= +observe.storage.report.action.create.local= +observe.storage.report.action.data.import.backup= +observe.storage.report.action.import.backup= +observe.storage.report.action.import.internal= +observe.storage.report.action.import.remote.data= +observe.storage.report.action.import.remote.referentiel= +observe.storage.report.action.migrate= +observe.storage.report.action.no.data.import= +observe.storage.report.action.no.referentiel.import= +observe.storage.report.action.referentiel.import.backup= +observe.storage.report.can.migrate= +observe.storage.report.can.not.migrate= +observe.storage.report.no.create.mode= +observe.storage.report.security.owner= +observe.storage.report.security.readers= +observe.storage.report.security.referentiels= +observe.storage.report.security.techniciens= +observe.storage.report.selected.all.data= +observe.storage.report.selected.all.data.to.import= +observe.storage.report.selected.backup.file= +observe.storage.report.selected.data= +observe.storage.report.selected.data.for.import= +observe.storage.report.selected.data.referentiel= +observe.storage.report.selected.data.to.export= +observe.storage.report.selected.data.to.import= +observe.storage.report.selected.localStorageFile= +observe.storage.report.selected.no.data= +observe.storage.report.selected.no.data.to.import= +observe.storage.report.selected.remoteStorage= +observe.storage.report.selected.security= +observe.storage.required.rw.on.data= +observe.storage.security.administrateur= +observe.storage.selected.dbMode= +observe.storage.selectedCreationMode= +observe.storage.showMigrationProgression= +observe.storage.showMigrationSql= +observe.storage.step.backup= +observe.storage.step.backup.description= +observe.storage.step.config= +observe.storage.step.config.description= +observe.storage.step.configData= +observe.storage.step.configData.description= +observe.storage.step.configReferentiel= +observe.storage.step.configReferentiel.description= +observe.storage.step.confirm= +observe.storage.step.confirm.description= +observe.storage.step.creationMode= +observe.storage.step.dbMode= +observe.storage.step.dbMode.description= +observe.storage.step.dbMode.detail= +observe.storage.step.label= +observe.storage.step.roles= +observe.storage.step.roles.description= +observe.storage.step.selectData= +observe.storage.step.selectData.description= +observe.storage.store.remote.config= +observe.storage.store.remote.config.tip= +observe.storage.useRemoteStorage.config= +observe.storage.useRemoteStorage.description= +observe.synchro.add.object= +observe.synchro.common.activity= +observe.synchro.common.latitude= +observe.synchro.common.longitude= +observe.synchro.common.quadrant= +observe.synchro.common.reference= +observe.synchro.common.select= +observe.synchro.common.vitesse= +observe.synchro.config.data.mode= +observe.synchro.config.data.storage= +observe.synchro.config.export.required.read.data= +observe.synchro.config.export.required.read.referentiel= +observe.synchro.config.export.required.write.data= +observe.synchro.config.importGPS= +observe.synchro.config.referentiel.mode= +observe.synchro.config.referentiel.storage= +observe.synchro.config.report= +observe.synchro.config.source.storage= +observe.synchro.config.validate= +observe.synchro.config.validation.report= +observe.synchro.configuration= +observe.synchro.continue.with.no.save.report= +observe.synchro.import.data.fromBackup= +observe.synchro.import.data.fromRemoteStorage= +observe.synchro.importGPS.invalidIntervals.list= +observe.synchro.message.all.obsolete.entities.fixed= +observe.synchro.message.need.save.for.synchro.operation= +observe.synchro.message.need.save.for.validation.operation= +observe.synchro.message.obsolete.entities.fixed= +observe.synchro.message.obsolote.entity.ref.found= +observe.synchro.message.obsolote.entity.refs.found= +observe.synchro.message.saveLocal.skip= +observe.synchro.no.data.import= +observe.synchro.no.local.storage= +observe.synchro.no.referentiel.import= +observe.synchro.no.remote.storage= +observe.synchro.obsolete.entities.list= +observe.synchro.obsolete.entity.fix= +observe.synchro.obsolete.entity.label= +observe.synchro.obsolete.entity.to.change.label= +observe.synchro.operation.canceled= +observe.synchro.operation.consolidate= +observe.synchro.operation.consolidate.description= +observe.synchro.operation.exportData= +observe.synchro.operation.exportData.description= +observe.synchro.operation.failed= +observe.synchro.operation.importGPS= +observe.synchro.operation.importGPS.description= +observe.synchro.operation.needFix= +observe.synchro.operation.report= +observe.synchro.operation.report.description= +observe.synchro.operation.running= +observe.synchro.operation.saveLocal= +observe.synchro.operation.saveLocal.description= +observe.synchro.operation.successed= +observe.synchro.operation.synchronize= +observe.synchro.operation.synchronize.description= +observe.synchro.operation.validate= +observe.synchro.operation.validate.description= +observe.synchro.operations= +observe.synchro.remove.object= +observe.synchro.replaceObsolete.object= +observe.synchro.report.copy.options= +observe.synchro.report.report.description= +observe.synchro.report.result= +observe.synchro.report.select= +observe.synchro.report.variables= +observe.synchro.safe.entity.to.choose.label= +observe.synchro.save.report= +observe.synchro.step.config= +observe.synchro.step.config.description= +observe.synchro.step.consolidate= +observe.synchro.step.consolidate.description= +observe.synchro.step.exportData= +observe.synchro.step.exportData.description= +observe.synchro.step.importGPS= +observe.synchro.step.importGPS.description= +observe.synchro.step.report= +observe.synchro.step.report.description= +observe.synchro.step.saveLocal= +observe.synchro.step.saveLocal.description= +observe.synchro.step.selectData= +observe.synchro.step.selectData.description= +observe.synchro.step.showResume= +observe.synchro.step.showResume.description= +observe.synchro.step.synchronize= +observe.synchro.step.synchronize.description= +observe.synchro.step.validate= +observe.synchro.step.validate.description= +observe.synchro.table.exportData.exist.label= +observe.synchro.table.exportData.exist.label.tip= +observe.synchro.table.exportData.program.label= +observe.synchro.table.exportData.program.label.tip= +observe.synchro.table.exportData.selected= +observe.synchro.table.exportData.selected.tip= +observe.synchro.table.exportData.trip.label= +observe.synchro.table.exportData.trip.label.tip= +observe.synchro.table.importGPS.activity.label= +observe.synchro.table.importGPS.activity.label.tip= +observe.synchro.table.importGPS.activity.latitude= +observe.synchro.table.importGPS.activity.latitude.tip= +observe.synchro.table.importGPS.activity.longitude= +observe.synchro.table.importGPS.activity.longitude.tip= +observe.synchro.table.importGPS.activity.quadrant= +observe.synchro.table.importGPS.activity.quadrant.tip= +observe.synchro.table.importGPS.activity.select= +observe.synchro.table.importGPS.activity.select.tip= +observe.synchro.table.importGPS.activity.vitesse= +observe.synchro.table.importGPS.activity.vitesse.tip= +observe.synchro.table.importGPS.computed.label= +observe.synchro.table.importGPS.computed.label.tip= +observe.synchro.table.importGPS.data.label= +observe.synchro.table.importGPS.data.label.tip= +observe.synchro.table.obsolete.entity.label= +observe.synchro.table.obsolete.entity.label.tip= +observe.synchro.table.obsolete.entity.select= +observe.synchro.table.obsolete.entity.select.tip= +observe.synchro.update.object= +observe.synchro.validate.invalid.data.list= +observe.synchro.validate.message.list= +observe.synchro.validate.save.reportFile= +observe.targetCatch.table.comment= +observe.targetCatch.table.comment.tip= +observe.targetCatch.table.deleteExtraMessage= +observe.targetCatch.table.speciesThon= +observe.targetCatch.table.speciesThon.tip= +observe.targetCatch.table.weight= +observe.targetCatch.table.weight.tip= +observe.targetCatch.table.weightCategory= +observe.targetCatch.table.weightCategory.tip= +observe.targetCatch.table.well= +observe.targetCatch.table.well.tip= +observe.targetDiscarded.message.table.will.delete.targetLength= +observe.targetDiscarded.table.broughtOnDeck= +observe.targetDiscarded.table.broughtOnDeck.tip= +observe.targetDiscarded.table.comment= +observe.targetDiscarded.table.comment.tip= +observe.targetDiscarded.table.deleteExtraMessage= +observe.targetDiscarded.table.reasonForDiscard= +observe.targetDiscarded.table.reasonForDiscard.tip= +observe.targetDiscarded.table.speciesThon= +observe.targetDiscarded.table.speciesThon.tip= +observe.targetDiscarded.table.weight= +observe.targetDiscarded.table.weight.tip= +observe.targetDiscarded.table.weightCategory= +observe.targetDiscarded.table.weightCategory.tip= +observe.targetSample.table.count= +observe.targetSample.table.count.tip= +observe.targetSample.table.length= +observe.targetSample.table.length.tip= +observe.targetSample.table.meanWeight= +observe.targetSample.table.meanWeight.tip= +observe.targetSample.table.measureType= +observe.targetSample.table.measureType.tip= +observe.targetSample.table.speciesThon= +observe.targetSample.table.speciesThon.tip= +observe.targetSample.table.totalWeight= +observe.targetSample.table.totalWeight.tip= +observe.tdr.action.create= +observe.tdr.action.create.tip= +observe.tdr.action.reset.dataLocation.tip= +observe.tdr.action.reset.homeId.tip= +observe.tdr.action.reset.serialNo.tip= +observe.tdr.availableSpecies= +observe.tdr.basket= +observe.tdr.branchline= +observe.tdr.data= +observe.tdr.dataLocation= +observe.tdr.dataLocation.tip= +observe.tdr.delete.data.message= +observe.tdr.deleteData= +observe.tdr.deleteData.tip= +observe.tdr.deployementEnd= +observe.tdr.deployementStart= +observe.tdr.enableTimestamp= +observe.tdr.enableTimestamp.tip= +observe.tdr.exportData= +observe.tdr.exportData.tip= +observe.tdr.fishingEnd= +observe.tdr.fishingEndDepth= +observe.tdr.fishingStart= +observe.tdr.fishingStartDepth= +observe.tdr.floatline1Length= +observe.tdr.floatline2Length= +observe.tdr.homeId= +observe.tdr.importData= +observe.tdr.importData.tip= +observe.tdr.itemHorizontalPosition= +observe.tdr.itemVerticalPosition= +observe.tdr.locationOnLongline= +observe.tdr.maxFishingDepth= +observe.tdr.meanDeployementDepth= +observe.tdr.meanFishingDepth= +observe.tdr.medianDeployementDepth= +observe.tdr.medianFishingDepth= +observe.tdr.message.data.imported= +observe.tdr.minFishingDepth= +observe.tdr.section= +observe.tdr.selectedSpecies= +observe.tdr.sensorBrand= +observe.tdr.serialNo= +observe.tdr.species= +observe.tdr.tab.caracteristics= +observe.tdr.tab.keyData= +observe.tdr.tab.localisation= +observe.tdr.tab.species= +observe.tdr.tab.timestamp= +observe.tdr.table.data= +observe.tdr.table.homeId= +observe.tdr.table.homeId.tip= +observe.tdr.table.sensorBrand= +observe.tdr.table.sensorBrand.tip= +observe.tdr.table.serialNo= +observe.tdr.table.serialNo.tip= +observe.tdr.title= +observe.title.about= +observe.title.can.not.delete.referentiel= +observe.title.can.not.export.obstuna= +observe.title.change.storage= +observe.title.choose.db.dump= +observe.title.choose.db.dump.directory= +observe.title.choose.importGPS= +observe.title.choose.report.directory= +observe.title.choose.reportFile= +observe.title.choose.sensorUsed.exportData= +observe.title.choose.sensorUsed.importData= +observe.title.choose.tdr.exportData= +observe.title.choose.tdr.importData= +observe.title.config.migrate= +observe.title.connect.existingDB= +observe.title.connect.localDB= +observe.title.connect.remoteDB= +observe.title.consolidate= +observe.title.consolidate.tip= +observe.title.content.baitHaulingStatuss= +observe.title.content.baitSettingStatuss= +observe.title.content.baitTypes= +observe.title.content.catchFateLonglines= +observe.title.content.country= +observe.title.content.detectionModes= +observe.title.content.encounterTypes= +observe.title.content.fpaZones= +observe.title.content.gearCaracteristicTypes= +observe.title.content.gearCaracteristics= +observe.title.content.gears= +observe.title.content.harbours= +observe.title.content.healthnesss= +observe.title.content.hookPositions= +observe.title.content.hookSizes= +observe.title.content.hookTypes= +observe.title.content.itemHorizontalPositions= +observe.title.content.itemVerticalPositions= +observe.title.content.lengthWeightParameters= +observe.title.content.lightsticksColors= +observe.title.content.lightsticksTypes= +observe.title.content.lineTypes= +observe.title.content.maturityStatuss= +observe.title.content.mitigationTypes= +observe.title.content.objectFates= +observe.title.content.objectOperations= +observe.title.content.objectTypes= +observe.title.content.observedSystems= +observe.title.content.oceans= +observe.title.content.organisms= +observe.title.content.persons= +observe.title.content.programs= +observe.title.content.reasonForDiscards= +observe.title.content.reasonForNoFishings= +observe.title.content.reasonForNullSets= +observe.title.content.sensorBrands= +observe.title.content.sensorDataFormats= +observe.title.content.sensorTypes= +observe.title.content.settingShapes= +observe.title.content.sexx= +observe.title.content.sizeMeasureTypes= +observe.title.content.speciesFates= +observe.title.content.speciesGroupSpeciess= +observe.title.content.speciesLists= +observe.title.content.speciesStatuss= +observe.title.content.speciess= +observe.title.content.stomacFullnesss= +observe.title.content.surroundingActivitys= +observe.title.content.transmittingBuoyOperations= +observe.title.content.transmittingBuoyTypes= +observe.title.content.tripTypes= +observe.title.content.vesselActivityLonglines= +observe.title.content.vesselActivitySeines= +observe.title.content.vesselSizeCategoryx= +observe.title.content.vesselTypex= +observe.title.content.vesselx= +observe.title.content.weightCategory= +observe.title.content.weightMeasureTypes= +observe.title.content.windSpeeds= +observe.title.create.local.db= +observe.title.delete= +observe.title.error.dialog= +observe.title.exportData= +observe.title.exportData.tip= +observe.title.h2.server.parameters= +observe.title.import.localDB= +observe.title.importGPS= +observe.title.importGPS.tip= +observe.title.load.remote.db= +observe.title.need.confirm= +observe.title.need.confirm.to.desactivate.referentiel= +observe.title.no.local.db.found= +observe.title.report= +observe.title.report.tip= +observe.title.save.localDB= +observe.title.save.remoteDB= +observe.title.show.usage= +observe.title.speciesList.not.found= +observe.title.storage.info= +observe.title.synchronize= +observe.title.synchronize.tip= +observe.title.technical.informations= +observe.title.unique.key= +observe.title.validate= +observe.title.validate.tip= +observe.title.welcome.admin= +observe.tree.activityLongline= +observe.tree.activityLongline.unsaved= +observe.tree.activitySeine= +observe.tree.activitySeine.unsaved= +observe.tree.baitHaulingStatus= +observe.tree.baitSettingStatus= +observe.tree.baitType= +observe.tree.catchFateLongline= +observe.tree.catchLongline= +observe.tree.country= +observe.tree.detectionMode= +observe.tree.encounter= +observe.tree.encounterType= +observe.tree.floatingObject.unsaved= +observe.tree.fpaZone= +observe.tree.gear= +observe.tree.gearCaracteristic= +observe.tree.gearCaracteristicType= +observe.tree.gearUseFeaturesLongline= +observe.tree.gearUseFeaturesSeine= +observe.tree.harbour= +observe.tree.healthness= +observe.tree.hookPosition= +observe.tree.hookSize= +observe.tree.hookType= +observe.tree.itemHorizontalPosition= +observe.tree.itemVerticalPosition= +observe.tree.lengthWeightParameter= +observe.tree.lightsticksColor= +observe.tree.lightsticksType= +observe.tree.lineType= +observe.tree.longlineDetailComposition= +observe.tree.longlineGlobalComposition= +observe.tree.maturityStatus= +observe.tree.mitigationType= +observe.tree.nonTargetCatch= +observe.tree.nonTargetSample= +observe.tree.objectFate= +observe.tree.objectObservedSpecies= +observe.tree.objectOperation= +observe.tree.objectSchoolEstimate= +observe.tree.objectType= +observe.tree.observedSystem= +observe.tree.ocean= +observe.tree.organism= +observe.tree.person= +observe.tree.program= +observe.tree.reasonForDiscard= +observe.tree.reasonForNoFishing= +observe.tree.reasonForNullSet= +observe.tree.reference.common= +observe.tree.reference.longline= +observe.tree.reference.seine= +observe.tree.route= +observe.tree.route.unsaved= +observe.tree.schoolEstimate= +observe.tree.sensorBrand= +observe.tree.sensorDataFormat= +observe.tree.sensorType= +observe.tree.sensorUsed= +observe.tree.setLongline= +observe.tree.setLongline.unsaved= +observe.tree.setSeine= +observe.tree.setSeine.unsaved= +observe.tree.settingShape= +observe.tree.sex= +observe.tree.sizeMeasureType= +observe.tree.species= +observe.tree.speciesFate= +observe.tree.speciesGroup= +observe.tree.speciesList= +observe.tree.speciesStatus= +observe.tree.stomacFullness= +observe.tree.surroundingActivity= +observe.tree.targetCatch= +observe.tree.targetDiscarded= +observe.tree.targetSample= +observe.tree.targetSampleCapture= +observe.tree.tdr= +observe.tree.transmittingBuoyOperation= +observe.tree.transmittingBuoyType= +observe.tree.tripLongline.unsaved= +observe.tree.tripSeine.unsaved= +observe.tree.tripType= +observe.tree.vessel= +observe.tree.vesselActivityLongline= +observe.tree.vesselActivitySeine= +observe.tree.vesselSizeCategory= +observe.tree.vesselType= +observe.tree.weightCategory= +observe.tree.weightMeasureType= +observe.tree.wind= +observe.tripLongline.captain= +observe.tripLongline.dataEntryOperator= +observe.tripLongline.endDate= +observe.tripLongline.homeId= +observe.tripLongline.message.active.found= +observe.tripLongline.message.active.found.for.other.program= +observe.tripLongline.message.creating= +observe.tripLongline.message.no.active.found= +observe.tripLongline.message.not.open= +observe.tripLongline.message.updating= +observe.tripLongline.observer= +observe.tripLongline.ocean= +observe.tripLongline.startDate= +observe.tripLongline.tab.general= +observe.tripLongline.tab.map= +observe.tripLongline.title= +observe.tripLongline.totalFishingOperationsNumber= +observe.tripLongline.tripType= +observe.tripLongline.vessel= +observe.tripSeine.message.active.found= +observe.tripSeine.message.active.found.for.other.program= +observe.tripSeine.message.creating= +observe.tripSeine.message.no.active.found= +observe.tripSeine.message.not.open= +observe.tripSeine.message.updating= +observe.tripSeine.tab.general= +observe.tripSeine.tab.map= +observe.tripSeine.title= +observe.validation.report.contextName= +observe.validation.report.entities.with.messages= +observe.validation.report.entity= +observe.validation.report.scopes= +observe.validation.report.title= +observe.vessel.tab.general= +observe.vessel.tab.other= +observe.view.message= +observe.view.navigation= +observe.view.server= +observe.warning.nimbus.landf= +observe.warning.no.ui= +ui.main.body.synchro.action.copy.to.clipBoard= diff --git a/observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionApplicationContext.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContext.java similarity index 52% rename from observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionApplicationContext.java rename to observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContext.java index 6c15c17..4feff7c 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionApplicationContext.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContext.java @@ -1,8 +1,8 @@ -package fr.ird.observe.services.rest.wm; +package fr.ird.observe.application.web; import com.google.common.base.Preconditions; -import fr.ird.observe.services.ObserveServiceApplicationContext; -import fr.ird.observe.services.topia.ObserveTopiaServiceFactory; +import fr.ird.observe.services.ObserveServiceFactory; +import fr.ird.observe.services.ObserveServiceMainFactory; import org.debux.webmotion.server.call.HttpContext; import javax.servlet.ServletContext; @@ -10,26 +10,24 @@ import javax.servlet.ServletContext; /** * @author Tony Chemit : chemit@codelutin.com */ -public class ObserveRestWebMotionApplicationContext { +public class ObserveWebApplicationContext { - public static final String APPLICATION_CONTEXT_PARAMETER = ObserveRestWebMotionApplicationContext.class.getName(); + public static final String APPLICATION_CONTEXT_PARAMETER = ObserveWebApplicationContext.class.getName(); public static final String MISSING_APPLICATION_CONTEXT = - ObserveRestWebMotionApplicationContext.class.getSimpleName() + " not found. You probably forgot to" + - " register " + ObserveRestWebMotionApplicationListener.class.getName() + " in your web.xml"; + ObserveWebApplicationContext.class.getSimpleName() + " not found. You probably forgot to" + + " register " + ObserveWebApplicationListener.class.getName() + " in your web.xml"; - protected ObserveTopiaServiceFactory serviceFactory; + protected ObserveServiceFactory serviceFactory; - protected ObserveServiceApplicationContext serviceApplicationContext; - - protected static ObserveRestWebMotionApplicationContext getApplicationContext(HttpContext context) { + protected static ObserveWebApplicationContext getApplicationContext(HttpContext context) { ServletContext servletContext = context.getServletContext(); - ObserveRestWebMotionApplicationContext result = - (ObserveRestWebMotionApplicationContext) servletContext - .getAttribute(ObserveRestWebMotionApplicationContext.APPLICATION_CONTEXT_PARAMETER); + ObserveWebApplicationContext result = + (ObserveWebApplicationContext) servletContext + .getAttribute(ObserveWebApplicationContext.APPLICATION_CONTEXT_PARAMETER); - Preconditions.checkState(result != null, ObserveRestWebMotionApplicationContext.MISSING_APPLICATION_CONTEXT); + Preconditions.checkState(result != null, ObserveWebApplicationContext.MISSING_APPLICATION_CONTEXT); return result; @@ -41,8 +39,8 @@ public class ObserveRestWebMotionApplicationContext { public void init() { - serviceFactory = new ObserveTopiaServiceFactory(); - serviceApplicationContext = new ObserveServiceApplicationContext(); + //FIXME Demander a la main factory directement la factory de topia + serviceFactory = ObserveServiceMainFactory.get(); // ObserveServiceConfig config = new ObserveServiceConfig(null); // serviceConfig = config; @@ -71,11 +69,7 @@ public class ObserveRestWebMotionApplicationContext { return true; } - public ObserveTopiaServiceFactory getServiceFactory() { + public ObserveServiceFactory getServiceFactory() { return serviceFactory; } - - public ObserveServiceApplicationContext getServiceApplicationContext() { - return serviceApplicationContext; - } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java new file mode 100644 index 0000000..c1dd564 --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java @@ -0,0 +1,42 @@ +package fr.ird.observe.application.web; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; + +/** + * @author Tony Chemit : chemit@codelutin.com + */ +public class ObserveWebApplicationListener implements ServletContextListener { + + private static final Log log = LogFactory.getLog(ObserveWebApplicationListener.class); + + protected ObserveWebApplicationContext context; + + @Override + public void contextInitialized(ServletContextEvent sce) { + + if (log.isInfoEnabled()) { + log.info("Initializing " + ObserveWebApplicationListener.class.getName()); + } + + context = new ObserveWebApplicationContext(); + context.init(); + + sce.getServletContext().setAttribute(ObserveWebApplicationContext.APPLICATION_CONTEXT_PARAMETER, context); + + } + + @Override + public void contextDestroyed(ServletContextEvent sce) { + + if (log.isInfoEnabled()) { + log.info("Destroying " + ObserveWebApplicationListener.class.getName()); + } + + context.close(); + } + +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionFilter.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java similarity index 80% rename from observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionFilter.java rename to observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java index e5ed46c..4ed6d67 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionFilter.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java @@ -1,7 +1,5 @@ -package fr.ird.observe.services.rest.wm; +package fr.ird.observe.application.web; -import fr.ird.observe.services.ObserveServiceApplicationContext; -import fr.ird.observe.services.topia.ObserveTopiaServiceFactory; import org.debux.webmotion.server.WebMotionFilter; import org.debux.webmotion.server.call.HttpContext; @@ -10,7 +8,7 @@ import javax.servlet.http.HttpServletRequest; /** * @author Tony Chemit - chemit@codelutin.com */ -public class ObserveRestWebMotionFilter extends WebMotionFilter { +public class ObserveWebMotionFilter extends WebMotionFilter { // protected ObserveTopiaPersistenceContext getTopiaContext(HttpContext context) { // HttpServletRequest servletRequest = context.getRequest(); @@ -27,8 +25,8 @@ public class ObserveRestWebMotionFilter extends WebMotionFilter { // final ObserveTopiaPersistenceContext persistenceContext = getTopiaContext(context); - ObserveRestWebMotionApplicationContext applicationContext = - ObserveRestWebMotionApplicationContext.getApplicationContext(context); + ObserveWebApplicationContext applicationContext = + ObserveWebApplicationContext.getApplicationContext(context); HttpServletRequest request = context.getRequest(); diff --git a/observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionJsonHelper.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionJsonHelper.java similarity index 95% rename from observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionJsonHelper.java rename to observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionJsonHelper.java index e0858ae..0e22499 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionJsonHelper.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionJsonHelper.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.rest.wm; +package fr.ird.observe.application.web; /* * #%L @@ -43,11 +43,11 @@ import java.util.Date; * @author Tony Chemit <chemit@codelutin.com> * @since 2.0 */ -public class ObserveRestWebMotionJsonHelper { +public class ObserveWebMotionJsonHelper { private final Gson gson; - public ObserveRestWebMotionJsonHelper(boolean prettyPrint) { + public ObserveWebMotionJsonHelper(boolean prettyPrint) { GsonBuilder gsonBuilder = new GsonBuilder(); diff --git a/observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionRender.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionRender.java similarity index 74% rename from observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionRender.java rename to observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionRender.java index 0338207..8c54993 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionRender.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionRender.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.rest.wm; +package fr.ird.observe.application.web; import org.debux.webmotion.server.call.Call; import org.debux.webmotion.server.call.HttpContext; @@ -15,11 +15,11 @@ import java.io.PrintWriter; * * @author Tony chemit - chemit@codelutin.com */ -public class ObserveRestWebMotionRender<T> extends Render { +public class ObserveWebMotionRender<T> extends Render { protected T model; - public ObserveRestWebMotionRender(T model) { + public ObserveWebMotionRender(T model) { this.model = model; } @@ -30,8 +30,8 @@ public class ObserveRestWebMotionRender<T> extends Render { HttpServletResponse response = context.getResponse(); response.setContentType("application/json"); - ObserveRestWebMotionApplicationContext applicationContext = - ObserveRestWebMotionApplicationContext.getApplicationContext(context); + ObserveWebApplicationContext applicationContext = + ObserveWebApplicationContext.getApplicationContext(context); // if (model instanceof InvalidFormException || model instanceof FavoriteListImportException) { // @@ -41,7 +41,7 @@ public class ObserveRestWebMotionRender<T> extends Render { boolean devMode = applicationContext.isDevMode(); - ObserveRestWebMotionJsonHelper gson = new ObserveRestWebMotionJsonHelper(devMode); + ObserveWebMotionJsonHelper gson = new ObserveWebMotionJsonHelper(devMode); String json = gson.toJson(model); PrintWriter out = context.getOut(); diff --git a/observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/ObserveWebMotionController.java similarity index 50% rename from observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionController.java rename to observe-application-web/src/main/java/fr/ird/observe/application/web/controller/ObserveWebMotionController.java index 19c85d8..7e31748 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/ObserveWebMotionController.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.rest.wm; +package fr.ird.observe.application.web.controller; import fr.ird.observe.services.ObserveService; import org.debux.webmotion.server.WebMotionController; @@ -6,6 +6,6 @@ import org.debux.webmotion.server.WebMotionController; /** * @author Tony Chemit : chemit@codelutin.com */ -public abstract class ObserveRestWebMotionController extends WebMotionController implements ObserveService { +public abstract class ObserveWebMotionController extends WebMotionController implements ObserveService { } diff --git a/observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/service/ReferentialServiceRest.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/ReferentialServiceController.java similarity index 89% rename from observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/service/ReferentialServiceRest.java rename to observe-application-web/src/main/java/fr/ird/observe/application/web/controller/ReferentialServiceController.java index aabf0cb..ab9b4c8 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/service/ReferentialServiceRest.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/ReferentialServiceController.java @@ -1,10 +1,9 @@ -package fr.ird.observe.services.rest.wm.service; +package fr.ird.observe.application.web.controller; import fr.ird.observe.services.ObserveServiceContext; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.rest.wm.ObserveRestWebMotionController; import fr.ird.observe.services.service.DataNotFoundException; import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.services.spi.Write; @@ -16,7 +15,7 @@ import java.util.Collection; * * @author Tony Chemit - chemit@codelutin.com */ -public class ReferentialServiceRest extends ObserveRestWebMotionController implements ReferentialService { +public class ReferentialServiceController extends ObserveWebMotionController implements ReferentialService { //TODO A injecter protected ReferentialService referentialService; diff --git a/observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionApplicationListener.java b/observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionApplicationListener.java deleted file mode 100644 index 132c765..0000000 --- a/observe-application-web/src/main/java/fr/ird/observe/services/rest/wm/ObserveRestWebMotionApplicationListener.java +++ /dev/null @@ -1,42 +0,0 @@ -package fr.ird.observe.services.rest.wm; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; - -/** - * @author Tony Chemit : chemit@codelutin.com - */ -public class ObserveRestWebMotionApplicationListener implements ServletContextListener { - - private static final Log log = LogFactory.getLog(ObserveRestWebMotionApplicationListener.class); - - protected ObserveRestWebMotionApplicationContext context; - - @Override - public void contextInitialized(ServletContextEvent sce) { - - if (log.isInfoEnabled()) { - log.info("Initializing " + ObserveRestWebMotionApplicationListener.class.getName()); - } - - context = new ObserveRestWebMotionApplicationContext(); - context.init(); - - sce.getServletContext().setAttribute(ObserveRestWebMotionApplicationContext.APPLICATION_CONTEXT_PARAMETER, context); - - } - - @Override - public void contextDestroyed(ServletContextEvent sce) { - - if (log.isInfoEnabled()) { - log.info("Destroying " + ObserveRestWebMotionApplicationListener.class.getName()); - } - - context.close(); - } - -} diff --git a/observe-application-web/src/main/resources/mapping b/observe-application-web/src/main/resources/mapping index ae059ed..03d0384 100644 --- a/observe-application-web/src/main/resources/mapping +++ b/observe-application-web/src/main/resources/mapping @@ -1,12 +1,12 @@ [config] -package.base=fr.ird.observe.services.rest.wm.service -default.render=fr.ird.observe.services.rest.wm.ObserveRestWebMotionRender +package.base=fr.ird.observe.application.web.controller +default.render=fr.ird.observe.application.web.ObserveWebMotionRender server.controller.scope=request -server.listener.class=fr.ird.observe.services.rest.wm.ObserveRestServerListener +server.listener.class=fr.ird.observe.services.rest.wm.ObserveServerListener [filters] -* /* fr.ird.observe.services.rest.wm.ObserveRestWebMotionFilter.inject +* /* fr.ird.observe.application.web.ObserveWebMotionFilter.inject [actions] -GET,POST /referential/{method} action:ReferentialServiceRest.{method} +GET,POST /api/v1/referential/{method} action:ReferentialServiceController.{method} diff --git a/observe-application-web/src/main/webapp/WEB-INF/web.xml b/observe-application-web/src/main/webapp/WEB-INF/web.xml index 35a2e2f..db975e2 100644 --- a/observe-application-web/src/main/webapp/WEB-INF/web.xml +++ b/observe-application-web/src/main/webapp/WEB-INF/web.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" > - <display-name>Observe REST API by WebMotion</display-name> + <display-name>Observe Web Application by WebMotion</display-name> <!--filter> <filter-name>topiaTransaction</filter-name> @@ -19,7 +19,7 @@ </filter-mapping--> <listener> - <listener-class>fr.ird.observe.services.rest.wm.ObserveRestWebMotionApplicationListener</listener-class> + <listener-class>fr.ird.observe.application.web.ObserveWebApplicationListener</listener-class> </listener> </web-app> diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceFactory.java b/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceFactory.java index 1f86f6d..9ec36b0 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceFactory.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceFactory.java @@ -1,5 +1,7 @@ package fr.ird.observe.services; +import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; + /** * Created on 5/4/15. * diff --git a/observe-services-configuration-api/pom.xml b/observe-services-configuration-api/pom.xml index dd4c065..7347b30 100644 --- a/observe-services-configuration-api/pom.xml +++ b/observe-services-configuration-api/pom.xml @@ -23,6 +23,17 @@ <artifactId>observe-services-model</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-services-configuration-api</artifactId> + <version>${project.version}</version> + </dependency> + <!-- TODO A supprimer rapidemment --> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-business</artifactId> + <version>${project.version}</version> + </dependency> <!-- commons dependencies --> diff --git a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveRestDataSourceConfiguration.java b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java similarity index 86% rename from observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveRestDataSourceConfiguration.java rename to observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java index 818a12b..50226ce 100644 --- a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveRestDataSourceConfiguration.java +++ b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.rest.client; +package fr.ird.observe.services.configuration; import java.net.URL; @@ -7,7 +7,7 @@ import java.net.URL; * * @author Tony Chemit - chemit@codelutin.com */ -public class ObserveRestDataSourceConfiguration implements ObserveDataSourceConfiguration { +public class ObserveDataSourceConfigurationRest implements ObserveDataSourceConfiguration { /** * L'url du serveur à utiliser. diff --git a/observe-services-configuration-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory b/observe-services-configuration-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory index 9753b48..d67b648 100644 --- a/observe-services-configuration-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory +++ b/observe-services-configuration-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory @@ -1 +1 @@ -fr.ird.observe.services.rest.client.ObserveRestClientServiceFactory \ No newline at end of file +fr.ird.observe.services.ObserveRestClientServiceFactory \ No newline at end of file diff --git a/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/topia/ObserveTopiaDataSourceConfiguration.java b/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopia.java similarity index 65% rename from observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/topia/ObserveTopiaDataSourceConfiguration.java rename to observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopia.java index 8b95c3c..434bc4d 100644 --- a/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/topia/ObserveTopiaDataSourceConfiguration.java +++ b/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopia.java @@ -1,14 +1,13 @@ -package fr.ird.observe.services.configuration.topia; +package fr.ird.observe.services.configuration; import fr.ird.observe.db.DataSource; -import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; /** * Created on 19/08/15. * * @author Tony Chemit - chemit@codelutin.com */ -public class ObserveTopiaDataSourceConfiguration implements ObserveDataSourceConfiguration { +public class ObserveDataSourceConfigurationTopia implements ObserveDataSourceConfiguration { private DataSource dataSource; diff --git a/observe-services-configuration-topia/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory b/observe-services-configuration-topia/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory deleted file mode 100644 index 016fcd0..0000000 --- a/observe-services-configuration-topia/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory +++ /dev/null @@ -1 +0,0 @@ -fr.ird.observe.services.topia.ObserveTopiaServiceFactory \ No newline at end of file diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceContext.java b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceContextRest.java similarity index 60% rename from observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceContext.java rename to observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceContextRest.java index 2083a1a..f742f0b 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceContext.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceContextRest.java @@ -1,7 +1,6 @@ -package fr.ird.observe.services.rest.client; +package fr.ird.observe.services; -import fr.ird.observe.services.ObserveServiceApplicationContext; -import fr.ird.observe.services.ObserveServiceContext; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.dto.constants.ReferentialLocale; import java.util.Date; @@ -11,11 +10,11 @@ import java.util.Date; * * @author Tony Chemit - chemit@codelutin.com */ -public class ObserveRestClientServiceContext implements ObserveServiceContext { +public class ObserveServiceContextRest implements ObserveServiceContext { protected ObserveServiceApplicationContext applicationContext; - protected ObserveRestClientDataSourceConfiguration dataSourceConfiguration; + protected ObserveDataSourceConfigurationRest dataSourceConfiguration; @Override public ReferentialLocale getReferentialLocale() { @@ -27,7 +26,7 @@ public class ObserveRestClientServiceContext implements ObserveServiceContext { return new Date(); } - public void setDataSourceConfiguration(ObserveRestClientDataSourceConfiguration dataSourceConfiguration) { + public void setDataSourceConfiguration(ObserveDataSourceConfigurationRest dataSourceConfiguration) { this.dataSourceConfiguration = dataSourceConfiguration; } diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceFactory.java b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java similarity index 65% rename from observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceFactory.java rename to observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java index 00041f5..ec4e350 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceFactory.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java @@ -1,26 +1,24 @@ -package fr.ird.observe.services.rest.client; +package fr.ird.observe.services; import com.google.common.base.Preconditions; import com.google.common.cache.LoadingCache; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; -import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.ObserveServiceApplicationContext; -import fr.ird.observe.services.ObserveServiceFactorySupport; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; /** * Created on 16/08/15. * * @author Tony Chemit - chemit@codelutin.com */ -public class ObserveRestClientServiceFactory extends ObserveServiceFactorySupport { +public class ObserveServiceFactoryRest extends ObserveServiceFactorySupport { - protected final LoadingCache<Class<?>, Class<?>> serviceTypeCache = newAddSuffixClassCache("fr.ird.observe.services.rest.client.service.", "RestClient"); + protected final LoadingCache<Class<?>, Class<?>> serviceTypeCache = newAddSuffixClassCache("fr.ird.observe.services.service.", "Rest"); @Override public <S extends ObserveService> boolean accept(ObserveDataSourceConfiguration dataSourceConfiguration, Class<S> serviceType) { Preconditions.checkNotNull(dataSourceConfiguration, "dataSourceConfiguration can't be null."); Preconditions.checkNotNull(serviceType, "serviceType can't be null."); - return dataSourceConfiguration instanceof ObserveRestClientDataSourceConfiguration; + return dataSourceConfiguration instanceof ObserveDataSourceConfigurationRest; } @Override @@ -28,15 +26,15 @@ public class ObserveRestClientServiceFactory extends ObserveServiceFactorySuppor Preconditions.checkNotNull(applicationContext, "applicationContext can't be null."); Preconditions.checkNotNull(dataSourceConfiguration, "dataSourceConfiguration can't be null."); - Preconditions.checkArgument(dataSourceConfiguration instanceof ObserveRestClientDataSourceConfiguration, "dataSourceConfiguration must be of type ObserveRestClientDataSourceConfiguration"); + Preconditions.checkArgument(dataSourceConfiguration instanceof ObserveDataSourceConfigurationRest, "dataSourceConfiguration must be of type ObserveRestClientDataSourceConfiguration"); Preconditions.checkNotNull(serviceType, "serviceType can't be null."); Class<S> serviceTypeImpl = getServiceClassType(serviceTypeCache, serviceType); Preconditions.checkNotNull(serviceTypeImpl, "serviceTypeImpl not found for : " + serviceType.getName()); - ObserveRestClientServiceContext serviceContext = new ObserveRestClientServiceContext(); + ObserveServiceContextRest serviceContext = new ObserveServiceContextRest(); serviceContext.setApplicationContext(applicationContext); - serviceContext.setDataSourceConfiguration((ObserveRestClientDataSourceConfiguration) dataSourceConfiguration); + serviceContext.setDataSourceConfiguration((ObserveDataSourceConfigurationRest) dataSourceConfiguration); S service = newServiceInstance(serviceTypeImpl, serviceContext); return service; diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRest.java b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRest.java new file mode 100644 index 0000000..4a9b000 --- /dev/null +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRest.java @@ -0,0 +1,20 @@ +package fr.ird.observe.services; + +/** + * Created on 16/08/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class ObserveServiceRest implements ObserveService { + + protected ObserveServiceContextRest serviceContext; + + public void setServiceContext(ObserveServiceContextRest serviceContext) { + this.serviceContext = serviceContext; + } + + @Override + public void setServiceContext(ObserveServiceContext serviceContext) { + + } +} diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientService.java b/observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientService.java deleted file mode 100644 index 73dd0ba..0000000 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientService.java +++ /dev/null @@ -1,23 +0,0 @@ -package fr.ird.observe.services.rest.client; - -import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.ObserveServiceContext; - -/** - * Created on 16/08/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class ObserveRestClientService implements ObserveService { - - protected ObserveRestClientServiceContext serviceContext; - - public void setServiceContext(ObserveRestClientServiceContext serviceContext) { - this.serviceContext = serviceContext; - } - - @Override - public void setServiceContext(ObserveServiceContext serviceContext) { - - } -} diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestClient.java b/observe-services-rest/src/main/java/fr/ird/observe/services/service/ReferentialServiceRest.java similarity index 79% rename from observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestClient.java rename to observe-services-rest/src/main/java/fr/ird/observe/services/service/ReferentialServiceRest.java index 431c831..153f6f6 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestClient.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/service/ReferentialServiceRest.java @@ -1,10 +1,9 @@ -package fr.ird.observe.services.rest.client.service; +package fr.ird.observe.services.service; +import fr.ird.observe.services.ObserveServiceRest; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.rest.client.ObserveRestClientService; -import fr.ird.observe.services.service.ReferentialService; import java.util.Collection; @@ -13,7 +12,7 @@ import java.util.Collection; * * @author Tony Chemit - chemit@codelutin.com */ -public class ReferentialServiceRestClient extends ObserveRestClientService implements ReferentialService { +public class ReferentialServiceRest extends ObserveServiceRest implements ReferentialService { @Override public <R extends ReferentialDto> ReferenceSetDto<R> getReferentialReferenceSet(Class<R> type) { diff --git a/observe-services-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory b/observe-services-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory index 9753b48..2f268d7 100644 --- a/observe-services-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory +++ b/observe-services-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory @@ -1 +1 @@ -fr.ird.observe.services.rest.client.ObserveRestClientServiceFactory \ No newline at end of file +fr.ird.observe.services.ObserveServiceFactoryRest \ No newline at end of file diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/ReferentialServiceRestTest.java similarity index 72% rename from observe-services-rest/src/test/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestTest.java rename to observe-services-rest/src/test/java/fr/ird/observe/services/service/ReferentialServiceRestTest.java index dd93de8..dea122a 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestTest.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/ReferentialServiceRestTest.java @@ -1,12 +1,11 @@ -package fr.ird.observe.services.rest.client.service; +package fr.ird.observe.services.service; +import fr.ird.observe.services.ObserveServiceFactoryRest; import fr.ird.observe.services.ObserveServiceApplicationContext; -import fr.ird.observe.services.ObserveServiceMainFactory; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.SexDto; -import fr.ird.observe.services.rest.client.ObserveRestClientDataSourceConfiguration; -import fr.ird.observe.services.service.ReferentialService; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -23,14 +22,14 @@ public class ReferentialServiceRestTest { @Before public void setUp() throws Exception { - ObserveRestClientDataSourceConfiguration dataSourceConfiguration = new ObserveRestClientDataSourceConfiguration(); + ObserveDataSourceConfigurationRest dataSourceConfiguration = new ObserveDataSourceConfigurationRest(); dataSourceConfiguration.setServerUrl(null); dataSourceConfiguration.setAuthenticationToken(null); ObserveServiceApplicationContext serviceApplicationContext = new ObserveServiceApplicationContext(); serviceApplicationContext.setReferentialLocale(ReferentialLocale.FR); - service = ObserveServiceMainFactory.get().newService(serviceApplicationContext, dataSourceConfiguration, ReferentialService.class); + service = new ObserveServiceFactoryRest().newService(serviceApplicationContext, dataSourceConfiguration, ReferentialService.class); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceMainFactory.java b/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveServiceMainFactory.java similarity index 97% rename from observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceMainFactory.java rename to observe-services-runner/src/main/java/fr/ird/observe/services/ObserveServiceMainFactory.java index 116f6ad..eb2d31d 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceMainFactory.java +++ b/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveServiceMainFactory.java @@ -2,6 +2,7 @@ package fr.ird.observe.services; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; +import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/AbstractObserveService.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/AbstractObserveService.java index 202b74a..8b088e4 100644 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/AbstractObserveService.java +++ b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/AbstractObserveService.java @@ -11,7 +11,6 @@ import fr.ird.observe.db.DataSource; import fr.ird.observe.entities.Entities; import fr.ird.observe.entities.EntityMap; import fr.ird.observe.entities.constants.ReferenceLocale; -import fr.ird.observe.services.topia.ObserveTopiaServiceFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; @@ -477,7 +476,7 @@ public abstract class AbstractObserveService implements ObserveService { protected <S extends ObserveService> S newService(Class<S> serviceType) { - S service = ObserveTopiaServiceFactory.newSimpleService(serviceType, serviceContext); + S service = ObserveServiceFactoryTopia.newSimpleService(serviceType, serviceContext); return service; } @@ -485,7 +484,7 @@ public abstract class AbstractObserveService implements ObserveService { protected <S extends ObserveService> S newService(DataSource dataSource, Class<S> serviceType) { ObserveServiceContext serviceContext1 = new ObserveServiceContext(serviceContext.applicationContext, dataSource); - S service = new ObserveTopiaServiceFactory().newService(serviceType, serviceContext1); + S service = new ObserveServiceFactoryTopia().newService(serviceType, serviceContext1); return service; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaServiceContext.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java similarity index 78% rename from observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaServiceContext.java rename to observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java index 939227a..048cb67 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaServiceContext.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java @@ -1,8 +1,9 @@ -package fr.ird.observe.services.topia; +package fr.ird.observe.services; import fr.ird.observe.db.DataSource; import fr.ird.observe.services.ObserveServiceApplicationContext; import fr.ird.observe.services.ObserveServiceContext; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopia; import fr.ird.observe.services.dto.constants.ReferentialLocale; import org.nuiton.topia.TopiaContext; @@ -13,11 +14,11 @@ import java.util.Date; * * @author Tony Chemit - chemit@codelutin.com */ -public class ObserveTopiaServiceContext implements ObserveServiceContext { +public class ObserveServiceContextTopia implements ObserveServiceContext { protected ObserveServiceApplicationContext applicationContext; - protected ObserveTopiaDataSourceConfiguration dataSourceConfiguration; + protected ObserveDataSourceConfigurationTopia dataSourceConfiguration; protected TopiaContext transaction; @@ -48,7 +49,7 @@ public class ObserveTopiaServiceContext implements ObserveServiceContext { this.applicationContext = applicationContext; } - public void setDataSourceConfiguration(ObserveTopiaDataSourceConfiguration dataSourceConfiguration) { + public void setDataSourceConfiguration(ObserveDataSourceConfigurationTopia dataSourceConfiguration) { this.dataSourceConfiguration = dataSourceConfiguration; } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaServiceFactory.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java similarity index 83% rename from observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaServiceFactory.java rename to observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java index 155e35c..07f6271 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaServiceFactory.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java @@ -1,13 +1,11 @@ -package fr.ird.observe.services.topia; +package fr.ird.observe.services; import com.google.common.base.Preconditions; import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableSet; import fr.ird.observe.db.DataSource; -import fr.ird.observe.services.ObserveServiceApplicationContext; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; -import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.ObserveServiceFactorySupport; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopia; import fr.ird.observe.services.spi.NoDataAccess; import fr.ird.observe.services.spi.Write; import org.apache.commons.logging.Log; @@ -25,10 +23,10 @@ import java.util.Set; * * @author Tony Chemit - chemit@codelutin.com */ -public class ObserveTopiaServiceFactory extends ObserveServiceFactorySupport { +public class ObserveServiceFactoryTopia extends ObserveServiceFactorySupport { /** Logger. */ - private static final Log log = LogFactory.getLog(ObserveTopiaServiceFactory.class); + private static final Log log = LogFactory.getLog(ObserveServiceFactoryTopia.class); protected final LoadingCache<Class<?>, Class<?>> serviceTypeCache = newAddSuffixClassCache("fr.ird.observe.services.topia.service.", "Topia"); @@ -37,7 +35,7 @@ public class ObserveTopiaServiceFactory extends ObserveServiceFactorySupport { Preconditions.checkNotNull(dataSourceConfiguration, "dataSourceConfiguration can't be null."); Preconditions.checkNotNull(serviceType, "serviceType can't be null."); - return dataSourceConfiguration instanceof ObserveTopiaDataSourceConfiguration; + return dataSourceConfiguration instanceof ObserveDataSourceConfigurationTopia; } @@ -46,15 +44,15 @@ public class ObserveTopiaServiceFactory extends ObserveServiceFactorySupport { Preconditions.checkNotNull(applicationContext, "applicationContext can't be null."); Preconditions.checkNotNull(dataSourceConfiguration, "dataSourceConfiguration can't be null."); - Preconditions.checkArgument(dataSourceConfiguration instanceof ObserveTopiaDataSourceConfiguration, "dataSourceConfiguration must be of type " + ObserveTopiaDataSourceConfiguration.class.getName()); + Preconditions.checkArgument(dataSourceConfiguration instanceof ObserveDataSourceConfigurationTopia, "dataSourceConfiguration must be of type " + ObserveDataSourceConfigurationTopia.class.getName()); Preconditions.checkNotNull(serviceType, "serviceType can't be null."); Class<S> serviceTypeImpl = getServiceClassType(serviceTypeCache, serviceType); Preconditions.checkNotNull(serviceTypeImpl, "serviceTypeImpl not found for : " + serviceType.getName()); - ObserveTopiaServiceContext serviceContext = new ObserveTopiaServiceContext(); + ObserveServiceContextTopia serviceContext = new ObserveServiceContextTopia(); serviceContext.setApplicationContext(applicationContext); - serviceContext.setDataSourceConfiguration((ObserveTopiaDataSourceConfiguration) dataSourceConfiguration); + serviceContext.setDataSourceConfiguration((ObserveDataSourceConfigurationTopia) dataSourceConfiguration); S service = newServiceInstance(serviceTypeImpl, serviceContext); service = newServiceTransactionalProxy(serviceType, service, serviceContext); @@ -62,7 +60,7 @@ public class ObserveTopiaServiceFactory extends ObserveServiceFactorySupport { } - protected <S extends ObserveService> S newServiceTransactionalProxy(Class<S> serviceType, S service, ObserveTopiaServiceContext serviceContext) { + protected <S extends ObserveService> S newServiceTransactionalProxy(Class<S> serviceType, S service, ObserveServiceContextTopia serviceContext) { ObserveServiceInvocationHandler invocationHandler = new ObserveServiceInvocationHandler(serviceContext, service); Object proxyService = Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{serviceType}, invocationHandler); @@ -72,13 +70,13 @@ public class ObserveTopiaServiceFactory extends ObserveServiceFactorySupport { protected static class ObserveServiceInvocationHandler implements InvocationHandler { - private final ObserveTopiaServiceContext serviceContext; + private final ObserveServiceContextTopia serviceContext; private final ObserveService target; private final Set<String> methodNamesToByPass; - protected ObserveServiceInvocationHandler(ObserveTopiaServiceContext serviceContext, ObserveService target) { + protected ObserveServiceInvocationHandler(ObserveServiceContextTopia serviceContext, ObserveService target) { this.serviceContext = serviceContext; this.target = target; diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java similarity index 92% rename from observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java rename to observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java index e58d350..b0836f7 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java @@ -1,12 +1,11 @@ -package fr.ird.observe.services.topia; +package fr.ird.observe.services; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableSet; import fr.ird.observe.ObserveDAOHelper; -import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.ObserveServiceContext; import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.ObserveDtosInitializer; import fr.ird.observe.services.dto.ObserveModelInitializerRunner; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.referential.ReferentialDto; @@ -25,7 +24,7 @@ import java.util.Map; */ public class ObserveServiceTopia implements ObserveService { - protected ObserveTopiaServiceContext serviceContext; + protected ObserveServiceContextTopia serviceContext; protected static ImmutableBiMap<Class<?>, Class<?>> DTO_TO_ENTITY_TYPES; @@ -46,8 +45,8 @@ public class ObserveServiceTopia implements ObserveService { @Override public void setServiceContext(ObserveServiceContext serviceContext) { Preconditions.checkNotNull(serviceContext, "serviceContext can't be null."); - Preconditions.checkArgument(serviceContext instanceof ObserveTopiaServiceContext, "serviceContext must be of type " + ObserveTopiaServiceContext.class.getName()); - this.serviceContext = (ObserveTopiaServiceContext) serviceContext; + Preconditions.checkArgument(serviceContext instanceof ObserveServiceContextTopia, "serviceContext must be of type " + ObserveServiceContextTopia.class.getName()); + this.serviceContext = (ObserveServiceContextTopia) serviceContext; } public static <D extends IdDto, E extends TopiaEntity> Class<E> getEntityType(Class<D> dtoType) { diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/builder/DtoToEntityBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java similarity index 97% rename from observe-services-topia/src/main/java/fr/ird/observe/services/topia/builder/DtoToEntityBuilder.java rename to observe-services-topia/src/main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java index 8bcc87f..f440a1a 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/builder/DtoToEntityBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java @@ -1,12 +1,12 @@ -package fr.ird.observe.services.topia.builder; +package fr.ird.observe.services.builder; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import fr.ird.observe.entities.Set; -import fr.ird.observe.services.topia.ObserveServiceTopia; +import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.topia.ObserveDtoBinders; +import fr.ird.observe.services.dto.ObserveDtoBinders; import fr.ird.observe.services.dto.ReferenceDto; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.beans.Binder; diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/builder/EntityToDtoBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java similarity index 97% rename from observe-services-topia/src/main/java/fr/ird/observe/services/topia/builder/EntityToDtoBuilder.java rename to observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java index 942d1f8..cc86f2a 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/builder/EntityToDtoBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.builder; +package fr.ird.observe.services.builder; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; @@ -6,9 +6,9 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.entities.Set; -import fr.ird.observe.services.topia.ObserveServiceTopia; +import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.topia.ObserveDtoBinders; +import fr.ird.observe.services.dto.ObserveDtoBinders; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialDto; diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/builder/EntityToReferenceDtoBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToReferenceDtoBuilder.java similarity index 94% rename from observe-services-topia/src/main/java/fr/ird/observe/services/topia/builder/EntityToReferenceDtoBuilder.java rename to observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToReferenceDtoBuilder.java index 9273b7e..a9e9cc2 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/builder/EntityToReferenceDtoBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToReferenceDtoBuilder.java @@ -1,9 +1,9 @@ -package fr.ird.observe.services.topia.builder; +package fr.ird.observe.services.builder; import com.google.common.base.Preconditions; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.topia.ObserveDtoBinders; +import fr.ird.observe.services.dto.ObserveDtoBinders; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.referential.ReferentialDto; diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/builder/EntityToReferentialReferenceDtoBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToReferentialReferenceDtoBuilder.java similarity index 95% rename from observe-services-topia/src/main/java/fr/ird/observe/services/topia/builder/EntityToReferentialReferenceDtoBuilder.java rename to observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToReferentialReferenceDtoBuilder.java index 22f5003..4b9d625 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/builder/EntityToReferentialReferenceDtoBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToReferentialReferenceDtoBuilder.java @@ -1,8 +1,8 @@ -package fr.ird.observe.services.topia.builder; +package fr.ird.observe.services.builder; import com.google.common.base.Preconditions; import fr.ird.observe.ObserveEntityEnum; -import fr.ird.observe.services.topia.ObserveDtoBinders; +import fr.ird.observe.services.dto.ObserveDtoBinders; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveDtoBinders.java b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtoBinders.java similarity index 94% rename from observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveDtoBinders.java rename to observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtoBinders.java index 7e2a529..a153321 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveDtoBinders.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtoBinders.java @@ -1,6 +1,5 @@ -package fr.ird.observe.services.topia; +package fr.ird.observe.services.dto; -import fr.ird.observe.services.dto.IdDto; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveDtosInitializer.java b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java similarity index 95% rename from observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveDtosInitializer.java rename to observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java index 42d743e..81dc827 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveDtosInitializer.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia; +package fr.ird.observe.services.dto; import com.google.common.base.Function; import com.google.common.collect.ImmutableBiMap; @@ -81,48 +81,8 @@ import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; import fr.ird.observe.entities.referentiel.seine.WeightCategory; import fr.ird.observe.entities.referentiel.seine.Wind; import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.entities.seine.FloatingObject; -import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; -import fr.ird.observe.entities.seine.GearUseFeaturesSeine; -import fr.ird.observe.entities.seine.NonTargetCatch; -import fr.ird.observe.entities.seine.NonTargetLength; -import fr.ird.observe.entities.seine.NonTargetSample; -import fr.ird.observe.entities.seine.ObjectObservedSpecies; -import fr.ird.observe.entities.seine.ObjectSchoolEstimate; -import fr.ird.observe.entities.seine.Route; -import fr.ird.observe.entities.seine.SchoolEstimate; -import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.entities.seine.TargetCatch; -import fr.ird.observe.entities.seine.TargetLength; -import fr.ird.observe.entities.seine.TargetSample; -import fr.ird.observe.entities.seine.TransmittingBuoy; -import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ObserveModelInitializer; -import fr.ird.observe.services.dto.longline.ActivityLonglineDto; -import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; -import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; -import fr.ird.observe.services.dto.longline.BaitsCompositionDto; -import fr.ird.observe.services.dto.longline.BasketDto; -import fr.ird.observe.services.dto.longline.BranchlineDto; -import fr.ird.observe.services.dto.longline.BranchlinesCompositionDto; -import fr.ird.observe.services.dto.longline.CatchLonglineDto; -import fr.ird.observe.services.dto.longline.EncounterDto; -import fr.ird.observe.services.dto.longline.FloatlinesCompositionDto; -import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; -import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; -import fr.ird.observe.services.dto.longline.HooksCompositionDto; -import fr.ird.observe.services.dto.longline.SectionDto; -import fr.ird.observe.services.dto.longline.SensorUsedDto; -import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; -import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; -import fr.ird.observe.services.dto.longline.SetLonglineDto; -import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; -import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; -import fr.ird.observe.services.dto.longline.SizeMeasureDto; -import fr.ird.observe.services.dto.longline.TdrDto; -import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.services.dto.longline.WeightMeasureDto; import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.services.dto.referential.FpaZoneDto; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; @@ -186,28 +146,6 @@ import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.referential.seine.WindDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; -import fr.ird.observe.services.dto.seine.FloatingObjectDto; -import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; -import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; -import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; -import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; -import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; -import fr.ird.observe.services.dto.seine.NonTargetCatchDto; -import fr.ird.observe.services.dto.seine.NonTargetLengthDto; -import fr.ird.observe.services.dto.seine.NonTargetSampleDto; -import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; -import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; -import fr.ird.observe.services.dto.seine.RouteDto; -import fr.ird.observe.services.dto.seine.SchoolEstimateDto; -import fr.ird.observe.services.dto.seine.SetSeineDto; -import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; -import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; -import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; -import fr.ird.observe.services.dto.seine.TargetCatchDto; -import fr.ird.observe.services.dto.seine.TargetLengthDto; -import fr.ird.observe.services.dto.seine.TargetSampleDto; -import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; -import fr.ird.observe.services.dto.seine.TripSeineDto; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.beans.BinderFactory; import org.nuiton.util.beans.BinderModelBuilder; diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/service/ReferentialServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java similarity index 94% rename from observe-services-topia/src/main/java/fr/ird/observe/services/topia/service/ReferentialServiceTopia.java rename to observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java index b4ff6ac..402947f 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/service/ReferentialServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java @@ -1,9 +1,9 @@ -package fr.ird.observe.services.topia.service; +package fr.ird.observe.services.service; import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.topia.builder.EntityToDtoBuilder; -import fr.ird.observe.services.topia.builder.EntityToReferentialReferenceDtoBuilder; +import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.builder.EntityToDtoBuilder; +import fr.ird.observe.services.builder.EntityToReferentialReferenceDtoBuilder; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.FormDtos; import fr.ird.observe.services.dto.IdDto; @@ -11,7 +11,6 @@ import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; -import fr.ird.observe.services.service.ReferentialService; import org.nuiton.topia.persistence.TopiaEntity; import java.util.Collection; diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineObservedSystemServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java similarity index 78% rename from observe-services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineObservedSystemServiceTopia.java rename to observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java index 2ba9c30..b4a9b13 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineObservedSystemServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java @@ -1,9 +1,8 @@ -package fr.ird.observe.services.topia.service.seine; +package fr.ird.observe.services.service.seine; -import fr.ird.observe.services.topia.ObserveServiceTopia; +import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; -import fr.ird.observe.services.service.seine.ActivitySeineObservedSystemService; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java similarity index 90% rename from observe-services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineServiceTopia.java rename to observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java index d4c695f..211c3e2 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java @@ -1,6 +1,6 @@ -package fr.ird.observe.services.topia.service.seine; +package fr.ird.observe.services.service.seine; -import fr.ird.observe.services.topia.ObserveServiceTopia; +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; diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/FloatingObjectServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java similarity index 90% rename from observe-services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/FloatingObjectServiceTopia.java rename to observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java index 72e20e1..4b39898 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/FloatingObjectServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java @@ -1,6 +1,6 @@ -package fr.ird.observe.services.topia.service.seine; +package fr.ird.observe.services.service.seine; -import fr.ird.observe.services.topia.ObserveServiceTopia; +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; diff --git a/observe-services-topia/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory b/observe-services-topia/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory index 016fcd0..ee2101e 100644 --- a/observe-services-topia/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory +++ b/observe-services-topia/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory @@ -1 +1 @@ -fr.ird.observe.services.topia.ObserveTopiaServiceFactory \ No newline at end of file +fr.ird.observe.services.ObserveServiceFactoryTopia \ No newline at end of file diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/topia/builder/DtoToEntityBuilderTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/builder/DtoToEntityBuilderTest.java similarity index 98% rename from observe-services-topia/src/test/java/fr/ird/observe/services/topia/builder/DtoToEntityBuilderTest.java rename to observe-services-topia/src/test/java/fr/ird/observe/services/builder/DtoToEntityBuilderTest.java index b12d4da..72ca1a0 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/topia/builder/DtoToEntityBuilderTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/builder/DtoToEntityBuilderTest.java @@ -1,9 +1,10 @@ -package fr.ird.observe.services.topia.builder; +package fr.ird.observe.services.builder; import com.google.common.collect.ImmutableSet; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.entities.referentiel.Organism; import fr.ird.observe.entities.referentiel.Program; +import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.constants.ReferenceStatus; import fr.ird.observe.services.dto.constants.ReferentialLocale; @@ -13,7 +14,6 @@ import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.referential.ReferentialReferenceDtos; -import fr.ird.observe.services.topia.ObserveServiceTopia; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/topia/builder/EntityToDtoBuilderTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/builder/EntityToDtoBuilderTest.java similarity index 97% rename from observe-services-topia/src/test/java/fr/ird/observe/services/topia/builder/EntityToDtoBuilderTest.java rename to observe-services-topia/src/test/java/fr/ird/observe/services/builder/EntityToDtoBuilderTest.java index 1a58e47..c4460d9 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/topia/builder/EntityToDtoBuilderTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/builder/EntityToDtoBuilderTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.builder; +package fr.ird.observe.services.builder; import com.google.common.collect.ImmutableSet; import fr.ird.observe.entities.constants.GearType; @@ -7,6 +7,7 @@ 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.builder.EntityToDtoBuilder; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceValueNotFoundException; @@ -16,7 +17,7 @@ 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.ReferentialReferenceDto; -import fr.ird.observe.services.topia.ObserveServiceTopia; +import fr.ird.observe.services.ObserveServiceTopia; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/topia/ApplicationContextResource.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ApplicationContextResource.java similarity index 86% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/topia/ApplicationContextResource.java rename to observe-services-topia/src/test/java/fr/ird/observe/services/service/ApplicationContextResource.java index 788f597..4071f76 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/topia/ApplicationContextResource.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ApplicationContextResource.java @@ -1,9 +1,10 @@ -package fr.ird.observe.services.service.topia; +package fr.ird.observe.services.service; import fr.ird.observe.IObserveConfig; import fr.ird.observe.services.ObserveServiceApplicationContext; +import fr.ird.observe.services.ObserveServiceFactoryTopia; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.topia.ObserveServiceTopia; +import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.test.TestHelper; import fr.ird.observe.util.Scripts; import org.apache.commons.logging.Log; @@ -27,9 +28,11 @@ public class ApplicationContextResource implements TestRule { protected final ObserveServiceApplicationContext serviceApplicationContext; + protected final ObserveServiceFactoryTopia serviceFactory; public ApplicationContextResource(Version databaseVersion) { this.databaseVersion = databaseVersion; this.serviceApplicationContext= new ObserveServiceApplicationContext(); + this.serviceFactory = new ObserveServiceFactoryTopia(); } public String getScriptPath(String classifier) { @@ -40,6 +43,10 @@ public class ApplicationContextResource implements TestRule { return serviceApplicationContext; } + public ObserveServiceFactoryTopia getServiceFactory() { + return serviceFactory; + } + @Override public Statement apply(final Statement base, final Description description) { return new Statement() { diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/topia/DataSourceResource.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceResource.java similarity index 98% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/topia/DataSourceResource.java rename to observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceResource.java index e973843..e699a79 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/topia/DataSourceResource.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceResource.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.topia; +package fr.ird.observe.services.service; import fr.ird.observe.ObserveTechnicalException; import fr.ird.observe.db.DBTestHelper; diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/topia/service/ReferentialServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java similarity index 91% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/topia/service/ReferentialServiceTopiaTest.java rename to observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java index 289e0b9..8220d53 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/topia/service/ReferentialServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java @@ -1,23 +1,18 @@ -package fr.ird.observe.services.service.topia.service; +package fr.ird.observe.services.service; import fr.ird.observe.db.DataSource; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.referentiel.LengthWeightParameter; import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.services.ObserveServiceApplicationContext; -import fr.ird.observe.services.ObserveServiceMainFactory; +import fr.ird.observe.services.ObserveServiceFactory; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopia; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.referential.LengthWeightParameterDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.service.DataNotFoundException; -import fr.ird.observe.services.service.ReferentialService; -import fr.ird.observe.services.service.topia.ApplicationContextResource; -import fr.ird.observe.services.service.topia.DataSourceResource; -import fr.ird.observe.services.topia.ObserveTopiaDataSourceConfiguration; -import fr.ird.observe.services.topia.service.ReferentialServiceTopia; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -55,11 +50,11 @@ public class ReferentialServiceTopiaTest { DataSource localDataSource = dataSourceResource.getDataSource(); - ObserveServiceMainFactory serviceFactory = ObserveServiceMainFactory.get(); + ObserveServiceFactory serviceFactory = applicationContextResource.getServiceFactory(); ObserveServiceApplicationContext serviceApplicationContext = applicationContextResource.getServiceApplicationContext(); - ObserveTopiaDataSourceConfiguration dataSourceConfiguration = new ObserveTopiaDataSourceConfiguration(); + ObserveDataSourceConfigurationTopia dataSourceConfiguration = new ObserveDataSourceConfigurationTopia(); dataSourceConfiguration.setDataSource(localDataSource); service = serviceFactory.newService(serviceApplicationContext, dataSourceConfiguration, ReferentialService.class); diff --git a/pom.xml b/pom.xml index 46f56db..2b8eb07 100644 --- a/pom.xml +++ b/pom.xml @@ -81,14 +81,18 @@ <modules> <module>observe-services-model</module> + <module>observe-services-configuration-api</module> <module>observe-services-api</module> <module>observe-entities</module> <module>observe-business</module> <module>observe-validation</module> + <module>observe-services-configuration-topia</module> <module>observe-services-topia</module> - <module>observe-services-rest-wm</module> - <module>observe-services-rest-client</module> - <module>observe-swing</module> + <module>observe-services-configuration-rest</module> + <module>observe-services-rest</module> + <module>observe-services-runner</module> + <module>observe-application-web</module> + <module>observe-application-swing</module> </modules> <!--scm> <url>https://svn.mpl.ird.fr/osiris/observe/trunk</url> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 5e1f3ff3568ec77ec8b3f2074ae8a7d1fb7e8e20 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 20 15:28:04 2015 +0200 Renommage du cache de type de services --- .../java/fr/ird/observe/services/ObserveServiceFactorySupport.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceFactorySupport.java b/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceFactorySupport.java index a449e99..846ac79 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceFactorySupport.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceFactorySupport.java @@ -17,7 +17,7 @@ public abstract class ObserveServiceFactorySupport implements ObserveServiceFact try { return (Class<S>) serviceTypeCache.get(serviceType); } catch (ExecutionException e) { - throw new IllegalStateException("Could not get class", e); + throw new IllegalStateException("Could not get service implementation class for " + serviceType.getName(), e); } } @@ -31,14 +31,14 @@ public abstract class ObserveServiceFactorySupport implements ObserveServiceFact } } - public static LoadingCache<Class<?>, Class<?>> newAddSuffixClassCache(final String prefix, final String suffix) { + protected static LoadingCache<Class<?>, Class<?>> newServiceImplementationTypesCache(final String suffix) { return CacheBuilder.newBuilder().build(new CacheLoader<Class<?>, Class<?>>() { @Override public Class<?> load(Class<?> key) throws Exception { - String fqn = prefix + key.getSimpleName() + suffix; + String fqn = key.getName() + suffix; try { Class<?> classImpl = Class.forName(fqn); return classImpl; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 341e3dc1a85922868f5b753ea9c530bc4b3d375e Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 20 15:54:00 2015 +0200 Mise en place de la configuration de la data source des service topia --- observe-services-configuration-topia/pom.xml | 28 ----- .../ObserveDataSourceConfigurationTopia.java | 21 ---- .../ObserveDataSourceConfigurationTopiaH2.java | 51 ++++++++ .../ObserveDataSourceConfigurationTopiaPG.java | 64 +++++++++++ ...ObserveDataSourceConfigurationTopiaSupport.java | 88 ++++++++++++++ .../services/ObserveServiceFactoryRest.java | 2 +- .../services/ObserveServiceContextTopia.java | 18 +-- .../services/ObserveServiceFactoryTopia.java | 128 +++++++++++++++++++-- .../services/ObserveServiceFactoryTopiaTaiste.java | 37 ++++++ .../service/ApplicationContextResource.java | 13 ++- .../services/service/DataSourceResource.java | 54 ++++++--- .../service/ReferentialServiceTopiaTest.java | 26 ++--- 12 files changed, 430 insertions(+), 100 deletions(-) diff --git a/observe-services-configuration-topia/pom.xml b/observe-services-configuration-topia/pom.xml index 6446501..db80d13 100644 --- a/observe-services-configuration-topia/pom.xml +++ b/observe-services-configuration-topia/pom.xml @@ -20,37 +20,9 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-model</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>observe-services-configuration-api</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>observe-services-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>observe-entities</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>observe-business</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>observe-business</artifactId> - <version>${project.version}</version> - <classifier>tests</classifier> - </dependency> - <!-- commons dependencies --> diff --git a/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopia.java b/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopia.java deleted file mode 100644 index 434bc4d..0000000 --- a/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopia.java +++ /dev/null @@ -1,21 +0,0 @@ -package fr.ird.observe.services.configuration; - -import fr.ird.observe.db.DataSource; - -/** - * Created on 19/08/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class ObserveDataSourceConfigurationTopia implements ObserveDataSourceConfiguration { - - private DataSource dataSource; - - public void setDataSource(DataSource dataSource) { - this.dataSource = dataSource; - } - - public DataSource getDataSource() { - return dataSource; - } -} diff --git a/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaH2.java b/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaH2.java new file mode 100644 index 0000000..59d029c --- /dev/null +++ b/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaH2.java @@ -0,0 +1,51 @@ +package fr.ird.observe.services.configuration; + +import com.google.common.base.MoreObjects; + +import java.io.File; +import java.util.Objects; + +/** + * Created on 19/08/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class ObserveDataSourceConfigurationTopiaH2 extends ObserveDataSourceConfigurationTopiaSupport { + + /** + * Le répertoire où se trouve la base (le nom de la base est {@code obstuna}). + */ + protected File directory; + + public File getDirectory() { + return directory; + } + + public void setDirectory(File directory) { + this.directory = directory; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof ObserveDataSourceConfigurationTopiaH2)) return false; + ObserveDataSourceConfigurationTopiaH2 that = (ObserveDataSourceConfigurationTopiaH2) o; + return Objects.equals(directory, that.directory) && + Objects.equals(username, that.username) && + Objects.equals(password, that.password); + } + + @Override + public int hashCode() { + return Objects.hash(directory, username, password); + } + + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("directory", directory) + .add("username", username) + .add("password", "***") + .toString(); + } +} diff --git a/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaPG.java b/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaPG.java new file mode 100644 index 0000000..5779441 --- /dev/null +++ b/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaPG.java @@ -0,0 +1,64 @@ +package fr.ird.observe.services.configuration; + +import com.google.common.base.MoreObjects; + +import java.util.Objects; + +/** + * Created on 19/08/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class ObserveDataSourceConfigurationTopiaPG extends ObserveDataSourceConfigurationTopiaSupport { + + /** + * L'url jdbc de la source. + */ + protected String jdbcUrl; + + /** + * Est-ce que l'on doit utiliser une connexion ssl ? + */ + protected boolean useSsl; + + public String getJdbcUrl() { + return jdbcUrl; + } + + public void setJdbcUrl(String jdbcUrl) { + this.jdbcUrl = jdbcUrl; + } + + public boolean isUseSsl() { + return useSsl; + } + + public void setUseSsl(boolean useSsl) { + this.useSsl = useSsl; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof ObserveDataSourceConfigurationTopiaPG)) return false; + ObserveDataSourceConfigurationTopiaPG that = (ObserveDataSourceConfigurationTopiaPG) o; + return Objects.equals(jdbcUrl, that.jdbcUrl) && + Objects.equals(username, that.username) && + Objects.equals(password, that.password); + } + + @Override + public int hashCode() { + return Objects.hash(jdbcUrl, username, password); + } + + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("jdbcUrl", jdbcUrl) + .add("username", username) + .add("password", "***") + .add("useSsl", useSsl) + .toString(); + } +} diff --git a/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaSupport.java b/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaSupport.java new file mode 100644 index 0000000..228fa7c --- /dev/null +++ b/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaSupport.java @@ -0,0 +1,88 @@ +package fr.ird.observe.services.configuration; + +/** + * Created on 19/08/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public abstract class ObserveDataSourceConfigurationTopiaSupport implements ObserveDataSourceConfiguration { + + /** + * Le nom de la data source. + */ + protected String label; + + /** + * L'utilisateur pour se connecter à la source. + */ + protected String username; + + /** + * Le mot de passe pour se connecter à la source. + */ + protected char[] password; + + /** + * Est-ce que la base doit être migrée à son ouverture? + */ + protected boolean canMigrate; + + /** + * Est-ce que l'on peut voir la progression lors d'une migration ? + */ + protected boolean showMigrationProgression; + + /** + * Est-ce que l'on peut voir le script sql de migration à appliquer ? + */ + protected boolean showMigrationSql; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public char[] getPassword() { + return password; + } + + public void setPassword(char... password) { + this.password = password; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public boolean isCanMigrate() { + return canMigrate; + } + + public void setCanMigrate(boolean canMigrate) { + this.canMigrate = canMigrate; + } + + public boolean isShowMigrationProgression() { + return showMigrationProgression; + } + + public void setShowMigrationProgression(boolean showMigrationProgression) { + this.showMigrationProgression = showMigrationProgression; + } + + public boolean isShowMigrationSql() { + return showMigrationSql; + } + + public void setShowMigrationSql(boolean showMigrationSql) { + this.showMigrationSql = showMigrationSql; + } + +} diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java index ec4e350..cf14936 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java @@ -12,7 +12,7 @@ import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; */ public class ObserveServiceFactoryRest extends ObserveServiceFactorySupport { - protected final LoadingCache<Class<?>, Class<?>> serviceTypeCache = newAddSuffixClassCache("fr.ird.observe.services.service.", "Rest"); + protected static final LoadingCache<Class<?>, Class<?>> serviceTypeCache = newServiceImplementationTypesCache("Rest"); @Override public <S extends ObserveService> boolean accept(ObserveDataSourceConfiguration dataSourceConfiguration, Class<S> serviceType) { diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java index 048cb67..cd76d41 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java @@ -1,9 +1,7 @@ package fr.ird.observe.services; import fr.ird.observe.db.DataSource; -import fr.ird.observe.services.ObserveServiceApplicationContext; -import fr.ird.observe.services.ObserveServiceContext; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopia; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaSupport; import fr.ird.observe.services.dto.constants.ReferentialLocale; import org.nuiton.topia.TopiaContext; @@ -18,13 +16,15 @@ public class ObserveServiceContextTopia implements ObserveServiceContext { protected ObserveServiceApplicationContext applicationContext; - protected ObserveDataSourceConfigurationTopia dataSourceConfiguration; + protected ObserveDataSourceConfigurationTopiaSupport dataSourceConfiguration; protected TopiaContext transaction; + //TODO A supprimer -> utiliser une TopiaApplicationContext + protected DataSource dataSource; + public DataSource getDataSource() { - //TODO A supprimer -> utiliser une TopiaApplicationContext - return dataSourceConfiguration.getDataSource(); + return dataSource; } public TopiaContext getTransaction() { @@ -49,7 +49,11 @@ public class ObserveServiceContextTopia implements ObserveServiceContext { this.applicationContext = applicationContext; } - public void setDataSourceConfiguration(ObserveDataSourceConfigurationTopia dataSourceConfiguration) { + public void setDataSourceConfiguration(ObserveDataSourceConfigurationTopiaSupport dataSourceConfiguration) { this.dataSourceConfiguration = dataSourceConfiguration; } + + public void setDataSource(DataSource dataSource) { + this.dataSource = dataSource; + } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java index 07f6271..16a0a9c 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java @@ -1,41 +1,78 @@ package fr.ird.observe.services; import com.google.common.base.Preconditions; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableSet; +import fr.ird.observe.ObserveTechnicalException; import fr.ird.observe.db.DataSource; +import fr.ird.observe.db.DataSourceException; +import fr.ird.observe.db.DataSourceFactory; +import fr.ird.observe.db.constants.CommonDataSourceConfigParam; +import fr.ird.observe.db.impl.H2DataSourceConfig; +import fr.ird.observe.db.impl.H2DataSourceConfigParam; +import fr.ird.observe.db.impl.PGDataSourceConfig; +import fr.ird.observe.db.impl.PGDataSourceConfigParam; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopia; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaSupport; import fr.ird.observe.services.spi.NoDataAccess; import fr.ird.observe.services.spi.Write; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; +import java.io.Closeable; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.Set; +import java.util.concurrent.ExecutionException; /** + * FIXME Supprimer les DataSourceConfig et DataSource et directement utiliser TopiaConfiguration. + * * Created on 16/08/15. * * @author Tony Chemit - chemit@codelutin.com */ -public class ObserveServiceFactoryTopia extends ObserveServiceFactorySupport { +public class ObserveServiceFactoryTopia extends ObserveServiceFactorySupport implements Closeable { /** Logger. */ private static final Log log = LogFactory.getLog(ObserveServiceFactoryTopia.class); - protected final LoadingCache<Class<?>, Class<?>> serviceTypeCache = newAddSuffixClassCache("fr.ird.observe.services.topia.service.", "Topia"); + protected static final LoadingCache<Class<?>, Class<?>> serviceTypeCache = newServiceImplementationTypesCache("Topia"); + + protected final LoadingCache<ObserveDataSourceConfigurationTopiaSupport, DataSource> dataSourceCache = CacheBuilder + .newBuilder() + .build(new CacheLoader<ObserveDataSourceConfigurationTopiaSupport, DataSource>() { + + @Override + public DataSource load(ObserveDataSourceConfigurationTopiaSupport key) throws Exception { + + DataSource dataSource = null; + if (key instanceof ObserveDataSourceConfigurationTopiaH2) { + dataSource = createH2DataSource((ObserveDataSourceConfigurationTopiaH2) key); + } + + if (key instanceof ObserveDataSourceConfigurationTopiaPG) { + dataSource = createPGDataSource((ObserveDataSourceConfigurationTopiaPG) key); + } + + Preconditions.checkState(dataSource != null, "No dataSource found for configuration: " + key); + return dataSource; + } + }); @Override public <S extends ObserveService> boolean accept(ObserveDataSourceConfiguration dataSourceConfiguration, Class<S> serviceType) { Preconditions.checkNotNull(dataSourceConfiguration, "dataSourceConfiguration can't be null."); Preconditions.checkNotNull(serviceType, "serviceType can't be null."); - return dataSourceConfiguration instanceof ObserveDataSourceConfigurationTopia; + return dataSourceConfiguration instanceof ObserveDataSourceConfigurationTopiaSupport; } @@ -44,15 +81,13 @@ public class ObserveServiceFactoryTopia extends ObserveServiceFactorySupport { Preconditions.checkNotNull(applicationContext, "applicationContext can't be null."); Preconditions.checkNotNull(dataSourceConfiguration, "dataSourceConfiguration can't be null."); - Preconditions.checkArgument(dataSourceConfiguration instanceof ObserveDataSourceConfigurationTopia, "dataSourceConfiguration must be of type " + ObserveDataSourceConfigurationTopia.class.getName()); + Preconditions.checkArgument(dataSourceConfiguration instanceof ObserveDataSourceConfigurationTopiaSupport, "dataSourceConfiguration must be of type " + ObserveDataSourceConfigurationTopiaSupport.class.getName()); Preconditions.checkNotNull(serviceType, "serviceType can't be null."); Class<S> serviceTypeImpl = getServiceClassType(serviceTypeCache, serviceType); Preconditions.checkNotNull(serviceTypeImpl, "serviceTypeImpl not found for : " + serviceType.getName()); - ObserveServiceContextTopia serviceContext = new ObserveServiceContextTopia(); - serviceContext.setApplicationContext(applicationContext); - serviceContext.setDataSourceConfiguration((ObserveDataSourceConfigurationTopia) dataSourceConfiguration); + ObserveServiceContextTopia serviceContext = createServiceContext(applicationContext, (ObserveDataSourceConfigurationTopiaSupport) dataSourceConfiguration); S service = newServiceInstance(serviceTypeImpl, serviceContext); service = newServiceTransactionalProxy(serviceType, service, serviceContext); @@ -60,6 +95,62 @@ public class ObserveServiceFactoryTopia extends ObserveServiceFactorySupport { } + protected ObserveServiceContextTopia createServiceContext(ObserveServiceApplicationContext applicationContext, ObserveDataSourceConfigurationTopiaSupport dataSourceConfiguration) { + + ObserveServiceContextTopia serviceContext = new ObserveServiceContextTopia(); + serviceContext.setApplicationContext(applicationContext); + ObserveDataSourceConfigurationTopiaSupport dataSourceConfigurationTopia = dataSourceConfiguration; + + serviceContext.setDataSourceConfiguration(dataSourceConfigurationTopia); + + DataSource dataSource = getDataSource(dataSourceConfigurationTopia); + serviceContext.setDataSource(dataSource); + return serviceContext; + + } + + protected DataSource createPGDataSource(ObserveDataSourceConfigurationTopiaPG key) { + + PGDataSourceConfig result = DataSourceFactory.newPGConfig( + key.getLabel(), + CommonDataSourceConfigParam.LOGIN, key.getUsername(), + CommonDataSourceConfigParam.PASSWORD, key.getPassword(), + CommonDataSourceConfigParam.CAN_MIGRATE, key.isCanMigrate(), + CommonDataSourceConfigParam.SHOW_MIGRATION_PROGRESSION, key.isShowMigrationProgression(), + CommonDataSourceConfigParam.SHOW_MIGRATION_SQL, key.isShowMigrationSql(), + PGDataSourceConfigParam.URL, key.getJdbcUrl(), + PGDataSourceConfigParam.USE_SSL, key.isUseSsl() + ); + return DataSourceFactory.newService(result); + + } + + protected DataSource createH2DataSource(ObserveDataSourceConfigurationTopiaH2 key) { + + H2DataSourceConfig result = DataSourceFactory.newH2Config( + key.getLabel(), + CommonDataSourceConfigParam.LOGIN, key.getUsername(), + CommonDataSourceConfigParam.PASSWORD, key.getPassword(), + CommonDataSourceConfigParam.CAN_MIGRATE, key.isCanMigrate(), + CommonDataSourceConfigParam.SHOW_MIGRATION_PROGRESSION, key.isShowMigrationProgression(), + CommonDataSourceConfigParam.SHOW_MIGRATION_SQL, key.isShowMigrationSql(), + H2DataSourceConfigParam.DIRECTORY, key.getDirectory() + ); + return DataSourceFactory.newService(result); + + } + + protected DataSource getDataSource(ObserveDataSourceConfigurationTopiaSupport dataSourceConfiguration) { + + try { + DataSource dataSource = dataSourceCache.get(dataSourceConfiguration); + return dataSource; + } catch (ExecutionException e) { + throw new ObserveTechnicalException("Could not get dataSource for configuration: " + dataSourceConfiguration, e); + } + + } + protected <S extends ObserveService> S newServiceTransactionalProxy(Class<S> serviceType, S service, ObserveServiceContextTopia serviceContext) { ObserveServiceInvocationHandler invocationHandler = new ObserveServiceInvocationHandler(serviceContext, service); @@ -68,6 +159,27 @@ public class ObserveServiceFactoryTopia extends ObserveServiceFactorySupport { } + @Override + public void close() { + + for (DataSource dataSource : dataSourceCache.asMap().values()) { + + if (dataSource.isOpen()) { + try { + dataSource.doClose(false); + } catch (DataSourceException e) { + if (log.isErrorEnabled()) { + log.error("Could not close data source: " + dataSource, e); + } + } + } + } + + dataSourceCache.invalidateAll(); + + + } + protected static class ObserveServiceInvocationHandler implements InvocationHandler { private final ObserveServiceContextTopia serviceContext; diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/ObserveServiceFactoryTopiaTaiste.java b/observe-services-topia/src/test/java/fr/ird/observe/services/ObserveServiceFactoryTopiaTaiste.java new file mode 100644 index 0000000..2b22b88 --- /dev/null +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/ObserveServiceFactoryTopiaTaiste.java @@ -0,0 +1,37 @@ +package fr.ird.observe.services; + +import fr.ird.observe.ObserveTechnicalException; +import fr.ird.observe.db.DataSource; +import fr.ird.observe.db.DataSourceException; +import fr.ird.observe.db.impl.H2DataSource; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaSupport; + +/** + * Created on 20/08/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class ObserveServiceFactoryTopiaTaiste extends ObserveServiceFactoryTopia { + + public H2DataSource getExistingDataSource(ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration) { + H2DataSource dataSource = (H2DataSource) dataSourceCache.getIfPresent(dataSourceConfiguration); + return dataSource; + } + + @Override + protected DataSource getDataSource(ObserveDataSourceConfigurationTopiaSupport dataSourceConfiguration) { + + DataSource dataSource = super.getDataSource(dataSourceConfiguration); + + if (!dataSource.isOpen()) { + try { + dataSource.doOpen(); + } catch (DataSourceException e) { + throw new ObserveTechnicalException("Could not open dataSource: " + dataSourceConfiguration, e); + } + } + return dataSource; + + } +} diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ApplicationContextResource.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ApplicationContextResource.java index 4071f76..04ab6ca 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ApplicationContextResource.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ApplicationContextResource.java @@ -2,9 +2,9 @@ package fr.ird.observe.services.service; import fr.ird.observe.IObserveConfig; import fr.ird.observe.services.ObserveServiceApplicationContext; -import fr.ird.observe.services.ObserveServiceFactoryTopia; -import fr.ird.observe.services.dto.constants.ReferentialLocale; +import fr.ird.observe.services.ObserveServiceFactoryTopiaTaiste; import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.test.TestHelper; import fr.ird.observe.util.Scripts; import org.apache.commons.logging.Log; @@ -28,11 +28,12 @@ public class ApplicationContextResource implements TestRule { protected final ObserveServiceApplicationContext serviceApplicationContext; - protected final ObserveServiceFactoryTopia serviceFactory; + protected final ObserveServiceFactoryTopiaTaiste serviceFactory; + public ApplicationContextResource(Version databaseVersion) { this.databaseVersion = databaseVersion; - this.serviceApplicationContext= new ObserveServiceApplicationContext(); - this.serviceFactory = new ObserveServiceFactoryTopia(); + this.serviceApplicationContext = new ObserveServiceApplicationContext(); + this.serviceFactory = new ObserveServiceFactoryTopiaTaiste(); } public String getScriptPath(String classifier) { @@ -43,7 +44,7 @@ public class ApplicationContextResource implements TestRule { return serviceApplicationContext; } - public ObserveServiceFactoryTopia getServiceFactory() { + public ObserveServiceFactoryTopiaTaiste getServiceFactory() { return serviceFactory; } diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceResource.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceResource.java index e699a79..fcc50fb 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceResource.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceResource.java @@ -1,9 +1,11 @@ package fr.ird.observe.services.service; -import fr.ird.observe.ObserveTechnicalException; import fr.ird.observe.db.DBTestHelper; -import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; +import fr.ird.observe.db.impl.H2DataSource; +import fr.ird.observe.db.impl.H2DataSourceConfig; +import fr.ird.observe.services.ObserveServiceFactoryTopiaTaiste; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.test.TestHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -12,6 +14,8 @@ import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runners.model.Statement; import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.TopiaEntity; import java.io.File; import java.net.URL; @@ -28,21 +32,27 @@ public class DataSourceResource implements TestRule { /** Logger. */ private static final Log log = LogFactory.getLog(DataSourceResource.class); - protected final String dbPath; + protected final ApplicationContextResource applicationContextResource; - protected DataSource dataSource; + protected final String dbPath; protected Map<String, TopiaContext> transactions = new LinkedHashMap<>(); - public DataSourceResource(String dbPath) { + protected ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration; + + public DataSourceResource(ApplicationContextResource applicationContextResource, String dbPath) { + this.applicationContextResource = applicationContextResource; this.dbPath = dbPath; } - public DataSource getDataSource() { - return dataSource; + public ObserveDataSourceConfigurationTopiaH2 getDataSourceConfiguration() { + return dataSourceConfiguration; } public TopiaContext newTransaction(String name) throws DataSourceException { + + ObserveServiceFactoryTopiaTaiste serviceFactory = applicationContextResource.getServiceFactory(); + H2DataSource dataSource = serviceFactory.getExistingDataSource(dataSourceConfiguration); TopiaContext topiaContext = dataSource.beginTransaction(name); transactions.put(name, topiaContext); return topiaContext; @@ -63,6 +73,11 @@ public class DataSourceResource implements TestRule { }; } + public <E extends TopiaEntity> TopiaDAO<E> getDAO(TopiaContext tx, Class<E> entityType) { + H2DataSource dataSource = getDataSource(); + return dataSource.getDAO(tx, entityType); + } + protected void before(Description description) throws Throwable { Class<?> testClass = description.getTestClass(); @@ -78,7 +93,7 @@ public class DataSourceResource implements TestRule { File localDbFile = TestHelper.newLocalDB(methodName); - dataSource = DBTestHelper.createAndOpenFromDump( + H2DataSource dataSource = DBTestHelper.createAndOpenFromDump( localDbFile, dbUrl, false, @@ -87,6 +102,18 @@ public class DataSourceResource implements TestRule { true, true); + H2DataSourceConfig dataSourceConfig = dataSource.getConfig(); + + dataSourceConfiguration = new ObserveDataSourceConfigurationTopiaH2(); + dataSourceConfiguration.setLabel(dataSourceConfig.getLabel()); + dataSourceConfiguration.setUsername(dataSourceConfig.getLogin()); + dataSourceConfiguration.setPassword(dataSourceConfig.getPassword()); + dataSourceConfiguration.setDirectory(dataSourceConfig.getStorageDirectory()); + dataSourceConfiguration.setCanMigrate(dataSourceConfig.isCanMigrate()); + dataSourceConfiguration.setShowMigrationProgression(dataSourceConfig.isShowMigrationProgression()); + dataSourceConfiguration.setShowMigrationSql(dataSourceConfig.isShowMigrationSql()); + + dataSource.doClose(false); } @@ -98,6 +125,7 @@ public class DataSourceResource implements TestRule { log.debug("Ends " + testClass.getName() + "::" + methodName); } + H2DataSource dataSource = getDataSource(); if (dataSource != null && dataSource.isOpen()) { for (Map.Entry<String, TopiaContext> entry : transactions.entrySet()) { @@ -114,13 +142,13 @@ public class DataSourceResource implements TestRule { } } - try { - dataSource.doClose(false); - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not close datasource: " + dataSource, e); - } } + applicationContextResource.getServiceFactory().close(); + } + private H2DataSource getDataSource() { + return applicationContextResource.getServiceFactory().getExistingDataSource(dataSourceConfiguration); + } } 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 8220d53..e78a353 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 @@ -1,12 +1,11 @@ package fr.ird.observe.services.service; -import fr.ird.observe.db.DataSource; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.referentiel.LengthWeightParameter; import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.services.ObserveServiceApplicationContext; -import fr.ird.observe.services.ObserveServiceFactory; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopia; +import fr.ird.observe.services.ObserveServiceFactoryTopiaTaiste; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceSetDto; @@ -40,22 +39,18 @@ public class ReferentialServiceTopiaTest { public static final ApplicationContextResource applicationContextResource = new ApplicationContextResource(H2DataSourceMigration.V_4_0); @Rule - public final DataSourceResource dataSourceResource = new DataSourceResource(applicationContextResource.getScriptPath("referentiel")); + public final DataSourceResource dataSourceResource = new DataSourceResource(applicationContextResource, applicationContextResource.getScriptPath("referentiel")); protected ReferentialService service; @Before public void setUp() throws Exception { - DataSource localDataSource = dataSourceResource.getDataSource(); - - - ObserveServiceFactory serviceFactory = applicationContextResource.getServiceFactory(); + ObserveServiceFactoryTopiaTaiste serviceFactory = applicationContextResource.getServiceFactory(); ObserveServiceApplicationContext serviceApplicationContext = applicationContextResource.getServiceApplicationContext(); - ObserveDataSourceConfigurationTopia dataSourceConfiguration = new ObserveDataSourceConfigurationTopia(); - dataSourceConfiguration.setDataSource(localDataSource); + ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = dataSourceResource.getDataSourceConfiguration(); service = serviceFactory.newService(serviceApplicationContext, dataSourceConfiguration, ReferentialService.class); @@ -73,7 +68,7 @@ public class ReferentialServiceTopiaTest { } Class entityType = entry.getValue(); - TopiaDAO dao = dataSourceResource.getDataSource().getDAO(tx, entityType); + TopiaDAO dao = dataSourceResource.getDAO(tx, entityType); long expectedCount = dao.count(); if (log.isInfoEnabled()) { @@ -132,11 +127,10 @@ public class ReferentialServiceTopiaTest { delete(tx, ProgramDto.class, Program.class); delete(tx, LengthWeightParameterDto.class, LengthWeightParameter.class); - } protected void loadToRead(TopiaContext tx, Class dtoType, Class entityType) { - TopiaDAO<?> dao = dataSourceResource.getDataSource().getDAO(tx, entityType); + TopiaDAO<?> dao = dataSourceResource.getDAO(tx, entityType); long expectedCount = dao.count(); if (log.isInfoEnabled()) { @@ -165,7 +159,7 @@ public class ReferentialServiceTopiaTest { } protected void loadToEdit(TopiaContext tx, Class dtoType, Class entityType) { - TopiaDAO<?> dao = dataSourceResource.getDataSource().getDAO(tx, entityType); + TopiaDAO<?> dao = dataSourceResource.getDAO(tx, entityType); long expectedCount = dao.count(); if (log.isInfoEnabled()) { @@ -189,7 +183,7 @@ public class ReferentialServiceTopiaTest { for (ReferenceSetDto labelSetDto : formDto.getLabels()) { Class refEntityType = ReferentialServiceTopia.getEntityType(labelSetDto.getType()); - long refExpected = dataSourceResource.getDataSource().getDAO(tx, refEntityType).count(); + long refExpected = dataSourceResource.getDAO(tx, refEntityType).count(); Assert.assertEquals(refExpected, labelSetDto.sizeReference()); } @@ -199,7 +193,7 @@ public class ReferentialServiceTopiaTest { protected void delete(TopiaContext tx, Class dtoType, Class entityType) { - TopiaDAO<?> dao = dataSourceResource.getDataSource().getDAO(tx, entityType); + TopiaDAO<?> dao = dataSourceResource.getDAO(tx, entityType); long expectedCount = dao.count(); TopiaEntity entity = dao.iterator().next(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 55176dba135b0a0198a6c720cd75edceb92c797d Author: Tony CHEMIT <chemit@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 --- .../xmi/observe-services-dto-common.properties | 32 +++++++++++++++++++++ .../services/builder/EntityToDtoBuilder.java | 33 ++++++++++++++++------ .../services/builder/EntityToDtoBuilderTest.java | 16 +++++++++-- 3 files changed, 71 insertions(+), 10 deletions(-) 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 aa5d253..e73b825 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 @@ -11,3 +11,35 @@ fr.ird.observe.services.dto.referential.GearCaracteristic.attribute.gearCaracter 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.ReferenceSet.attribute.reference.stereotype=unique,ordered + +fr.ird.observe.services.dto.referential.Vessel.attribute.flagCountry.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.Country +fr.ird.observe.services.dto.referential.Vessel.attribute.vesselType.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.VesselType +fr.ird.observe.services.dto.referential.Vessel.attribute.vesselSizeCategory.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.VesselSizeCategory +fr.ird.observe.services.dto.referential.Species.attribute.ocean.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.Ocean +fr.ird.observe.services.dto.referential.Species.attribute.speciesGroup.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.SpeciesGroup +fr.ird.observe.services.dto.referential.SpeciesList.attribute.species.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.Species +fr.ird.observe.services.dto.referential.Program.attribute.organism.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.Organism +fr.ird.observe.services.dto.referential.Person.attribute.country.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.Country +fr.ird.observe.services.dto.referential.Organism.attribute.country.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.Country +fr.ird.observe.services.dto.referential.LengthWeightParameter.attribute.species.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.Species +fr.ird.observe.services.dto.referential.LengthWeightParameter.attribute.ocean.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.Ocean +fr.ird.observe.services.dto.referential.LengthWeightParameter.attribute.sex.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.Sex +fr.ird.observe.services.dto.referential.Harbour.attribute.country.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.Country +fr.ird.observe.services.dto.referential.Gear.attribute.gearCaracteristic.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.GearCaracteristic +fr.ird.observe.services.dto.referential.GearCaracteristic.attribute.gearCaracteristicType.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.GearCaracteristicType + +#TODO Add also generic on class +#fr.ird.observe.services.dto.Form.class.tagValue.simpleBeanWithNoInterfaceClassGeneric=D extends fr.ird.observe.services.dto.IdDto +#fr.ird.observe.services.dto.Form.attribute.type.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=D +#fr.ird.observe.services.dto.Form.attribute.labels.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=D + +#fr.ird.observe.services.dto.Reference.class.tagValue.simpleBeanWithNoInterfaceClassGeneric=D extends fr.ird.observe.services.dto.IdDto +#fr.ird.observe.services.dto.Reference.attribute.type.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=D + +#fr.ird.observe.services.dto.ReferentialReference.class.tagValue.simpleBeanWithNoInterfaceClassGeneric=D extends fr.ird.observe.services.dto.IdDto +#fr.ird.observe.services.dto.ReferentialReference.attribute.type.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=D + +#fr.ird.observe.services.dto.ReferenceSet.class.tagValue.simpleBeanWithNoInterfaceClassGeneric=D extends fr.ird.observe.services.dto.IdDto +#fr.ird.observe.services.dto.ReferenceSet.attribute.referenctype.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=D +#fr.ird.observe.services.dto.ReferenceSet.attribute.reference.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=D + diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java index cc86f2a..198b4b3 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java @@ -4,16 +4,17 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import fr.ird.observe.ObserveEntityEnum; +import com.google.common.reflect.TypeToken; import fr.ird.observe.entities.Set; -import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ObserveDtoBinders; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.beans.Binder; +import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl; import java.io.Closeable; import java.util.ArrayList; @@ -76,7 +77,15 @@ public class EntityToDtoBuilder<E extends TopiaEntity, D extends IdDto> implemen Collection collection = (Collection) propertyValue; - Class<?> collectionType = binder.getTargetPropertyType(propertyName); + //FIXME Trouver par quoi remplacer (ne pas utiliser une api de sun) + à améliorer + TypeToken<?> collectionGenericType = TypeToken.of(binder.getTargetPropertyGenericType(propertyName)); + + Class<?> collectionType = collectionGenericType.getRawType(); + + ParameterizedTypeImpl collectionGenericTypeType = (ParameterizedTypeImpl) collectionGenericType.getType(); + + ParameterizedTypeImpl type1 = (ParameterizedTypeImpl) collectionGenericTypeType.getActualTypeArguments()[0]; + Class type = (Class) type1.getActualTypeArguments()[0]; Collection<Object> dtoCollection = newCollection(collectionType); @@ -86,9 +95,7 @@ public class EntityToDtoBuilder<E extends TopiaEntity, D extends IdDto> implemen if (o1 instanceof TopiaEntity) { - Class<? extends TopiaEntity> entityType = ObserveEntityEnum.valueOf((TopiaEntity) o1).getContract(); - - Class dtoType = ObserveServiceTopia.getDtoType(entityType); + Class dtoType = type; Collection<? extends TopiaEntity> topiaEntities = (Collection<? extends TopiaEntity>) collection; @@ -114,8 +121,18 @@ public class EntityToDtoBuilder<E extends TopiaEntity, D extends IdDto> implemen TopiaEntity entityValue = (TopiaEntity) propertyValue; - Class<? extends TopiaEntity> entityType = ObserveEntityEnum.valueOf(entityValue).getContract(); - Class dtoType = ObserveServiceTopia.getDtoType(entityType); + Class dtoType; + TypeToken<?> typeToken = TypeToken.of(binder.getTargetPropertyGenericType(propertyName)); + Class<?> rawType = typeToken.getRawType(); + if (rawType.isAssignableFrom(ReferenceDto.class) || rawType.isAssignableFrom(ReferentialReferenceDto.class)) { + + //FIXME Trouver par quoi remplacer (ne pas utiliser une api de sun) + ParameterizedTypeImpl type = (ParameterizedTypeImpl) typeToken.getType(); + dtoType = (Class) type.getActualTypeArguments()[0]; + } else { + dtoType = rawType; + } + propertyValue = entityToRef(referentialLocale, dtoType, entityValue, referenceTypesBuilder); addProperty(propertyName, propertyValue, dtoPropertiesBuilder); continue; diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/builder/EntityToDtoBuilderTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/builder/EntityToDtoBuilderTest.java index c4460d9..43079e2 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/builder/EntityToDtoBuilderTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/builder/EntityToDtoBuilderTest.java @@ -7,7 +7,7 @@ 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.builder.EntityToDtoBuilder; +import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceValueNotFoundException; @@ -17,7 +17,6 @@ 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.ReferentialReferenceDto; -import fr.ird.observe.services.ObserveServiceTopia; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -68,6 +67,19 @@ public class EntityToDtoBuilderTest { organism.setCode("organismCode"); program.setOrganism(organism); + /* + Type[] actualTypeArguments = ((ParameterizedType) typeOfT).getActualTypeArguments(); + if (actualTypeArguments[1].equals(MatrixBounds.class)) { + type2 = new TypeToken<Map<?, MatrixBounds>>() { + + }.getType(); + } else { + type2 = new TypeToken<Map<?, ?>>() { + + }.getType(); + } + */ + EntityToDtoBuilder<Program, ProgramDto> builder = EntityToDtoBuilder.create(Program.class, ProgramDto.class); ProgramDto programDto = builder.build(ReferentialLocale.FR, program); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 a20943ec14300552a1f75512092208f3cc53988d Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 20 16:04:50 2015 +0200 fix merge --- .../services/dto/ObserveDtosInitializer.java | 718 +++++++++++---------- 1 file changed, 389 insertions(+), 329 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java index 81dc827..d17a7c9 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java @@ -81,8 +81,46 @@ import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; import fr.ird.observe.entities.referentiel.seine.WeightCategory; import fr.ird.observe.entities.referentiel.seine.Wind; import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.ObserveModelInitializer; +import fr.ird.observe.entities.seine.FloatingObject; +import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; +import fr.ird.observe.entities.seine.GearUseFeaturesSeine; +import fr.ird.observe.entities.seine.NonTargetCatch; +import fr.ird.observe.entities.seine.NonTargetLength; +import fr.ird.observe.entities.seine.NonTargetSample; +import fr.ird.observe.entities.seine.ObjectObservedSpecies; +import fr.ird.observe.entities.seine.ObjectSchoolEstimate; +import fr.ird.observe.entities.seine.Route; +import fr.ird.observe.entities.seine.SchoolEstimate; +import fr.ird.observe.entities.seine.SetSeine; +import fr.ird.observe.entities.seine.TargetCatch; +import fr.ird.observe.entities.seine.TargetLength; +import fr.ird.observe.entities.seine.TargetSample; +import fr.ird.observe.entities.seine.TransmittingBuoy; +import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; +import fr.ird.observe.services.dto.longline.BaitsCompositionDto; +import fr.ird.observe.services.dto.longline.BasketDto; +import fr.ird.observe.services.dto.longline.BranchlineDto; +import fr.ird.observe.services.dto.longline.BranchlinesCompositionDto; +import fr.ird.observe.services.dto.longline.CatchLonglineDto; +import fr.ird.observe.services.dto.longline.EncounterDto; +import fr.ird.observe.services.dto.longline.FloatlinesCompositionDto; +import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; +import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; +import fr.ird.observe.services.dto.longline.HooksCompositionDto; +import fr.ird.observe.services.dto.longline.SectionDto; +import fr.ird.observe.services.dto.longline.SensorUsedDto; +import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; +import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; +import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; +import fr.ird.observe.services.dto.longline.SizeMeasureDto; +import fr.ird.observe.services.dto.longline.TdrDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.longline.WeightMeasureDto; import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.services.dto.referential.FpaZoneDto; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; @@ -146,6 +184,28 @@ import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.referential.seine.WindDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; +import fr.ird.observe.services.dto.seine.FloatingObjectDto; +import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; +import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; +import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; +import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; +import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; +import fr.ird.observe.services.dto.seine.NonTargetCatchDto; +import fr.ird.observe.services.dto.seine.NonTargetLengthDto; +import fr.ird.observe.services.dto.seine.NonTargetSampleDto; +import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; +import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; +import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.services.dto.seine.SchoolEstimateDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; +import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; +import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; +import fr.ird.observe.services.dto.seine.TargetCatchDto; +import fr.ird.observe.services.dto.seine.TargetLengthDto; +import fr.ird.observe.services.dto.seine.TargetSampleDto; +import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.beans.BinderFactory; import org.nuiton.util.beans.BinderModelBuilder; @@ -259,311 +319,311 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { @Override public void initActivityLonglineDto() { registerDto(ActivityLonglineDto.class, ActivityLongline.class, - ActivityLonglineDto.PROPERTY_COMMENT, - ActivityLonglineDto.PROPERTY_OPEN, - ActivityLonglineDto.PROPERTY_TIME_STAMP, - ActivityLonglineDto.PROPERTY_LATITUDE, - ActivityLonglineDto.PROPERTY_LONGITUDE, - ActivityLonglineDto.PROPERTY_SEA_SURFACE_TEMPERATURE, - ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, - ActivityLonglineDto.PROPERTY_FPA_ZONE); + ActivityLonglineDto.PROPERTY_COMMENT, + ActivityLonglineDto.PROPERTY_OPEN, + ActivityLonglineDto.PROPERTY_TIME_STAMP, + ActivityLonglineDto.PROPERTY_LATITUDE, + ActivityLonglineDto.PROPERTY_LONGITUDE, + ActivityLonglineDto.PROPERTY_SEA_SURFACE_TEMPERATURE, + ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, + ActivityLonglineDto.PROPERTY_FPA_ZONE); } @Override public void initActivityLonglineEncouterDto() { registerDto(ActivityLonglineEncouterDto.class, ActivityLongline.class, - ActivityLonglineEncouterDto.PROPERTY_COMMENT, - ActivityLonglineEncouterDto.PROPERTY_ENCOUNTER); + ActivityLonglineEncouterDto.PROPERTY_COMMENT, + ActivityLonglineEncouterDto.PROPERTY_ENCOUNTER); } @Override public void initActivityLonglineSensorUsedDto() { registerDto(ActivityLonglineSensorUsedDto.class, ActivityLongline.class, - ActivityLonglineSensorUsedDto.PROPERTY_COMMENT, - ActivityLonglineSensorUsedDto.PROPERTY_SENSOR_USED); + ActivityLonglineSensorUsedDto.PROPERTY_COMMENT, + ActivityLonglineSensorUsedDto.PROPERTY_SENSOR_USED); } @Override public void initBaitsCompositionDto() { registerDto(BaitsCompositionDto.class, BaitsComposition.class, - BaitsCompositionDto.PROPERTY_PROPORTION, - BaitsCompositionDto.PROPERTY_INDIVIDUAL_SIZE, - BaitsCompositionDto.PROPERTY_INDIVIDUAL_WEIGHT, - BaitsCompositionDto.PROPERTY_BAIT_SETTING_STATUS, - BaitsCompositionDto.PROPERTY_BAIT_TYPE); + BaitsCompositionDto.PROPERTY_PROPORTION, + BaitsCompositionDto.PROPERTY_INDIVIDUAL_SIZE, + BaitsCompositionDto.PROPERTY_INDIVIDUAL_WEIGHT, + BaitsCompositionDto.PROPERTY_BAIT_SETTING_STATUS, + BaitsCompositionDto.PROPERTY_BAIT_TYPE); } @Override public void initBasketDto() { registerDto(BasketDto.class, Basket.class, - BasketDto.PROPERTY_SETTING_IDENTIFIER, - BasketDto.PROPERTY_HAULING_IDENTIFIER, - BasketDto.PROPERTY_FLOATLINE1_LENGTH, - BasketDto.PROPERTY_FLOATLINE2_LENGTH, - BasketDto.PROPERTY_BRANCHLINE); + BasketDto.PROPERTY_SETTING_IDENTIFIER, + BasketDto.PROPERTY_HAULING_IDENTIFIER, + BasketDto.PROPERTY_FLOATLINE1_LENGTH, + BasketDto.PROPERTY_FLOATLINE2_LENGTH, + BasketDto.PROPERTY_BRANCHLINE); } @Override public void initBranchlineDto() { registerDto(BranchlineDto.class, Branchline.class, - BranchlineDto.PROPERTY_COMMENT, - BranchlineDto.PROPERTY_SETTING_IDENTIFIER, - BranchlineDto.PROPERTY_HAULING_IDENTIFIER, - BranchlineDto.PROPERTY_DEPTH_RECORDER, - BranchlineDto.PROPERTY_TIMER, - BranchlineDto.PROPERTY_TIME_SINCE_CONTACT, - BranchlineDto.PROPERTY_HOOK_OFFSET, - BranchlineDto.PROPERTY_BRANCHLINE_LENGTH, - BranchlineDto.PROPERTY_WEIGHTED_SWIVEL, - BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD, - BranchlineDto.PROPERTY_WEIGHTED_SNAP, - BranchlineDto.PROPERTY_SWIVEL_WEIGHT, - BranchlineDto.PROPERTY_SNAP_WEIGHT, - BranchlineDto.PROPERTY_TRACELINE_LENGTH, - BranchlineDto.PROPERTY_HOOK_LOST, - BranchlineDto.PROPERTY_TRACE_CUT_OFF, - BranchlineDto.PROPERTY_TOP_TYPE, - BranchlineDto.PROPERTY_TRACELINE_TYPE, - BranchlineDto.PROPERTY_HOOK_TYPE, - BranchlineDto.PROPERTY_HOOK_SIZE, - BranchlineDto.PROPERTY_BAIT_TYPE, - BranchlineDto.PROPERTY_BAIT_SETTING_STATUS, - BranchlineDto.PROPERTY_BAIT_HAULING_STATUS); + BranchlineDto.PROPERTY_COMMENT, + BranchlineDto.PROPERTY_SETTING_IDENTIFIER, + BranchlineDto.PROPERTY_HAULING_IDENTIFIER, + BranchlineDto.PROPERTY_DEPTH_RECORDER, + BranchlineDto.PROPERTY_TIMER, + BranchlineDto.PROPERTY_TIME_SINCE_CONTACT, + BranchlineDto.PROPERTY_HOOK_OFFSET, + BranchlineDto.PROPERTY_BRANCHLINE_LENGTH, + BranchlineDto.PROPERTY_WEIGHTED_SWIVEL, + BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD, + BranchlineDto.PROPERTY_WEIGHTED_SNAP, + BranchlineDto.PROPERTY_SWIVEL_WEIGHT, + BranchlineDto.PROPERTY_SNAP_WEIGHT, + BranchlineDto.PROPERTY_TRACELINE_LENGTH, + BranchlineDto.PROPERTY_HOOK_LOST, + BranchlineDto.PROPERTY_TRACE_CUT_OFF, + BranchlineDto.PROPERTY_TOP_TYPE, + BranchlineDto.PROPERTY_TRACELINE_TYPE, + BranchlineDto.PROPERTY_HOOK_TYPE, + BranchlineDto.PROPERTY_HOOK_SIZE, + BranchlineDto.PROPERTY_BAIT_TYPE, + BranchlineDto.PROPERTY_BAIT_SETTING_STATUS, + BranchlineDto.PROPERTY_BAIT_HAULING_STATUS); } @Override public void initBranchlinesCompositionDto() { registerDto(BranchlinesCompositionDto.class, BranchlinesComposition.class, - BranchlinesCompositionDto.PROPERTY_LENGTH, - BranchlinesCompositionDto.PROPERTY_PROPORTION, - BranchlinesCompositionDto.PROPERTY_TOP_TYPE, - BranchlinesCompositionDto.PROPERTY_TRACELINE_TYPE); + BranchlinesCompositionDto.PROPERTY_LENGTH, + BranchlinesCompositionDto.PROPERTY_PROPORTION, + BranchlinesCompositionDto.PROPERTY_TOP_TYPE, + BranchlinesCompositionDto.PROPERTY_TRACELINE_TYPE); } @Override public void initCatchLonglineDto() { registerDto(CatchLonglineDto.class, CatchLongline.class, - CatchLonglineDto.PROPERTY_COMMENT, - CatchLonglineDto.PROPERTY_HOME_ID, - CatchLonglineDto.PROPERTY_COUNT, - CatchLonglineDto.PROPERTY_TOTAL_WEIGHT, - CatchLonglineDto.PROPERTY_HOOK_WHEN_DISCARDED, - CatchLonglineDto.PROPERTY_DEPREDATED, - CatchLonglineDto.PROPERTY_BEAT_DIAMETER, - CatchLonglineDto.PROPERTY_GONADE_WEIGHT, - CatchLonglineDto.PROPERTY_PHOTO_REFERENCES, - CatchLonglineDto.PROPERTY_NUMBER, - CatchLonglineDto.PROPERTY_ACQUISITION_MODE, - CatchLonglineDto.PROPERTY_SPECIES_CATCH, - CatchLonglineDto.PROPERTY_CATCH_HEALTHNESS, - CatchLonglineDto.PROPERTY_HOOK_POSITION, - CatchLonglineDto.PROPERTY_CATCH_FATE_LONGLINE, - CatchLonglineDto.PROPERTY_DISCARD_HEALTHNESS, - CatchLonglineDto.PROPERTY_PREDATOR, - CatchLonglineDto.PROPERTY_STOMAC_FULLNESS, - CatchLonglineDto.PROPERTY_SEX, - CatchLonglineDto.PROPERTY_MATURITY_STATUS, - CatchLonglineDto.PROPERTY_SIZE_MEASURE, - CatchLonglineDto.PROPERTY_WEIGHT_MEASURE, - CatchLonglineDto.PROPERTY_SECTION, - CatchLonglineDto.PROPERTY_BASKET, - CatchLonglineDto.PROPERTY_BRANCHLINE); + CatchLonglineDto.PROPERTY_COMMENT, + CatchLonglineDto.PROPERTY_HOME_ID, + CatchLonglineDto.PROPERTY_COUNT, + CatchLonglineDto.PROPERTY_TOTAL_WEIGHT, + CatchLonglineDto.PROPERTY_HOOK_WHEN_DISCARDED, + CatchLonglineDto.PROPERTY_DEPREDATED, + CatchLonglineDto.PROPERTY_BEAT_DIAMETER, + CatchLonglineDto.PROPERTY_GONADE_WEIGHT, + CatchLonglineDto.PROPERTY_PHOTO_REFERENCES, + CatchLonglineDto.PROPERTY_NUMBER, + CatchLonglineDto.PROPERTY_ACQUISITION_MODE, + CatchLonglineDto.PROPERTY_SPECIES_CATCH, + CatchLonglineDto.PROPERTY_CATCH_HEALTHNESS, + CatchLonglineDto.PROPERTY_HOOK_POSITION, + CatchLonglineDto.PROPERTY_CATCH_FATE_LONGLINE, + CatchLonglineDto.PROPERTY_DISCARD_HEALTHNESS, + CatchLonglineDto.PROPERTY_PREDATOR, + CatchLonglineDto.PROPERTY_STOMAC_FULLNESS, + CatchLonglineDto.PROPERTY_SEX, + CatchLonglineDto.PROPERTY_MATURITY_STATUS, + CatchLonglineDto.PROPERTY_SIZE_MEASURE, + CatchLonglineDto.PROPERTY_WEIGHT_MEASURE, + CatchLonglineDto.PROPERTY_SECTION, + CatchLonglineDto.PROPERTY_BASKET, + CatchLonglineDto.PROPERTY_BRANCHLINE); } @Override public void initEncounterDto() { registerDto(EncounterDto.class, Encounter.class, - EncounterDto.PROPERTY_DISTANCE, - EncounterDto.PROPERTY_COUNT, - EncounterDto.PROPERTY_ENCOUNTER_TYPE, - EncounterDto.PROPERTY_SPECIES); + EncounterDto.PROPERTY_DISTANCE, + EncounterDto.PROPERTY_COUNT, + EncounterDto.PROPERTY_ENCOUNTER_TYPE, + EncounterDto.PROPERTY_SPECIES); } @Override public void initFloatlinesCompositionDto() { registerDto(FloatlinesCompositionDto.class, FloatlinesComposition.class, - FloatlinesCompositionDto.PROPERTY_LENGTH, - FloatlinesCompositionDto.PROPERTY_PROPORTION, - FloatlinesCompositionDto.PROPERTY_LINE_TYPE); + FloatlinesCompositionDto.PROPERTY_LENGTH, + FloatlinesCompositionDto.PROPERTY_PROPORTION, + FloatlinesCompositionDto.PROPERTY_LINE_TYPE); } @Override public void initGearUseFeaturesLonglineDto() { registerDto(GearUseFeaturesLonglineDto.class, GearUseFeaturesLongline.class, - GearUseFeaturesLonglineDto.PROPERTY_NUMBER, - GearUseFeaturesLonglineDto.PROPERTY_USED_IN_TRIP, - GearUseFeaturesLonglineDto.PROPERTY_GEAR, - GearUseFeaturesLonglineDto.PROPERTY_GEAR_USE_FEATURES_MEASUREMENT); + GearUseFeaturesLonglineDto.PROPERTY_NUMBER, + GearUseFeaturesLonglineDto.PROPERTY_USED_IN_TRIP, + GearUseFeaturesLonglineDto.PROPERTY_GEAR, + GearUseFeaturesLonglineDto.PROPERTY_GEAR_USE_FEATURES_MEASUREMENT); } @Override public void initGearUseFeaturesMeasurementLonglineDto() { registerDto(GearUseFeaturesMeasurementLonglineDto.class, GearUseFeaturesMeasurementLongline.class, - GearUseFeaturesMeasurementLonglineDto.PROPERTY_MEASUREMENT_VALUE, - GearUseFeaturesMeasurementLonglineDto.PROPERTY_GEAR_CARACTERISTIC); + GearUseFeaturesMeasurementLonglineDto.PROPERTY_MEASUREMENT_VALUE, + GearUseFeaturesMeasurementLonglineDto.PROPERTY_GEAR_CARACTERISTIC); } @Override public void initHooksCompositionDto() { registerDto(HooksCompositionDto.class, HooksComposition.class, - HooksCompositionDto.PROPERTY_PROPORTION, - HooksCompositionDto.PROPERTY_HOOK_OFFSET, - HooksCompositionDto.PROPERTY_HOOK_TYPE, - HooksCompositionDto.PROPERTY_HOOK_SIZE); + HooksCompositionDto.PROPERTY_PROPORTION, + HooksCompositionDto.PROPERTY_HOOK_OFFSET, + HooksCompositionDto.PROPERTY_HOOK_TYPE, + HooksCompositionDto.PROPERTY_HOOK_SIZE); } @Override public void initSectionDto() { registerDto(SectionDto.class, Section.class, - SectionDto.PROPERTY_SETTING_IDENTIFIER, - SectionDto.PROPERTY_HAULING_IDENTIFIER, - SectionDto.PROPERTY_BASKET); + SectionDto.PROPERTY_SETTING_IDENTIFIER, + SectionDto.PROPERTY_HAULING_IDENTIFIER, + SectionDto.PROPERTY_BASKET); } @Override public void initSensorUsedDto() { registerDto(SensorUsedDto.class, SensorUsed.class, - SensorUsedDto.PROPERTY_DATA, - SensorUsedDto.PROPERTY_DATA_FILENAME, - SensorUsedDto.PROPERTY_DATA_LOCATION, - SensorUsedDto.PROPERTY_SENSOR_SERIAL_NO, - SensorUsedDto.PROPERTY_SENSOR_TYPE, - SensorUsedDto.PROPERTY_SENSOR_BRAND, - SensorUsedDto.PROPERTY_SENSOR_DATA_FORMAT); + SensorUsedDto.PROPERTY_DATA, + SensorUsedDto.PROPERTY_DATA_FILENAME, + SensorUsedDto.PROPERTY_DATA_LOCATION, + SensorUsedDto.PROPERTY_SENSOR_SERIAL_NO, + SensorUsedDto.PROPERTY_SENSOR_TYPE, + SensorUsedDto.PROPERTY_SENSOR_BRAND, + SensorUsedDto.PROPERTY_SENSOR_DATA_FORMAT); } @Override public void initSetLonglineDto() { registerDto(SetLonglineDto.class, SetLongline.class, - SetLonglineDto.PROPERTY_COMMENT, - SetLonglineDto.PROPERTY_HOME_ID, - SetLonglineDto.PROPERTY_NUMBER, - SetLonglineDto.PROPERTY_BASKETS_PER_SECTION_COUNT, - SetLonglineDto.PROPERTY_BRANCHLINES_PER_BASKET_COUNT, - SetLonglineDto.PROPERTY_TOTAL_SECTIONS_COUNT, - SetLonglineDto.PROPERTY_TOTAL_BASKETS_COUNT, - SetLonglineDto.PROPERTY_TOTAL_HOOKS_COUNT, - SetLonglineDto.PROPERTY_WEIGHTED_SNAP, - SetLonglineDto.PROPERTY_SNAP_WEIGHT, - SetLonglineDto.PROPERTY_WEIGHTED_SWIVEL, - SetLonglineDto.PROPERTY_SWIVEL_WEIGHT, - SetLonglineDto.PROPERTY_LIGHTSTICKS_PER_BASKET_COUNT, - SetLonglineDto.PROPERTY_TIME_BETWEEN_HOOKS, - SetLonglineDto.PROPERTY_SHOOTER_USED, - SetLonglineDto.PROPERTY_SHOOTER_SPEED, - SetLonglineDto.PROPERTY_MAX_DEPTH_TARGETED, - SetLonglineDto.PROPERTY_SETTING_START_TIME_STAMP, - SetLonglineDto.PROPERTY_SETTING_START_LATITUDE, - SetLonglineDto.PROPERTY_SETTING_START_LONGITUDE, - SetLonglineDto.PROPERTY_SETTING_START_TIME_STAMP, - SetLonglineDto.PROPERTY_SETTING_END_LATITUDE, - SetLonglineDto.PROPERTY_SETTING_END_LONGITUDE, - SetLonglineDto.PROPERTY_SETTING_VESSEL_SPEED, - SetLonglineDto.PROPERTY_HAULING_DIRECTION_SAME_AS_SETTING, - SetLonglineDto.PROPERTY_HAULING_START_TIME_STAMP, - SetLonglineDto.PROPERTY_HAULING_START_LATITUDE, - SetLonglineDto.PROPERTY_HAULING_START_LONGITUDE, - SetLonglineDto.PROPERTY_HAULING_END_TIME_STAMP, - SetLonglineDto.PROPERTY_HAULING_END_LATITUDE, - SetLonglineDto.PROPERTY_HAULING_END_LONGITUDE, - SetLonglineDto.PROPERTY_HAULING_BREAKS, - SetLonglineDto.PROPERTY_MONITORED, - SetLonglineDto.PROPERTY_LINE_TYPE, - SetLonglineDto.PROPERTY_LIGHTSTICKS_COLOR, - SetLonglineDto.PROPERTY_LIGHTSTICKS_TYPE, - SetLonglineDto.PROPERTY_SETTING_SHAPE); + SetLonglineDto.PROPERTY_COMMENT, + SetLonglineDto.PROPERTY_HOME_ID, + SetLonglineDto.PROPERTY_NUMBER, + SetLonglineDto.PROPERTY_BASKETS_PER_SECTION_COUNT, + SetLonglineDto.PROPERTY_BRANCHLINES_PER_BASKET_COUNT, + SetLonglineDto.PROPERTY_TOTAL_SECTIONS_COUNT, + SetLonglineDto.PROPERTY_TOTAL_BASKETS_COUNT, + SetLonglineDto.PROPERTY_TOTAL_HOOKS_COUNT, + SetLonglineDto.PROPERTY_WEIGHTED_SNAP, + SetLonglineDto.PROPERTY_SNAP_WEIGHT, + SetLonglineDto.PROPERTY_WEIGHTED_SWIVEL, + SetLonglineDto.PROPERTY_SWIVEL_WEIGHT, + SetLonglineDto.PROPERTY_LIGHTSTICKS_PER_BASKET_COUNT, + SetLonglineDto.PROPERTY_TIME_BETWEEN_HOOKS, + SetLonglineDto.PROPERTY_SHOOTER_USED, + SetLonglineDto.PROPERTY_SHOOTER_SPEED, + SetLonglineDto.PROPERTY_MAX_DEPTH_TARGETED, + SetLonglineDto.PROPERTY_SETTING_START_TIME_STAMP, + SetLonglineDto.PROPERTY_SETTING_START_LATITUDE, + SetLonglineDto.PROPERTY_SETTING_START_LONGITUDE, + SetLonglineDto.PROPERTY_SETTING_START_TIME_STAMP, + SetLonglineDto.PROPERTY_SETTING_END_LATITUDE, + SetLonglineDto.PROPERTY_SETTING_END_LONGITUDE, + SetLonglineDto.PROPERTY_SETTING_VESSEL_SPEED, + SetLonglineDto.PROPERTY_HAULING_DIRECTION_SAME_AS_SETTING, + SetLonglineDto.PROPERTY_HAULING_START_TIME_STAMP, + SetLonglineDto.PROPERTY_HAULING_START_LATITUDE, + SetLonglineDto.PROPERTY_HAULING_START_LONGITUDE, + SetLonglineDto.PROPERTY_HAULING_END_TIME_STAMP, + SetLonglineDto.PROPERTY_HAULING_END_LATITUDE, + SetLonglineDto.PROPERTY_HAULING_END_LONGITUDE, + SetLonglineDto.PROPERTY_HAULING_BREAKS, + SetLonglineDto.PROPERTY_MONITORED, + SetLonglineDto.PROPERTY_LINE_TYPE, + SetLonglineDto.PROPERTY_LIGHTSTICKS_COLOR, + SetLonglineDto.PROPERTY_LIGHTSTICKS_TYPE, + SetLonglineDto.PROPERTY_SETTING_SHAPE); } @Override public void initSetLonglineCatchDto() { registerDto(SetLonglineCatchDto.class, SetLongline.class, - SetLonglineCatchDto.PROPERTY_CATCH_LONGLINE); + SetLonglineCatchDto.PROPERTY_CATCH_LONGLINE); } @Override public void initSetLonglineDetailCompositionDto() { registerDto(SetLonglineDetailCompositionDto.class, SetLongline.class, - SetLonglineDetailCompositionDto.PROPERTY_SECTION); + SetLonglineDetailCompositionDto.PROPERTY_SECTION); } @Override public void initSetLonglineGlobalCompositionDto() { registerDto(SetLonglineGlobalCompositionDto.class, SetLongline.class, - SetLonglineGlobalCompositionDto.PROPERTY_FLOATLINES_COMPOSITION, - SetLonglineGlobalCompositionDto.PROPERTY_BRANCHLINES_COMPOSITION, - SetLonglineGlobalCompositionDto.PROPERTY_HOOKS_COMPOSITION, - SetLonglineGlobalCompositionDto.PROPERTY_BAITS_COMPOSITION, - SetLonglineGlobalCompositionDto.PROPERTY_MITIGATION_TYPE); + SetLonglineGlobalCompositionDto.PROPERTY_FLOATLINES_COMPOSITION, + SetLonglineGlobalCompositionDto.PROPERTY_BRANCHLINES_COMPOSITION, + SetLonglineGlobalCompositionDto.PROPERTY_HOOKS_COMPOSITION, + SetLonglineGlobalCompositionDto.PROPERTY_BAITS_COMPOSITION, + SetLonglineGlobalCompositionDto.PROPERTY_MITIGATION_TYPE); } @Override public void initSetLonglineTdrDto() { registerDto(SetLonglineTdrDto.class, SetLongline.class, - SetLonglineTdrDto.PROPERTY_TDR); + SetLonglineTdrDto.PROPERTY_TDR); } @Override public void initSizeMeasureDto() { registerDto(SizeMeasureDto.class, SizeMeasure.class, - SizeMeasureDto.PROPERTY_SIZE, - SizeMeasureDto.PROPERTY_SIZE_MEASURE_TYPE); + SizeMeasureDto.PROPERTY_SIZE, + SizeMeasureDto.PROPERTY_SIZE_MEASURE_TYPE); } @Override public void initTdrDto() { registerDto(TdrDto.class, Tdr.class, - TdrDto.PROPERTY_HOME_ID, - TdrDto.PROPERTY_FLOATLINE1_LENGTH, - TdrDto.PROPERTY_FLOATLINE2_LENGTH, - TdrDto.PROPERTY_SERIAL_NO, - TdrDto.PROPERTY_DATA, - TdrDto.PROPERTY_DATA_FILENAME, - TdrDto.PROPERTY_DATA_LOCATION, - TdrDto.PROPERTY_DEPLOYEMENT_START, - TdrDto.PROPERTY_DEPLOYEMENT_END, - TdrDto.PROPERTY_FISHING_START, - TdrDto.PROPERTY_FISHING_END, - TdrDto.PROPERTY_FISHING_START_DEPTH, - TdrDto.PROPERTY_FISHING_END_DEPTH, - TdrDto.PROPERTY_MEAN_DEPLOYEMENT_DEPTH, - TdrDto.PROPERTY_MEDIAN_DEPLOYEMENT_DEPTH, - TdrDto.PROPERTY_MIN_FISHING_DEPTH, - TdrDto.PROPERTY_MAX_FISHING_DEPTH, - TdrDto.PROPERTY_MEAN_FISHING_DEPTH, - TdrDto.PROPERTY_MEDIAN_FISHING_DEPTH, - TdrDto.PROPERTY_SENSOR_BRAND, - TdrDto.PROPERTY_ITEM_HORIZONTAL_POSITION, - TdrDto.PROPERTY_ITEM_VERTICAL_POSITION, - TdrDto.PROPERTY_SPECIES, - TdrDto.PROPERTY_BASKET, - TdrDto.PROPERTY_SECTION, - TdrDto.PROPERTY_BRANCHLINE); + TdrDto.PROPERTY_HOME_ID, + TdrDto.PROPERTY_FLOATLINE1_LENGTH, + TdrDto.PROPERTY_FLOATLINE2_LENGTH, + TdrDto.PROPERTY_SERIAL_NO, + TdrDto.PROPERTY_DATA, + TdrDto.PROPERTY_DATA_FILENAME, + TdrDto.PROPERTY_DATA_LOCATION, + TdrDto.PROPERTY_DEPLOYEMENT_START, + TdrDto.PROPERTY_DEPLOYEMENT_END, + TdrDto.PROPERTY_FISHING_START, + TdrDto.PROPERTY_FISHING_END, + TdrDto.PROPERTY_FISHING_START_DEPTH, + TdrDto.PROPERTY_FISHING_END_DEPTH, + TdrDto.PROPERTY_MEAN_DEPLOYEMENT_DEPTH, + TdrDto.PROPERTY_MEDIAN_DEPLOYEMENT_DEPTH, + TdrDto.PROPERTY_MIN_FISHING_DEPTH, + TdrDto.PROPERTY_MAX_FISHING_DEPTH, + TdrDto.PROPERTY_MEAN_FISHING_DEPTH, + TdrDto.PROPERTY_MEDIAN_FISHING_DEPTH, + TdrDto.PROPERTY_SENSOR_BRAND, + TdrDto.PROPERTY_ITEM_HORIZONTAL_POSITION, + TdrDto.PROPERTY_ITEM_VERTICAL_POSITION, + TdrDto.PROPERTY_SPECIES, + TdrDto.PROPERTY_BASKET, + TdrDto.PROPERTY_SECTION, + TdrDto.PROPERTY_BRANCHLINE); } @Override public void initTripLonglineDto() { registerDto(TripLonglineDto.class, TripLongline.class, - TripLonglineDto.PROPERTY_COMMENT, - TripLonglineDto.PROPERTY_OPEN, - TripLonglineDto.PROPERTY_START_DATE, - TripLonglineDto.PROPERTY_END_DATE, - TripLonglineDto.PROPERTY_TOTAL_FISHING_OPERATIONS_NUMBER, - TripLonglineDto.PROPERTY_HOME_ID, - TripLonglineDto.PROPERTY_TRIP_TYPE, - TripLonglineDto.PROPERTY_CAPTAIN, - TripLonglineDto.PROPERTY_OBSERVER, - TripLonglineDto.PROPERTY_DATA_ENTRY_OPERATOR, - TripLonglineDto.PROPERTY_VESSEL, - TripLonglineDto.PROPERTY_OCEAN, - TripLonglineDto.PROPERTY_DEPARTURE_HARBOUR, - TripLonglineDto.PROPERTY_LANDING_HARBOUR); + TripLonglineDto.PROPERTY_COMMENT, + TripLonglineDto.PROPERTY_OPEN, + TripLonglineDto.PROPERTY_START_DATE, + TripLonglineDto.PROPERTY_END_DATE, + TripLonglineDto.PROPERTY_TOTAL_FISHING_OPERATIONS_NUMBER, + TripLonglineDto.PROPERTY_HOME_ID, + TripLonglineDto.PROPERTY_TRIP_TYPE, + TripLonglineDto.PROPERTY_CAPTAIN, + TripLonglineDto.PROPERTY_OBSERVER, + TripLonglineDto.PROPERTY_DATA_ENTRY_OPERATOR, + TripLonglineDto.PROPERTY_VESSEL, + TripLonglineDto.PROPERTY_OCEAN, + TripLonglineDto.PROPERTY_DEPARTURE_HARBOUR, + TripLonglineDto.PROPERTY_LANDING_HARBOUR); } @Override public void initWeightMeasureDto() { registerDto(WeightMeasureDto.class, WeightMeasure.class, - WeightMeasureDto.PROPERTY_WEIGHT, - WeightMeasureDto.PROPERTY_WEIGHT_MEASURE_TYPE); + WeightMeasureDto.PROPERTY_WEIGHT, + WeightMeasureDto.PROPERTY_WEIGHT_MEASURE_TYPE); } // -------------------------------------------------------------------------------------------------------------- // @@ -1141,261 +1201,261 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { @Override public void initActivitySeineDto() { registerDto(ActivitySeineDto.class, ActivitySeine.class, - ActivitySeineDto.PROPERTY_COMMENT, - ActivitySeineDto.PROPERTY_OPEN, - ActivitySeineDto.PROPERTY_TIME, - ActivitySeineDto.PROPERTY_LATITUDE, - ActivitySeineDto.PROPERTY_LONGITUDE, - ActivitySeineDto.PROPERTY_VESSEL_SPEED, - ActivitySeineDto.PROPERTY_SEA_SURFACE_TEMPERATURE, - ActivitySeineDto.PROPERTY_ERS_ID, - ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, - ActivitySeineDto.PROPERTY_SURROUNDING_ACTIVITY, - ActivitySeineDto.PROPERTY_DETECTION_MODE, - ActivitySeineDto.PROPERTY_REASON_FOR_NO_FISHING, - ActivitySeineDto.PROPERTY_PREVIOUS_FPA_ZONE, - ActivitySeineDto.PROPERTY_CURRENT_FPA_ZONE, - ActivitySeineDto.PROPERTY_NEXT_FPA_ZONE, - ActivitySeineDto.PROPERTY_NEXT_FPA_ZONE); + ActivitySeineDto.PROPERTY_COMMENT, + ActivitySeineDto.PROPERTY_OPEN, + ActivitySeineDto.PROPERTY_TIME, + ActivitySeineDto.PROPERTY_LATITUDE, + ActivitySeineDto.PROPERTY_LONGITUDE, + ActivitySeineDto.PROPERTY_VESSEL_SPEED, + ActivitySeineDto.PROPERTY_SEA_SURFACE_TEMPERATURE, + ActivitySeineDto.PROPERTY_ERS_ID, + ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, + ActivitySeineDto.PROPERTY_SURROUNDING_ACTIVITY, + ActivitySeineDto.PROPERTY_DETECTION_MODE, + ActivitySeineDto.PROPERTY_REASON_FOR_NO_FISHING, + ActivitySeineDto.PROPERTY_PREVIOUS_FPA_ZONE, + ActivitySeineDto.PROPERTY_CURRENT_FPA_ZONE, + ActivitySeineDto.PROPERTY_NEXT_FPA_ZONE, + ActivitySeineDto.PROPERTY_NEXT_FPA_ZONE); } @Override public void initActivitySeineObservedSystemDto() { registerDto(ActivitySeineObservedSystemDto.class, ActivitySeine.class, - ActivitySeineObservedSystemDto.PROPERTY_COMMENT, - ActivitySeineObservedSystemDto.PROPERTY_OPEN, - ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM_DISTANCE, - ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM); + ActivitySeineObservedSystemDto.PROPERTY_COMMENT, + ActivitySeineObservedSystemDto.PROPERTY_OPEN, + ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM_DISTANCE, + ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM); } @Override public void initFloatingObjectDto() { registerDto(FloatingObjectDto.class, FloatingObject.class, - FloatingObjectDto.PROPERTY_COMMENT, - FloatingObjectDto.PROPERTY_DAYS_AT_SEA_COUNT, - FloatingObjectDto.PROPERTY_SUPPORT_VESSEL_NAME, - FloatingObjectDto.PROPERTY_OBJECT_FATE, - FloatingObjectDto.PROPERTY_OBJECT_OPERATION, - FloatingObjectDto.PROPERTY_OBJECT_TYPE + FloatingObjectDto.PROPERTY_COMMENT, + FloatingObjectDto.PROPERTY_DAYS_AT_SEA_COUNT, + FloatingObjectDto.PROPERTY_SUPPORT_VESSEL_NAME, + FloatingObjectDto.PROPERTY_OBJECT_FATE, + FloatingObjectDto.PROPERTY_OBJECT_OPERATION, + FloatingObjectDto.PROPERTY_OBJECT_TYPE ); } @Override public void initFloatingObjectObservedSpeciesDto() { registerDto(FloatingObjectObservedSpeciesDto.class, FloatingObject.class, - FloatingObjectObservedSpeciesDto.PROPERTY_COMMENT, - FloatingObjectObservedSpeciesDto.PROPERTY_OBJECT_OBSERVED_SPECIES); + FloatingObjectObservedSpeciesDto.PROPERTY_COMMENT, + FloatingObjectObservedSpeciesDto.PROPERTY_OBJECT_OBSERVED_SPECIES); } @Override public void initFloatingObjectSchoolEstimateDto() { registerDto(FloatingObjectSchoolEstimateDto.class, FloatingObject.class, - FloatingObjectSchoolEstimateDto.PROPERTY_COMMENT, - FloatingObjectSchoolEstimateDto.PROPERTY_OBJECT_SCHOOL_ESTIMATE); + FloatingObjectSchoolEstimateDto.PROPERTY_COMMENT, + FloatingObjectSchoolEstimateDto.PROPERTY_OBJECT_SCHOOL_ESTIMATE); } @Override public void initFloatingObjectTransmittingBuoyDto() { registerDto(FloatingObjectTransmittingBuoyDto.class, FloatingObject.class, - FloatingObjectTransmittingBuoyDto.PROPERTY_COMMENT, - FloatingObjectTransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY); + FloatingObjectTransmittingBuoyDto.PROPERTY_COMMENT, + FloatingObjectTransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY); } @Override public void initGearUseFeaturesMeasurementSeineDto() { registerDto(GearUseFeaturesMeasurementSeineDto.class, GearUseFeaturesMeasurementSeine.class, - GearUseFeaturesMeasurementSeineDto.PROPERTY_MEASUREMENT_VALUE, - GearUseFeaturesMeasurementSeineDto.PROPERTY_GEAR_CARACTERISTIC); + GearUseFeaturesMeasurementSeineDto.PROPERTY_MEASUREMENT_VALUE, + GearUseFeaturesMeasurementSeineDto.PROPERTY_GEAR_CARACTERISTIC); } @Override public void initGearUseFeaturesSeineDto() { registerDto(GearUseFeaturesSeineDto.class, GearUseFeaturesSeine.class, - GearUseFeaturesSeineDto.PROPERTY_COMMENT, - GearUseFeaturesSeineDto.PROPERTY_NUMBER, - GearUseFeaturesSeineDto.PROPERTY_USED_IN_TRIP, - GearUseFeaturesSeineDto.PROPERTY_GEAR_USE_FEATURES_MEASUREMENT); + GearUseFeaturesSeineDto.PROPERTY_COMMENT, + GearUseFeaturesSeineDto.PROPERTY_NUMBER, + GearUseFeaturesSeineDto.PROPERTY_USED_IN_TRIP, + GearUseFeaturesSeineDto.PROPERTY_GEAR_USE_FEATURES_MEASUREMENT); } @Override public void initNonTargetCatchDto() { registerDto(NonTargetCatchDto.class, NonTargetCatch.class, - NonTargetCatchDto.PROPERTY_COMMENT, - NonTargetCatchDto.PROPERTY_CATCH_WEIGHT, - NonTargetCatchDto.PROPERTY_CATCH_WEIGHT_COMPUTED_SOURCE, - NonTargetCatchDto.PROPERTY_MEAN_WEIGHT, - NonTargetCatchDto.PROPERTY_MEAN_WEIGHT_COMPUTED_SOURCE, - NonTargetCatchDto.PROPERTY_MEAN_LENGTH, - NonTargetCatchDto.PROPERTY_MEAN_LENGTH_COMPUTED_SOURCE, - NonTargetCatchDto.PROPERTY_TOTAL_COUNT, - NonTargetCatchDto.PROPERTY_TOTAL_COUNT_COMPUTED_SOURCE, - NonTargetCatchDto.PROPERTY_SPECIES_FATE, - NonTargetCatchDto.PROPERTY_REASON_FOR_DISCARD); + NonTargetCatchDto.PROPERTY_COMMENT, + NonTargetCatchDto.PROPERTY_CATCH_WEIGHT, + NonTargetCatchDto.PROPERTY_CATCH_WEIGHT_COMPUTED_SOURCE, + NonTargetCatchDto.PROPERTY_MEAN_WEIGHT, + NonTargetCatchDto.PROPERTY_MEAN_WEIGHT_COMPUTED_SOURCE, + NonTargetCatchDto.PROPERTY_MEAN_LENGTH, + NonTargetCatchDto.PROPERTY_MEAN_LENGTH_COMPUTED_SOURCE, + NonTargetCatchDto.PROPERTY_TOTAL_COUNT, + NonTargetCatchDto.PROPERTY_TOTAL_COUNT_COMPUTED_SOURCE, + NonTargetCatchDto.PROPERTY_SPECIES_FATE, + NonTargetCatchDto.PROPERTY_REASON_FOR_DISCARD); } @Override public void initNonTargetLengthDto() { registerDto(NonTargetLengthDto.class, NonTargetLength.class, - NonTargetLengthDto.PROPERTY_LENGTH, - NonTargetLengthDto.PROPERTY_LENGTH, - NonTargetLengthDto.PROPERTY_LENGTH_SOURCE, - NonTargetLengthDto.PROPERTY_PICTURES_REFERENCES, - NonTargetLengthDto.PROPERTY_WEIGHT, - NonTargetLengthDto.PROPERTY_WEIGHT_SOURCE, - NonTargetLengthDto.PROPERTY_COUNT, - NonTargetLengthDto.PROPERTY_ACQUISITION_MODE, - NonTargetLengthDto.PROPERTY_SPECIES); + NonTargetLengthDto.PROPERTY_LENGTH, + NonTargetLengthDto.PROPERTY_LENGTH, + NonTargetLengthDto.PROPERTY_LENGTH_SOURCE, + NonTargetLengthDto.PROPERTY_PICTURES_REFERENCES, + NonTargetLengthDto.PROPERTY_WEIGHT, + NonTargetLengthDto.PROPERTY_WEIGHT_SOURCE, + NonTargetLengthDto.PROPERTY_COUNT, + NonTargetLengthDto.PROPERTY_ACQUISITION_MODE, + NonTargetLengthDto.PROPERTY_SPECIES); } @Override public void initNonTargetSampleDto() { registerDto(NonTargetSampleDto.class, NonTargetSample.class, - NonTargetSampleDto.PROPERTY_COMMENT, - NonTargetSampleDto.PROPERTY_NON_TARGET_LENGTH); + NonTargetSampleDto.PROPERTY_COMMENT, + NonTargetSampleDto.PROPERTY_NON_TARGET_LENGTH); } @Override public void initObjectObservedSpeciesDto() { registerDto(ObjectObservedSpeciesDto.class, ObjectObservedSpecies.class, - ObjectObservedSpeciesDto.PROPERTY_COUNT, - ObjectObservedSpeciesDto.PROPERTY_STATUT, - ObjectObservedSpeciesDto.PROPERTY_SPECIES, - ObjectObservedSpeciesDto.PROPERTY_SPECIES_STATUS); + ObjectObservedSpeciesDto.PROPERTY_COUNT, + ObjectObservedSpeciesDto.PROPERTY_STATUT, + ObjectObservedSpeciesDto.PROPERTY_SPECIES, + ObjectObservedSpeciesDto.PROPERTY_SPECIES_STATUS); } @Override public void initObjectSchoolEstimateDto() { registerDto(ObjectSchoolEstimateDto.class, ObjectSchoolEstimate.class, - ObjectSchoolEstimateDto.PROPERTY_TOTAL_WEIGHT, - ObjectSchoolEstimateDto.PROPERTY_SPECIES); + ObjectSchoolEstimateDto.PROPERTY_TOTAL_WEIGHT, + ObjectSchoolEstimateDto.PROPERTY_SPECIES); } @Override public void initRouteDto() { registerDto(RouteDto.class, Route.class, - RouteDto.PROPERTY_COMMENT, - RouteDto.PROPERTY_OPEN, - RouteDto.PROPERTY_DATE, - RouteDto.PROPERTY_START_LOG_VALUE, - RouteDto.PROPERTY_END_LOG_VALUE, - RouteDto.PROPERTY_CHECK_LEVEL + RouteDto.PROPERTY_COMMENT, + RouteDto.PROPERTY_OPEN, + RouteDto.PROPERTY_DATE, + RouteDto.PROPERTY_START_LOG_VALUE, + RouteDto.PROPERTY_END_LOG_VALUE, + RouteDto.PROPERTY_CHECK_LEVEL ); } @Override public void initSchoolEstimateDto() { registerDto(SchoolEstimateDto.class, SchoolEstimate.class, - SchoolEstimateDto.PROPERTY_TOTAL_WEIGHT, - SchoolEstimateDto.PROPERTY_MEAN_WEIGHT, - SchoolEstimateDto.PROPERTY_SPECIES); + SchoolEstimateDto.PROPERTY_TOTAL_WEIGHT, + SchoolEstimateDto.PROPERTY_MEAN_WEIGHT, + SchoolEstimateDto.PROPERTY_SPECIES); } @Override public void initSetSeineDto() { registerDto(SetSeineDto.class, SetSeine.class, - SetSeineDto.PROPERTY_COMMENT, - SetSeineDto.PROPERTY_START_TIME, - SetSeineDto.PROPERTY_END_PURSING_TIME_STAMP, - SetSeineDto.PROPERTY_END_SET_TIME_STAMP, - SetSeineDto.PROPERTY_MAX_GEAR_DEPTH, - SetSeineDto.PROPERTY_CURRENT_SPEED, - SetSeineDto.PROPERTY_CURRENT_DIRECTION, - SetSeineDto.PROPERTY_SCHOOL_TOP_DEPTH, - SetSeineDto.PROPERTY_SCHOOL_MEAN_DEPTH, - SetSeineDto.PROPERTY_SCHOOL_THICKNESS, - SetSeineDto.PROPERTY_SONAR_USED, - SetSeineDto.PROPERTY_SUPPORT_VESSEL_NAME, - SetSeineDto.PROPERTY_NON_TARGET_DISCARDED, - SetSeineDto.PROPERTY_CURRENT_MEASURE_DEPTH, - SetSeineDto.PROPERTY_SCHOOL_TYPE, - SetSeineDto.PROPERTY_REASON_FOR_NULL_SET); + SetSeineDto.PROPERTY_COMMENT, + SetSeineDto.PROPERTY_START_TIME, + SetSeineDto.PROPERTY_END_PURSING_TIME_STAMP, + SetSeineDto.PROPERTY_END_SET_TIME_STAMP, + SetSeineDto.PROPERTY_MAX_GEAR_DEPTH, + SetSeineDto.PROPERTY_CURRENT_SPEED, + SetSeineDto.PROPERTY_CURRENT_DIRECTION, + SetSeineDto.PROPERTY_SCHOOL_TOP_DEPTH, + SetSeineDto.PROPERTY_SCHOOL_MEAN_DEPTH, + SetSeineDto.PROPERTY_SCHOOL_THICKNESS, + SetSeineDto.PROPERTY_SONAR_USED, + SetSeineDto.PROPERTY_SUPPORT_VESSEL_NAME, + SetSeineDto.PROPERTY_NON_TARGET_DISCARDED, + SetSeineDto.PROPERTY_CURRENT_MEASURE_DEPTH, + SetSeineDto.PROPERTY_SCHOOL_TYPE, + SetSeineDto.PROPERTY_REASON_FOR_NULL_SET); } @Override public void initSetSeineNonTargetCatchDto() { registerDto(SetSeineNonTargetCatchDto.class, SetSeine.class, - SetSeineNonTargetCatchDto.PROPERTY_NON_TARGET_CATCH); + SetSeineNonTargetCatchDto.PROPERTY_NON_TARGET_CATCH); } @Override public void initSetSeineSchoolEstimateDto() { registerDto(SetSeineSchoolEstimateDto.class, SetSeine.class, - SetSeineSchoolEstimateDto.PROPERTY_COMMENT, - SetSeineSchoolEstimateDto.PROPERTY_SCHOOL_ESTIMATE); + SetSeineSchoolEstimateDto.PROPERTY_COMMENT, + SetSeineSchoolEstimateDto.PROPERTY_SCHOOL_ESTIMATE); } @Override public void initSetSeineTargetCatchDto() { registerDto(SetSeineTargetCatchDto.class, SetSeine.class, - SetSeineTargetCatchDto.PROPERTY_TARGET_CATCH); + SetSeineTargetCatchDto.PROPERTY_TARGET_CATCH); } @Override public void initTargetCatchDto() { registerDto(TargetCatchDto.class, TargetCatch.class, - TargetCatchDto.PROPERTY_COMMENT, - TargetCatchDto.PROPERTY_CATCH_WEIGHT, - TargetCatchDto.PROPERTY_WELL, - TargetCatchDto.PROPERTY_BROUGHT_ON_DECK, - TargetCatchDto.PROPERTY_DISCARDED, - TargetCatchDto.PROPERTY_SPECIES, - TargetCatchDto.PROPERTY_REASON_FOR_DISCARD, - TargetCatchDto.PROPERTY_WEIGHT_CATEGORY); + TargetCatchDto.PROPERTY_COMMENT, + TargetCatchDto.PROPERTY_CATCH_WEIGHT, + TargetCatchDto.PROPERTY_WELL, + TargetCatchDto.PROPERTY_BROUGHT_ON_DECK, + TargetCatchDto.PROPERTY_DISCARDED, + TargetCatchDto.PROPERTY_SPECIES, + TargetCatchDto.PROPERTY_REASON_FOR_DISCARD, + TargetCatchDto.PROPERTY_WEIGHT_CATEGORY); } @Override public void initTargetLengthDto() { registerDto(TargetLengthDto.class, TargetLength.class, - TargetLengthDto.PROPERTY_MEASURE_TYPE, - TargetLengthDto.PROPERTY_LENGTH, - TargetLengthDto.PROPERTY_LENGTH_SOURCE, - TargetLengthDto.PROPERTY_COUNT, - TargetLengthDto.PROPERTY_WEIGHT, - TargetLengthDto.PROPERTY_WEIGHT_SOURCE, - TargetLengthDto.PROPERTY_ACQUISITION_MODE, - TargetLengthDto.PROPERTY_SPECIES); + TargetLengthDto.PROPERTY_MEASURE_TYPE, + TargetLengthDto.PROPERTY_LENGTH, + TargetLengthDto.PROPERTY_LENGTH_SOURCE, + TargetLengthDto.PROPERTY_COUNT, + TargetLengthDto.PROPERTY_WEIGHT, + TargetLengthDto.PROPERTY_WEIGHT_SOURCE, + TargetLengthDto.PROPERTY_ACQUISITION_MODE, + TargetLengthDto.PROPERTY_SPECIES); } @Override public void initTargetSampleDto() { registerDto(TargetSampleDto.class, TargetSample.class, - TargetSampleDto.PROPERTY_COMMENT, - TargetSampleDto.PROPERTY_NATURE, - TargetSampleDto.PROPERTY_DISCARDED, - TargetSampleDto.PROPERTY_TARGET_LENGTH); + TargetSampleDto.PROPERTY_COMMENT, + TargetSampleDto.PROPERTY_NATURE, + TargetSampleDto.PROPERTY_DISCARDED, + TargetSampleDto.PROPERTY_TARGET_LENGTH); } @Override public void initTransmittingBuoyDto() { registerDto(TransmittingBuoyDto.class, TransmittingBuoy.class, - TransmittingBuoyDto.PROPERTY_CODE, - TransmittingBuoyDto.PROPERTY_BRAND, - TransmittingBuoyDto.PROPERTY_OWNERSHIP, - TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OPERATION, - TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_TYPE); + TransmittingBuoyDto.PROPERTY_CODE, + TransmittingBuoyDto.PROPERTY_BRAND, + TransmittingBuoyDto.PROPERTY_OWNERSHIP, + TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OPERATION, + TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_TYPE); } @Override public void initTripSeineDto() { registerDto(TripSeineDto.class, TripSeine.class, - TripSeineDto.PROPERTY_COMMENT, - TripSeineDto.PROPERTY_OPEN, - TripSeineDto.PROPERTY_START_DATE, - TripSeineDto.PROPERTY_END_DATE, - TripSeineDto.PROPERTY_DATE_ARRIVEE_PORT, - TripSeineDto.PROPERTY_CHECK_LEVEL, - TripSeineDto.PROPERTY_FORMS_URL, - TripSeineDto.PROPERTY_REPORTS_URL, - TripSeineDto.PROPERTY_HISTORICAL_DATA, - TripSeineDto.PROPERTY_ERS_ID, - TripSeineDto.PROPERTY_OBSERVER, - TripSeineDto.PROPERTY_CAPTAIN, - TripSeineDto.PROPERTY_DATA_ENTRY_OPERATOR, - TripSeineDto.PROPERTY_VESSEL, - TripSeineDto.PROPERTY_OCEAN, - TripSeineDto.PROPERTY_DEPARTURE_HARBOUR, - TripSeineDto.PROPERTY_LANDING_HARBOUR); + TripSeineDto.PROPERTY_COMMENT, + TripSeineDto.PROPERTY_OPEN, + TripSeineDto.PROPERTY_START_DATE, + TripSeineDto.PROPERTY_END_DATE, + TripSeineDto.PROPERTY_DATE_ARRIVEE_PORT, + TripSeineDto.PROPERTY_CHECK_LEVEL, + TripSeineDto.PROPERTY_FORMS_URL, + TripSeineDto.PROPERTY_REPORTS_URL, + TripSeineDto.PROPERTY_HISTORICAL_DATA, + TripSeineDto.PROPERTY_ERS_ID, + TripSeineDto.PROPERTY_OBSERVER, + TripSeineDto.PROPERTY_CAPTAIN, + TripSeineDto.PROPERTY_DATA_ENTRY_OPERATOR, + TripSeineDto.PROPERTY_VESSEL, + TripSeineDto.PROPERTY_OCEAN, + TripSeineDto.PROPERTY_DEPARTURE_HARBOUR, + TripSeineDto.PROPERTY_LANDING_HARBOUR); } protected <R extends IdDto, E extends TopiaEntity> void registerDtoType(Class<R> dtoType, Class<E> entityType) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 99c1bb8f2b28609eef7678ff9ba18e50e5412107 Merge: 7f5fa3a a20943e Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 20 16:08:54 2015 +0200 On quitte pour mieux revenir! Merge branch 'feature/7463' into develop .../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 +- observe-services-configuration-api/LICENSE.txt | 0 observe-services-configuration-api/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 observe-services-runner/LICENSE.txt | 0 observe-services-runner/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(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm