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

branch develop updated (e0378f8 -> 1e2dcae)
by codelutin.com scm 16 Sep '15

16 Sep '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from e0378f8 merge 7519 into develop new 1e2dcae oubli d'un fixme non commenté The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 1e2dcaea74c7bf0fac4f90e797348ba24bb36ed6 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Sep 16 10:58:12 2015 +0200 oubli d'un fixme non commenté Summary of changes: .../src/main/java/fr/ird/observe/ui/admin/report/ReportModel.java | 2 +- .../fr/ird/observe/ui/content/open/impl/longline/TripLonglineUI.css | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch develop updated (d2f75e8 -> e0378f8)
by codelutin.com scm 16 Sep '15

16 Sep '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from d2f75e8 Récupérer les permissions de lecture/écriture sur une source de données PG Termine #7523 new 79004d9 remplacement des entités par les dto (refs #7519) new 5723f4a ca build toujours pas, mais ça avance... reste plus que les packages list, ref et table dans ui.content new cdaf184 Ca build enfin ! C'est plein de fixme et les tests passent pas mais ca build (refs #7519) new 3ab3b46 remplacement de certains dtos par les referencedto new 5564607 ajout de spropiétés date et time dans les models d'ui new b45b8d3 ajout de spropiétés date et time dans les models d'ui new b366dd9 fix predicates new e0378f8 merge 7519 into develop The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit e0378f8909f5a61f1df9e7df56e7be997a00122e Merge: d2f75e8 b366dd9 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Sep 16 10:32:06 2015 +0200 merge 7519 into develop commit b366dd9f4582117fd1b8bf5085620e7799af9aa8 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Sep 15 18:07:07 2015 +0200 fix predicates commit b45b8d3a8b03ecaa01d5627342539f95356dddd2 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Sep 15 17:54:20 2015 +0200 ajout de spropiétés date et time dans les models d'ui commit 55646074ce4b4debb9982fe1b89973cf5670ebb1 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Sep 15 17:52:07 2015 +0200 ajout de spropiétés date et time dans les models d'ui commit 3ab3b46ea36a0078051c74e964655a8d8b4b1ccd Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Sep 15 16:45:15 2015 +0200 remplacement de certains dtos par les referencedto commit cdaf1841ef9ad4a6d18e560a37ca7d00d1f11cc1 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Sep 14 19:35:33 2015 +0200 Ca build enfin ! C'est plein de fixme et les tests passent pas mais ca build (refs #7519) commit 5723f4a9a4cc734c36b4f936052edcf0e2f575a7 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Sep 11 17:50:53 2015 +0200 ca build toujours pas, mais ça avance... reste plus que les packages list, ref et table dans ui.content commit 79004d9b932306ae82e8b88b9f23a35880828b56 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Sep 10 18:04:15 2015 +0200 remplacement des entités par les dto (refs #7519) Summary of changes: observe-application-swing/pom.xml | 44 +- .../main/java/fr/ird/observe/ObserveCLAction.java | 77 +- .../main/java/fr/ird/observe/ObserveConfig.java | 212 ++-- .../java/fr/ird/observe/ObserveConfigOption.java | 6 +- .../main/java/fr/ird/observe/ObserveContext.java | 386 +++---- .../main/java/fr/ird/observe/ObserveRunner.java | 37 +- .../fr/ird/observe/business/BinderService.java | 72 ++ .../fr/ird/observe/business}/DecoratorService.java | 464 ++++---- .../fr/ird/observe/business/IObserveConfig.java | 411 +++++++ .../LonglinePositionAware.java} | 41 +- .../business}/ObserveApplicationContext.java | 82 +- .../observe/business}/ObserveServiceHelper.java | 206 ++-- .../ObserveTechnicalException.java} | 28 +- .../SendMessageAble.java} | 36 +- .../observe/business/converter/FloatConverter.java | 87 ++ .../fr/ird/observe/business/db/DataContext.java | 702 ++++++++++++ .../fr/ird/observe/business/db/DataSource.java | 225 ++++ .../ird/observe/business/db/DataSourceConfig.java | 219 ++++ .../db/DataSourceConfigParam.java} | 42 +- .../observe/business/db/DataSourceException.java | 55 + .../ird/observe/business/db/DataSourceFactory.java | 457 ++++++++ .../observe/business/db/DataSourceProvider.java | 72 ++ .../db/constants/CommonDataSourceConfigParam.java | 127 +++ .../business/db/constants/ConnexionStatus.java | 66 ++ .../business/db/constants/CreationMode.java | 82 ++ .../business/db/constants/DataContextType.java | 328 ++++++ .../observe/business/db/constants/DataPolicy.java | 72 ++ .../db/constants/DataSourceState.java} | 43 +- .../ird/observe/business/db/constants/DbMode.java | 65 ++ .../decorator/LengthWeightParameterDecorator.java | 89 ++ .../decorator/NonTargetCatchDecorator.java | 56 + .../decorator/NonTargetLengthDecorator.java | 63 ++ .../decorator/ObjectObservedSpeciesDecorator.java | 54 + .../business/decorator/ObserveDecorator.java | 91 ++ .../decorator/ReferenceDecorator.java} | 27 +- .../business/decorator/SpeciesDecorator.java | 71 ++ .../business/decorator/TripLonglineDecorator.java | 31 +- .../decorator/TripSeineDecorator.java} | 37 +- .../ird/observe/business/gps/CoordinateHelper.java | 55 + .../gps/GPSAble.java} | 49 +- .../ird/observe/business}/gps/GPSFileReader.java | 2 +- .../fr/ird/observe/business}/gps/GPSPoint.java | 4 +- .../fr/ird/observe/business}/gps/GPSPointImpl.java | 5 +- .../observe/business}/gps/GPSPointInterval.java | 2 +- .../business}/gps/GPSPointIntervalImpl.java | 2 +- .../fr/ird/observe/business}/gps/GPSRoute.java | 2 +- .../fr/ird/observe/business}/gps/GPSRouteImpl.java | 2 +- .../fr/ird/observe/business}/gps/GPSService.java | 2 +- .../fr/ird/observe/business}/gps/GpsPoints.java | 8 +- .../ird/observe/business/report/ReportBuilder.java | 490 +++++++++ .../observe/business/report/model/DataMatrix.java | 259 +++++ .../ird/observe/business/report/model/Report.java | 144 +++ .../business/report/model/ReportExecute.java | 295 +++++ .../business/report/model/ReportOperation.java | 109 ++ .../business/report/model/ReportRequest.java | 369 +++++++ .../report/model/ReportVariable.java} | 39 +- .../report/model/operations/ExecuteRequests.java | 126 +++ .../report/package-info.java} | 37 +- .../ird/observe/business/util/SecurityModel.java | 217 ++++ .../business}/validation/ObserveValidator.java | 8 +- .../business/validation/ValidationContext.java | 304 ++++++ .../validation/ValidationMessageDetector.java | 559 ++++++++++ .../business}/validation/ValidationModelMode.java | 38 +- .../business}/validation/ValidationService.java | 29 +- .../business}/validation/ValidatorsMap.java | 2 +- .../observe/entities/longline/SectionTemplate.java | 184 ++++ .../ird/observe/entities/tripMap/TripMapPoint.java | 71 ++ .../observe/entities/tripMap/TripMapPointType.java | 58 + .../main/java/fr/ird/observe/ui/ObserveMainUI.css | 6 +- .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 33 +- .../fr/ird/observe/ui/ObserveMainUIHandler.java | 36 +- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 45 +- .../observe/ui/actions/ChangeDbLanguageAction.java | 6 +- .../observe/ui/actions/ChangeStorageAction.java | 2 +- .../fr/ird/observe/ui/actions/CloseHelpAction.java | 2 +- .../ird/observe/ui/actions/CloseStorageAction.java | 4 +- .../ui/actions/ImportStorageFromFileAction.java | 4 +- .../observe/ui/actions/ReloadResourcesAction.java | 2 +- .../observe/ui/actions/ReloadStorageAction.java | 80 +- .../ui/actions/SaveStorageToFileAction.java | 24 +- .../ird/observe/ui/actions/ShowConfigAction.java | 206 ++-- .../observe/ui/actions/StartH2WebServerAction.java | 14 +- .../observe/ui/actions/StartServerModeAction.java | 72 +- .../observe/ui/actions/StopH2WebServerAction.java | 11 +- .../observe/ui/actions/StopServerModeAction.java | 19 +- .../ui/actions/shared/AbstractUIAction.java | 2 +- .../ui/actions/shared/CloseAndCreateUIAction.java | 8 +- .../ui/actions/shared/CloseOpenUIAction.java | 8 +- .../observe/ui/actions/shared/ReOpenUIAction.java | 7 +- .../java/fr/ird/observe/ui/admin/AdminStep.java | 2 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 200 ++-- .../fr/ird/observe/ui/admin/AdminUILauncher.java | 20 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 391 +++---- .../observe/ui/admin/config/ConfigUIHandler.java | 20 +- .../ird/observe/ui/admin/config/SelectDataUI.css | 2 +- .../ird/observe/ui/admin/config/SelectDataUI.jaxx | 8 +- .../ui/admin/consolidate/ConsolidateModel.java | 34 +- .../ui/admin/consolidate/ConsolidateUIHandler.java | 153 ++- .../ird/observe/ui/admin/export/ExportModel.java | 87 +- .../observe/ui/admin/export/ExportUIHandler.java | 126 +-- .../fr/ird/observe/ui/admin/export/TripEntry.java | 20 +- .../ui/admin/export/TripToExportTableModel.java | 14 +- .../observe/ui/admin/gps/GPSAbleTableModel.java | 2 +- .../ui/admin/gps/GPSActivityTableModel.java | 21 +- .../fr/ird/observe/ui/admin/gps/ImportGPSUI.jaxx | 5 +- .../observe/ui/admin/gps/ImportGPSUIHandler.java | 109 +- .../ird/observe/ui/admin/report/ReportModel.java | 6 +- .../fr/ird/observe/ui/admin/report/ReportUI.jaxx | 2 +- .../observe/ui/admin/report/ReportUIHandler.java | 73 +- .../observe/ui/admin/report/ResultTableModel.java | 4 +- .../observe/ui/admin/save/SaveLocalUIHandler.java | 377 ++++--- .../ObsoleteEntityListCellRenderer.java | 11 +- .../synchronize/ObsoleteEntityTableModel.java | 51 +- .../ui/admin/synchronize/SynchronizeModel.java | 105 +- .../ui/admin/synchronize/SynchronizeUI.jaxx | 9 +- .../ui/admin/synchronize/SynchronizeUIHandler.java | 1152 ++++++++++---------- .../ui/admin/validate/ValidateConfigUI.jaxx | 2 +- .../validate/ValidateEntityListCellRenderer.java | 125 +-- .../observe/ui/admin/validate/ValidateModel.java | 137 ++- .../ui/admin/validate/ValidateUIHandler.java | 332 +++--- .../main/java/fr/ird/observe/ui/content/Common.css | 2 +- .../java/fr/ird/observe/ui/content/ContentUI.jaxx | 16 +- .../ird/observe/ui/content/ContentUIHandler.java | 340 +++--- .../observe/ui/content/ContentUIInitializer.java | 128 +-- .../ird/observe/ui/content/ContentUIManager.java | 192 ++-- .../fr/ird/observe/ui/content/ContentUIModel.java | 92 +- .../ird/observe/ui/content/ObserveContentUI.java | 11 +- .../content/impl/longline/BasketsTableModel.java | 13 +- .../ui/content/impl/longline/BranchlineUI.css | 40 +- .../ui/content/impl/longline/BranchlineUI.jaxx | 46 +- .../content/impl/longline/BranchlineUIHandler.java | 69 +- .../content/impl/longline/BranchlineUIModel.java | 130 ++- .../impl/longline/BranchlinesTableModel.java | 13 +- .../LonglineCompositionTableModelSupport.java | 14 +- .../impl/longline/LonglineDetailCompositionUI.jaxx | 14 +- .../LonglineDetailCompositionUIHandler.java | 930 ++++++++-------- .../LonglineDetailCompositionUIInitializer.java | 11 +- .../longline/LonglineDetailCompositionUIModel.java | 250 ++--- ...onglineDetailCompositionUIValidationHelper.java | 95 +- .../impl/longline/LonglineGlobalCompositionUI.css | 6 +- .../impl/longline/LonglineGlobalCompositionUI.jaxx | 14 +- .../LonglineGlobalCompositionUIHandler.java | 78 +- .../longline/LonglineGlobalCompositionUIModel.java | 23 +- .../impl/longline/SectionTemplatesTableModel.java | 130 +-- .../content/impl/longline/SectionsTableModel.java | 177 +-- .../ui/content/impl/longline/SetLonglineUI.css | 106 +- .../ui/content/impl/longline/SetLonglineUI.jaxx | 35 +- .../impl/longline/SetLonglineUIHandler.java | 352 +++--- .../content/impl/longline/SetLonglineUIModel.java | 316 ++++-- .../impl/seine/ActivitySeineObservedSystemUI.css | 4 +- .../impl/seine/ActivitySeineObservedSystemUI.jaxx | 18 +- .../ActivitySeineObservedSystemUIHandler.java | 93 +- .../seine/ActivitySeineObservedSystemUIModel.java | 26 +- .../FloatingObjectTransmittingBuoyOperationUI.css | 24 +- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 48 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 400 +++---- ...tingObjectTransmittingBuoyOperationUIModel.java | 61 +- .../ui/content/impl/seine/FloatingObjectUI.css | 12 +- .../ui/content/impl/seine/FloatingObjectUI.jaxx | 20 +- .../impl/seine/FloatingObjectUIHandler.java | 182 ++-- .../content/impl/seine/FloatingObjectUIModel.java | 28 +- .../observe/ui/content/impl/seine/SetSeineUI.css | 40 +- .../observe/ui/content/impl/seine/SetSeineUI.jaxx | 14 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 331 +++--- .../ui/content/impl/seine/SetSeineUIModel.java | 88 +- .../ird/observe/ui/content/list/ContentListUI.jaxx | 4 +- .../ui/content/list/ContentListUIHandler.java | 22 +- .../ui/content/list/ContentListUIModel.java | 4 +- .../list/impl/longline/ActivityLonglinesUI.jaxx | 8 +- .../impl/longline/ActivityLonglinesUIHandler.java | 39 +- .../impl/longline/ActivityLonglinesUIModel.java | 42 +- .../ui/content/list/impl/longline/CommonListUI.css | 8 +- .../list/impl/longline/TripLonglinesUI.jaxx | 10 +- .../list/impl/longline/TripLonglinesUIHandler.java | 41 +- .../list/impl/longline/TripLonglinesUIModel.java | 34 +- .../content/list/impl/seine/ActivitySeinesUI.jaxx | 8 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 40 +- .../list/impl/seine/ActivitySeinesUIModel.java | 42 +- .../ui/content/list/impl/seine/CommonListUI.css | 12 +- .../ui/content/list/impl/seine/RoutesUI.jaxx | 10 +- .../content/list/impl/seine/RoutesUIHandler.java | 43 +- .../ui/content/list/impl/seine/RoutesUIModel.java | 26 +- .../ui/content/list/impl/seine/TripSeinesUI.jaxx | 12 +- .../list/impl/seine/TripSeinesUIHandler.java | 44 +- .../content/list/impl/seine/TripSeinesUIModel.java | 34 +- .../observe/ui/content/open/ContentOpenableUI.jaxx | 5 +- .../ui/content/open/ContentOpenableUIHandler.java | 81 +- .../ui/content/open/ContentOpenableUIModel.java | 5 +- .../open/impl/longline/ActivityLonglineUI.css | 21 +- .../open/impl/longline/ActivityLonglineUI.jaxx | 25 +- .../impl/longline/ActivityLonglineUIHandler.java | 380 +++---- .../impl/longline/ActivityLonglineUIModel.java | 98 +- .../content/open/impl/longline/TripLonglineUI.css | 39 +- .../content/open/impl/longline/TripLonglineUI.jaxx | 47 +- .../open/impl/longline/TripLonglineUIHandler.java | 244 ++--- .../open/impl/longline/TripLonglineUIModel.java | 51 +- .../ui/content/open/impl/seine/ActivitySeineUI.css | 41 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 52 +- .../open/impl/seine/ActivitySeineUIHandler.java | 396 +++---- .../open/impl/seine/ActivitySeineUIModel.java | 112 +- .../observe/ui/content/open/impl/seine/RouteUI.css | 6 +- .../ui/content/open/impl/seine/RouteUI.jaxx | 11 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 397 +++---- .../ui/content/open/impl/seine/RouteUIModel.java | 62 +- .../ui/content/open/impl/seine/TripSeineUI.css | 42 +- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 41 +- .../open/impl/seine/TripSeineUIHandler.java | 277 +++-- .../content/open/impl/seine/TripSeineUIModel.java | 51 +- .../observe/ui/content/ref/ContentReferenceUI.css | 2 +- .../observe/ui/content/ref/ContentReferenceUI.jaxx | 4 +- .../ui/content/ref/ContentReferenceUIHandler.java | 658 ++++++----- .../ui/content/ref/ContentReferenceUIModel.java | 106 +- .../observe/ui/content/ref/ReferenceHomeUI.jaxx | 4 +- .../ui/content/ref/ReferenceHomeUIHandler.java | 8 +- .../ui/content/ref/ReferenceHomeUIModel.java | 10 +- .../ref/ReferentialContentUIInitializer.java | 39 +- .../ui/content/ref/UniqueKeyTableModel.java | 2 +- .../ird/observe/ui/content/ref/impl/CountryUI.jaxx | 10 +- .../ui/content/ref/impl/CountryUIModel.java | 8 +- .../ird/observe/ui/content/ref/impl/FpaZoneUI.jaxx | 10 +- .../ui/content/ref/impl/FpaZoneUIModel.java | 8 +- .../content/ref/impl/GearCaracteristicTypeUI.jaxx | 10 +- .../ref/impl/GearCaracteristicTypeUIModel.java | 6 +- .../ui/content/ref/impl/GearCaracteristicUI.css | 2 +- .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 14 +- .../content/ref/impl/GearCaracteristicUIModel.java | 14 +- .../fr/ird/observe/ui/content/ref/impl/GearUI.css | 2 +- .../fr/ird/observe/ui/content/ref/impl/GearUI.jaxx | 15 +- .../observe/ui/content/ref/impl/GearUIHandler.java | 8 +- .../observe/ui/content/ref/impl/GearUIModel.java | 36 +- .../ird/observe/ui/content/ref/impl/HarbourUI.css | 6 +- .../ird/observe/ui/content/ref/impl/HarbourUI.jaxx | 14 +- .../ui/content/ref/impl/HarbourUIModel.java | 18 +- .../content/ref/impl/LengthWeightParameterUI.jaxx | 24 +- .../ref/impl/LengthWeightParameterUIHandler.java | 8 +- .../ref/impl/LengthWeightParameterUIModel.java | 46 +- .../ird/observe/ui/content/ref/impl/OceanUI.jaxx | 10 +- .../observe/ui/content/ref/impl/OceanUIModel.java | 6 +- .../observe/ui/content/ref/impl/OrganismUI.jaxx | 14 +- .../ui/content/ref/impl/OrganismUIModel.java | 8 +- .../ird/observe/ui/content/ref/impl/PersonUI.css | 2 +- .../ird/observe/ui/content/ref/impl/PersonUI.jaxx | 14 +- .../observe/ui/content/ref/impl/PersonUIModel.java | 22 +- .../ird/observe/ui/content/ref/impl/ProgramUI.jaxx | 16 +- .../ui/content/ref/impl/ProgramUIHandler.java | 8 +- .../ui/content/ref/impl/ProgramUIModel.java | 74 +- .../fr/ird/observe/ui/content/ref/impl/SexUI.jaxx | 10 +- .../observe/ui/content/ref/impl/SexUIModel.java | 6 +- .../ui/content/ref/impl/SpeciesGroupUI.jaxx | 10 +- .../ui/content/ref/impl/SpeciesGroupUIModel.java | 6 +- .../observe/ui/content/ref/impl/SpeciesListUI.jaxx | 15 +- .../ui/content/ref/impl/SpeciesListUIHandler.java | 8 +- .../ui/content/ref/impl/SpeciesListUIModel.java | 36 +- .../ird/observe/ui/content/ref/impl/SpeciesUI.jaxx | 19 +- .../ui/content/ref/impl/SpeciesUIHandler.java | 8 +- .../ui/content/ref/impl/SpeciesUIModel.java | 94 +- .../ui/content/ref/impl/VesselSizeCategoryUI.jaxx | 10 +- .../ref/impl/VesselSizeCategoryUIModel.java | 10 +- .../observe/ui/content/ref/impl/VesselTypeUI.jaxx | 10 +- .../ui/content/ref/impl/VesselTypeUIModel.java | 6 +- .../ird/observe/ui/content/ref/impl/VesselUI.jaxx | 22 +- .../ui/content/ref/impl/VesselUIHandler.java | 8 +- .../observe/ui/content/ref/impl/VesselUIModel.java | 78 +- .../ref/impl/longline/BaitHaulingStatusUI.jaxx | 14 +- .../impl/longline/BaitHaulingStatusUIModel.java | 6 +- .../ref/impl/longline/BaitSettingStatusUI.jaxx | 10 +- .../impl/longline/BaitSettingStatusUIModel.java | 8 +- .../ui/content/ref/impl/longline/BaitTypeUI.jaxx | 10 +- .../content/ref/impl/longline/BaitTypeUIModel.java | 6 +- .../ref/impl/longline/CatchFateLonglineUI.jaxx | 10 +- .../impl/longline/CatchFateLonglineUIModel.java | 6 +- .../content/ref/impl/longline/EncounterTypeUI.jaxx | 10 +- .../ref/impl/longline/EncounterTypeUIModel.java | 6 +- .../ui/content/ref/impl/longline/HealthnessUI.jaxx | 10 +- .../ref/impl/longline/HealthnessUIModel.java | 6 +- .../content/ref/impl/longline/HookPositionUI.jaxx | 10 +- .../ref/impl/longline/HookPositionUIModel.java | 6 +- .../ui/content/ref/impl/longline/HookSizeUI.jaxx | 24 +- .../content/ref/impl/longline/HookSizeUIModel.java | 6 +- .../ui/content/ref/impl/longline/HookTypeUI.jaxx | 24 +- .../content/ref/impl/longline/HookTypeUIModel.java | 6 +- .../impl/longline/ItemHorizontalPositionUI.jaxx | 10 +- .../longline/ItemHorizontalPositionUIModel.java | 6 +- .../ref/impl/longline/ItemVerticalPositionUI.jaxx | 10 +- .../impl/longline/ItemVerticalPositionUIModel.java | 6 +- .../ref/impl/longline/LightsticksColorUI.jaxx | 10 +- .../ref/impl/longline/LightsticksColorUIModel.java | 6 +- .../ref/impl/longline/LightsticksTypeUI.jaxx | 10 +- .../ref/impl/longline/LightsticksTypeUIModel.java | 6 +- .../ui/content/ref/impl/longline/LineTypeUI.jaxx | 10 +- .../content/ref/impl/longline/LineTypeUIModel.java | 6 +- .../ref/impl/longline/MaturityStatusUI.jaxx | 10 +- .../ref/impl/longline/MaturityStatusUIModel.java | 8 +- .../ref/impl/longline/MitigationTypeUI.jaxx | 10 +- .../ref/impl/longline/MitigationTypeUIModel.java | 6 +- .../content/ref/impl/longline/SensorBrandUI.jaxx | 10 +- .../ref/impl/longline/SensorBrandUIModel.java | 8 +- .../ref/impl/longline/SensorDataFormatUI.jaxx | 10 +- .../ref/impl/longline/SensorDataFormatUIModel.java | 6 +- .../ui/content/ref/impl/longline/SensorTypeUI.jaxx | 10 +- .../ref/impl/longline/SensorTypeUIModel.java | 6 +- .../content/ref/impl/longline/SettingShapeUI.jaxx | 10 +- .../ref/impl/longline/SettingShapeUIModel.java | 6 +- .../ref/impl/longline/SizeMeasureTypeUI.jaxx | 10 +- .../ref/impl/longline/SizeMeasureTypeUIModel.java | 6 +- .../ref/impl/longline/StomacFullnessUI.jaxx | 10 +- .../ref/impl/longline/StomacFullnessUIModel.java | 6 +- .../ui/content/ref/impl/longline/TripTypeUI.jaxx | 10 +- .../content/ref/impl/longline/TripTypeUIModel.java | 6 +- .../impl/longline/VesselActivityLonglineUI.jaxx | 10 +- .../longline/VesselActivityLonglineUIModel.java | 6 +- .../ref/impl/longline/WeightMeasureTypeUI.jaxx | 10 +- .../impl/longline/WeightMeasureTypeUIModel.java | 6 +- .../ui/content/ref/impl/seine/DetectionModeUI.jaxx | 10 +- .../ref/impl/seine/DetectionModeUIModel.java | 6 +- .../ui/content/ref/impl/seine/ObjectFateUI.jaxx | 10 +- .../content/ref/impl/seine/ObjectFateUIModel.java | 6 +- .../content/ref/impl/seine/ObjectOperationUI.jaxx | 10 +- .../ref/impl/seine/ObjectOperationUIModel.java | 6 +- .../ui/content/ref/impl/seine/ObjectTypeUI.jaxx | 10 +- .../content/ref/impl/seine/ObjectTypeUIModel.java | 6 +- .../content/ref/impl/seine/ObservedSystemUI.jaxx | 12 +- .../ref/impl/seine/ObservedSystemUIModel.java | 8 +- .../content/ref/impl/seine/ReasonForDiscardUI.jaxx | 10 +- .../ref/impl/seine/ReasonForDiscardUIModel.java | 6 +- .../ref/impl/seine/ReasonForNoFishingUI.jaxx | 10 +- .../ref/impl/seine/ReasonForNoFishingUIModel.java | 6 +- .../content/ref/impl/seine/ReasonForNullSetUI.jaxx | 10 +- .../ref/impl/seine/ReasonForNullSetUIModel.java | 6 +- .../ui/content/ref/impl/seine/SpeciesFateUI.jaxx | 10 +- .../content/ref/impl/seine/SpeciesFateUIModel.java | 6 +- .../ui/content/ref/impl/seine/SpeciesStatusUI.jaxx | 10 +- .../ref/impl/seine/SpeciesStatusUIModel.java | 6 +- .../ref/impl/seine/SurroundingActivityUI.jaxx | 10 +- .../ref/impl/seine/SurroundingActivityUIModel.java | 6 +- .../impl/seine/TransmittingBuoyOperationUI.jaxx | 10 +- .../seine/TransmittingBuoyOperationUIModel.java | 6 +- .../ref/impl/seine/TransmittingBuoyTypeUI.jaxx | 10 +- .../impl/seine/TransmittingBuoyTypeUIModel.java | 6 +- .../ref/impl/seine/VesselActivitySeineUI.jaxx | 10 +- .../ref/impl/seine/VesselActivitySeineUIModel.java | 6 +- .../content/ref/impl/seine/WeightCategoryUI.jaxx | 14 +- .../ref/impl/seine/WeightCategoryUIModel.java | 10 +- .../observe/ui/content/ref/impl/seine/WindUI.jaxx | 10 +- .../ui/content/ref/impl/seine/WindUIModel.java | 8 +- .../ird/observe/ui/content/table/CommonTable.css | 2 +- .../ui/content/table/ContentTableModel.java | 55 +- .../observe/ui/content/table/ContentTableUI.jaxx | 7 +- .../ui/content/table/ContentTableUIHandler.java | 369 +++---- .../content/table/ContentTableUIInitializer.java | 28 +- .../ui/content/table/ContentTableUIModel.java | 85 +- .../ui/content/table/ObserveContentTableUI.java | 5 +- .../table/impl/longline/BaitsCompositionUI.css | 12 +- .../table/impl/longline/BaitsCompositionUI.jaxx | 25 +- .../impl/longline/BaitsCompositionUIHandler.java | 48 +- .../impl/longline/BaitsCompositionUIModel.java | 49 +- .../impl/longline/BranchlinesCompositionUI.css | 11 +- .../impl/longline/BranchlinesCompositionUI.jaxx | 23 +- .../longline/BranchlinesCompositionUIHandler.java | 60 +- .../longline/BranchlinesCompositionUIModel.java | 33 +- .../CatchLonglineContentTableUIInitializer.java | 8 +- .../impl/longline/CatchLonglineTableModel.java | 10 +- .../table/impl/longline/CatchLonglineUI.css | 60 +- .../table/impl/longline/CatchLonglineUI.jaxx | 70 +- .../impl/longline/CatchLonglineUIHandler.java | 572 +++++----- .../table/impl/longline/CatchLonglineUIModel.java | 202 ++-- .../ui/content/table/impl/longline/EncounterUI.css | 8 +- .../content/table/impl/longline/EncounterUI.jaxx | 24 +- .../table/impl/longline/EncounterUIHandler.java | 32 +- .../table/impl/longline/EncounterUIModel.java | 34 +- .../impl/longline/FloatlinesCompositionUI.css | 8 +- .../impl/longline/FloatlinesCompositionUI.jaxx | 23 +- .../longline/FloatlinesCompositionUIHandler.java | 58 +- .../longline/FloatlinesCompositionUIModel.java | 31 +- .../GearUseFeaturesLonglineTableModel.java | 28 +- .../impl/longline/GearUseFeaturesLonglineUI.css | 15 +- .../impl/longline/GearUseFeaturesLonglineUI.jaxx | 23 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 246 ++--- .../longline/GearUseFeaturesLonglineUIModel.java | 89 +- ...rUseFeaturesMeasurementLonglinesTableModel.java | 28 +- .../table/impl/longline/HooksCompositionUI.css | 11 +- .../table/impl/longline/HooksCompositionUI.jaxx | 33 +- .../impl/longline/HooksCompositionUIHandler.java | 60 +- .../impl/longline/HooksCompositionUIModel.java | 33 +- .../impl/longline/LonglinePositionHelper.java | 125 +-- .../content/table/impl/longline/SensorUsedUI.css | 14 +- .../content/table/impl/longline/SensorUsedUI.jaxx | 28 +- .../table/impl/longline/SensorUsedUIHandler.java | 61 +- .../table/impl/longline/SensorUsedUIModel.java | 43 +- .../impl/longline/SizeMeasuresTableModel.java | 27 +- .../ui/content/table/impl/longline/TdrUI.css | 70 +- .../ui/content/table/impl/longline/TdrUI.jaxx | 43 +- .../content/table/impl/longline/TdrUIHandler.java | 117 +- .../ui/content/table/impl/longline/TdrUIModel.java | 307 ++++-- .../impl/longline/WeightMeasuresTableModel.java | 24 +- .../seine/GearUseFeatureMeasurementCellEditor.java | 16 +- .../GearUseFeatureMeasurementCellRenderer.java | 19 +- ...GearUseFeaturesMeasurementSeinesTableModel.java | 28 +- .../impl/seine/GearUseFeaturesSeineTableModel.java | 25 +- .../table/impl/seine/GearUseFeaturesSeineUI.css | 8 +- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 23 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 247 ++--- .../impl/seine/GearUseFeaturesSeineUIModel.java | 81 +- .../content/table/impl/seine/NonTargetCatchUI.css | 21 +- .../content/table/impl/seine/NonTargetCatchUI.jaxx | 33 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 401 ++++--- .../table/impl/seine/NonTargetCatchUIModel.java | 61 +- .../content/table/impl/seine/NonTargetSampleUI.css | 18 +- .../table/impl/seine/NonTargetSampleUI.jaxx | 26 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 316 +++--- .../table/impl/seine/NonTargetSampleUIModel.java | 62 +- .../table/impl/seine/ObjectObservedSpeciesUI.css | 6 +- .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 24 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 34 +- .../impl/seine/ObjectObservedSpeciesUIModel.java | 31 +- .../table/impl/seine/ObjectSchoolEstimateUI.css | 4 +- .../table/impl/seine/ObjectSchoolEstimateUI.jaxx | 20 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 30 +- .../impl/seine/ObjectSchoolEstimateUIModel.java | 23 +- .../content/table/impl/seine/SchoolEstimateUI.css | 6 +- .../content/table/impl/seine/SchoolEstimateUI.jaxx | 23 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 142 +-- .../table/impl/seine/SchoolEstimateUIModel.java | 35 +- .../ui/content/table/impl/seine/TargetCatchUI.css | 8 +- .../ui/content/table/impl/seine/TargetCatchUI.jaxx | 27 +- .../table/impl/seine/TargetCatchUIHandler.java | 414 +++---- .../table/impl/seine/TargetCatchUIModel.java | 45 +- .../table/impl/seine/TargetDiscardCatchUI.css | 8 +- .../table/impl/seine/TargetDiscardCatchUI.jaxx | 31 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 556 +++++----- .../impl/seine/TargetDiscardCatchUIModel.java | 47 +- .../content/table/impl/seine/TargetSampleUI.jaxx | 18 +- .../table/impl/seine/TargetSampleUIHandler.java | 301 ++--- .../table/impl/seine/TargetSampleUIModel.java | 46 +- .../ird/observe/ui/storage/ObstunaAdminAction.java | 386 ++++--- .../ird/observe/ui/storage/RemoteUILauncher.java | 63 +- .../ui/storage/StorageBackupUILauncher.java | 43 +- .../ird/observe/ui/storage/StorageUIHandler.java | 1016 ++++++++--------- .../ird/observe/ui/storage/StorageUILauncher.java | 2 +- .../fr/ird/observe/ui/storage/StorageUIModel.java | 615 ++++++----- .../observe/ui/storage/tabs/ChooseDbModeUI.jaxx | 4 +- .../ird/observe/ui/storage/tabs/ConfigDataUI.jaxx | 2 +- .../ui/storage/tabs/ConfigReferentielUI.jaxx | 2 +- .../fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx | 2 +- .../observe/ui/storage/tabs/RolesTableModel.java | 2 +- .../fr/ird/observe/ui/storage/tabs/RolesUI.jaxx | 2 +- .../ird/observe/ui/storage/tabs/SelectDataUI.jaxx | 2 +- .../ui/storage/tabs/StorageTabUIHandler.java | 71 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 53 +- .../ird/observe/ui/tree/ActivityLonglineNode.java | 20 +- .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 19 +- .../ui/tree/DataSelectionTreeCellRenderer.java | 4 +- .../ui/tree/DataSelectionTreeSelectionModel.java | 113 +- ...{EntityNodeSupport.java => DtoNodeSupport.java} | 62 +- .../observe/ui/tree/FloatingObjectSeineNode.java | 20 +- .../ird/observe/ui/tree/ObserveDataProvider.java | 49 +- .../tree/ObserveNavigationTreeShowPopupAction.java | 91 +- .../java/fr/ird/observe/ui/tree/ObserveNode.java | 11 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 121 +- .../ird/observe/ui/tree/ProgramLonglineNode.java | 20 +- .../fr/ird/observe/ui/tree/ProgramSeineNode.java | 20 +- .../fr/ird/observe/ui/tree/RouteSeineNode.java | 19 +- .../fr/ird/observe/ui/tree/SetLonglineNode.java | 20 +- .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 20 +- .../fr/ird/observe/ui/tree/TripLonglineNode.java | 20 +- .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 19 +- .../actions/ChangeTripProgramActionListener.java | 45 +- .../ui/tree/loadors/AbstractNodeChildLoador.java | 40 +- .../loadors/ActivityLonglineNodeChildLoador.java | 35 +- .../loadors/ActivityLonglinesNodeChildLoador.java | 19 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 43 +- .../loadors/ActivitySeinesNodeChildLoador.java | 18 +- .../loadors/FloatingObjectNodeChildLoador.java | 12 +- .../loadors/ProgramLonglineNodeChildLoador.java | 82 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 74 +- .../loadors/ReferenceCommonNodeChildLoador.java | 11 +- .../loadors/ReferenceLonglineNodeChildLoador.java | 11 +- .../loadors/ReferenceSeineNodeChildLoador.java | 11 +- .../ui/tree/loadors/RootNodeChildLoador.java | 68 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 24 +- .../tree/loadors/SetLonglineNodeChildLoador.java | 9 +- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 23 +- .../java/fr/ird/observe/ui/usage/UsagesUI.jaxx | 4 +- .../fr/ird/observe/ui/usage/UsagesUIHandler.java | 26 +- ...ObserveSimpleValidatorMessageTableRenderer.java | 2 +- .../util/ObserveValidatorMessageTableRenderer.java | 2 +- .../EditableTableWithCacheTableModelSupport.java | 21 +- .../ui/util/tripMap/TripMapContentBuilder.java | 5 +- .../observe/ui/util/tripMap/TripMapUIHandler.java | 26 +- .../observe-application-swing_en_GB.properties | 181 +++ .../observe-application-swing_es_ES.properties | 181 +++ .../observe-application-swing_fr_FR.properties | 181 +++ ...glineDetailCompositionValidatorServiceTest.java | 146 +-- .../main/java/fr/ird/observe/DecoratorService.java | 4 +- .../fr/ird/observe/ObserveApplicationContext.java | 6 +- .../java/fr/ird/observe/ObserveServiceHelper.java | 6 +- .../java/fr/ird/observe/gps/GPSFileReader.java | 2 +- .../main/java/fr/ird/observe/gps/GPSService.java | 2 +- .../ird/observe/validation/ObserveValidator.java | 2 +- .../ird/observe/validation/ValidationContext.java | 2 +- .../validation/ValidationMessageDetector.java | 2 +- .../observe/validation/ValidationModelMode.java | 2 +- .../ird/observe/validation/ValidationService.java | 2 +- .../fr/ird/observe/validation/ValidatorsMap.java | 2 +- .../fr.ird.observe.business.db.DataSourceProvider | 2 + .../services/fr.ird.observe.db.DataSourceProvider | 2 - .../java/fr/ird/observe/gps/GPSFileReaderTest.java | 2 +- .../test/java/fr/ird/observe/gps/GPSRouteTest.java | 2 +- .../java/fr/ird/observe/gps/GPSServiceTest.java | 2 +- .../observe/validation/ValidationServiceTest.java | 2 +- .../field/AbstractEspeceFieldValidator.java | 2 +- .../field/ActivityDebutDePecheSaneValidator.java | 2 +- .../field/ActivityFinDePecheSaneValidator.java | 2 +- .../field/ActivityFinDeVeilleExistsValidator.java | 2 +- .../field/ActivitySimpleSpeedValidator.java | 6 +- .../validation/field/ActivitySpeedValidator.java | 6 +- .../field/CollectionFieldExpressionValidator2.java | 2 +- .../field/CollectionUniqueKeyValidator2.java | 2 +- .../field/ObserveCollectionUniqueKeyValidator.java | 2 +- .../field/RouteActivitysFieldValidator.java | 2 +- .../field/SetLonglineUniqueHomeIdValidator.java | 2 +- .../field/SetLonglineUniqueNumberValidator.java | 2 +- .../field/SpeciesLengthFieldValidator.java | 2 +- .../field/SpeciesWeightFieldValidator.java | 2 +- .../field/VesselActivityFieldValidator.java | 2 +- .../src/main/resources/validators.xml | 26 +- .../validation/BeanValidatorDetectorTest.java | 2 +- .../validation/RelationRegexTest.java | 2 +- .../field/ActivitySeineSpeedValidatorTest.java | 2 +- .../ird/observe/{ => business}/gps/GPSPoint.java | 2 +- .../observe/{ => business}/gps/GPSPointImpl.java | 2 +- .../{ => business}/gps/GPSPointInterval.java | 2 +- .../{ => business}/gps/GPSPointIntervalImpl.java | 2 +- .../ird/observe/{ => business}/gps/GPSRoute.java | 2 +- .../observe/{ => business}/gps/GPSRouteImpl.java | 2 +- .../ird/observe/{ => business}/gps/GpsPoints.java | 2 +- .../java/fr/ird/observe/services/dto/IdDtos.java | 10 +- .../observe/services/AbstractObserveService.java | 2 +- .../ObserveServiceFactoryProviderTopia.java | 6 +- .../observe/services/ReplicationServiceImpl.java | 6 +- .../services/operation/GpsImportServiceImpl.java | 4 +- .../services/operation/SynchronizeServiceImpl.java | 4 +- .../services/operation/ValidationServiceImpl.java | 2 +- pom.xml | 2 +- 544 files changed, 21066 insertions(+), 13206 deletions(-) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/BinderService.java copy {observe-business/src/main/java/fr/ird/observe => observe-application-swing/src/main/java/fr/ird/observe/business}/DecoratorService.java (50%) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/IObserveConfig.java copy observe-application-swing/src/main/java/fr/ird/observe/{ui/tree/TripSeineNode.java => business/LonglinePositionAware.java} (52%) copy {observe-business/src/main/java/fr/ird/observe => observe-application-swing/src/main/java/fr/ird/observe/business}/ObserveApplicationContext.java (77%) copy {observe-business/src/main/java/fr/ird/observe => observe-application-swing/src/main/java/fr/ird/observe/business}/ObserveServiceHelper.java (64%) copy observe-application-swing/src/main/java/fr/ird/observe/{ui/content/ref/impl/longline/BaitSettingStatusUIModel.java => business/ObserveTechnicalException.java} (64%) copy observe-application-swing/src/main/java/fr/ird/observe/{ui/admin/config/SelectDataUI.css => business/SendMessageAble.java} (58%) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/converter/FloatConverter.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/DataContext.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSource.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceConfig.java copy observe-application-swing/src/main/java/fr/ird/observe/{ui/admin/config/SelectDataUI.css => business/db/DataSourceConfigParam.java} (58%) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceException.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceFactory.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceProvider.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/CommonDataSourceConfigParam.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/ConnexionStatus.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/CreationMode.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataContextType.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataPolicy.java copy observe-application-swing/src/main/java/fr/ird/observe/{ui/admin/config/SelectDataUI.css => business/db/constants/DataSourceState.java} (58%) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DbMode.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/decorator/LengthWeightParameterDecorator.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/decorator/NonTargetCatchDecorator.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/decorator/NonTargetLengthDecorator.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/decorator/ObjectObservedSpeciesDecorator.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/decorator/ObserveDecorator.java copy observe-application-swing/src/main/java/fr/ird/observe/{ui/content/ref/ReferenceHomeUIModel.java => business/decorator/ReferenceDecorator.java} (60%) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/decorator/SpeciesDecorator.java copy observe-entities-validation/src/main/java/fr/ird/observe/validation/field/SpeciesLengthFieldValidator.java => observe-application-swing/src/main/java/fr/ird/observe/business/decorator/TripLonglineDecorator.java (54%) copy observe-application-swing/src/main/java/fr/ird/observe/{ui/admin/export/TripEntry.java => business/decorator/TripSeineDecorator.java} (54%) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/gps/CoordinateHelper.java copy observe-application-swing/src/main/java/fr/ird/observe/{ui/content/ref/impl/longline/BaitSettingStatusUIModel.java => business/gps/GPSAble.java} (53%) copy {observe-business/src/main/java/fr/ird/observe => observe-application-swing/src/main/java/fr/ird/observe/business}/gps/GPSFileReader.java (99%) copy {observe-entities/src/main/java/fr/ird/observe => observe-application-swing/src/main/java/fr/ird/observe/business}/gps/GPSPoint.java (98%) copy {observe-entities/src/main/java/fr/ird/observe => observe-application-swing/src/main/java/fr/ird/observe/business}/gps/GPSPointImpl.java (95%) copy {observe-entities/src/main/java/fr/ird/observe => observe-application-swing/src/main/java/fr/ird/observe/business}/gps/GPSPointInterval.java (99%) copy {observe-entities/src/main/java/fr/ird/observe => observe-application-swing/src/main/java/fr/ird/observe/business}/gps/GPSPointIntervalImpl.java (98%) copy {observe-entities/src/main/java/fr/ird/observe => observe-application-swing/src/main/java/fr/ird/observe/business}/gps/GPSRoute.java (99%) copy {observe-entities/src/main/java/fr/ird/observe => observe-application-swing/src/main/java/fr/ird/observe/business}/gps/GPSRouteImpl.java (99%) copy {observe-business/src/main/java/fr/ird/observe => observe-application-swing/src/main/java/fr/ird/observe/business}/gps/GPSService.java (98%) copy {observe-entities/src/main/java/fr/ird/observe => observe-application-swing/src/main/java/fr/ird/observe/business}/gps/GpsPoints.java (96%) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/report/ReportBuilder.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/report/model/DataMatrix.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/report/model/Report.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/report/model/ReportExecute.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/report/model/ReportOperation.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/report/model/ReportRequest.java copy observe-application-swing/src/main/java/fr/ird/observe/{ui/admin/export/TripEntry.java => business/report/model/ReportVariable.java} (56%) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/report/model/operations/ExecuteRequests.java copy observe-application-swing/src/main/java/fr/ird/observe/{ui/admin/config/SelectDataUI.css => business/report/package-info.java} (58%) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/util/SecurityModel.java copy {observe-business/src/main/java/fr/ird/observe => observe-application-swing/src/main/java/fr/ird/observe/business}/validation/ObserveValidator.java (96%) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/validation/ValidationContext.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/validation/ValidationMessageDetector.java copy {observe-business/src/main/java/fr/ird/observe => observe-application-swing/src/main/java/fr/ird/observe/business}/validation/ValidationModelMode.java (68%) copy {observe-business/src/main/java/fr/ird/observe => observe-application-swing/src/main/java/fr/ird/observe/business}/validation/ValidationService.java (88%) copy {observe-business/src/main/java/fr/ird/observe => observe-application-swing/src/main/java/fr/ird/observe/business}/validation/ValidatorsMap.java (98%) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/entities/tripMap/TripMapPoint.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/entities/tripMap/TripMapPointType.java rename observe-application-swing/src/main/java/fr/ird/observe/ui/tree/{EntityNodeSupport.java => DtoNodeSupport.java} (66%) create mode 100644 observe-business/src/main/resources/META-INF/services/fr.ird.observe.business.db.DataSourceProvider delete mode 100644 observe-business/src/main/resources/META-INF/services/fr.ird.observe.db.DataSourceProvider rename observe-entities-validation/src/main/java/fr/ird/observe/{ => business}/validation/field/AbstractEspeceFieldValidator.java (99%) rename observe-entities-validation/src/main/java/fr/ird/observe/{ => business}/validation/field/ActivityDebutDePecheSaneValidator.java (99%) rename observe-entities-validation/src/main/java/fr/ird/observe/{ => business}/validation/field/ActivityFinDePecheSaneValidator.java (99%) rename observe-entities-validation/src/main/java/fr/ird/observe/{ => business}/validation/field/ActivityFinDeVeilleExistsValidator.java (99%) rename observe-entities-validation/src/main/java/fr/ird/observe/{ => business}/validation/field/ActivitySimpleSpeedValidator.java (97%) rename observe-entities-validation/src/main/java/fr/ird/observe/{ => business}/validation/field/ActivitySpeedValidator.java (98%) rename observe-entities-validation/src/main/java/fr/ird/observe/{ => business}/validation/field/CollectionFieldExpressionValidator2.java (98%) rename observe-entities-validation/src/main/java/fr/ird/observe/{ => business}/validation/field/CollectionUniqueKeyValidator2.java (96%) rename observe-entities-validation/src/main/java/fr/ird/observe/{ => business}/validation/field/ObserveCollectionUniqueKeyValidator.java (99%) rename observe-entities-validation/src/main/java/fr/ird/observe/{ => business}/validation/field/RouteActivitysFieldValidator.java (98%) rename observe-entities-validation/src/main/java/fr/ird/observe/{ => business}/validation/field/SetLonglineUniqueHomeIdValidator.java (98%) rename observe-entities-validation/src/main/java/fr/ird/observe/{ => business}/validation/field/SetLonglineUniqueNumberValidator.java (98%) rename observe-entities-validation/src/main/java/fr/ird/observe/{ => business}/validation/field/SpeciesLengthFieldValidator.java (96%) rename observe-entities-validation/src/main/java/fr/ird/observe/{ => business}/validation/field/SpeciesWeightFieldValidator.java (96%) rename observe-entities-validation/src/main/java/fr/ird/observe/{ => business}/validation/field/VesselActivityFieldValidator.java (99%) rename observe-entities-validation/src/test/java/fr/ird/observe/{ => business}/validation/BeanValidatorDetectorTest.java (99%) rename observe-entities-validation/src/test/java/fr/ird/observe/{ => business}/validation/RelationRegexTest.java (98%) rename observe-entities-validation/src/test/java/fr/ird/observe/{ => business}/validation/field/ActivitySeineSpeedValidatorTest.java (98%) rename observe-entities/src/main/java/fr/ird/observe/{ => business}/gps/GPSPoint.java (98%) rename observe-entities/src/main/java/fr/ird/observe/{ => business}/gps/GPSPointImpl.java (98%) rename observe-entities/src/main/java/fr/ird/observe/{ => business}/gps/GPSPointInterval.java (99%) rename observe-entities/src/main/java/fr/ird/observe/{ => business}/gps/GPSPointIntervalImpl.java (98%) rename observe-entities/src/main/java/fr/ird/observe/{ => business}/gps/GPSRoute.java (99%) rename observe-entities/src/main/java/fr/ird/observe/{ => business}/gps/GPSRouteImpl.java (99%) rename observe-entities/src/main/java/fr/ird/observe/{ => business}/gps/GpsPoints.java (99%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 8

branch feature/7519 deleted (was 792ad97)
by codelutin.com scm 16 Sep '15

16 Sep '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7519 in repository observe. See http://git.codelutin.com/observe.git was 792ad97 fix predicates This change permanently discards the following revisions: discards 792ad97 fix predicates discards 0d49a35 ajout de spropiétés date et time dans les models d'ui discards d2fbe48 ajout de spropiétés date et time dans les models d'ui discards 0326efe remplacement de certains dtos par les referencedto discards 2f4af8b Ca build enfin ! C'est plein de fixme et les tests passent pas mais ca build (refs #7519) discards 3efb3e6 ca build toujours pas, mais ça avance... reste plus que les packages list, ref et table dans ui.content discards c79340d remplacement des entités par les dto (refs #7519) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch feature/7421 created (now cca99f3)
by codelutin.com scm 16 Sep '15

16 Sep '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7421 in repository observe. See http://git.codelutin.com/observe.git at cca99f3 compression des requète (refs #7521) This branch includes the following new commits: new cca99f3 compression des requète (refs #7521) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit cca99f35eb293fc8ae7afff952bc842d8d1c31b4 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Sep 16 10:29:27 2015 +0200 compression des requète (refs #7521) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/7463-2 deleted (was 55d33ad)
by codelutin.com scm 16 Sep '15

16 Sep '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7463-2 in repository observe. See http://git.codelutin.com/observe.git was 55d33ad Optimisation des dépendances + on repasse certains test en ignore The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch develop updated (2bfa227 -> d2f75e8)
by codelutin.com scm 16 Sep '15

16 Sep '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 2bfa227 Mise à jour du référentiel (Termine #7520). Merge branch 'feature/7520' into develop new eb98b30 recuperation des permission à partir de la BD, et verification de ces permissions à l'execution des service (refs #7523) new d1322f4 gestion des permissions dans la couche serveur REST et client (refs #7523) new 3555d2b Ne pas recréer une configuration topia alors qu'on l'a déjà new d2f75e8 Récupérer les permissions de lecture/écriture sur une source de données PG Termine #7523 The 4 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 d2f75e848788034b123dee012571eaf83777f371 Merge: 2bfa227 3555d2b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Sep 16 09:30:09 2015 +0200 Récupérer les permissions de lecture/écriture sur une source de données PG Termine #7523 Merge branch 'feature/7523' into develop commit 3555d2bffacfbbf8d925436ff8697dea41017eca Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Sep 16 09:30:05 2015 +0200 Ne pas recréer une configuration topia alors qu'on l'a déjà commit d1322f4932a331744276bf89d7746a91bc76b0b0 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Sep 15 10:10:22 2015 +0200 gestion des permissions dans la couche serveur REST et client (refs #7523) commit eb98b300a2464634a3ff4686598d551cfa2dba0d Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Sep 14 16:57:48 2015 +0200 recuperation des permission à partir de la BD, et verification de ces permissions à l'execution des service (refs #7523) Summary of changes: .../web/controller/v1/ConfigurationController.java | 14 +- .../controller/v1/DataSourceServiceController.java | 12 +- .../v1/ObserveServiceControllerSupport.java | 5 +- .../controller/v1/ObserveWebErrorController.java | 7 +- .../web/request/ObserveWebRequestContext.java | 13 ++ .../ObserveWebSecurityApplicationContext.java | 15 +- ...ObserveWebSecurityAuthenticationTokenCache.java | 25 +-- .../services/ObserveServiceInitializer.java | 17 ++ ...bserveDataSourceConfigurationAndConnection.java | 24 +++ .../services/dto/UnauthorizedException.java | 24 +++ .../fr/ird/observe/services/TestClassResource.java | 2 + .../ird/observe/services/TestMethodResource.java | 2 + .../fr/ird/observe/services/ObserveJdbcHelper.java | 59 ++++++ .../services/ObserveServiceFactoryTopia.java | 32 +++ .../ObserveTopiaApplicationContextFactory.java | 10 +- .../services/service/DataSourceServiceTopia.java | 67 ++++++- .../services/service/ReferentialServiceTopia.java | 9 +- .../services/ApplicationContextResource.java | 11 ++ .../ird/observe/services/DataSourceResource.java | 11 ++ .../ObserveDataSourceConnectionTopiaTaiste.java | 15 ++ .../services/service/AbstractServiceTopiaTest.java | 21 +- .../service/DataSourceServiceTopiaTest.java | 5 +- .../fr/ird/observe/services/service/RigthTest.java | 215 +++++++++++++++++++++ 23 files changed, 562 insertions(+), 53 deletions(-) create mode 100644 observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationAndConnection.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/UnauthorizedException.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/ObserveJdbcHelper.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/ObserveDataSourceConnectionTopiaTaiste.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/RigthTest.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 4

branch feature/7523 deleted (was 305c368)
by codelutin.com scm 16 Sep '15

16 Sep '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7523 in repository observe. See http://git.codelutin.com/observe.git was 305c368 gestion des permissions dans la couche serveur REST et client (refs #7523) This change permanently discards the following revisions: discards 305c368 gestion des permissions dans la couche serveur REST et client (refs #7523) discards e212c6f recuperation des permission à partir de la BD, et verification de ces permissions à l'execution des service (refs #7523) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch develop updated (cbf55f5 -> 2bfa227)
by codelutin.com scm 16 Sep '15

16 Sep '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from cbf55f5 renommage des classes de test pour le module client Rest new ac7c587 ajout de la date de mise a jour pour les entité dans le référentiel (refs #7520) new 7407fcd ajout de la date de mise a jour pour les Trip, Route, Activity, Set (refs #7470) new 35481cc ajout de la date de mise a jour dans les DTO (refs #7470 #7520) new a78bd4e lever un execption en cas de modification concurent d'une entité siuvie en modif (refs #7470 #7520) new 5b64f73 fix npe (refs #7470 #7520) new 9f17d49 A la sauvegarde d'un DTO, verifier seulement que la date de dernière mise a jour en base n'est pas après la date du DTO (refs #7520) new 2bfa227 Mise à jour du référentiel (Termine #7520). Merge branch 'feature/7520' into develop The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 2bfa22757d2ec70552d1195f75aefd66d750e2e9 Merge: cbf55f5 9f17d49 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Sep 16 08:34:12 2015 +0200 Mise à jour du référentiel (Termine #7520). Merge branch 'feature/7520' into develop commit 9f17d4914216271dd9261cda2fa3b6dc12d67e7e Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Sep 15 10:52:47 2015 +0200 A la sauvegarde d'un DTO, verifier seulement que la date de dernière mise a jour en base n'est pas après la date du DTO (refs #7520) commit 5b64f735b90cbe9baa4dd8aab5a4f77c12466af0 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Sep 11 11:20:59 2015 +0200 fix npe (refs #7470 #7520) commit a78bd4e97e995e91b8df5908873bec7230d7d735 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Sep 11 11:09:27 2015 +0200 lever un execption en cas de modification concurent d'une entité siuvie en modif (refs #7470 #7520) commit 35481cc6bcb3471ad7eb800162cf39ffc63f74ce Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Sep 11 10:21:39 2015 +0200 ajout de la date de mise a jour dans les DTO (refs #7470 #7520) commit 7407fcdbb3c0fe80c6ffcf53dd0edb098ee451d1 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Sep 10 16:08:39 2015 +0200 ajout de la date de mise a jour pour les Trip, Route, Activity, Set (refs #7470) commit ac7c5874a591a2e323906c69273dafda6d990c0e Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Sep 10 15:18:33 2015 +0200 ajout de la date de mise a jour pour les entité dans le référentiel (refs #7520) Summary of changes: .../v1/ReferentialServiceController.java | 6 + .../java/fr/ird/observe/entities/Activity.java | 2 +- .../java/fr/ird/observe/entities/ObserveSet.java | 2 +- .../main/java/fr/ird/observe/entities/Trip.java | 2 +- .../migration/AbstractDataSourceMigration.java | 3 +- .../DataSourceMigrationForVersion_5_0.java | 6 +- .../resources/db/5.0/add_lastUpdate_field-H2.sql | 153 ++++++++++++++++++++ .../resources/db/5.0/add_lastUpdate_field-PG.sql | 154 +++++++++++++++++++++ observe-entities/src/main/xmi/observe-common.zargo | Bin 35191 -> 37033 bytes .../src/main/xmi/observe-longline.zargo | Bin 95691 -> 96937 bytes observe-entities/src/main/xmi/observe-seine.zargo | Bin 83247 -> 84597 bytes .../service/ConcurrentModificationException.java | 26 ++++ .../services/service/ReferentialService.java | 4 + .../observe/services/dto/FollowedUpdateDto.java | 14 ++ .../ird/observe/services/dto/ReferenceSetDtos.java | 8 +- .../xmi/observe-services-dto-common.properties | 6 +- .../src/main/xmi/observe-services-dto-common.zargo | Bin 34629 -> 35328 bytes .../xmi/observe-services-dto-longline.properties | 6 +- .../main/xmi/observe-services-dto-longline.zargo | Bin 59030 -> 61407 bytes .../main/xmi/observe-services-dto-seine.properties | 6 +- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 56972 -> 59029 bytes .../ird/observe/services/ObserveServiceTopia.java | 80 ++++++++++- .../services/dto/ObserveDtosInitializer.java | 57 +++++--- .../services/service/ReferentialServiceTopia.java | 17 +++ .../services/service/AbstractServiceTopiaTest.java | 20 ++- .../service/ReferentialServiceTopiaTest.java | 36 +++++ .../service/seine/TripSeineServiceTopiaTest.java | 52 +++++++ 27 files changed, 619 insertions(+), 41 deletions(-) create mode 100644 observe-entities/src/main/resources/db/5.0/add_lastUpdate_field-H2.sql create mode 100644 observe-entities/src/main/resources/db/5.0/add_lastUpdate_field-PG.sql create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/ConcurrentModificationException.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/FollowedUpdateDto.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 7

branch feature/7520 deleted (was 9f17d49)
by codelutin.com scm 16 Sep '15

16 Sep '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7520 in repository observe. See http://git.codelutin.com/observe.git was 9f17d49 A la sauvegarde d'un DTO, verifier seulement que la date de dernière mise a jour en base n'est pas après la date du DTO (refs #7520) This change permanently discards the following revisions: discards 9f17d49 A la sauvegarde d'un DTO, verifier seulement que la date de dernière mise a jour en base n'est pas après la date du DTO (refs #7520) discards 5b64f73 fix npe (refs #7470 #7520) discards a78bd4e lever un execption en cas de modification concurent d'une entité siuvie en modif (refs #7470 #7520) discards 35481cc ajout de la date de mise a jour dans les DTO (refs #7470 #7520) discards 7407fcd ajout de la date de mise a jour pour les Trip, Route, Activity, Set (refs #7470) discards ac7c587 ajout de la date de mise a jour pour les entité dans le référentiel (refs #7520) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch feature/7519 updated (2f4af8b -> 792ad97)
by codelutin.com scm 15 Sep '15

15 Sep '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7519 in repository observe. See http://git.codelutin.com/observe.git from 2f4af8b Ca build enfin ! C'est plein de fixme et les tests passent pas mais ca build (refs #7519) new 0326efe remplacement de certains dtos par les referencedto new d2fbe48 ajout de spropiétés date et time dans les models d'ui new 0d49a35 ajout de spropiétés date et time dans les models d'ui new 792ad97 fix predicates The 4 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 792ad97ca255af5bca09eeb469c9dca1e2b84df7 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Sep 15 18:07:07 2015 +0200 fix predicates commit 0d49a35e46b6018f526408f87d1fabf5e9be8923 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Sep 15 17:54:20 2015 +0200 ajout de spropiétés date et time dans les models d'ui commit d2fbe48e41224bcab795c4525812845b4a9f8122 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Sep 15 17:52:07 2015 +0200 ajout de spropiétés date et time dans les models d'ui commit 0326efe45bee96aff0b009deb3076fc44582d280 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Sep 15 16:45:15 2015 +0200 remplacement de certains dtos par les referencedto Summary of changes: .../ui/content/impl/longline/BranchlineUI.css | 6 +- .../content/impl/longline/BranchlineUIModel.java | 32 +++++ .../ui/content/impl/longline/SetLonglineUI.css | 16 +-- .../content/impl/longline/SetLonglineUIModel.java | 129 +++++++++++++++++++++ .../impl/seine/ActivitySeineObservedSystemUI.css | 6 +- .../impl/seine/ActivitySeineObservedSystemUI.jaxx | 3 +- .../FloatingObjectTransmittingBuoyOperationUI.css | 19 ++- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 9 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 9 +- .../open/impl/longline/ActivityLonglineUI.css | 8 +- .../impl/longline/ActivityLonglineUIModel.java | 44 +++++++ .../content/open/impl/longline/TripLonglineUI.css | 7 +- .../ui/content/open/impl/seine/ActivitySeineUI.css | 9 +- .../open/impl/seine/ActivitySeineUIModel.java | 12 ++ .../ui/content/open/impl/seine/TripSeineUI.css | 9 +- .../fr/ird/observe/ui/content/ref/impl/GearUI.css | 6 +- .../fr/ird/observe/ui/content/ref/impl/GearUI.jaxx | 3 +- .../observe/ui/content/ref/impl/SpeciesListUI.css | 6 +- .../observe/ui/content/ref/impl/SpeciesListUI.jaxx | 3 +- .../ird/observe/ui/content/ref/impl/SpeciesUI.css | 3 +- .../ird/observe/ui/content/ref/impl/SpeciesUI.jaxx | 3 +- .../table/impl/longline/BaitsCompositionUI.css | 3 +- .../impl/longline/BaitsCompositionUIModel.java | 13 ++- .../table/impl/longline/CatchLonglineUI.css | 12 +- .../table/impl/longline/CatchLonglineUI.jaxx | 5 +- .../ui/content/table/impl/longline/TdrUI.css | 22 ++-- .../ui/content/table/impl/longline/TdrUI.jaxx | 3 +- .../ui/content/table/impl/longline/TdrUIModel.java | 122 +++++++++++++++++++ 28 files changed, 427 insertions(+), 95 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 4