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 79004d9b932306ae82e8b88b9f23a35880828b56 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 10 18:04:15 2015 +0200 remplacement des entités par les dto (refs #7519) --- observe-application-swing/pom.xml | 37 +- .../main/java/fr/ird/observe/BinderService.java | 72 +++ .../main/java/fr/ird/observe/DecoratorService.java | 543 ++++++++++++++++ .../main/java/fr/ird/observe/IObserveConfig.java | 411 ++++++++++++ .../fr/ird/observe/ObserveApplicationContext.java | 228 +++++++ .../main/java/fr/ird/observe/ObserveCLAction.java | 77 ++- .../main/java/fr/ird/observe/ObserveContext.java | 18 +- ...UIModel.java => ObserveTechnicalException.java} | 28 +- .../impl/SexUIModel.java => SendMessageAble.java} | 27 +- .../main/java/fr/ird/observe/db/DataContext.java | 702 +++++++++++++++++++++ .../main/java/fr/ird/observe/db/DataSource.java | 225 +++++++ .../java/fr/ird/observe/db/DataSourceConfig.java | 219 +++++++ .../DataSourceConfigParam.java} | 43 +- .../fr/ird/observe/db/DataSourceException.java | 55 ++ .../java/fr/ird/observe/db/DataSourceFactory.java | 456 +++++++++++++ .../java/fr/ird/observe/db/DataSourceProvider.java | 73 +++ .../db/constants/CommonDataSourceConfigParam.java | 127 ++++ .../ird/observe/db/constants/ConnexionStatus.java | 66 ++ .../fr/ird/observe/db/constants/CreationMode.java | 82 +++ .../ird/observe/db/constants/DataContextType.java | 328 ++++++++++ .../fr/ird/observe/db/constants/DataPolicy.java | 72 +++ .../constants/DataSourceState.java} | 34 +- .../java/fr/ird/observe/db/constants/DbMode.java | 65 ++ .../ird/observe/db/model/DataSelectionModel.java | 513 +++++++++++++++ .../java/fr/ird/observe/db/util/SecurityModel.java | 217 +++++++ .../java/fr/ird/observe/gps/GPSFileReader.java | 356 +++++++++++ .../main/java/fr/ird/observe/gps/GPSService.java | 115 ++++ .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 12 +- .../fr/ird/observe/ui/ObserveMainUIHandler.java | 6 +- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 41 +- .../observe/ui/actions/ChangeDbLanguageAction.java | 2 +- .../ird/observe/ui/actions/ShowConfigAction.java | 4 +- .../ui/actions/shared/CloseAndCreateUIAction.java | 4 +- .../ui/actions/shared/CloseOpenUIAction.java | 4 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 12 +- .../ui/admin/consolidate/ConsolidateModel.java | 8 +- .../ui/admin/consolidate/ConsolidateUIHandler.java | 10 +- .../ird/observe/ui/admin/export/ExportModel.java | 8 +- .../observe/ui/admin/export/ExportUIHandler.java | 8 +- .../fr/ird/observe/ui/admin/export/TripEntry.java | 2 +- .../ui/admin/export/TripToExportTableModel.java | 4 +- .../observe/ui/admin/gps/GPSAbleTableModel.java | 2 +- .../ui/admin/gps/GPSActivityTableModel.java | 2 +- .../fr/ird/observe/ui/admin/gps/ImportGPSUI.jaxx | 5 +- .../observe/ui/admin/gps/ImportGPSUIHandler.java | 8 +- .../ird/observe/ui/admin/report/ReportModel.java | 21 +- .../fr/ird/observe/ui/admin/report/ReportUI.jaxx | 2 +- .../observe/ui/admin/report/ReportUIHandler.java | 50 +- .../observe/ui/admin/report/ResultTableModel.java | 4 +- .../observe/ui/admin/save/SaveLocalUIHandler.java | 8 +- .../ui/admin/synchronize/SynchronizeUIHandler.java | 4 +- .../ui/admin/validate/ValidateUIHandler.java | 6 +- .../java/fr/ird/observe/ui/content/ContentUI.jaxx | 4 +- .../ird/observe/ui/content/ContentUIHandler.java | 150 +++-- .../observe/ui/content/ContentUIInitializer.java | 6 +- .../ird/observe/ui/content/ContentUIManager.java | 226 +++---- .../fr/ird/observe/ui/content/ContentUIModel.java | 88 ++- .../ird/observe/ui/content/ObserveContentUI.java | 7 +- .../content/impl/longline/BasketsTableModel.java | 15 +- .../ui/content/impl/longline/BranchlineUI.jaxx | 46 +- .../content/impl/longline/BranchlineUIHandler.java | 31 +- .../content/impl/longline/BranchlineUIModel.java | 98 +-- .../impl/longline/BranchlinesTableModel.java | 13 +- .../LonglineCompositionTableModelSupport.java | 14 +- .../impl/longline/LonglineDetailCompositionUI.jaxx | 14 +- .../LonglineDetailCompositionUIHandler.java | 71 +-- .../LonglineDetailCompositionUIInitializer.java | 6 +- .../longline/LonglineDetailCompositionUIModel.java | 248 ++++---- ...onglineDetailCompositionUIValidationHelper.java | 54 +- .../impl/longline/LonglineGlobalCompositionUI.jaxx | 14 +- .../LonglineGlobalCompositionUIHandler.java | 4 +- .../longline/LonglineGlobalCompositionUIModel.java | 21 +- .../impl/longline/SectionTemplatesTableModel.java | 2 +- .../content/impl/longline/SectionsTableModel.java | 6 +- .../ui/content/impl/longline/SetLonglineUI.jaxx | 26 +- .../impl/longline/SetLonglineUIHandler.java | 4 +- .../content/impl/longline/SetLonglineUIModel.java | 189 +++--- .../impl/seine/ActivitySeineObservedSystemUI.jaxx | 12 +- .../ActivitySeineObservedSystemUIHandler.java | 6 +- .../seine/ActivitySeineObservedSystemUIModel.java | 25 +- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 46 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 16 +- ...tingObjectTransmittingBuoyOperationUIModel.java | 59 +- .../ui/content/impl/seine/FloatingObjectUI.jaxx | 20 +- .../impl/seine/FloatingObjectUIHandler.java | 6 +- .../content/impl/seine/FloatingObjectUIModel.java | 26 +- .../observe/ui/content/impl/seine/SetSeineUI.jaxx | 12 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 12 +- .../ui/content/impl/seine/SetSeineUIModel.java | 86 +-- .../ird/observe/ui/content/list/ContentListUI.jaxx | 4 +- .../ui/content/list/ContentListUIModel.java | 4 +- .../list/impl/longline/ActivityLonglinesUI.jaxx | 8 +- .../impl/longline/ActivityLonglinesUIHandler.java | 4 +- .../impl/longline/ActivityLonglinesUIModel.java | 40 +- .../list/impl/longline/TripLonglinesUI.jaxx | 10 +- .../list/impl/longline/TripLonglinesUIHandler.java | 4 +- .../list/impl/longline/TripLonglinesUIModel.java | 32 +- .../content/list/impl/seine/ActivitySeinesUI.jaxx | 8 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 4 +- .../list/impl/seine/ActivitySeinesUIModel.java | 40 +- .../ui/content/list/impl/seine/RoutesUI.jaxx | 10 +- .../content/list/impl/seine/RoutesUIHandler.java | 4 +- .../ui/content/list/impl/seine/RoutesUIModel.java | 24 +- .../ui/content/list/impl/seine/TripSeinesUI.jaxx | 12 +- .../list/impl/seine/TripSeinesUIHandler.java | 4 +- .../content/list/impl/seine/TripSeinesUIModel.java | 32 +- .../observe/ui/content/open/ContentOpenableUI.jaxx | 5 +- .../ui/content/open/ContentOpenableUIHandler.java | 4 +- .../ui/content/open/ContentOpenableUIModel.java | 5 +- .../open/impl/longline/ActivityLonglineUI.jaxx | 22 +- .../impl/longline/ActivityLonglineUIHandler.java | 4 +- .../impl/longline/ActivityLonglineUIModel.java | 48 +- .../content/open/impl/longline/TripLonglineUI.jaxx | 44 +- .../open/impl/longline/TripLonglineUIHandler.java | 6 +- .../open/impl/longline/TripLonglineUIModel.java | 49 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 46 +- .../open/impl/seine/ActivitySeineUIHandler.java | 12 +- .../open/impl/seine/ActivitySeineUIModel.java | 98 +-- .../ui/content/open/impl/seine/RouteUI.jaxx | 8 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 12 +- .../ui/content/open/impl/seine/RouteUIModel.java | 60 +- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 38 +- .../open/impl/seine/TripSeineUIHandler.java | 6 +- .../content/open/impl/seine/TripSeineUIModel.java | 49 +- .../observe/ui/content/ref/ContentReferenceUI.jaxx | 4 +- .../ui/content/ref/ContentReferenceUIHandler.java | 34 +- .../ui/content/ref/ContentReferenceUIModel.java | 104 +-- .../observe/ui/content/ref/ReferenceHomeUI.jaxx | 2 +- .../ui/content/ref/ReferenceHomeUIHandler.java | 2 +- .../ui/content/ref/ReferenceHomeUIModel.java | 8 +- .../ref/ReferentialContentUIInitializer.java | 16 +- .../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.jaxx | 14 +- .../content/ref/impl/GearCaracteristicUIModel.java | 14 +- .../fr/ird/observe/ui/content/ref/impl/GearUI.jaxx | 14 +- .../observe/ui/content/ref/impl/GearUIHandler.java | 2 +- .../observe/ui/content/ref/impl/GearUIModel.java | 36 +- .../ird/observe/ui/content/ref/impl/HarbourUI.jaxx | 14 +- .../ui/content/ref/impl/HarbourUIModel.java | 16 +- .../content/ref/impl/LengthWeightParameterUI.jaxx | 24 +- .../ref/impl/LengthWeightParameterUIHandler.java | 2 +- .../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.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 | 2 +- .../ui/content/ref/impl/ProgramUIModel.java | 74 +-- .../fr/ird/observe/ui/content/ref/impl/SexUI.jaxx | 8 +- .../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 | 14 +- .../ui/content/ref/impl/SpeciesListUIHandler.java | 2 +- .../ui/content/ref/impl/SpeciesListUIModel.java | 36 +- .../ird/observe/ui/content/ref/impl/SpeciesUI.jaxx | 18 +- .../ui/content/ref/impl/SpeciesUIHandler.java | 2 +- .../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 | 2 +- .../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 | 6 +- .../impl/seine/TransmittingBuoyTypeUIModel.java | 6 +- .../ref/impl/seine/VesselActivitySeineUI.jaxx | 10 +- .../ref/impl/seine/VesselActivitySeineUIModel.java | 6 +- .../content/ref/impl/seine/WeightCategoryUI.jaxx | 12 +- .../ref/impl/seine/WeightCategoryUIModel.java | 10 +- .../observe/ui/content/ref/impl/seine/WindUI.jaxx | 10 +- .../ui/content/ref/impl/seine/WindUIModel.java | 8 +- .../ui/content/table/ContentTableModel.java | 8 +- .../observe/ui/content/table/ContentTableUI.jaxx | 6 +- .../ui/content/table/ContentTableUIHandler.java | 5 +- .../ui/content/table/ContentTableUIModel.java | 80 +-- .../ui/content/table/ObserveContentTableUI.java | 4 +- .../table/impl/longline/BaitsCompositionUI.jaxx | 22 +- .../impl/longline/BaitsCompositionUIHandler.java | 8 +- .../impl/longline/BaitsCompositionUIModel.java | 34 +- .../impl/longline/BranchlinesCompositionUI.jaxx | 20 +- .../longline/BranchlinesCompositionUIHandler.java | 8 +- .../longline/BranchlinesCompositionUIModel.java | 33 +- .../CatchLonglineContentTableUIInitializer.java | 4 +- .../impl/longline/CatchLonglineTableModel.java | 10 +- .../table/impl/longline/CatchLonglineUI.jaxx | 64 +- .../impl/longline/CatchLonglineUIHandler.java | 28 +- .../table/impl/longline/CatchLonglineUIModel.java | 200 +++--- .../content/table/impl/longline/EncounterUI.jaxx | 24 +- .../table/impl/longline/EncounterUIHandler.java | 8 +- .../table/impl/longline/EncounterUIModel.java | 34 +- .../impl/longline/FloatlinesCompositionUI.jaxx | 18 +- .../longline/FloatlinesCompositionUIHandler.java | 6 +- .../longline/FloatlinesCompositionUIModel.java | 31 +- .../GearUseFeaturesLonglineTableModel.java | 16 +- .../impl/longline/GearUseFeaturesLonglineUI.jaxx | 24 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 12 +- .../longline/GearUseFeaturesLonglineUIModel.java | 87 +-- ...rUseFeaturesMeasurementLonglinesTableModel.java | 6 +- .../table/impl/longline/HooksCompositionUI.jaxx | 30 +- .../impl/longline/HooksCompositionUIHandler.java | 8 +- .../impl/longline/HooksCompositionUIModel.java | 33 +- .../impl/longline/LonglinePositionHelper.java | 16 +- .../content/table/impl/longline/SensorUsedUI.jaxx | 28 +- .../table/impl/longline/SensorUsedUIHandler.java | 10 +- .../table/impl/longline/SensorUsedUIModel.java | 43 +- .../impl/longline/SizeMeasuresTableModel.java | 6 +- .../ui/content/table/impl/longline/TdrUI.jaxx | 42 +- .../content/table/impl/longline/TdrUIHandler.java | 8 +- .../ui/content/table/impl/longline/TdrUIModel.java | 183 +++--- .../impl/longline/WeightMeasuresTableModel.java | 6 +- .../seine/GearUseFeatureMeasurementCellEditor.java | 6 +- .../GearUseFeatureMeasurementCellRenderer.java | 6 +- ...GearUseFeaturesMeasurementSeinesTableModel.java | 22 +- .../impl/seine/GearUseFeaturesSeineTableModel.java | 18 +- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 22 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 12 +- .../impl/seine/GearUseFeaturesSeineUIModel.java | 88 +-- .../content/table/impl/seine/NonTargetCatchUI.jaxx | 22 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 22 +- .../table/impl/seine/NonTargetCatchUIModel.java | 61 +- .../table/impl/seine/NonTargetSampleUI.jaxx | 20 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 10 +- .../table/impl/seine/NonTargetSampleUIModel.java | 62 +- .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 20 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 8 +- .../impl/seine/ObjectObservedSpeciesUIModel.java | 31 +- .../table/impl/seine/ObjectSchoolEstimateUI.jaxx | 18 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 6 +- .../impl/seine/ObjectSchoolEstimateUIModel.java | 23 +- .../content/table/impl/seine/SchoolEstimateUI.jaxx | 18 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 12 +- .../table/impl/seine/SchoolEstimateUIModel.java | 35 +- .../ui/content/table/impl/seine/TargetCatchUI.jaxx | 20 +- .../table/impl/seine/TargetCatchUIHandler.java | 18 +- .../table/impl/seine/TargetCatchUIModel.java | 45 +- .../table/impl/seine/TargetDiscardCatchUI.jaxx | 22 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 20 +- .../impl/seine/TargetDiscardCatchUIModel.java | 47 +- .../content/table/impl/seine/TargetSampleUI.jaxx | 16 +- .../table/impl/seine/TargetSampleUIHandler.java | 8 +- .../table/impl/seine/TargetSampleUIModel.java | 46 +- .../ird/observe/ui/storage/ObstunaAdminAction.java | 386 ++++++----- .../ird/observe/ui/storage/RemoteUILauncher.java | 58 +- .../ird/observe/ui/storage/StorageUIHandler.java | 5 +- .../fr/ird/observe/ui/storage/StorageUIModel.java | 548 +++++++++------- .../ui/tree/AbstractObserveTreeCellRenderer.java | 16 +- .../ird/observe/ui/tree/ActivityLonglineNode.java | 2 +- .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 2 +- .../ui/tree/DataSelectionTreeCellRenderer.java | 2 +- .../ui/tree/DataSelectionTreeSelectionModel.java | 4 +- .../fr/ird/observe/ui/tree/EntityNodeSupport.java | 2 +- .../observe/ui/tree/FloatingObjectSeineNode.java | 2 +- .../tree/ObserveNavigationTreeShowPopupAction.java | 4 +- .../java/fr/ird/observe/ui/tree/ObserveNode.java | 4 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 22 +- .../ird/observe/ui/tree/ProgramLonglineNode.java | 2 +- .../fr/ird/observe/ui/tree/ProgramSeineNode.java | 2 +- .../fr/ird/observe/ui/tree/RouteSeineNode.java | 2 +- .../fr/ird/observe/ui/tree/SetLonglineNode.java | 2 +- .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 2 +- .../fr/ird/observe/ui/tree/TripLonglineNode.java | 2 +- .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 2 +- .../loadors/ActivityLonglineNodeChildLoador.java | 4 +- .../loadors/ActivityLonglinesNodeChildLoador.java | 2 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 6 +- .../loadors/ActivitySeinesNodeChildLoador.java | 2 +- .../loadors/FloatingObjectNodeChildLoador.java | 2 +- .../loadors/ProgramLonglineNodeChildLoador.java | 2 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 2 +- .../loadors/ReferenceCommonNodeChildLoador.java | 2 +- .../loadors/ReferenceLonglineNodeChildLoador.java | 2 +- .../loadors/ReferenceSeineNodeChildLoador.java | 2 +- .../ui/tree/loadors/RootNodeChildLoador.java | 4 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 2 +- .../tree/loadors/SetLonglineNodeChildLoador.java | 2 +- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 2 +- .../java/fr/ird/observe/ui/usage/UsagesUI.jaxx | 4 +- .../fr/ird/observe/ui/usage/UsagesUIHandler.java | 2 +- .../observe/ui/util/tripMap/TripMapUIHandler.java | 2 +- .../ird/observe/validation/ObserveValidator.java | 185 ++++++ .../ird/observe/validation/ValidationContext.java | 301 +++++++++ .../validation/ValidationMessageDetector.java | 559 ++++++++++++++++ .../observe/validation/ValidationModelMode.java | 85 +++ .../ird/observe/validation/ValidationService.java | 155 +++++ .../fr/ird/observe/validation/ValidatorsMap.java | 121 ++++ ...glineDetailCompositionValidatorServiceTest.java | 12 +- pom.xml | 2 +- 371 files changed, 10195 insertions(+), 3812 deletions(-) diff --git a/observe-application-swing/pom.xml b/observe-application-swing/pom.xml index 9182473..7884e03 100644 --- a/observe-application-swing/pom.xml +++ b/observe-application-swing/pom.xml @@ -81,22 +81,6 @@ <!-- sibling dependencies --> <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-validation</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - <!--dependency> - <groupId>${project.groupId}</groupId> <artifactId>observe-services-model</artifactId> <version>${project.version}</version> </dependency> @@ -114,7 +98,7 @@ <groupId>${project.groupId}</groupId> <artifactId>observe-services-runner</artifactId> <version>${project.version}</version> - </dependency--> + </dependency> <!-- jaxx dependencies --> @@ -238,25 +222,6 @@ <artifactId>jxlayer</artifactId> </dependency> - <!-- persistence --> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - </dependency> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - </dependency> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <scope>runtime</scope> - </dependency> - <!-- Map --> <dependency> <groupId>org.geotools</groupId> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/BinderService.java b/observe-application-swing/src/main/java/fr/ird/observe/BinderService.java new file mode 100644 index 0000000..cd641f9 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/BinderService.java @@ -0,0 +1,72 @@ +/* + * #%L + * ObServe :: Business + * %% + * 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% + */ +package fr.ird.observe; + +import fr.ird.observe.services.dto.AbstractObserveDto; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.util.TopiaEntityBinder; +import org.nuiton.topia.persistence.util.TopiaEntityHelper; +import org.nuiton.util.beans.BinderModelBuilder; + +/** + * Service d'utilisation des binders + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.4 + */ +public class BinderService { + + public <E extends AbstractObserveDto> BinderModelBuilder<E, E> newBinderBuilder(Class<E> type, String... properties) { + BinderModelBuilder<E, E> builder = BinderModelBuilder.newEmptyBuilder(type); + builder.addSimpleProperties(properties); + return builder; + } + + public <E extends TopiaEntity> TopiaEntityBinder<E> getTopiaBinder(Class<E> entityClass, + String contextName) { + if (ObserveBinderHelper.getCachedBinderModel(entityClass, entityClass, contextName) == null) { + + // we do not want to have auto created binder model by the factory + return null; + } + return (TopiaEntityBinder<E>) ObserveBinderHelper.newBinder(entityClass, entityClass, contextName, TopiaEntityBinder.class); + } + + public <E extends TopiaEntity> TopiaEntityBinder<E> registerTopiaBinder(Class<E> entityClass, + BinderModelBuilder<E, E> builder, + String contextName) { + return ObserveBinderHelper.registerTopiaBinder(entityClass, builder, contextName); + } + + public <E extends TopiaEntity> TopiaEntityBinder<E> getSimpleTopiaBinder(Class<E> entityClass) { + return getTopiaBinder(entityClass, "Observe"); + } + + public <E extends TopiaEntity> void simpleCopy(E source, E target, boolean tech) { + Class<E> entityClass = (Class<E>) TopiaEntityHelper.getContractClass(ObserveDAOHelper.getContracts(), target.getClass()); + TopiaEntityBinder<E> binder = getSimpleTopiaBinder(entityClass); + if (binder == null) { + throw new NullPointerException("could not find a simple topia binder of type : " + target.getClass()); + } + binder.load(source, target, tech); + } +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/DecoratorService.java b/observe-application-swing/src/main/java/fr/ird/observe/DecoratorService.java new file mode 100644 index 0000000..b04984b --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/DecoratorService.java @@ -0,0 +1,543 @@ +/* + * #%L + * ObServe :: Business + * %% + * 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% + */ +package fr.ird.observe; + +import fr.ird.observe.decorator.LengthWeightParameterDecorator; +import fr.ird.observe.decorator.NonTargetCatchDecorator; +import fr.ird.observe.decorator.NonTargetLengthDecorator; +import fr.ird.observe.decorator.ObjectObservedSpeciesDecorator; +import fr.ird.observe.decorator.ReferenceDecorator; +import fr.ird.observe.decorator.SpeciesDecorator; +import fr.ird.observe.decorator.TripLonglineDecorator; +import fr.ird.observe.decorator.TripSeineDecorator; +import fr.ird.observe.services.dto.referential.*; +import fr.ird.observe.services.dto.seine.*; +import fr.ird.observe.services.dto.longline.*; +import fr.ird.observe.services.dto.referential.longline.*; +import fr.ird.observe.services.dto.referential.seine.*; +import fr.ird.observe.gps.GPSPoint; +import fr.ird.observe.gps.GPSPointInterval; +import fr.ird.observe.services.dto.constants.ReferentialLocale; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.referential.PersonDto; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.RouteDto; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.decorator.Decorator; +import org.nuiton.decorator.DecoratorProvider; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.util.TopiaEntityRef; + +import java.beans.Introspector; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import static org.nuiton.i18n.I18n.*; + + +/** + * Le service de décoration. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.3 + */ +public class DecoratorService extends DecoratorProvider { + + /** Logger */ + private static final Log log = LogFactory.getLog(DecoratorService.class); + + /** Le pattern pour utiliser les clef i18n generees dans les entites */ + protected static final Pattern LABEL_PATTERN = Pattern.compile("observe\\.common\\.(.+)"); + + public static final String HAULING_IDENTIFIER = "haulingIdentifier"; + + public static final String OBSERVE_COMMON_PREFIX = "observe.common."; + + /** la locale du referentiel. */ + protected ReferentialLocale referentialLocale; + + public DecoratorService(ReferentialLocale referentialLocale) { + this.referentialLocale = referentialLocale; + loadDecorators(); + } + + public ReferentialLocale getReferentialLocale() { + return referentialLocale; + } + + public void setReferentialLocale(ReferentialLocale referentialLocale) { + this.referentialLocale = referentialLocale; + } + + public Matcher getPropertyMatch(String regex) { + return LABEL_PATTERN.matcher(regex); + } + + @SuppressWarnings({"unchecked"}) + public static String getEntityLabel(Class entityClass) { + return getEntityLabel(OBSERVE_COMMON_PREFIX, entityClass); + } + + public static String getEntityLabel(String prefix, Class entityClass) { + if (!TopiaEntity.class.isAssignableFrom(entityClass)) { + throw new IllegalArgumentException( + entityClass + " is not a TopiaEntity"); + } + entityClass = ObserveDAOHelper.getContractClass(entityClass); + return getPropertyLabel(prefix, entityClass.getSimpleName()); + } + + + public static String getPropertyLabel(String propertyName) { + String type = getPropertyLabel(OBSERVE_COMMON_PREFIX, propertyName); + return type; + } + + public static String getPropertyLabel(String prefix, String propertyName) { + String type = prefix + Introspector.decapitalize(propertyName); + return type; + } + + public Class<?>[] sortTypes(Class<?>... types) { + List<Class<?>> list = Arrays.asList(types); + final Map<Class<?>, String> cache = new HashMap<Class<?>, String>(); + + Comparator<Class<?>> result = new Comparator<Class<?>>() { + + @Override + public int compare(Class<?> o1, Class<?> o2) { + String s1 = getValue(o1); + String s2 = getValue(o2); + return s1.compareTo(s2); + } + + String getValue(Class<?> klass) { + String result = cache.get(klass); + if (result == null) { + // calcul de la valeur + result = t(getEntityLabel(klass)); + cache.put(klass, result); + } + return result; + } + }; + Collections.sort(list, result); + cache.clear(); + return list.toArray(new Class<?>[list.size()]); + } + + public String decorate(Object o) { + Decorator<Object> decorator = getDecorator(o); + String result = ""; + if (decorator != null) { + result = decorator.toString(o); + } + return result; + } + + public String decorate(String context, Object o) { + Decorator<Object> decorator = getDecorator(o, context); + String result = ""; + if (decorator != null) { + result = decorator.toString(o); + } + return result; + } + + static { + // pour avoir les traduction sur le lastName de la propriété + n("observe.common.vesselActivitySeine/label1"); + n("observe.common.vesselActivitySeine/label2"); + n("observe.common.vesselActivitySeine/label3"); + n("observe.common.vesselActivitySeine/label4"); + n("observe.common.vesselActivitySeine/label5"); + n("observe.common.vesselActivitySeine/label6"); + n("observe.common.vesselActivitySeine/label7"); + n("observe.common.vesselActivitySeine/label8"); + + n("observe.common.vessel/label1"); + n("observe.common.vessel/label2"); + n("observe.common.vessel/label3"); + n("observe.common.vessel/label4"); + n("observe.common.vessel/label5"); + n("observe.common.vessel/label6"); + n("observe.common.vessel/label7"); + n("observe.common.vessel/label8"); + + n("observe.common.ocean/label1"); + n("observe.common.ocean/label2"); + n("observe.common.ocean/label3"); + n("observe.common.ocean/label4"); + n("observe.common.ocean/label5"); + n("observe.common.ocean/label6"); + n("observe.common.ocean/label7"); + n("observe.common.ocean/label8"); + + n("observe.common.species/scientificLabel"); + n("observe.common.observerLabel"); + + + n("observe.common.targetSample"); + n("observe.common.targetLength"); + n("observe.common.nonTargetSample"); + n("observe.common.nonTargetLength"); + n("observe.common.nonTargetCatch"); + n("observe.common.setSeine"); + n("observe.common.targetCatch"); + n("observe.common.transmittingBuoy"); + n("observe.common.objectObservedSpecies"); + n("observe.common.schoolEstimate"); + n("observe.common.objectSchoolEstimate"); + n("observe.common.floatingObject"); + n("observe.common.activitySeine"); + n("observe.common.route"); + n("observe.common.tripSeine"); + + n("observe.common.activityLongline"); + n("observe.common.baitsComposition"); + n("observe.common.basket"); + n("observe.common.branchline"); + n("observe.common.branchlinesComposition"); + n("observe.common.catchLongline"); + n("observe.common.encounter"); + n("observe.common.setLongline"); + n("observe.common.time"); + n("observe.common.floatlinesComposition"); + n("observe.common.hooksComposition"); + n("observe.common.section"); + n("observe.common.sensorUsed"); + n("observe.common.sizeMeasure"); + n("observe.common.tdr"); + n("observe.common.tdrRecord"); + n("observe.common.tripLongline"); + n("observe.common.weightMeasure"); + n("observe.common.gearUseFeaturesSeine"); + n("observe.common.gearUseFeaturesLongline"); + + n("observe.common.vesselSizeCategory"); + n("observe.common.harbour"); + n("observe.common.country"); + n("observe.common.vesselType"); + n("observe.common.vessel"); + n("observe.common.speciesGroup"); + n("observe.common.species"); + n("observe.common.sex"); + n("observe.common.fpaZone"); + n("observe.common.speciesList"); + n("observe.common.person"); + n("observe.common.ocean"); + n("observe.common.organism"); + n("observe.common.lengthWeightParameter"); + n("observe.common.program"); + + n("observe.common.vesselActivitySeine"); + n("observe.common.surroundingActivity"); + n("observe.common.reasonForNullSet"); + n("observe.common.reasonForNoFishing"); + n("observe.common.speciesFate"); + n("observe.common.objectFate"); + n("observe.common.weightCategory"); + n("observe.common.detectionMode"); + n("observe.common.transmittingBuoyOperation"); + n("observe.common.objectOperation"); + n("observe.common.reasonForDiscard"); + n("observe.common.speciesStatus"); + n("observe.common.observedSystem"); + n("observe.common.transmittingBuoyType"); + n("observe.common.objectType"); + n("observe.common.wind"); + + n("observe.common.baitHaulingStatus"); + n("observe.common.baitSettingStatus"); + n("observe.common.baitType"); + n("observe.common.catchFateLongline"); + n("observe.common.encounterType"); + n("observe.common.healthness"); + n("observe.common.hookPosition"); + n("observe.common.hookSize"); + n("observe.common.hookType"); + n("observe.common.itemVerticalPosition"); + n("observe.common.itemHorizontalPosition"); + n("observe.common.lightsticksColor"); + n("observe.common.lightsticksType"); + n("observe.common.lineType"); + n("observe.common.maturityStatus"); + n("observe.common.mitigationType"); + n("observe.common.sensorBrand"); + n("observe.common.sensorDataFormat"); + n("observe.common.sensorPosition"); + n("observe.common.sensorType"); + n("observe.common.settingShape"); + n("observe.common.sizeMeasureType"); + n("observe.common.stomacFullness"); + n("observe.common.tripType"); + n("observe.common.vesselActivityLongline"); + n("observe.common.weightMeasureType"); + n("observe.common.id"); + n("observe.common.floatlineLengths"); + n("observe.common.locode"); + n("observe.common.name"); + n("observe.common.gearCaracteristicType"); + n("observe.common.gearCaracteristic"); + n("observe.common.gear"); + n("observe.common.gender"); + + n("observe.common.floatline1Length"); + n("observe.common.floatline2Length"); + n("observe.common.branchlineLength"); + n("observe.common.tracelineLength"); + + } + + @Override + protected void loadDecorators() { + if (referentialLocale == null) { + // on n'enregistre pas les décorateur tant que la locale n'est pas + // positionnée + return; + } + + Locale locale = referentialLocale.getLocale(); + + String libelle = referentialLocale.getLibelle(); + registerJXPathDecorator(ProgramDto.class, + t("observe.common.program") + + " ${" + libelle + "}$s"); + registerJXPathDecorator(RouteDto.class, + "${date}$td/%1$tm/%1$tY"); + registerMultiJXPathDecorator( + ActivitySeineDto.class, + "${time}$tH:%1$tM##${vesselActivitySeine/" + libelle + "}$s", + "##", " - "); + registerMultiJXPathDecorator( + ActivityLonglineDto.class, + "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivityLongline/" + libelle + "}$s", + "##", " - "); + registerMultiJXPathDecorator(PersonDto.class, "${lastName}$s##${firstName}$s", "##", " "); + registerDefaultReferentialDtoDecorator(SexDto.class, libelle); + //FIXME Use startDate - endDate + registerDefaultReferentialDtoDecorator(FpaZoneDto.class, libelle); + registerDefaultReferentialDtoDecorator(OceanDto.class, libelle); + registerDefaultReferentialDtoDecorator(DetectionModeDto.class, libelle); + registerDefaultReferentialDtoDecorator(VesselDto.class, libelle); + registerDefaultReferentialDtoDecorator(CountryDto.class, libelle); + registerReferentialDtoDecorator(VesselSizeCategoryDto.class, "${code}$s##${gaugeLabel}$s##${capacityLabel}$s"); + registerDefaultReferentialDtoDecorator(VesselTypeDto.class, libelle); + registerDefaultReferentialDtoDecorator(VesselActivitySeineDto.class, libelle); + registerDefaultReferentialDtoDecorator(SurroundingActivityDto.class, libelle); + registerDefaultReferentialDtoDecorator(ObservedSystemDto.class, libelle); + registerReferentialDtoDecorator(WindDto.class, "${code}$s##${" + libelle + "}$s##${speedRange}$s"); + registerMultiJXPathDecorator( + FloatingObjectDto.class, + "DCP ${objectType/" + libelle + "}$s", "##", " - "); + //FIXME Remove this + registerJXPathDecorator(SetSeineDto.class, t("observe.common.setSeine")); + //FIXME Remove this + registerJXPathDecorator(SetLonglineDto.class, t("observe.common.setLongline")); + registerDefaultReferentialDtoDecorator(ObjectFateDto.class, libelle); + registerDefaultReferentialDtoDecorator(OrganismDto.class, libelle); + registerDefaultReferentialDtoDecorator(ObjectTypeDto.class, libelle); + registerDefaultReferentialDtoDecorator(ObjectOperationDto.class, libelle); + registerDefaultReferentialDtoDecorator(SpeciesStatusDto.class, libelle); + registerDefaultReferentialDtoDecorator(TransmittingBuoyTypeDto.class, libelle); + registerDefaultReferentialDtoDecorator(TransmittingBuoyOperationDto.class, libelle); + registerDefaultReferentialDtoDecorator(ReasonForNullSetDto.class, libelle); + registerDefaultReferentialDtoDecorator(ReasonForNoFishingDto.class, libelle); + registerDefaultReferentialDtoDecorator(WeightCategoryDto.class, libelle); + registerDefaultReferentialDtoDecorator(ReasonForDiscardDto.class, libelle); + registerDefaultReferentialDtoDecorator(SpeciesFateDto.class, libelle); + registerDefaultReferentialDtoDecorator(SpeciesGroupDto.class, libelle); + registerDefaultReferentialDtoDecorator(SpeciesListDto.class, libelle); + + registerDefaultReferentialDtoDecorator(BaitHaulingStatusDto.class, libelle); + registerDefaultReferentialDtoDecorator(BaitSettingStatusDto.class, libelle); + registerDefaultReferentialDtoDecorator(BaitTypeDto.class, libelle); + registerDefaultReferentialDtoDecorator(CatchFateLonglineDto.class, libelle); + registerDefaultReferentialDtoDecorator(EncounterTypeDto.class, libelle); + registerDefaultReferentialDtoDecorator(HealthnessDto.class, libelle); + registerDefaultReferentialDtoDecorator(HookPositionDto.class, libelle); + registerDefaultReferentialDtoDecorator(HookSizeDto.class, libelle); + registerDefaultReferentialDtoDecorator(HookTypeDto.class, libelle); + registerDefaultReferentialDtoDecorator(ItemVerticalPositionDto.class, libelle); + registerDefaultReferentialDtoDecorator(ItemHorizontalPositionDto.class, libelle); + registerDefaultReferentialDtoDecorator(LightsticksColorDto.class, libelle); + registerDefaultReferentialDtoDecorator(LightsticksTypeDto.class, libelle); + registerDefaultReferentialDtoDecorator(LineTypeDto.class, libelle); + registerDefaultReferentialDtoDecorator(MaturityStatusDto.class, libelle); + registerDefaultReferentialDtoDecorator(MitigationTypeDto.class, libelle); + registerReferentialDtoDecorator(SensorBrandDto.class, "${code}$s##${brandName}$s"); + registerDefaultReferentialDtoDecorator(SensorDataFormatDto.class, libelle); + registerDefaultReferentialDtoDecorator(SensorTypeDto.class, libelle); + registerDefaultReferentialDtoDecorator(SettingShapeDto.class, libelle); + registerDefaultReferentialDtoDecorator(SizeMeasureTypeDto.class, libelle); + registerDefaultReferentialDtoDecorator(StomacFullnessDto.class, libelle); + registerDefaultReferentialDtoDecorator(TripTypeDto.class, libelle); + registerDefaultReferentialDtoDecorator(VesselActivityLonglineDto.class, libelle); + registerDefaultReferentialDtoDecorator(WeightMeasureTypeDto.class, libelle); + registerDefaultReferentialDtoDecorator(GearCaracteristicTypeDto.class, libelle); + registerDefaultReferentialDtoDecorator(GearCaracteristicDto.class, libelle); + registerDefaultReferentialDtoDecorator(GearDto.class, libelle); + + registerReferentialDtoDecorator(HarbourDto.class, "${code}$s##${name}$s##${locode}$s"); + + registerMultiJXPathDecorator( + ObjectSchoolEstimateDto.class, + "${species/scientificLabel}$s##${weight}$d", "##", + " - "); + registerMultiJXPathDecorator( + SchoolEstimateDto.class, + "${species/scientificLabel}$s##${weight}$d##${meanWeight}$d", "##", " - "); + registerMultiJXPathDecorator( + TargetCatchDto.class, + "${weightCategory/species/scientificLabel}$s##${weightCategory/" + libelle + "}$s##${weight}$f", "##", " - "); + registerMultiJXPathDecorator( + TargetLengthDto.class, + "${species/scientificLabel}$s##${length}$f##${count}$d", "##", " - "); + + registerMultiJXPathDecorator( + TransmittingBuoyDto.class, + "${transmittingBuoyType/" + libelle + "}$s##${transmittingBuoyOperation/" + libelle + "}$s##${code}$s", "##", + " - "); + + String settingIdentifier = l(locale, "observe.common.settingIdentifier"); + String haulingIdentifier = l(locale, "observe.common.haulingIdentifier"); + + registerMultiJXPathDecorator( + SectionDto.class, + " ${settingIdentifier}$s (" + settingIdentifier + ")##${haulingIdentifier}$s (" + haulingIdentifier + ")", "##", " - "); + + registerMultiJXPathDecorator( + BasketDto.class, + " ${settingIdentifier}$s (" + settingIdentifier + ")##${haulingIdentifier}$s (" + haulingIdentifier + ")", "##", " - "); + + registerMultiJXPathDecorator( + BranchlineDto.class, + " ${settingIdentifier}$s (" + settingIdentifier + ")##${haulingIdentifier}$s (" + haulingIdentifier + ")", "##", " - "); + + registerJXPathDecorator(SectionDto.class, HAULING_IDENTIFIER, "${haulingIdentifier}$s"); + registerJXPathDecorator(BasketDto.class, HAULING_IDENTIFIER, "${haulingIdentifier}$s"); + registerJXPathDecorator(BranchlineDto.class, HAULING_IDENTIFIER, "${haulingIdentifier}$s"); + + // TripSeine decorator + registerDecorator(new TripSeineDecorator(libelle)); + + // TripLongline decorator + registerDecorator(new TripLonglineDecorator(libelle)); + + String oldCode = l(locale, "observe.common.oldCode3L"); + // Species decorator + registerDecorator(new SpeciesDecorator(libelle, oldCode)); + + // ObjectObservedSpecies decorator + registerDecorator(new ObjectObservedSpeciesDecorator(libelle)); + + // NonTargetCatch decorator + registerDecorator(new NonTargetCatchDecorator(libelle)); + + // NonTargetLength decorator + registerDecorator(new NonTargetLengthDecorator(libelle)); + + // LengthWeightParameter decorator + registerDecorator(new LengthWeightParameterDecorator(libelle)); + + registerDecorator(new TopiaEntityRefDecorator()); + + // gps decorators + registerJXPathDecorator(ActivitySeineDto.class, + "activity-gps", + t("observe.common.gps.activity")); + registerJXPathDecorator(GPSPoint.class, + "gpsPoint-gps", + t("observe.common.gps.gpsPoint")); + registerJXPathDecorator(GPSPointInterval.class, + "gpsPointInterval-gps", + t("observe.common.gps.gpsPointInterval")); + + registerMultiJXPathDecorator(GPSPoint.class, + "${time}$td/%1$tm/%1$tY %1$tH:%1$tM##${latitude}$s##${longitude}$s", + "##", " "); + + registerMultiJXPathDecorator(SectionTemplate.class, "${id}$s##${floatlineLengths}$s", "##", " "); + + registerJXPathDecorator(CatchLonglineDto.class, "${homeId}$s"); + registerJXPathDecorator(TdrDto.class, "${homeId}$s"); + } + + + protected <T extends ReferentialDto> void registerDefaultReferentialDtoDecorator(Class<T> referenceType, String libelle) { + registerReferentialDtoDecorator(referenceType, "${code}$s##${" + libelle + "}$s"); + } + + protected <T extends ReferentialDto> void registerReferentialDtoDecorator(Class<T> referenceType, String expression) { + registerDecorator(new ReferenceDecorator<T>(referenceType, expression)); + } + + public class TopiaEntityRefDecorator extends Decorator<TopiaEntityRef> { + + private static final long serialVersionUID = 1L; + + public TopiaEntityRefDecorator() throws NullPointerException { + super(TopiaEntityRef.class); + } + + @Override + public String toString(Object bean) { + if (bean == null) { + return ""; + } + String message; + try { + TopiaEntityRef ref = (TopiaEntityRef) bean; + + TopiaEntity invoker = ref.getInvoker(); + if (invoker == null) { + invoker = ref.getRef(); + } + String invokerProperty = + t(getPropertyLabel( + ref.getInvokerProperty())); + String type = t(getEntityLabel(invoker.getClass())); + Decorator<?> decorator = + getDecoratorByType(invoker.getClass()); + if (invokerProperty == null) { + message = t("observe.synchro.obsolete.entity.label", type, decorator.toString(invoker)); + } else { + message = t("observe.synchro.obsolete.entity.ref", type, decorator.toString(invoker), invokerProperty); + } + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error(e); + } + message = ""; + } + return message; + } + } +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/IObserveConfig.java b/observe-application-swing/src/main/java/fr/ird/observe/IObserveConfig.java new file mode 100644 index 0000000..ddd8146 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/IObserveConfig.java @@ -0,0 +1,411 @@ +/* + * #%L + * ObServe :: Business + * %% + * 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% + */ +package fr.ird.observe; + +import fr.ird.observe.db.constants.CreationMode; +import fr.ird.observe.db.constants.DbMode; +import org.nuiton.util.version.Version; + +import java.beans.PropertyChangeListener; +import java.io.File; +import java.util.Locale; + +/** + * Contrat de la configuration d'Observe. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.2 + */ +public interface IObserveConfig { + /** + * le fichier de configuration de l'application avec les informations sur le + * projet (version, license,...) et la configuration des ui (icons, ...) + */ + String APPLICATION_PROPERTIES = "/observe.properties"; + + /** le lastName du repertoire ou sont les donnees de l'application */ + String USER_DIRECTORY_FILENAME = ".observe"; + + /** le pattern du fichier de sauvegarde d'une base locale */ + String BACKUP_DB_PATTERN = "obstuna-local-%1$tF--%1$tk-%1$tM-%1$tS.sql.gz"; + + /** le pattern du fichier de sauvegarde d'une base access importée */ + String ACCESS_DB_PATTERN = "import-access-%1$tF--%1$tk-%1$tM-%1$tS.sql.gz"; + + /** le pattern du fichier de rapport après validation */ + String REPORT_PATTERN = "report-%1$tF--%1$tk-%1$tM-%1$tS.sql.gz"; + + /** + * La version de l'application. + */ + String APPLICATION_VERSION = "application.version"; + + /** + * La version du modèle de la persistence + */ + //FIXME +// String DB_VERSION = AbstractDataSourceMigration.DB_VERSION; + + String VERSION = "version"; + + String PROPERTY_DEFAULT_DB_MODE = "defaultDbMode"; + + String PROPERTY_DEFAULT_CREATION_MODE = "defaultCreationMode"; + + String PROPERTY_SPECIES_LIST_SEINE_TARGET_CATCH_ID = "speciesListSeineTargetCatchId"; + + String PROPERTY_SPECIES_LIST_SEINE_SCHOOL_ESTIMATE_ID = "speciesListSeineSchoolEstimateId"; + + String PROPERTY_SPECIES_LIST_SEINE_OBJECT_SCHOOL_ESTIMATE_ID = "speciesListSeineObjectSchoolEstimateId"; + + String PROPERTY_SPECIES_LIST_SEINE_NON_TARGET_CATCH_ID = "speciesListSeineNonTargetCatchId"; + + String PROPERTY_SPECIES_LIST_SEINE_OBJECT_OBSERVED_SPECIES_ID = "speciesListSeineObjectObservedSpeciesId"; + + String PROPERTY_SPECIES_LIST_LONGLINE_CATCH_ID = "speciesListLonglineCatchId"; + + String PROPERTY_SPECIES_LIST_LONGLINE_ENCOUNTER_ID = "speciesListLonglineEncounterId"; + + String PROPERTY_SPECIES_LIST_LONGLINE_DEPREDATOR_ID = "speciesListLonglineDepredatorId"; + + String PROPERTY_VERSION = "version"; + + String PROPERTY_DB_VERSION = "dbVersion"; + + String PROPERTY_AUTO_POPUP_NUMBER_EDITOR = "autoPopupNumberEditor"; + + String PROPERTY_SHOW_NUMBER_EDITOR_BUTTON = "showNumberEditorButton"; + + String PROPERTY_SHOW_DATE_TIME_EDITOR_SLIDER= "showTimeEditorSlider"; + + String PROPERTY_LOCAL_STORAGE_EXIST = "localStorageExist"; + + String PROPERTY_INITIAL_DUMP_EXIST = "initialDumpExist"; + + String PROPERTY_MAIN_STORAGE_OPENED = "mainStorageOpened"; + + String PROPERTY_STORE_REMOTE_STORAGE = "storeRemoteStorage"; + + String PROPERTY_DEFAULT_GPS_MAX_DELAY = "defaultGpsMaxDelay"; + + String PROPERTY_DEFAULT_GPS_MAX_SPEED = "defaultGpsMaxSpeed"; + + String PROPERTY_CHANGE_SYNCHRO_SRC = "changeSynchroSrc"; + + String PROPERTY_NON_TARGET_OBSERVATION = "nonTargetObservation"; + + String PROPERTY_TARGET_DISCARDS_OBSERVATION = "targetDiscardsObservation"; + + String PROPERTY_SAMPLES_OBSERVATION = "samplesObservation"; + + String PROPERTY_OBJECTS_OBSERVATION = "objectsObservation"; + + String PROPERTY_DETAILLED_ACTIVITIES_OBSERVATION = "detailledActivitiesObservation"; + + String PROPERTY_MAMMALS_OBSERVATION = "mammalsObservation"; + + String PROPERTY_BIRDS_OBSERVATION = "birdsObservation"; + + String PROPERTY_BAIT_OBSERVATION = "baitObservation"; + + String PROPERTY_RESOURCES_DIRECTORY = "resourcesDirectory"; + + String PROPERTY_LOCALE = "locale"; + + String PROPERTY_DB_LOCALE = "dbLocale"; + + String PROPERTY_CAN_MIGRATE_OBSTUNA = "canMigrateObstuna"; + + String PROPERTY_CAN_MIGRATE_H2 = "canMigrateH2"; + + String PROPERTY_MAIN_STORAGE_OPENED_LOCAL = "mainStorageOpenedLocal"; + + String PROPERTY_COPYRIGHT_TEXT = "copyrightText"; + + String PROPERTY_FULL_SCREEN = "fullScreen"; + + String PROPERTY_LOCAL_DBDIRECTORY = "localDBDirectory"; + + String PROPERTY_I18N_DIRECTORY = "i18nDirectory"; + + String PROPERTY_INITIAL_DB_DUMP = "initialDbDump"; + + String PROPERTY_BACKUP_DIRECTORY = "backupDirectory"; + + String PROPERTY_REPORT_DIRECTORY = "reportDirectory"; + + String PROPERTY_MAP_DIRECTORY = "mapDirectory"; + + String PROPERTY_TMP_DIRECTORY = "tmpDirectory"; + + String PROPERTY_DISPLAY_MAIN_UI = "displayMainUI"; + + String PROPERTY_CAN_USE_UI = "canUseUI"; + + String PROPERTY_ADJUSTING = "adjusting"; + + String PROPERTY_H2_LOGIN = "h2Login"; + + String PROPERTY_H2_PASSWORD = "h2Password"; + + String PROPERTY_OBSTUNA_URL = "obstunaUrl"; + + String PROPERTY_OBSTUNA_LOGIN = "obstunaLogin"; + + String PROPERTY_OBSTUNA_PASSWORD = "obstunaPassword"; + + String PROPERTY_OBSTUNA_USE_SSL = "obstunaUseSsl"; + + String PROPERTY_LOAD_LOCAL_STORAGE = "loadLocalStorage"; + + String PROPERTY_SHOW_MIGRATION_PROGRESSION = "showMigrationProgression"; + + String PROPERTY_SHOW_MIGRATION_SQL = "showMigrationSql"; + + String PROPERTY_VALIDATION_REPORT_DIRECTORY = "validationReportDirectory"; + + String PROPERTY_SHOW_SQL = "showSql"; + + String PROPERTY_H2_SERVER_PORT = "h2ServerPort"; + + String PROPERTY_DEV_MODE = "devMode"; + + boolean isDevMode(); + + Version getVersion(); + + Version getDbVersion(); + + boolean isAutoPopupNumberEditor(); + + boolean isShowNumberEditorButton(); + + boolean isShowTimeEditorSlider(); + + boolean isLocalStorageExist(); + + boolean isInitialDumpExist(); + + boolean isMainStorageOpened(); + + boolean isStoreRemoteStorage(); + + int getDefaultGpsMaxDelay(); + + float getDefaultGpsMaxSpeed(); + + boolean isChangeSynchroSrc(); + + int getNonTargetObservation(); + + int getTargetDiscardsObservation(); + + int getSamplesObservation(); + + int getObjectsObservation(); + + int getDetailledActivitiesObservation(); + + int getMammalsObservation(); + + int getBirdsObservation(); + + int getBaitObservation(); + + File getResourcesDirectory(); + + Locale getLocale(); + + Locale getDbLocale(); + + boolean isCanMigrateObstuna(); + + boolean isCanMigrateH2(); + + Boolean getMainStorageOpenedLocal(); + + String getCopyrightText(); + + boolean isFullScreen(); + + File getLocalDBDirectory(); + + File getI18nDirectory(); + + File getInitialDbDump(); + + File getBackupDirectory(); + + File getReportDirectory(); + + File getTmpDirectory(); + + File getLogConfigurationFile(); + + boolean isDisplayMainUI(); + + boolean isCanUseUI(); + + boolean isAdjusting(); + + String getH2Login(); + + char[] getH2Password(); + + String getObstunaUrl(); + + String getObstunaLogin(); + + char[] getObstunaPassword(); + + boolean isObstunaUseSsl(); + + boolean isLoadLocalStorage(); + + boolean isShowMigrationProgression(); + + boolean isShowMigrationSql(); + + File getValidationReportDirectory(); + + boolean isShowSql(); + + int getH2ServerPort(); + + void setResourcesDirectory(File newValue); + + DbMode getDefaultDbMode(); + + CreationMode getDefaultCreationMode(); + + void saveForUser(String... excludeKeys); + + //FIXME +// void fromStorageConfig(H2DataSourceConfig config); + +// void fromStorageConfig(PGDataSourceConfig config); + +// H2DataSourceConfig toH2StorageConfig(String label); + +// PGDataSourceConfig toPostgresStorageConfig(String label); + + void setAutoPopupNumberEditor(boolean newValue); + + void setShowNumberEditorButton(boolean newValue); + + void setShowTimeEditorSlider(boolean newValue); + + void setFullScreen(boolean newValue); + + void setChangeSynchroSrc(boolean newValue); + + void setStoreRemoteStorage(boolean newValue); + + void setLoadLocalStorage(boolean newValue); + + void setDefaultDbMode(DbMode newValue); + + void setDefaultCreationMode(CreationMode newValue); + + void setDefaultGpsMaxDelay(int newValue); + + void setDefaultGpsMaxSpeed(float newValue); + + void setLocale(Locale newValue); + + void setDbLocale(Locale newValue); + + void setCanMigrateObstuna(Boolean newValue); + + void setCanMigrateH2(Boolean newValue); + + void setNonTargetObservation(int newValue); + + void setTargetDiscardsObservation(int newValue); + + void setSamplesObservation(int newValue); + + void setObjectsObservation(int newValue); + + void setDetailledActivitiesObservation(int newValue); + + void setMammalsObservation(int newValue); + + void setBirdsObservation(int newValue); + + void setBaitObservation(int newValue); + + void addPropertyChangeListener(PropertyChangeListener listener); + + void addPropertyChangeListener(String propertyName, + PropertyChangeListener listener); + + void removePropertyChangeListener(PropertyChangeListener listener); + + void removePropertyChangeListener(String propertyName, + PropertyChangeListener listener); + + void setShowMigrationSql(boolean showMigrationSql); + + void setShowMigrationProgression(boolean showMigrationProgression); + + void setShowSql(boolean showSql); + + boolean hasListeners(String propertyName); + + PropertyChangeListener[] getPropertyChangeListeners(String propertyName); + + PropertyChangeListener[] getPropertyChangeListeners(); + + String getSpeciesListSeineNonTargetCatchId(); + + String getSpeciesListSeineTargetCatchId(); + + String getSpeciesListSeineSchoolEstimateId(); + + String getSpeciesListSeineObjectObservedSpeciesId(); + + String getSpeciesListSeineObjectSchoolEstimateId(); + + String getSpeciesListLonglineCatchId(); + + String getSpeciesListLonglineEncounterId(); + + String getSpeciesListLonglineDepredatorId(); + + void setSpeciesListSeineNonTargetCatchId(String speciesListSeineNonTargetCatchId); + + void setSpeciesListSeineTargetCatchId(String speciesListSeineTargetCatchId); + + void setSpeciesListSeineSchoolEstimateId(String speciesListSeineSchoolEstimateId); + + void setSpeciesListSeineObjectObservedSpeciesId(String speciesListSeineObjectObservedSpeciesId); + + void setSpeciesListSeineObjectSchoolEstimateId(String speciesListseineObjectSchoolEstimateId); + + void setSpeciesListLonglineCatchId(String speciesListLonglineCatchId); + + void setSpeciesListLonglineEncounterId(String speciesListLonglineEncounterId); + + void setSpeciesListLonglineDepredatorId(String speciesListLonglineDepredatorId); + +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveApplicationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveApplicationContext.java new file mode 100644 index 0000000..eea92f7 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveApplicationContext.java @@ -0,0 +1,228 @@ +/* + * #%L + * ObServe :: Business + * %% + * 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% + */ +package fr.ird.observe; + +import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.DataSource; +import fr.ird.observe.db.DataSourceFactory; +import fr.ird.observe.gps.GPSService; +import fr.ird.observe.services.dto.constants.ReferentialLocale; +import fr.ird.observe.validation.ObserveValidator; +import fr.ird.observe.validation.ValidationContext; +import jaxx.runtime.JAXXUtil; +import jaxx.runtime.context.DefaultApplicationContext; +import jaxx.runtime.context.JAXXContextEntryDef; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.decorator.Decorator; + +import java.util.Locale; + +/** + * Le contexte de l'application. + * <p/> + * On définit ici toutes les entrées du contexte applicatif. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.0 + */ +public class ObserveApplicationContext extends DefaultApplicationContext { + + /** Logger */ + static private Log log = LogFactory.getLog(ObserveApplicationContext.class); + + /** the jaxx context entry to store the config */ + public static final JAXXContextEntryDef<IObserveConfig> CONFIG_ENTRY_DEF = + JAXXUtil.newContextEntryDef(IObserveConfig.class); + + /** the jaxx context entry to store the decorator service */ + public static final JAXXContextEntryDef<DecoratorService> DECORATOR_SERVICE_ENTRY_DEF = + JAXXUtil.newContextEntryDef(DecoratorService.class); + + /** the jaxx context entry to store the decorator service */ + public static final JAXXContextEntryDef<BinderService> BINDER_SERVICE_ENTRY_DEF = + JAXXUtil.newContextEntryDef(BinderService.class); + + /** the jaxx context entry to store the gps service */ + public static final JAXXContextEntryDef<GPSService> GPS_SERVICE_ENTRY_DEF = + JAXXUtil.newContextEntryDef(GPSService.class); + + //FIXME +// /** the jaxx context entry to store the consolidate data service */ +// public static final JAXXContextEntryDef<ConsolidateDataService> CONSOLIDATE_DATA_SERVICE_ENTRY_DEF = +// JAXXUtil.newContextEntryDef(ConsolidateDataService.class); + //FIXME +// /** the jaxx context entry to store the data service */ +// public static final JAXXContextEntryDef<DataService> DATA_SERVICE_ENTRY_DEF = +// JAXXUtil.newContextEntryDef(DataService.class); + + /** the jaxx context entry to store the data service */ + public static final JAXXContextEntryDef<DataContext> DATA_CONTEXT_ENTRY_DEF = + JAXXUtil.newContextEntryDef(DataContext.class); + + /** the jaxx context entry to store the data source (says the ui data source) */ + public static final JAXXContextEntryDef<DataSource> DATA_SOURCE_ENTRY_DEF = + JAXXUtil.newContextEntryDef(DataSource.class); + + public static final JAXXContextEntryDef<ValidationContext> VALIDATION_CONTEXT_ENTRY_DEF = + JAXXUtil.newContextEntryDef(ValidationContext.class); + + public <O> Decorator<O> getDecorator(Class<O> clazz) { + DecoratorService provider = getDecoratorService(); + Decorator<O> value = provider.getDecoratorByType(clazz); + return value; + } + + public <O> Decorator<O> getDecorator(Class<O> clazz, String name) { + DecoratorService provider = getDecoratorService(); + Decorator<O> value = provider.getDecoratorByType(clazz, name); + return value; + } + + public IObserveConfig getConfig() { + return CONFIG_ENTRY_DEF.getContextValue(this); + } + + public final DataSource getDataSource() { + DataSource dataSource = DATA_SOURCE_ENTRY_DEF.getContextValue(this); + return dataSource; + } + + public final void setDataSource(DataSource source) { + if (source == null) { + DATA_SOURCE_ENTRY_DEF.removeContextValue(this); + } else { + DATA_SOURCE_ENTRY_DEF.setContextValue(this, source); + } + } + + public final DecoratorService getDecoratorService() { + DecoratorService decoratorService = + DECORATOR_SERVICE_ENTRY_DEF.getContextValue(this); + if (decoratorService == null) { + + // initialisation du service de décoration + // initialisation + IObserveConfig config = getConfig(); + ReferentialLocale loc = ReferentialLocale.FR; + if (config != null) { + Locale dbLocale = config.getDbLocale(); + if (dbLocale != null) { + loc = ReferentialLocale.valueOf(dbLocale); + } + } + decoratorService = new DecoratorService(loc); + DECORATOR_SERVICE_ENTRY_DEF.setContextValue(this, decoratorService); + } + return decoratorService; + } + + //FIXME +// public final DataService getDataService() { +// DataService dataService = +// DATA_SERVICE_ENTRY_DEF.getContextValue(this); +// if (dataService == null) { +// dataService = new DataService(); +// DATA_SERVICE_ENTRY_DEF.setContextValue(this, dataService); +// } +// return dataService; +// } + + public final BinderService getBinderService() { + BinderService service = BINDER_SERVICE_ENTRY_DEF.getContextValue(this); + if (service == null) { + service = new BinderService(); + BINDER_SERVICE_ENTRY_DEF.setContextValue(this, service); + } + return service; + } + + public final GPSService getGPSService() { + GPSService service = + GPS_SERVICE_ENTRY_DEF.getContextValue(this); + if (service == null) { + service = new GPSService(); + GPS_SERVICE_ENTRY_DEF.setContextValue(this, service); + } + return service; + } + + //FIXME +// public ConsolidateDataService getConsolidateDataService() { +// +// ConsolidateDataService service = +// CONSOLIDATE_DATA_SERVICE_ENTRY_DEF.getContextValue(this); +// if (service == null) { +// service = new ConsolidateDataService(); +// CONSOLIDATE_DATA_SERVICE_ENTRY_DEF.setContextValue(this, service); +// } +// return service; +// } + + public final DataContext getDataContext() { + DataContext result = DATA_CONTEXT_ENTRY_DEF.getContextValue(this); + if (result == null) { + result = new DataContext(); + DATA_CONTEXT_ENTRY_DEF.setContextValue(this, result); + } + return result; + } + + public final ValidationContext getValidationContext() { + ValidationContext result = + VALIDATION_CONTEXT_ENTRY_DEF.getContextValue(this); + if (result == null) { + result = new ValidationContext(); + ObserveValidator.setValidationContext(result); + result.setDataContext(getDataContext()); + VALIDATION_CONTEXT_ENTRY_DEF.setContextValue(this, result); + } + return result; + } + + /** + * close the application's context. + * + * @throws Exception if any pb while closing + */ + public void close() throws Exception { + if (log.isDebugEnabled()) { + log.debug("closing context " + this); + } + + // fermeture du context de données + if (getDataSource() != null) { + setDataSource(null); + } + + getValidationContext().closeDataSource(); + + // fermeture des services de persistances ouverts + DataSourceFactory.dispose(); + + // fermeture du context principal + clear(); + + //FIXME +// ObserveServiceHelper.close(); + } +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveCLAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveCLAction.java index 321c1b8..f35d5de 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveCLAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveCLAction.java @@ -21,10 +21,6 @@ */ package fr.ird.observe; -import com.google.common.base.Joiner; -import com.google.common.collect.Lists; -import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.ui.ObserveMainUIHandler; import fr.ird.observe.ui.admin.AdminStep; import fr.ird.observe.ui.admin.AdminUILauncher; @@ -34,15 +30,11 @@ import jaxx.runtime.swing.application.ActionWorker; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.config.ConfigActionDef; -import org.nuiton.topia.persistence.TopiaId; import java.io.Console; import java.io.IOException; import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; import java.util.EnumSet; -import java.util.List; import static org.nuiton.i18n.I18n.t; @@ -183,7 +175,8 @@ public class ObserveCLAction { public void useJMX() throws Exception { // just set the useJMX flag - ObserveServiceHelper.setUseJMX(true); + //FIXME +// ObserveServiceHelper.setUseJMX(true); } /** Désactiver la possiblite de lancer l'ui principale. */ @@ -296,7 +289,8 @@ public class ObserveCLAction { ObserveContext context = ObserveContext.get(); - getConfig().setOption(AbstractDataSourceMigration.AUTO_MIGRATE, "false"); + // FIXME +// getConfig().setOption(AbstractDataSourceMigration.AUTO_MIGRATE, "false"); if (operation == ObstunaAdminAction.UPDATE || operation == ObstunaAdminAction.CREATE) { @@ -333,37 +327,38 @@ public class ObserveCLAction { Class<?> klazz = null; - List<ObserveEntityEnum> enums = Lists.newArrayList(Entities.ALL_ENTITIES); - enums.remove(ObserveEntityEnum.CommentableEntity); - enums.remove(ObserveEntityEnum.OpenableEntity); - enums.remove(ObserveEntityEnum.I18nReferenceEntity); - enums.remove(ObserveEntityEnum.ReferenceEntity); - - for (ObserveEntityEnum e : enums) { - if (className.equals(e.name())) { - klazz = e.getContract(); - break; - } - } - - if (klazz == null) { - - Collections.sort(enums, new Comparator<ObserveEntityEnum>() { - @Override - public int compare(ObserveEntityEnum observeEntityEnum, ObserveEntityEnum observeEntityEnum2) { - return observeEntityEnum.name().compareTo(observeEntityEnum2.name()); - } - }); - if (log.isErrorEnabled()) { - log.error(className + " not found! availables names :\n\t" + Joiner.on("\n\t").join(enums)); - } - return; - } - - for (int i = 0; i < nbId; i++) { - String topiaId = TopiaId.create(klazz); - System.out.println(topiaId); - } + //FIXME +// List<ObserveEntityEnum> enums = Lists.newArrayList(Entities.ALL_ENTITIES); +// enums.remove(ObserveEntityEnum.CommentableEntity); +// enums.remove(ObserveEntityEnum.OpenableEntity); +// enums.remove(ObserveEntityEnum.I18nReferenceEntity); +// enums.remove(ObserveEntityEnum.ReferenceEntity); +// +// for (ObserveEntityEnum e : enums) { +// if (className.equals(e.name())) { +// klazz = e.getContract(); +// break; +// } +// } +// +// if (klazz == null) { +// +// Collections.sort(enums, new Comparator<ObserveEntityEnum>() { +// @Override +// public int compare(ObserveEntityEnum observeEntityEnum, ObserveEntityEnum observeEntityEnum2) { +// return observeEntityEnum.name().compareTo(observeEntityEnum2.name()); +// } +// }); +// if (log.isErrorEnabled()) { +// log.error(className + " not found! availables names :\n\t" + Joiner.on("\n\t").join(enums)); +// } +// return; +// } +// +// for (int i = 0; i < nbId; i++) { +// String topiaId = TopiaId.create(klazz); +// System.out.println(topiaId); +// } } protected ObserveConfig getConfig() { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveContext.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveContext.java index da6a48f..85ee6f1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveContext.java @@ -21,15 +21,7 @@ */ package fr.ird.observe; -import fr.ird.observe.db.DataContext; -import fr.ird.observe.db.DataSource; -import fr.ird.observe.db.DataSourceException; -import fr.ird.observe.db.constants.DbMode; -import fr.ird.observe.db.event.DataSourceEvent; -import fr.ird.observe.db.event.DataSourceListenerAdapter; -import fr.ird.observe.db.impl.H2DataSource; import fr.ird.observe.ui.actions.ChangeStorageAction; -import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.ObserveMainUIHandler; import fr.ird.observe.ui.ObserveUIMode; import fr.ird.observe.ui.UIHelper; @@ -46,14 +38,12 @@ import fr.ird.observe.ui.actions.shared.ResetEditUIAction; import fr.ird.observe.ui.actions.shared.SaveEditUIAction; import fr.ird.observe.ui.actions.shared.SelectNodeUIAction; import fr.ird.observe.ui.actions.shared.SelectOpenNodeUIAction; -import fr.ird.observe.ui.content.ContentUI; import fr.ird.observe.ui.tree.ObserveTreeHelper; import jaxx.runtime.context.JAXXContextEntryDef; import jaxx.runtime.swing.CardLayout2; import jaxx.runtime.swing.ErrorDialogUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.h2.jdbc.JdbcSQLException; import org.hibernate.cfg.Environment; import javax.swing.ActionMap; @@ -109,11 +99,15 @@ public class ObserveContext extends ObserveApplicationContext { * @throws IllegalStateException si le contexte n'a pas été initialisé */ public static ObserveContext get() throws IllegalStateException { - return (ObserveContext) ObserveServiceHelper.get(); + //FIXME +// return (ObserveContext) ObserveServiceHelper.get(); + return null; } public static boolean isClosed() { - return ObserveServiceHelper.isClosed(); + //FIXME +// return ObserveServiceHelper.isClosed(); + return null; } public ObserveConfig getConfig() { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitSettingStatusUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveTechnicalException.java similarity index 65% copy from observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitSettingStatusUIModel.java copy to observe-application-swing/src/main/java/fr/ird/observe/ObserveTechnicalException.java index 098b373..7eb30b0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/BaitSettingStatusUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveTechnicalException.java @@ -1,8 +1,8 @@ -package fr.ird.observe.ui.content.ref.impl.longline; +package fr.ird.observe; /* * #%L - * ObServe :: Swing + * ObServe :: Business * %% * Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit * %% @@ -22,23 +22,29 @@ package fr.ird.observe.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.entities.referentiel.longline.BaitSettingStatus; -import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; - /** - * Created on 9/28/14. + * Created on 8/30/14. * * @author Tony Chemit - chemit@codelutin.com - * @since XXX + * @since 3.7 */ -public class BaitSettingStatusUIModel extends ContentReferenceUIModel<BaitSettingStatus> { +public class ObserveTechnicalException extends RuntimeException { private static final long serialVersionUID = 1L; - public BaitSettingStatusUIModel() { - super(BaitSettingStatus.class + public ObserveTechnicalException() { + } + + public ObserveTechnicalException(String message) { + super(message); + } + + public ObserveTechnicalException(String message, Throwable cause) { + super(message, cause); + } - ); + public ObserveTechnicalException(Throwable cause) { + super(cause); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SexUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/SendMessageAble.java similarity index 57% copy from observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SexUIModel.java copy to observe-application-swing/src/main/java/fr/ird/observe/SendMessageAble.java index 1078b62..1930156 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SexUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/SendMessageAble.java @@ -1,14 +1,12 @@ -package fr.ird.observe.ui.content.ref.impl; - /* * #%L - * ObServe :: Swing + * ObServe :: Business * %% - * Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit + * 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 + * 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, @@ -16,27 +14,20 @@ package fr.ird.observe.ui.content.ref.impl; * 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 + * 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% */ - -import fr.ird.observe.entities.referentiel.Sex; -import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; +package fr.ird.observe; /** - * Created on 9/27/14. + * Un contrat pour pouvoir propager les messages. * * @author Tony Chemit - chemit@codelutin.com - * @since XXX + * @since 1.5 */ -public class SexUIModel extends ContentReferenceUIModel<Sex> { - - private static final long serialVersionUID = 1L; - - public SexUIModel() { - super(Sex.class); - } +public interface SendMessageAble { + void sendMessage(String message); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/DataContext.java b/observe-application-swing/src/main/java/fr/ird/observe/db/DataContext.java new file mode 100644 index 0000000..28603b1 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/DataContext.java @@ -0,0 +1,702 @@ +package fr.ird.observe.db; + +/* + * #%L + * ObServe :: Business + * %% + * Copyright (C) 2008 - 2014 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% + */ + +import fr.ird.observe.db.constants.DataContextType; +import fr.ird.observe.services.dto.AbstractObserveDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.FloatingObjectDto; +import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jdesktop.beans.AbstractSerializableBean; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +public class DataContext extends AbstractSerializableBean { + + public static final String PROPERTY_OPEN_PROGRAM = "openProgram"; + + public static final String PROPERTY_OPEN_TRIP = "openTrip"; + + public static final String PROPERTY_OPEN_ROUTE = "openRoute"; + + public static final String PROPERTY_OPEN_ACTIVITY = "openActivity"; + + public static final String PROPERTY_OPEN_SET = "openSet"; + + public static final String PROPERTY_OPEN_PROGRAM_ID = "openProgramId"; + + public static final String PROPERTY_OPEN_TRIP_ID = "openTripId"; + + public static final String PROPERTY_OPEN_ROUTE_ID = "openRouteId"; + + public static final String PROPERTY_OPEN_ACTIVITY_ID = "openActivityId"; + + public static final String PROPERTY_OPEN_SET_ID = "openSetId"; + + public static final String PROPERTY_SELECTED_PROGRAM_ID = "selectedProgramId"; + + public static final String PROPERTY_SELECTED_TRIP_ID = "selectedTripId"; + + public static final String PROPERTY_SELECTED_ROUTE_ID = "selectedRouteId"; + + public static final String PROPERTY_SELECTED_ACTIVITY_ID = "selectedActivityId"; + + public static final String PROPERTY_SELECTED_SET_ID = "selectedSetId"; + + public static final String PROPERTY_SELECTED_FLOATING_OBJECT_ID = "selectedFloatingObjectId"; + + public static final String PROPERTY_ENABLED = "enabled"; + + public static final String PROPERTY_SELECTION_CHANGED = "selectionChanged"; + + protected String openProgramId; + + protected String openTripId; + + protected String openRouteId; + + protected String openActivityId; + + protected String openSetId; + + protected String selectedProgramId; + + protected String selectedTripId; + + protected String selectedRouteId; + + protected String selectedActivityId; + + protected String selectedSetId; + + protected String selectedFloatingObjectId; + + protected boolean enabled; + + protected boolean selectionChanged; + + protected TripSeine validationTripSeine; + + protected Route validationRoute; + + protected ActivitySeine validationActivitySeine; + + protected SetSeine validationSetSeine; + + protected FloatingObject validationFloatingObject; + + /** Logger */ + private static final Log log = LogFactory.getLog(DataContext.class); + + private static final long serialVersionUID = 1L; + + public String getOpenProgramId() { + return openProgramId; + } + + public void setOpenProgramId(String openProgramId) { + String oldValue = getOpenProgramId(); + boolean oldValue2 = isOpenProgram(); + this.openProgramId = openProgramId; + firePropertyChange(PROPERTY_OPEN_PROGRAM_ID, oldValue, this.openProgramId); + firePropertyChange(PROPERTY_OPEN_PROGRAM, oldValue2, isOpenProgram()); + } + + public String getOpenTripId() { + return openTripId; + } + + public String getOpenTripLonglineId() { + return isOpenTripLongline() ? getOpenTripId() : null; + } + + public String getOpenTripSeineId() { + return isOpenTripSeine() ? getOpenTripId() : null; + } + + + public void setOpenTripId(String openTripId) { + String oldValue = getOpenTripId(); + boolean oldValue2 = isOpenTrip(); + this.openTripId = openTripId; + firePropertyChange(PROPERTY_OPEN_TRIP_ID, oldValue, this.openTripId); + firePropertyChange(PROPERTY_OPEN_TRIP, oldValue2, isOpenTrip()); + } + + public String getOpenRouteId() { + return openRouteId; + } + + public void setOpenRouteId(String openRouteId) { + String oldValue = getOpenRouteId(); + boolean oldValue2 = isOpenRoute(); + this.openRouteId = openRouteId; + firePropertyChange(PROPERTY_OPEN_ROUTE_ID, oldValue, openRouteId); + firePropertyChange(PROPERTY_OPEN_ROUTE, oldValue2, isOpenRoute()); + } + + public String getOpenActivityId() { + return openActivityId; + } + + public String getOpenActivityLonglineId() { + return isOpenActivityLongline() ? getOpenActivityId() : null; + } + + public String getOpenActivitySeineId() { + return isOpenActivitySeine() ? getOpenActivityId() : null; + } + + public void setOpenActivityId(String openActivityId) { + String oldValue = getOpenActivityId(); + boolean oldValue2 = isOpenActivity(); + this.openActivityId = openActivityId; + firePropertyChange(PROPERTY_OPEN_ACTIVITY_ID, oldValue, this.openActivityId); + firePropertyChange(PROPERTY_OPEN_ACTIVITY, oldValue2, isOpenActivity()); + } + + public String getOpenSetId() { + return openSetId; + } + + public String getOpenSetLonglineId() { + return isOpenSetLongline() ? getOpenSetId() : null; + } + + public String getOpenSetSeineId() { + return isOpenSetSeine() ? getOpenSetId() : null; + } + + + public void setOpenSetId(String openSetId) { + String oldValue = getOpenSetId(); + boolean oldValue2 = isOpenSet(); + this.openSetId = openSetId; + firePropertyChange(PROPERTY_OPEN_SET_ID, oldValue, this.openSetId); + firePropertyChange(PROPERTY_OPEN_SET, oldValue2, isOpenSet()); + } + + public String getSelectedProgramId() { + return selectedProgramId; + } + + public void setSelectedProgramId(String selectedProgramId) { + String oldValue = getSelectedProgramId(); + this.selectedProgramId = selectedProgramId; + firePropertyChange(PROPERTY_SELECTED_PROGRAM_ID, oldValue, this.selectedProgramId); + } + + public String getSelectedTripId() { + return selectedTripId; + } + + public String getSelectedTripLonglineId() { + return isSelectedTripLongline() ? getSelectedTripId() : null; + } + + public String getSelectedTripSeineId() { + return isSelectedTripSeine() ? getSelectedTripId() : null; + } + + public void setSelectedTripId(String selectedTripId) { + String oldValue = getSelectedTripId(); + this.selectedTripId = selectedTripId; + firePropertyChange(PROPERTY_SELECTED_TRIP_ID, oldValue, this.selectedTripId); + } + + public boolean isSelectedTripLongline() { + return selectedTripId != null && Entities.isLonglineId(selectedTripId); + } + + public boolean isSelectedTripSeine() { + return selectedTripId != null && Entities.isSeineId(selectedTripId); + } + + public String getSelectedRouteId() { + return selectedRouteId; + } + + public void setSelectedRouteId(String selectedRouteId) { + String oldValue = getSelectedRouteId(); + this.selectedRouteId = selectedRouteId; + firePropertyChange(PROPERTY_SELECTED_ROUTE_ID, oldValue, selectedRouteId); + } + + public String getSelectedActivityId() { + return selectedActivityId; + } + + public String getSelectedActivityLonglineId() { + return isSelectedActivityLongline() ? getSelectedActivityId() : null; + } + + public String getSelectedActivitySeineId() { + return isSelectedActivitySeine() ? getSelectedActivityId() : null; + } + + public boolean isSelectedActivityLongline() { + return selectedActivityId != null && Entities.isLonglineId(selectedActivityId); + } + + public boolean isSelectedActivitySeine() { + return selectedActivityId != null && Entities.isSeineId(selectedActivityId); + } + + public void setSelectedActivityId(String selectedActivityId) { + String oldValue = getSelectedActivityId(); + this.selectedActivityId = selectedActivityId; + firePropertyChange(PROPERTY_SELECTED_ACTIVITY_ID, oldValue, this.selectedActivityId); + } + + public String getSelectedSetId() { + return selectedSetId; + } + + public String getSelectedSetLonglineId() { + return isSelectedActivityLongline() ? getSelectedSetId() : null; + } + + public String getSelectedSetSeineId() { + return isSelectedActivitySeine() ? getSelectedSetId() : null; + } + + public void setSelectedSetId(String selectedSetId) { + String oldValue = getSelectedSetId(); + this.selectedSetId = selectedSetId; + firePropertyChange(PROPERTY_SELECTED_SET_ID, oldValue, this.selectedSetId); + } + + public String getSelectedFloatingObjectId() { + return selectedFloatingObjectId; + } + + public void setSelectedFloatingObjectId(String selectedFloatingObjectId) { + String oldValue = getSelectedFloatingObjectId(); + this.selectedFloatingObjectId = selectedFloatingObjectId; + firePropertyChange(PROPERTY_SELECTED_FLOATING_OBJECT_ID, oldValue, this.selectedFloatingObjectId); + } + + public boolean isEnabled() { + return enabled; + } + + public boolean getEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + boolean oldValue = getEnabled(); + this.enabled = enabled; + firePropertyChange(PROPERTY_ENABLED, oldValue, enabled); + } + + public boolean isSelectionChanged() { + return selectionChanged; + } + + public boolean getSelectionChanged() { + return selectionChanged; + } + + public void setSelectionChanged(boolean selectionChanged) { + boolean oldValue = getSelectionChanged(); + this.selectionChanged = selectionChanged; + firePropertyChange(PROPERTY_SELECTION_CHANGED, oldValue, selectionChanged); + } + + public DataContext() { + } + + static DataContextType[] types; + + static DataContextType[] reverseTypes; + + public DataContextType[] getTypes() { + if (types == null) { + types = DataContextType.values(); + } + return types; + } + + public DataContextType[] getReverseTypes() { + if (reverseTypes == null) { + List<DataContextType> list = Arrays.asList(DataContextType.values()); + Collections.reverse(list); + reverseTypes = list.toArray(new DataContextType[list.size()]); + } + + return reverseTypes; + } + + public String getHigherOpenId() { + for (DataContextType type : getReverseTypes()) { + String result = type.getOpenId(this); + if (result != null) { + return result; + } + } + return null; + } + + public String getHigherSelectedId() { + + for (DataContextType type : getReverseTypes()) { + String result = type.getSelectedId(this); + if (result != null) { + return result; + } + } + return null; + } + + public String[] getSelectedIds() { + + List<String> ids = new ArrayList<String>(); + + for (DataContextType type : getTypes()) { + String result = type.getSelectedId(this); + if (result != null) { + ids.add(result); + } + } + return ids.toArray(new String[ids.size()]); + } + + public String[] getOpenIds() { + + List<String> ids = new ArrayList<String>(); + + for (DataContextType type : getTypes()) { + String result = type.getOpenId(this); + if (result != null) { + ids.add(result); + } + } + return ids.toArray(new String[ids.size()]); + } + + public String[] getOpenIds(Class<?> type) { + + String[] result = null; + + if (isOpenProgram()) { + + List<String> ids = new ArrayList<String>(); + ids.add(getOpenProgramId()); + + if (!ProgramDto.class.equals(type) && isOpenTrip()) { + + String tripId = getOpenTripId(); + ids.add(tripId); + + if (tripId.startsWith(TripSeineDto.class.getName())) { + + // on a seine trip + if (!TripSeineDto.class.equals(type) && isOpenRoute()) { + ids.add(getOpenRouteId()); + if (!RouteDto.class.equals(type) && isOpenActivitySeine()) { + ids.add(getOpenActivitySeineId()); + if (!ActivitySeineDto.class.equals(type) && isOpenSetSeine()) { + ids.add(getOpenSetSeineId()); + } + } + } + + } else { + + // on a longline trip + if (!TripLonglineDto.class.equals(type) && isOpenActivityLongline()) { + ids.add(getOpenActivityLonglineId()); + if (!ActivityLonglineDto.class.equals(type) && isOpenSetLongline()) { + ids.add(getOpenSetLonglineId()); + } + + } + + } + + } + + result = ids.toArray(new String[ids.size()]); + + } + + return result; + } + + public boolean isOpenProgram() { + return openProgramId != null; + } + + public boolean isOpenTrip() { + return openTripId != null; + } + + public boolean isOpenTripLongline() { + return isOpenTrip() && Entities.isLonglineId(openTripId); + } + + public boolean isOpenTripSeine() { + return isOpenTrip() && Entities.isSeineId(openTripId); + } + + public boolean isOpenRoute() { + return openRouteId != null; + } + + public boolean isOpenActivity() { + return openActivityId != null; + } + + public boolean isOpenActivityLongline() { + return isOpenActivity() && Entities.isLonglineId(openActivityId); + } + + public boolean isOpenActivitySeine() { + return isOpenActivity() && Entities.isSeineId(openActivityId); + } + + + public boolean isOpenSet() { + return openSetId != null; + } + + public boolean isOpenSetLongline() { + return isOpenSet() && Entities.isLonglineId(openSetId); + } + + public boolean isOpenSetSeine() { + return isOpenSet() && Entities.isSeineId(openSetId); + } + + public boolean isSelectedOpen(Class<?> type) { + + for (DataContextType entityType : DataContextType.values()) { + if (entityType.acceptType(type)) { + + // bon type trouve + + String openId = entityType.getOpenId(this); + String selectedId = entityType.getSelectedId(this); + if (selectedId == null || openId == null) { + + // pas selectionne ou rien d'ouvert + return false; + } + + return selectedId.equals(openId); + } + } + + // type non trouve + return false; + } + + public void populateSelectedIds(String... selectedId) { + + List<String> oldSelection = Arrays.asList(getSelectedIds()); + + if (log.isDebugEnabled()) { + log.debug("old selection = " + oldSelection); + } + + // on nettoye toujours toutes les anciennes sélections + // avant de positionner les nouvelles + resetSelect(); + + List<String> realSelection = null; + if (selectedId != null && selectedId.length > 0) { + + realSelection = new ArrayList<String>(); + for (String s : selectedId) { + if (s == null) { + + // ce cas peut arriver lors de la creation d'un nouvel objet + continue; + } + DataContextType type = DataContextType.acceptId(s); + if (type == null) { + + if (log.isWarnEnabled()) { + log.warn("Could not find type for id : " + s); + } + continue; + } + + type.setSelectedId(this, s); + realSelection.add(s); + if (log.isDebugEnabled()) { + log.debug("add selectedId : " + s); + } + } + } + + if (oldSelection.equals(realSelection)) { + + // rien a change + if (log.isDebugEnabled()) { + log.debug("selection does not changed"); + } + return; + } + + if (log.isInfoEnabled()) { + log.info("new selection = " + realSelection); + } + + // on change toujours l'état de selection + + setSelectionChanged(true); + } + + public void populateOpens(String... openIds) { + if (!getEnabled()) { + + if (log.isWarnEnabled()) { + log.warn(this + " is not enabled"); + } + // service non initialisé + resetOpen(); + return; + } + + List<String> oldSelection = Arrays.asList(getOpenIds()); + List<String> realSelection = new ArrayList<String>(); + + if (openIds != null && openIds.length > 0) { + + for (String s : openIds) { + if (s == null) { + + // ce cas peut arriver lors de la creation d'un nouvel objet + continue; + } + DataContextType type = DataContextType.acceptId(s); + if (type == null) { + + if (log.isWarnEnabled()) { + log.warn("Could not find type for id : " + s); + } + continue; + } + + if (!type.canOpen()) { + + // pas de traitement open + continue; + } + + type.setOpenId(this, s); + realSelection.add(s); + if (log.isDebugEnabled()) { + log.debug("add openId : " + s); + } + } + } + + if (oldSelection.equals(realSelection)) { + + // rien a change + if (log.isDebugEnabled()) { + log.debug("openIds selection does not changed"); + } + return; + } + + if (log.isInfoEnabled()) { + log.info("new openIds selection = " + realSelection); + log.info("old openIds selection = " + oldSelection); + } + + for (String s : oldSelection) { + + if (realSelection.contains(s)) { + // pas bouge rien a faire + continue; + } + + DataContextType type = DataContextType.acceptId(s); + if (type == null) { + + if (log.isWarnEnabled()) { + log.warn("Could not find type for id : " + s); + } + continue; + } + + if (!type.canOpen()) { + + // pas de traitement open + continue; + } + + String newId = type.getOpenId(this); + if (newId != null) { + + if (log.isInfoEnabled()) { + log.info("will remove old obsolete open id : " + s); + } + + // plus d'id pour ce type, on le supprime + type.setOpenId(this, null); + } + } + } + + protected void reset() { + resetOpen(); + resetSelect(); + } + + protected void resetSelect() { + setSelectedProgramId(null); + setSelectedTripId(null); + setSelectedRouteId(null); + setSelectedActivityId(null); + setSelectedFloatingObjectId(null); + setSelectedSetId(null); + selectionChanged = false; + } + + protected void resetOpen() { + setOpenProgramId(null); + setOpenTripId(null); + setOpenRouteId(null); + setOpenActivityId(null); + } + + protected void firePropertyChange(String propertyName, Object newValue) { + firePropertyChange(propertyName, null, newValue); + } + +} //DataContext diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/DataSource.java b/observe-application-swing/src/main/java/fr/ird/observe/db/DataSource.java new file mode 100644 index 0000000..0a25edc --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/DataSource.java @@ -0,0 +1,225 @@ +/* + * #%L + * ObServe :: Business + * %% + * 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% + */ +package fr.ird.observe.db; + +import fr.ird.observe.db.constants.DataSourceState; +import org.nuiton.util.version.Version; + +import java.io.File; +import java.util.Properties; + +/** + * Le contrat d'une source de données. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.4 + */ +public interface DataSource { + + String OPEN_PROPERTY_KEY = "open"; + + String REFERENTIEL_PROPERTY_KEY = "referentiel"; + + String DATA_PROPERTY_KEY = "data"; + + // ------------------------------------------------------------------------- + // Methodes de démarrage et fermeture de la source de données + // ------------------------------------------------------------------------- + + /** + * Pour initialiser le service sans l'ouvrir. + * <p/> + * Note: cette opération est délégué à la configuration. + * <p/> + * A la fin de cette méthode, l'état doit être {@link + * DataSourceState#INIT} si + * tout s'est bien déroulé. + * + * @see DataSourceConfig#init() + */ + void init(); + + /** + * Ouvre le service. + * <p/> + * Après cette opération, le service doit être en état {@link + * DataSourceState#OPEN} si + * tout s'est bien déroulé. + * + * @throws DataSourceException si pb + */ + void doOpen() throws DataSourceException; + + /** + * Ferme le service. + * <p/> + * Après cette opération, le service doit être en état {@link + * DataSourceState#CLOSED} + * + * @param destroy drapeau pour savoir si on doit détruire la base après + * fermeture. + * @throws DataSourceException if pb + */ + void doClose(boolean destroy) throws DataSourceException; + + // ------------------------------------------------------------------------- + // Methodes d'accès aux état internes de la source de données + // ------------------------------------------------------------------------- + + /** + * Recupère la version de la base. (ne peut pas être utilisé avant que la + * base soit ouverte). + * <p/> + * Note: si la base n'est pas versionnée, la version est nulle. + * + * @return la version de la base, ou <code>null</code> si la base n'est pas + * versionnee + * @throws DataSourceException if pb + */ + Version getDbVersion() throws DataSourceException; + + /** @return le libellé court du service */ + String getShortLabel(); + + /** @return le libellé complet du service */ + String getLabel(); + + /** + * @return {@code true} si le service est ouvert (i.e qu'il y a une + * connection ouverte vers la base). + */ + boolean isOpen(); + + boolean wasClosed(); + + /** @return la configuration du service */ + DataSourceConfig getConfig(); + + /** @return {@code true} si on peut lire le référentiel */ + boolean canReadReferentiel(); + + /** @return {@code true} si on peut écrire sur le référentiel */ + boolean canWriteReferentiel(); + + /** @return {@code true} si on peut lire les donées observer */ + boolean canReadData(); + + /** @return {@code true} si on peut écrire des données observer */ + boolean canWriteData(); + + Properties getConfigForTopia(); + + // ------------------------------------------------------------------------- + // Methodes de manipulation des transactions, DAO et TopiaService + // ------------------------------------------------------------------------- + + //FIXME +// /** @return le parent de tous les context topia. */ +// TopiaContext getRootCtxt(); +// +// TopiaContext beginTransaction(String methodName) throws DataSourceException; +// +// void rollbackTransaction(TopiaContext context, +// String methodName) throws DataSourceException; +// +// void commitTransaction(TopiaContext context, +// String methodName) throws DataSourceException; +// +// void closeTransaction(TopiaContext context, +// String methodName) throws DataSourceException; + +// ReplicationService getReplicationService(); +// +// <S extends TopiaService> S getTopiaService(Class<S> serviceType); +// +// <P extends TopiaEntity> TopiaDAO<P> getDAO(TopiaContext context, +// Class<P> entityType) throws TopiaException; +// +// <P extends TopiaEntity> TopiaDAO<P> getDAO(TopiaContext context, +// P entity) throws TopiaException; +// +// <E extends OpenableEntity & TopiaEntity> E getOpen(TopiaContext tx, +// Class<E> klass) throws DataSourceException; +// +// String[] getOpenIds(TopiaContext tx) throws DataSourceException; + + /** + * Exporte la base de données dans un script gzip-compresse. + * <p/> + * Note : Actuellement, seul esl bases de type H2 peuvent utiliser cette + * fonctionnalitee. + * + * @param gzipFile le fichier ou ecrire le script gzippe + * @throws DataSourceException si un pb pendant l'objectOperation + */ + void storeDB(File gzipFile) throws DataSourceException; + + //FIXME +// /** +// * Décore un obet persistant. +// * +// * @param tx la transaction à utiliser (si elle est nulle on en crée une que l'on ferme avant la fin de l'appel). +// * @param id l'id de l'obet à décorer +// * @param decorator le décorateur +// * @return la décoration +// * @throws DataSourceException si pas possible de récupérer l'objet en base +// */ +// String decorateEntity(TopiaContext tx, +// String id, +// Decorator<?> decorator) throws DataSourceException; +// +// <E extends TopiaEntity> List<E> loadDecoratedEntities(TopiaContext tx, +// Class<E> entityClass, +// Decorator<E> decorator) throws DataSourceException; + + // ------------------------------------------------------------------------- + // Methodes de vérification d'état + // ------------------------------------------------------------------------- + + /** + * Verifie que l'etat du service est l'un de ceux donnes en parametre. + * + * @param state les etats acceptes + * @throws IllegalStateException si l'etat du service n'est pas l'un de ceux + * donnes en parametre + */ + void checkState(DataSourceState... state) throws IllegalStateException; + + // ------------------------------------------------------------------------- + // Methodes de l'api des écouteurs sur évènement sur source de données + // ------------------------------------------------------------------------- + + //FIXME +// void addDataSourceListener(DataSourceListener listener); +// +// boolean containsDataSourceListener(DataSourceListener listener); +// +// void removeDataSourceListener(DataSourceListener listener); +// +// DataSourceListener[] getDataSourceListeners(); +// +// void fireNewMessage(String message); +// +// void fireNewMessage(String message, DataSourceEvent.MessageLevel level); +// +// <E> E findByTopiaId(TopiaContext tx, String entityId) throws TopiaException; +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/DataSourceConfig.java b/observe-application-swing/src/main/java/fr/ird/observe/db/DataSourceConfig.java new file mode 100644 index 0000000..c082e06 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/DataSourceConfig.java @@ -0,0 +1,219 @@ +/* + * #%L + * ObServe :: Business + * %% + * 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% + */ +package fr.ird.observe.db; + +import fr.ird.observe.db.constants.CreationMode; +import fr.ird.observe.db.constants.DataPolicy; +import fr.ird.observe.db.constants.DataSourceState; + +import java.util.EnumSet; +import java.util.Properties; +import java.util.Set; + +/** + * Le contrat de la configuration d'une source de données. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.4 + */ +public interface DataSourceConfig extends Cloneable { + + /** + * Récupère la valeur d'un paramètre. + * + * @param <T> le type de la valeur d'un paramètre + * @param param la définition du paramètre + * @param type le type du paramètre + * @return la valeur du paramètre + */ + <T> T get(DataSourceConfigParam param, Class<T> type); + + /** + * Positionne une nouvelle valeur pour unparamètre donné. + * <p/> + * Note: si on passe la valeur <code>null</code> alors le paramètre ne sera + * plus utilisé (jusqu'à ré-affectation d'un valeur non nulle). + * + * @param param la définition du paramètre + * @param value la nouvelle valeur à positionner + */ + void set(DataSourceConfigParam param, Object value); + + /** + * Prépare l'utilisation de la configuration sans ouvrir aucun connexion + * vers la base de données associée. + * <p/> + * A la fin de cette méthode, l'état doit être {@link + * DataSourceState#INIT} si + * tout s'est bien déroulé. + */ + void init(); + + /** @return la configuration sous forme l'un fichier de properties. */ + Properties getDbConfig(); + + /** + * Méthode pour valider la configuration. + * <p/> + * Cette méthode doit être appelée par le service avant toute ouverture de + * service pour assurer que l'on obtiendra un service valide. + * + * @return {@code true} si la configuration est valide. + */ + boolean isValid(); + + /** + * @return {@code true} si le service de persistance utilise un cache + * sur les entités du référentiel. + */ + boolean isUseCache(); + + /** @return le label court de la source de donnees. */ + String getShortLabel(); + + /** @return le label long de la source de donnees. */ + String getLabel(); + + /** @return le login pour se connecter a la base */ + String getLogin(); + + /** @return le mot de passe pour se connecter a la base */ + char[] getPassword(); + + /** + * @return {@code true} si on doit effectuer une tentative de mise a + * jour de la base a l'ouverture du service. + */ + boolean isCanMigrate(); + + boolean isShowMigrationSql(); + + boolean isShowMigrationProgression(); + + void setShowMigrationSql(boolean showSql); + + void setShowMigrationProgression(boolean showProgression); + + /** + * Positionne le login de connexion. + * + * @param login le nouveau login de connexion + */ + void setLogin(String login); + + /** + * Positionne le mot de passe de connexion. + * + * @param password le nouveau mot de passe de connexion + */ + void setPassword(char[] password); + + /** + * Positionne le label court de la source de donnees. + * + * @param shortLabel le nouvel label court de la source de donnes. + */ + void setShortLabel(String shortLabel); + + /** + * Positionne le drapeau d'utilisation du cache des entites. + * <p/> + * Il s'agit d'un cache sur le referentiel, mise a jour a chaque + * modification sur une entite du referentiel. + * <p/> + * Sera util lorsque l'on editera le referentiel dans l'application. + * + * @param useCache la nouvelle valeur du drapeau + */ + void setUseCache(boolean useCache); + + /** @return une instance clonee de la configuration */ + DataSourceConfig clone(); + + /** + * Recopie cette configuration vers la configuratyion donnee en parametre. + * + * @param config la configuration destination + */ + void copyTo(DataSourceConfig config); + + /** @return les droits sur la source de donnees */ + EnumSet<DataPolicy> getPolicy(); + + /** + * Recupère les droits utilisables sur ce service de persistance. + * <p/> + * La liste des droits sera positionné dans le champ {@link #getPolicy()}. + * <p/> + * Cette méthode est appellé à l'ouverture du service si la connexion a bien + * été établie. + */ + void detectPolicy(); + + /** @return les droits sur la source de donnees formates. */ + String getPolicyLabel(); + + void fillWrights(StringBuilder buffer, boolean read, + boolean write, String label); + + /** + * @param canMigrate pour indiquer si on doit effecuter une tentative de + * mise a jour a l'ouverture du service. + */ + void setCanMigrate(boolean canMigrate); + + boolean isCanReadData(); + + boolean isCanReadReferentiel(); + + boolean isCanWriteData(); + + boolean isCanWriteReferentiel(); + + CreationMode getCreationMode(); + + void setCreationMode(CreationMode creationMode); + + DataSourceConfig getImportConfig(); + + void setImportConfig(DataSourceConfig importConfig); + + DataSourceConfig getImportDataConfig(); + + void setImportDataConfig(DataSourceConfig importDataConfig); + + Set<String> getImportDataIds(); + + void setImportDataIds(Set<String> importDataIds); + +// boolean hasH2ImportConfig(); +// +// boolean hasPGImportConfig(); + + boolean hasImportReferentielConfig(); + + boolean hasImportDataConfig(); + +// H2DataSourceConfig getH2ImportConfig(); +// +// PGDataSourceConfig getPGImportConfig(); +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/TripEntry.java b/observe-application-swing/src/main/java/fr/ird/observe/db/DataSourceConfigParam.java similarity index 55% copy from observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/TripEntry.java copy to observe-application-swing/src/main/java/fr/ird/observe/db/DataSourceConfigParam.java index b49ff82..2f1acd1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/TripEntry.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/DataSourceConfigParam.java @@ -1,6 +1,6 @@ /* * #%L - * ObServe :: Swing + * ObServe :: Business * %% * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit * %% @@ -19,32 +19,25 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.ui.admin.export; +package fr.ird.observe.db; -import fr.ird.observe.entities.Trip; - -import java.io.Serializable; - -/** Une classe qui représente une entrée dans le modèle (sans la sélection) */ -public class TripEntry implements Serializable { - - private static final long serialVersionUID = 1L; - - protected final Trip trip; - - protected final boolean exist; - - public TripEntry(Trip trip, boolean exist) { - this.trip = trip; - this.exist = exist; - } +/** + * Le contrat d'un paramètre de la configuration d'une source de données. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.4 + */ +public interface DataSourceConfigParam { - public Trip getTrip() { - return trip; - } + /** + * @return le lastName de la clef utilisée pour stocker la valeur de la + * propriété. + */ + String getMapName(); - public boolean isExist() { - return exist; - } + /** @return le lastName de la propriété. */ + String getPropertyName(); + /** @return le type de la propriété. */ + Class<?> getType(); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/DataSourceException.java b/observe-application-swing/src/main/java/fr/ird/observe/db/DataSourceException.java new file mode 100644 index 0000000..2782db7 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/DataSourceException.java @@ -0,0 +1,55 @@ +/* + * #%L + * ObServe :: Business + * %% + * 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% + */ +package fr.ird.observe.db; + +/** + * L'exception déclanché lors de l'accès aux méthodes de la source de données. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.4 + */ +public class DataSourceException extends Exception { + + private final static long serialVersionUID = 1L; + + protected final String methodName; + + public DataSourceException(String message, String methodName) { + super(message); + this.methodName = methodName; + } + + public DataSourceException(Throwable cause, String methodName) { + super(cause); + this.methodName = methodName; + } + + public DataSourceException(String message, Throwable cause, String methodName) { + super(message, cause); + this.methodName = methodName; + } + + public String getMethodName() { + return methodName; + } + +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/DataSourceFactory.java b/observe-application-swing/src/main/java/fr/ird/observe/db/DataSourceFactory.java new file mode 100644 index 0000000..1a9961a --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/DataSourceFactory.java @@ -0,0 +1,456 @@ +/* + * #%L + * ObServe :: Business + * %% + * 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% + */ +package fr.ird.observe.db; + +import fr.ird.observe.db.constants.CommonDataSourceConfigParam; +import fr.ird.observe.db.constants.CreationMode; +import fr.ird.observe.db.event.DataSourceEvent; +import fr.ird.observe.db.event.DataSourceListener; +import fr.ird.observe.db.event.DataSourceListenerAdapter; +import fr.ird.observe.db.impl.H2DataSource; +import fr.ird.observe.db.impl.H2DataSourceConfig; +import fr.ird.observe.db.impl.H2DataSourceConfigParam; +import fr.ird.observe.db.impl.PGDataSource; +import fr.ird.observe.db.impl.PGDataSourceConfig; +import fr.ird.observe.db.impl.PGDataSourceConfigParam; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.File; +import java.net.URL; +import java.util.Collections; +import java.util.HashSet; +import java.util.ServiceLoader; +import java.util.Set; + +import static org.nuiton.i18n.I18n.t; + +/** + * L'usine de source de données. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.4 + */ +public class DataSourceFactory { + + /** Logger */ + private static final Log log = + LogFactory.getLog(DataSourceFactory.class); + + /** l'ensemble des proversId découverts */ + protected static Set<DataSourceProvider<?, ?>> proversId; + + /** l'ensemble des services actuellement ouverts */ + protected static final Set<DataSource> services = + new HashSet<DataSource>(); + + /** + * un ecouteur sur les services pour mettre à jour la liste des services + * actifs + */ + protected static final DataSourceListener l = + new DataSourceListenerAdapter() { + + @Override + public void onClosed(DataSourceEvent event) { + DataSource s = event.getSource(); + if (log.isDebugEnabled()) { + log.debug("remove active service " + s.getLabel()); + } + services.remove(s); + } + + @Override + public void onOpened(DataSourceEvent event) { + DataSource s = event.getSource(); + if (log.isDebugEnabled()) { + log.debug("add active service " + s.getLabel()); + } + services.add(s); + } + + @Override + public void onNewMessage(DataSourceEvent event) { + if (log.isInfoEnabled()) { + log.info(event.getMessage()); + } + } + }; + +// public static Version getDbVersion() { +// if (ObserveServiceHelper.context != null) { +// ApplicationConfig config; +// config = ObserveServiceHelper.context.getContextValue(ApplicationConfig.class); +// if (config != null) { +// return config.getOption(Version.class, +// AbstractDataSourceMigration.DB_VERSION); +// } +// } +// return null; +// } + + /** + * @param label le label du service de persistance + * @param params les paramètres de la configuration + * @return la configuration instanciée + */ + public static H2DataSourceConfig newH2Config(String label, Object... params) { + + H2DataSourceConfig config = newConfig(label, + H2DataSourceConfig.class, + H2DataSource.class, + params + ); + + return config; + } + + /** + * @param label le label du service de persistance + * @param params les paramètres de la configuration + * @return la configuration instanciée + */ + public static PGDataSourceConfig newPGConfig(String label, Object... params) { + + PGDataSourceConfig config = newConfig(label, + PGDataSourceConfig.class, + PGDataSource.class, + params + ); + + return config; + } + + public static PGDataSource newService(PGDataSourceConfig config) { + + PGDataSource service = newService(config, PGDataSource.class); + + return service; + } + + public static H2DataSource newService(H2DataSourceConfig config) { + + H2DataSource service = newService(config, H2DataSource.class); + + return service; + } + + public static DataSource newService(DataSourceConfig config) { + + DataSource service = null; + + if (config instanceof H2DataSourceConfig) { + service = newService((H2DataSourceConfig) config); + } else if (config instanceof PGDataSourceConfig) { + service = newService((PGDataSourceConfig) config); + } + + return service; + } + + /** + * @param <C> le type de la configuration + * @param label le label du service de persistance + * @param configClass le type de configuration + * @param serviceClass le type de service + * @param params les paramètres de la configuration + * @return la configuration instanciée + */ + private static <C extends DataSourceConfig, S extends DataSource> C newConfig(String label, + Class<C> configClass, + Class<S> serviceClass, + Object... params) { + + DataSourceProvider<C, S> provider = + getProvider(configClass, serviceClass); + + C config = provider.newConfig(label, params); + + return config; + } + + public static <C extends DataSourceConfig, S extends DataSource> S + newService(C config, Class<S> serviceClass) { + + DataSourceProvider<C, S> provider = getProvider(config, serviceClass); + + S service = provider.newService(config); + + service.addDataSourceListener(l); + + service.init(); + + return service; + } + + public static Set<DataSourceProvider<?, ?>> getProversId() { + if (proversId == null) { + proversId = discover(); + } + return proversId; + } + + public static void dispose() throws DataSourceException { + if (log.isInfoEnabled()) { + log.info("close all services (" + services.size() + ')'); + } + + for (DataSource service : services) { + // on supprime le listener qui met a jour la liste de services + // sinon on entre en concurrence de modification + service.removeDataSourceListener(l); + if (service.isOpen()) { + service.doClose(false); + } + } + services.clear(); + } + + @SuppressWarnings("unchecked") + protected static <C extends DataSourceConfig, S extends DataSource> + DataSourceProvider<C, S> getProvider(Class<C> configClass, + Class<S> serviceClass) { + + if (configClass == null) { + throw new NullPointerException("configClass can not be null"); + } + + if (serviceClass == null) { + throw new NullPointerException("serviceClass can not be null"); + } + + for (DataSourceProvider<?, ?> p : getProversId()) { + if (configClass.equals(p.getConfigClass()) && + serviceClass.equals(p.getServiceClass())) { + return (DataSourceProvider<C, S>) p; + } + } + return null; + } + + @SuppressWarnings("unchecked") + protected static <C extends DataSourceConfig, S extends DataSource> + DataSourceProvider<C, S> getProvider(C config, + Class<S> serviceClass) { + + if (config == null) { + throw new NullPointerException("config can not be null"); + } + + if (serviceClass == null) { + throw new NullPointerException("serviceClass can not be null"); + } + + Class<C> configClass = (Class<C>) config.getClass(); + return getProvider(configClass, serviceClass); + } + + protected static Set<DataSourceProvider<?, ?>> discover() { + Set<DataSourceProvider<?, ?>> detected; + detected = new HashSet<DataSourceProvider<?, ?>>(); + if (log.isDebugEnabled()) { + log.debug("init " + DataSourceFactory.class); + } + for (DataSourceProvider<?, ?> p : ServiceLoader.load(DataSourceProvider.class)) { + detected.add(p); + if (log.isDebugEnabled()) { + log.debug(t("observe.storage.message.provider.detected", p.getServiceClass().getName())); + } + } + + return Collections.unmodifiableSet(detected); + } + + /** + * Creates the config for an empty local storage. + * + * @param label label of storage + * @param dir directory of the database + * @param login login to connect ot the storage + * @param password password to connect ot the storage + * @return the instanciate config + */ + public static H2DataSourceConfig newH2ConfigEmpty( + String label, + File dir, + String login, + char[] password) { + H2DataSourceConfig config = newH2Config( + label, + CommonDataSourceConfigParam.LOGIN, login, + CommonDataSourceConfigParam.PASSWORD, password, + CommonDataSourceConfigParam.CREATION_MODE, CreationMode.EMPTY, + H2DataSourceConfigParam.DIRECTORY, dir + ); + return config; + } + + /** + * Creates the config for a new local storage loaded from the given {@code + * dump}. + * + * @param label label of storage + * @param dir directory of the database + * @param dump url of the dump to load + * @param login login to connect ot the storage + * @param password password to connect ot the storage + * @param canMigrate flag to migrate db if required + * @return the instanciate config + */ + public static H2DataSourceConfig newH2ConfigFromDump( + String label, + File dir, + URL dump, + String login, + char[] password, + boolean canMigrate) { + H2DataSourceConfig config = newH2Config( + label, + CommonDataSourceConfigParam.LOGIN, login, + CommonDataSourceConfigParam.PASSWORD, password, + CommonDataSourceConfigParam.CREATION_MODE, CreationMode.IMPORT_EXTERNAL_DUMP, + H2DataSourceConfigParam.DUMP, dump, + H2DataSourceConfigParam.DIRECTORY, dir, + CommonDataSourceConfigParam.CAN_MIGRATE, canMigrate + ); + return config; + } + + /** + * Creates the config for an existing local storage with migration if + * required. + * + * @param label label of storage + * @param dir directory of the database + * @param login login to connect ot the storage + * @param password password to connect ot the storage + * @param canMigrate flag to update database + * @return the instanciate config + */ + public static H2DataSourceConfig newH2ConfigUseLocalStorage( + String label, + File dir, + String login, + char[] password, + boolean canMigrate) { + H2DataSourceConfig config = newH2Config( + label, + CommonDataSourceConfigParam.LOGIN, login, + CommonDataSourceConfigParam.PASSWORD, password, + H2DataSourceConfigParam.DIRECTORY, dir, + CommonDataSourceConfigParam.CAN_MIGRATE, canMigrate + ); + return config; + } + + /** + * Creates the config for an new local storage with a copy of the + * referentiel of local storage given his {@code importConfig} with + * migration if required. + * + * @param label label of storage + * @param dir directory of the database + * @param importConfig import service configuration + * @param login login to connect ot the storage + * @param password password to connect ot the storage + * @param canMigrate flag to allow migration + * @return the instanciate config + */ + public static H2DataSourceConfig newH2ConfigImportLocalStorage( + String label, + File dir, + H2DataSourceConfig importConfig, + String login, + char[] password, + boolean canMigrate) { + H2DataSourceConfig config = newH2Config( + label, + CommonDataSourceConfigParam.LOGIN, login, + CommonDataSourceConfigParam.PASSWORD, password, + CommonDataSourceConfigParam.CREATION_MODE, CreationMode.IMPORT_LOCAL_STORAGE, + H2DataSourceConfigParam.DIRECTORY, dir, + CommonDataSourceConfigParam.IMPORT_CONFIG, importConfig, + CommonDataSourceConfigParam.CAN_MIGRATE, canMigrate + ); + return config; + } + + /** + * Creates the config for an new local storage with a copy of the + * referentiel of remote storage given his {@code importConfig} with + * migration if required. + * + * @param label label of storage + * @param dir directory of the database + * @param importConfig import service configuration + * @param login login to connect ot the storage + * @param password password to connect ot the storage + * @param canMigrate flag to allow migration + * @return the instanciate config + */ + public static H2DataSourceConfig newH2ConfigImportRemoteStorage( + String label, + File dir, + PGDataSourceConfig importConfig, + String login, + char[] password, + boolean canMigrate) { + H2DataSourceConfig config = newH2Config( + label, + CommonDataSourceConfigParam.LOGIN, login, + CommonDataSourceConfigParam.PASSWORD, password, + CommonDataSourceConfigParam.CREATION_MODE, CreationMode.IMPORT_REMOTE_STORAGE, + H2DataSourceConfigParam.DIRECTORY, dir, + CommonDataSourceConfigParam.IMPORT_CONFIG, importConfig, + CommonDataSourceConfigParam.CAN_MIGRATE, canMigrate + ); + return config; + } + + /** + * Creates a configuration to connect to a remote dn. + * + * @param dbName storage label + * @param login login to connect remote db + * @param password password to connect remote db + * @param url url of remote db + * @param canMigrate flag to allow migration + * @return the new instanciated configuration + */ + public static PGDataSourceConfig newPGConfig( + String dbName, + String login, + char[] password, + String url, + boolean canMigrate) { + + PGDataSourceConfig config = newPGConfig( + dbName, + CommonDataSourceConfigParam.LOGIN, login, + CommonDataSourceConfigParam.PASSWORD, password, + PGDataSourceConfigParam.URL, url, + CommonDataSourceConfigParam.CAN_MIGRATE, canMigrate + ); + + return config; + } +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/DataSourceProvider.java b/observe-application-swing/src/main/java/fr/ird/observe/db/DataSourceProvider.java new file mode 100644 index 0000000..769ba53 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/DataSourceProvider.java @@ -0,0 +1,73 @@ +/* + * #%L + * ObServe :: Business + * %% + * 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% + */ +package fr.ird.observe.db; + +import fr.ird.observe.services.dto.migration.AbstractDataSourceMigrationDto; +import org.hibernate.dialect.Dialect; + +import java.sql.Driver; + +/** + * Le contrat d'un provider de source de données. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.4 + */ +public interface DataSourceProvider<C extends DataSourceConfig, S extends DataSource> { + + /** @return le type de configuration que le provider peut fournir. */ + Class<C> getConfigClass(); + + /** @return le type de service que le provider peut fournir. */ + Class<S> getServiceClass(); + + /** @return le dialect hibernate utilisé */ + Class<? extends Dialect> getDialectClass(); + + /** @return le driver sql du service */ + Class<? extends Driver> getDriverClass(); + + /** @return la classe de migration */ + Class<? extends AbstractDataSourceMigration> getMigrationClass(); + + /** @return les paramètres utilisables sur la configuration */ + DataSourceConfigParam[] getParams(); + + /** + * Pour créer une nouvelle configuration. + * + * @param label le libellé du service + * @param params les paramètres de la configuration + * @return la nouvelle configuration instanciée mais non initialisée. + */ + C newConfig(String label, Object... params); + + /** + * Pour créer un nouveau service à partir de sa configuration. + * <p/> + * Note: le service n'est pas ouvert. + * + * @param config la configuration du service + * @return le service instancié non ouvert. + */ + S newService(C config); +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/constants/CommonDataSourceConfigParam.java b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/CommonDataSourceConfigParam.java new file mode 100644 index 0000000..5b6dbbf --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/CommonDataSourceConfigParam.java @@ -0,0 +1,127 @@ +/* + * #%L + * ObServe :: Business + * %% + * 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% + */ +package fr.ird.observe.db.constants; + +import fr.ird.observe.db.DataSourceConfig; +import fr.ird.observe.db.DataSourceConfigParam; +import org.hibernate.cfg.Environment; +import org.nuiton.topia.migration.TopiaMigrationEngine; + +import java.util.Set; + +/** + * Les différents parametres communs a tout type de configuration. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.0 + */ +public enum CommonDataSourceConfigParam implements DataSourceConfigParam { + + /** le lastName d'utilisateur pour se connecter à la base */ + LOGIN( + "login", + Environment.USER, + String.class + ), + /** le mot de passe de l'utilisateur pour se connecter à la base */ + PASSWORD( + "password", + Environment.PASS, + char[].class + ), + /** un drapeau pour voir les requetes sql lors de la migration. */ + SHOW_MIGRATION_SQL( + TopiaMigrationEngine.MIGRATION_SHOW_SQL, + Boolean.class + ), + /** un drapeau pour voir la progression des requetes sql lors de la migration. */ + SHOW_MIGRATION_PROGRESSION( + TopiaMigrationEngine.MIGRATION_SHOW_PROGRESSION, + Boolean.class + ), + /** un drapeau pour autoriser les migrations. */ + CAN_MIGRATE( + "migrate", + Boolean.class + ), + /** + * le type de création de la base. + * <p/> + * Si on veut juste utiliser une base sans opération de création, on + * n'utilise pas ce paramètre. + */ + CREATION_MODE("creationMode", CreationMode.class), + + /** + * le service de persistance à utiliser en mode création pour importer un + * référentiel. + * <p/> + * Cette donnée sera utilisée uniquement si le mode de création est : + * <p/> + * {@link CreationMode#IMPORT_LOCAL_STORAGE} + * ou {@link CreationMode#IMPORT_REMOTE_STORAGE}. + */ + IMPORT_CONFIG("importConfig", DataSourceConfig.class), + /** + * le service de persistance à utiliser en mode création pour importer + * des données. + */ + IMPORT_DATA_CONFIG("importDataConfig", DataSourceConfig.class), + + /** + * Les ids à importer (si {@code null} alors on import tout). + */ + IMPORT_DATA_IDS("importDataIds", Set.class); + + private final String mapName; + + private final String propertyName; + + private final Class<?> type; + + CommonDataSourceConfigParam(String name, Class<?> type) { + this(name, name, type); + } + + CommonDataSourceConfigParam(String propertyName, + String mapName, + Class<?> type) { + this.mapName = mapName; + this.propertyName = propertyName; + this.type = type; + } + + @Override + public String getMapName() { + return mapName; + } + + @Override + public String getPropertyName() { + return propertyName; + } + + @Override + public Class<?> getType() { + return type; + } +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/constants/ConnexionStatus.java b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/ConnexionStatus.java new file mode 100644 index 0000000..f87c840 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/ConnexionStatus.java @@ -0,0 +1,66 @@ +/* + * #%L + * ObServe :: Business + * %% + * 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% + */ +package fr.ird.observe.db.constants; + +import static org.nuiton.i18n.I18n.n; + +/** + * Pour caractériser l'état d'une connexion à un service de persistance. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.0 + */ +public enum ConnexionStatus { + + /** lorsque la connexion n'as pas encore ete testee */ + UNTESTED( + n("observe.storage.connexionStatut.untested"), + n("observe.storage.connexionStatut.untested.description") + ), + /** lorsque le test de connexion a abouti */ + SUCCESS( + n("observe.storage.connexionStatut.success"), + n("observe.storage.connexionStatut.success.description") + ), + /** lorsque le test de connexion a echoue */ + FAILED( + n("observe.storage.connexionStatut.failed"), + n("observe.storage.connexionStatut.failed.description") + ); + + private final String label; + + private final String description; + + ConnexionStatus(String label, String description) { + this.label = label; + this.description = description; + } + + public String getLabel() { + return label; + } + + public String getDescription() { + return description; + } +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/constants/CreationMode.java b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/CreationMode.java new file mode 100644 index 0000000..f82178b --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/CreationMode.java @@ -0,0 +1,82 @@ +/* + * #%L + * ObServe :: Business + * %% + * 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% + */ +package fr.ird.observe.db.constants; + +import static org.nuiton.i18n.I18n.n; + +/** + * Pour caractériser comment créer une base locale. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.0 + */ +public enum CreationMode { + + /** creer une nouvelle base locale vide */ + EMPTY( + n("observe.storage.creationMode.empty"), + n("observe.storage.creationMode.empty.description") + ), + /** creer une nouvelle base a partir du dump embarque */ + IMPORT_INTERNAL_DUMP( + n("observe.storage.creationMode.internalDump"), + n("observe.storage.creationMode.internalDump.description") + ), + /** creer une nouvelle base a partir d'un dump sur fs */ + IMPORT_EXTERNAL_DUMP( + n("observe.storage.creationMode.externalDump"), + n("observe.storage.creationMode.externalDump.description") + ), + /** + * creer une nouvelle base vide et importer le referentiel via une base + * locale. + */ + IMPORT_LOCAL_STORAGE( + n("observe.storage.creationMode.importLocalStorage"), + n("observe.storage.creationMode.importLocalStorage.description") + ), + /** + * creer une nouvelle base vide et importer le referentiel via une base + * distante. + */ + IMPORT_REMOTE_STORAGE( + n("observe.storage.creationMode.importRemoteStorage"), + n("observe.storage.creationMode.importRemoteStorage.description") + ); + + private final String label; + + private final String description; + + CreationMode(String label, String description) { + this.label = label; + this.description = description; + } + + public String getLabel() { + return label; + } + + public String getDescription() { + return description; + } +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/constants/DataContextType.java b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/DataContextType.java new file mode 100644 index 0000000..054fa62 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/DataContextType.java @@ -0,0 +1,328 @@ +/* + * #%L + * ObServe :: Business + * %% + * 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% + */ +package fr.ird.observe.db.constants; + +import fr.ird.observe.db.DataContext; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.FloatingObjectDto; +import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; + +/** + * Les types de données connues par le {@link DataContext}. + * <p/> + * Chaque constant permet de récupérer des données du context de données. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.4 + */ +public enum DataContextType { + + Program(Program.class, DataContext.PROPERTY_OPEN_PROGRAM) { + @Override + public boolean isOpen(DataContext context) { + return context.isOpenProgram(); + } + + @Override + public String getOpenId(DataContext context) { + return context.getOpenProgramId(); + } + + @Override + public void setOpenId(DataContext dataContext, String id) { + dataContext.setOpenProgramId(id); + } + + @Override + public String getSelectedId(DataContext context) { + return context.getSelectedProgramId(); + } + + @Override + public void setSelectedId(DataContext context, String id) { + context.setSelectedProgramId(id); + } + }, + + TripSeine(TripSeine.class, DataContext.PROPERTY_OPEN_TRIP) { + @Override + public boolean isOpen(DataContext context) { + return context.isOpenTripSeine(); + } + + @Override + public String getOpenId(DataContext context) { + return context.getOpenTripSeineId(); + } + + @Override + public void setOpenId(DataContext dataContext, String id) { + dataContext.setOpenTripId(id); + } + + @Override + public String getSelectedId(DataContext context) { + return context.getSelectedTripSeineId(); + } + + @Override + public void setSelectedId(DataContext context, String id) { + context.setSelectedTripId(id); + } + }, + + TripLongline(TripLongline.class, DataContext.PROPERTY_OPEN_TRIP) { + @Override + public boolean isOpen(DataContext context) { + return context.isOpenTripLongline(); + } + + @Override + public String getOpenId(DataContext context) { + return context.getOpenTripLonglineId(); + } + + @Override + public void setOpenId(DataContext dataContext, String id) { + dataContext.setOpenTripId(id); + } + + @Override + public String getSelectedId(DataContext context) { + return context.getSelectedTripLonglineId(); + } + + @Override + public void setSelectedId(DataContext context, String id) { + context.setSelectedTripId(id); + } + }, + + Route(Route.class, DataContext.PROPERTY_OPEN_ROUTE) { + @Override + public boolean isOpen(DataContext context) { + return context.isOpenRoute(); + } + + @Override + public String getOpenId(DataContext context) { + return context.getOpenRouteId(); + } + + @Override + public void setOpenId(DataContext dataContext, String id) { + dataContext.setOpenRouteId(id); + } + + @Override + public String getSelectedId(DataContext context) { + return context.getSelectedRouteId(); + } + + @Override + public void setSelectedId(DataContext context, String id) { + context.setSelectedRouteId(id); + } + }, + + ActivitySeine(ActivitySeine.class, DataContext.PROPERTY_OPEN_ACTIVITY) { + @Override + public boolean isOpen(DataContext context) { + return context.isOpenActivityLongline(); + } + + @Override + public String getOpenId(DataContext context) { + return context.getOpenActivitySeineId(); + } + + @Override + public void setOpenId(DataContext dataContext, String id) { + dataContext.setOpenActivityId(id); + } + + @Override + public String getSelectedId(DataContext context) { + return context.getSelectedActivitySeineId(); + } + + @Override + public void setSelectedId(DataContext context, String id) { + context.setSelectedActivityId(id); + } + }, + + ActivityLongline(ActivityLongline.class, DataContext.PROPERTY_OPEN_ACTIVITY) { + @Override + public boolean isOpen(DataContext context) { + return context.isOpenActivityLongline(); + } + + @Override + public String getOpenId(DataContext context) { + return context.getOpenActivityLonglineId(); + } + + @Override + public void setOpenId(DataContext dataContext, String id) { + dataContext.setOpenActivityId(id); + } + + @Override + public String getSelectedId(DataContext context) { + return context.getSelectedActivityLonglineId(); + } + + @Override + public void setSelectedId(DataContext context, String id) { + context.setSelectedActivityId(id); + } + }, + + SetSeine(SetSeine.class, DataContext.PROPERTY_OPEN_SET) { + @Override + public boolean isOpen(DataContext context) { + return context.isOpenSetSeine(); + } + + @Override + public String getOpenId(DataContext context) { + return context.getOpenSetSeineId(); + } + + @Override + public void setOpenId(DataContext dataContext, String id) { + dataContext.setOpenSetId(id); + } + + @Override + public String getSelectedId(DataContext context) { + return context.getSelectedSetSeineId(); + } + + @Override + public void setSelectedId(DataContext context, String id) { + context.setSelectedSetId(id); + } + }, + + SetLongline(SetLongline.class, DataContext.PROPERTY_OPEN_SET) { + @Override + public boolean isOpen(DataContext context) { + return context.isOpenSetLongline(); + } + + @Override + public String getOpenId(DataContext context) { + return context.getOpenSetLonglineId(); + } + + @Override + public void setOpenId(DataContext dataContext, String id) { + dataContext.setOpenSetId(id); + } + + @Override + public String getSelectedId(DataContext context) { + return context.getSelectedSetLonglineId(); + } + + @Override + public void setSelectedId(DataContext context, String id) { + context.setSelectedSetId(id); + } + }, + + FloatingObject(FloatingObject.class, null) { + @Override + public String getSelectedId(DataContext context) { + return context.getSelectedFloatingObjectId(); + } + + @Override + public void setSelectedId(DataContext context, String id) { + context.setSelectedFloatingObjectId(id); + } + }; + + private final Class<?> type; + + private final String openProperty; + + DataContextType(Class<?> type, String openProperty) { + this.type = type; + this.openProperty = openProperty; + } + + public boolean acceptType(Class<?> type) { + return type.equals(getType()); + } + + public boolean acceptId0(String id) { + return id.startsWith(getType().getName()); + } + + public Class<?> getType() { + return type; + } + + public String getOpenProperty() { + return openProperty; + } + + public boolean canOpen() { + return openProperty != null; + } + + public boolean isOpen(DataContext context) { + return false; + } + + public String getOpenId(DataContext context) { + return null; + } + + public abstract String getSelectedId(DataContext context); + + public abstract void setSelectedId(DataContext context, String id); + + public static DataContextType acceptId(String s) { + DataContextType result = null; + for (DataContextType type : DataContextType.values()) { + if (s.startsWith(type.getType().getName())) { + result = type; + break; + } + } + return result; + } + + public void setOpenId(DataContext dataContext, String id) { + // rien a faire par defaut + } +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/constants/DataPolicy.java b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/DataPolicy.java new file mode 100644 index 0000000..6cd2673 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/DataPolicy.java @@ -0,0 +1,72 @@ +/* + * #%L + * ObServe :: Business + * %% + * 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% + */ +package fr.ird.observe.db.constants; + +import static org.nuiton.i18n.I18n.n; + +/** + * Pour caractériser les droits de lecture, ecriture sur les données d'un + * service de persistance. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.0 + */ +public enum DataPolicy { + + /** pour lire le référentiel */ + READ_REFERENTIEL( + n("observe.storage.dataPolicy.readReferentiel"), + n("observe.storage.dataPolicy.readReferentiel.description") + ), + /** pour lire les données observer */ + READ_DATA( + n("observe.storage.dataPolicy.readData"), + n("observe.storage.dataPolicy.readData.description") + ), + /** pour modifier le référentiel */ + WRITE_REFERENTIEL( + n("observe.storage.dataPolicy.writeReferentiel"), + n("observe.storage.dataPolicy.writeReferentiel.description") + ), + /** pour modifier les données observer */ + WRITE_DATA( + n("observe.storage.dataPolicy.writeData"), + n("observe.storage.dataPolicy.writeData.description") + ); + + private final String label; + + private final String description; + + DataPolicy(String label, String description) { + this.label = label; + this.description = description; + } + + public String getLabel() { + return label; + } + + public String getDescription() { + return description; + } +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SexUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/DataSourceState.java similarity index 57% copy from observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SexUIModel.java copy to observe-application-swing/src/main/java/fr/ird/observe/db/constants/DataSourceState.java index 1078b62..46bb8c6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SexUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/DataSourceState.java @@ -1,14 +1,12 @@ -package fr.ird.observe.ui.content.ref.impl; - /* * #%L - * ObServe :: Swing + * ObServe :: Business * %% - * Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit + * 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 + * 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, @@ -16,27 +14,27 @@ package fr.ird.observe.ui.content.ref.impl; * 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 + * 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% */ - -import fr.ird.observe.entities.referentiel.Sex; -import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; +package fr.ird.observe.db.constants; /** - * Created on 9/27/14. + * Pour qualifier l'état d'un storageService. * * @author Tony Chemit - chemit@codelutin.com - * @since XXX + * @since 1.0 */ -public class SexUIModel extends ContentReferenceUIModel<Sex> { - - private static final long serialVersionUID = 1L; - - public SexUIModel() { - super(Sex.class); - } +public enum DataSourceState { + /** avant l'intialisation */ + NULL, + /** apres l'initialisation */ + INIT, + /** apres l'ouverture */ + OPEN, + /** apres la fermeture */ + CLOSED } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/constants/DbMode.java b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/DbMode.java new file mode 100644 index 0000000..23053b9 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/DbMode.java @@ -0,0 +1,65 @@ +/* + * #%L + * ObServe :: Business + * %% + * 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% + */ +package fr.ird.observe.db.constants; + +import static org.nuiton.i18n.I18n.n; + +/** + * Pour caractériser le type de connexion requis. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.0 + */ +public enum DbMode { + /** Pour utiliser une base locale */ + USE_LOCAL( + n("observe.storage.dbMode.useLocal"), + n("observe.storage.dbMode.useLocal.description") + ), + /** Pour creer une base locale */ + CREATE_LOCAL( + n("observe.storage.dbMode.createLocal"), + n("observe.storage.dbMode.createLocal.description") + ), + /** Pour utiliser une base distante */ + USE_REMOTE( + n("observe.storage.dbMode.useRemote"), + n("observe.storage.dbMode.useRemote.description") + ); + + private final String label; + + private final String description; + + DbMode(String label, String description) { + this.label = label; + this.description = description; + } + + public String getLabel() { + return label; + } + + public String getDescription() { + return description; + } +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/model/DataSelectionModel.java b/observe-application-swing/src/main/java/fr/ird/observe/db/model/DataSelectionModel.java new file mode 100644 index 0000000..9d9c84f --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/model/DataSelectionModel.java @@ -0,0 +1,513 @@ +/* + * #%L + * ObServe :: Business + * %% + * 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% + */ +package fr.ird.observe.db.model; + +import fr.ird.observe.DataService; +import fr.ird.observe.db.DataSource; +import fr.ird.observe.db.constants.DataSourceState; +import fr.ird.observe.services.dto.EntitiesDto; +import fr.ird.observe.services.dto.TripDto; +import fr.ird.observe.services.dto.TripsDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.referential.ProgramsDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.util.TopiaEntityHelper; + +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; + +/** + * Un modèle pour représenter la sélection de données. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.4 + */ +public class DataSelectionModel implements Serializable { + + public static void populate(DataSelectionModel model, + DataService service, + DataSource source) throws Exception { + + source.checkState(DataSourceState.OPEN); + + Map<String, List<String>> datas = new HashMap<String, List<String>>(); + + List<Program> programs = service.getAllProgramStub(source); + for (Program program : programs) { + + if (Programs.isProgramSeine(program)) { + List<TripSeine> trips = service.getTripSeineStubByProgram(source, program.getTopiaId()); + populate(model, program, trips, datas); + } + + if (Programs.isProgramLongline(program)) { + List<TripLongline> trips = service.getTripLonglineStubByProgram(source, program.getTopiaId()); + populate(model, program, trips, datas); + } + + } + model.setDatas(datas); + + } + + protected static <T extends Trip> void populate(DataSelectionModel model, + Program program, + List<T> trips, + Map<String, List<String>> datas) { + + model.cacheEntity(program); + + if (!trips.isEmpty()) { + List<String> tripIds = new ArrayList<String>(); + + if (model.isUseOpenData()) { + + // ajout de toutes les marées ouvertes ou non + for (T trip : trips) { + trip.setProgram(program); + model.cacheEntity(trip); + tripIds.add(trip.getTopiaId()); + } + + } else { + + // ajout de toutes les marées non ouvertes + for (T trip : trips) { + trip.setProgram(program); + if (!trip.isOpen()) { + model.cacheEntity(trip); + tripIds.add(trip.getTopiaId()); + } + } + + } + + if (!tripIds.isEmpty()) { + + datas.put(program.getTopiaId(), tripIds); + if (log.isDebugEnabled()) { + log.debug("Add program " + program.getLabel1() + " with " + tripIds.size() + " trip(s)."); + } + + } + + } + + } + + public static final String PROPERTY_USE_REFERENTIEL = "useReferentiel"; + + public static final String PROPERTY_USE_DATA = "useData"; + + public static final String PROPERTY_USE_OPEN_DATA = "useOpenData"; + + public static final String PROPERTY_SELECTED_DATA = "selectedData"; + + public static final String PROPERTY_SELECTED_REFERENTIEL = "selectedReferentiel"; + + public static final String PROPERTY_DATAS = "datas"; + + /** Logger */ + private static final Log log = LogFactory.getLog(DataSelectionModel.class); + + private static final long serialVersionUID = 2L; + + /** un drapeau pour selectionner ou non les donnees observers */ + protected boolean useData; + + /** un drapeau pour selectionner ou non des donnees observers ouvertes */ + protected boolean useOpenData; + + /** un drapeau pour selectionner ou non des donnees observer */ + protected boolean useReferentiel; + + /** la liste des programs utilisables (qui ont des marees) */ + protected transient Map<String, List<String>> datas; + + /** + * Le cache des entités chargées pour construire le modèle de sélection. + * + * Ces entités pourront ensuite être injectées dans les noeuds sans avoir à les recharger. + * + * @since 4.0 + */ + protected final Map<String, ? super TopiaEntity> entityCache; + + /** la liste des marees selectionnee */ + protected transient Set<String> selectedData; + + /** la liste des referentiels possibles */ + protected final Set<Class<?>> referentiel; + + /** la liste des referentiels selectionnes */ + protected final Set<Class<?>> selectedReferentiel; + + /** nb marees */ + protected int nbTrips; + + /** nb referentiels */ + protected final int nbReferentiels; + + protected final PropertyChangeSupport pcs; + + public void populate() throws Exception { + throw new UnsupportedOperationException(); + } + + public DataSelectionModel() { + pcs = new PropertyChangeSupport(this); + Class<?>[] classes = TopiaEntityHelper.getContracts(Entities.REFERENCE_ENTITIES); + List<Class<?>> list = Arrays.asList(classes); + referentiel = new HashSet<Class<?>>(list); + selectedReferentiel = new HashSet<Class<?>>(); + nbReferentiels = referentiel.size(); + entityCache = new TreeMap<String, TopiaEntity>(); + } + + public boolean isUseReferentiel() { + return useReferentiel; + } + + public boolean isUseData() { + return useData; + } + + public boolean isUseOpenData() { + return useOpenData; + } + + public boolean isEmpty() { + if (isUseReferentiel()) { + if (!isReferentielEmpty()) { + return false; + } + } + if (isUseData()) { + if (!isDataEmpty()) { + return false; + } + } + return true; + } + + protected void cacheEntity(TopiaEntity entity) { + entityCache.put(entity.getTopiaId(), entity); + } + + public TopiaEntity getEntityCache(String id) { + return (TopiaEntity) entityCache.get(id); + } + + public boolean isReferentielEmpty() { + return selectedReferentiel.isEmpty(); + } + + public boolean isReferentielFull() { + return selectedReferentiel.size() == nbReferentiels; + } + + public boolean isDataEmpty() { + return selectedData == null || selectedData.isEmpty(); + } + + public boolean isDataFull() { + return selectedData != null && selectedData.size() == nbTrips; + } + + public Set<Class<?>> getSelectedReferentiel() { + return selectedReferentiel; + } + + public Map<String, List<String>> getDatas() { + if (datas == null) { + datas = new HashMap<String, List<String>>(); + } + return datas; + } + + public Set<String> getSelectedData() { + if (selectedData == null) { + selectedData = new HashSet<String>(); + } + return selectedData; + } + + public Map<String, List<String>> getSelectedDataByProgram() { + if (datas == null || selectedData == null || selectedData.isEmpty()) { + return Collections.emptyMap(); + } + Map<String, List<String>> result = + new HashMap<String, List<String>>(datas.size()); + + for (String m : selectedData) { + + // on recherche son program + for (String p : datas.keySet()) { + if (datas.get(p).contains(m)) { + List<String> trips = result.get(p); + if (trips == null) { + trips = new ArrayList<String>(); + result.put(p, trips); + } + trips.add(m); + break; + } + } + } + return result; + } + + public boolean isSelectedData(String id) { + + if (Trips.isTripId(id)) { + + // recherche directe sur les ids de marees + return getSelectedData().contains(id); + } + + if (id.startsWith(Program.class.getName())) { + // on doit verifier que toutes les marees du program sont sélectionnées + List<String> tripIds = datas.get(id); + if (CollectionUtils.isEmpty(tripIds)) { + + // pas de marées + return false; + } + + for (String tripId : tripIds) { + if (!isSelectedData(tripId)) { + + // au moins une marée non sélectionnée + + return false; + } + } + + // toutes les marées sont sélectionnée + return true; + } + + // ne devrait pas arrivée + return false; + + } + + public boolean isSelectedReferentiel(Class<?> type) { + checkReferentielType(type); + return getSelectedReferentiel().contains(type); + } + + public void setUseReferentiel(boolean useReferentiel) { + this.useReferentiel = useReferentiel; + firePropertyChange(PROPERTY_USE_REFERENTIEL, useReferentiel); + } + + public void setUseData(boolean useData) { + this.useData = useData; + firePropertyChange(PROPERTY_USE_DATA, useData); + } + + public void setUseOpenData(boolean useOpenData) { + this.useOpenData = useOpenData; + firePropertyChange(PROPERTY_USE_OPEN_DATA, useOpenData); + } + + public void addSelectedReferentiel(Class<?> type) { + checkReferentielType(type); + if (log.isDebugEnabled()) { + log.debug("Add referentiel type " + type); + } + getSelectedReferentiel().add(type); + firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); + } + + public void addAllSelectedReferentiel() { + getSelectedReferentiel().addAll(referentiel); + firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); + } + + public void removeSelectedReferentiel(Class<?> type) { + checkReferentielType(type); + if (log.isDebugEnabled()) { + log.debug("remove referentiel type " + type); + } + getSelectedReferentiel().remove(type); + firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); + } + + public void removeAll() { + getSelectedReferentiel().clear(); + getSelectedData().clear(); + firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); + firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); + } + + public void removeAllSelectedReferentiel() { + getSelectedReferentiel().clear(); + firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); + } + + public void setDatas(Map<String, List<String>> datas) { + this.datas = datas; + + // on compte le count de marées totale + int nbTrips = 0; + if (datas != null) { + for (List<String> marees : datas.values()) { + nbTrips += marees.size(); + } + } + this.nbTrips = nbTrips; + + if (log.isDebugEnabled()) { + log.debug("Nb program registred : " + (datas == null ? 0 : datas.size())); + log.debug("Nb trip registred : " + this.nbTrips); + } + firePropertyChange(PROPERTY_DATAS, datas); + } + + public void addSelectedData(String id) { + + if (Trips.isTripId(id)) { + + // ajout d'une marée + if (log.isDebugEnabled()) { + log.debug("Add Trip " + id); + } + getSelectedData().add(id); + } else if (id.startsWith(Program.class.getName())) { + + // ajout de toutes les marées du program + + if (log.isDebugEnabled()) { + log.debug("Add all trips of program " + id); + } + getSelectedData().addAll(datas.get(id)); + } + + + firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); + } + + public void addAllSelectedData() { + if (log.isDebugEnabled()) { + log.debug("All all data."); + } + for (List<String> p : datas.values()) { + getSelectedData().addAll(p); + } + firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); + } + + public void removeSelectedData(String id) { + if (Trips.isTripId(id)) { + + // ajout d'une marée + if (log.isDebugEnabled()) { + log.debug("Remove maree " + id); + } + getSelectedData().remove(id); + } else if (id.startsWith(Program.class.getName())) { + + // ajout de toutes les marées du program + + if (log.isDebugEnabled()) { + log.debug("Remove all marees of program " + id); + } + getSelectedData().removeAll(datas.get(id)); + } + firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); + } + + public void removeAllSelectedData() { + if (selectedData != null) { + selectedData.clear(); + } + firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); + } + + public void addPropertyChangeListener(PropertyChangeListener listener) { + pcs.addPropertyChangeListener(listener); + } + + public void addPropertyChangeListener(String propertyName, + PropertyChangeListener listener) { + pcs.addPropertyChangeListener(propertyName, listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + pcs.removePropertyChangeListener(listener); + } + + public void removePropertyChangeListener(String propertyName, + PropertyChangeListener listener) { + pcs.removePropertyChangeListener(propertyName, listener); + } + + protected void firePropertyChange(String propertyName, Object newValue) { + pcs.firePropertyChange(propertyName, null, newValue); + } + + protected void firePropertyChange(String propertyName, + Object oldValue, + Object newValue) { + pcs.firePropertyChange(propertyName, oldValue, newValue); + } + + protected void checkReferentielType(Class<?> type) { + if (!referentiel.contains(type)) { + throw new IllegalArgumentException( + "given <" + type + "> is not in referentiel universe : " + + referentiel); + } + } + + public void destroy() { + removeAll(); + // suppression de tous les listeners + PropertyChangeListener[] listeners = pcs.getPropertyChangeListeners(); + for (PropertyChangeListener l : listeners) { + removePropertyChangeListener(l); + } + } + + @Override + protected void finalize() throws Throwable { + super.finalize(); + destroy(); + } +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/util/SecurityModel.java b/observe-application-swing/src/main/java/fr/ird/observe/db/util/SecurityModel.java new file mode 100644 index 0000000..b0223aa --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/util/SecurityModel.java @@ -0,0 +1,217 @@ +/* + * #%L + * ObServe :: Business + * %% + * 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% + */ +package fr.ird.observe.db.util; + +import com.google.common.base.Function; +import com.google.common.collect.Iterables; +import com.google.common.collect.Sets; + +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.io.Serializable; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import java.util.TreeMap; + +/** + * Le modèle la sécurité à appliquer sur une base postgres + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.4 + */ +public class SecurityModel implements Serializable { + + public static final String PROPERTY_ADMINISTRATEUR = "administrateur"; + + public static final String PROPERTY_ROLE = "role"; + + public static final String PROPERTY_ASSIGNED = "assigned"; + + private static final long serialVersionUID = 1L; + + public static final Function<String, String> ESCAPE_STRING = new Function<String, String>() { + @Override + public String apply(String input) { + return "\"" + input + "\""; + } + }; + + public enum Role { + unused, + referentiel, + utilisateur, + technicien + } + + protected String administrateur; + + protected SortedMap<String, Role> map; + + protected PropertyChangeSupport pcs = new PropertyChangeSupport(this); + + public SecurityModel() { + map = new TreeMap<String, Role>(); + } + + public String getAdministrateur() { + return administrateur; + } + + public Role getRole(String role) { + return map.get(role); + } + + public Set<String> getRole(Role role) { + Set<String> roles = new HashSet<String>(); + for (Map.Entry<String, Role> entry : map.entrySet()) { + if (role.equals(entry.getValue())) { + roles.add(entry.getKey()); + } + } + return roles; + } + + public Set<String> getRole() { + return map.keySet(); + } + + public Set<String> getTechnicien() { + return getRole(Role.technicien); + } + + public Set<String> getUtilisateur() { + return getRole(Role.utilisateur); + } + + public Set<String> getReferentiel() { + return getRole(Role.referentiel); + } + + public Set<String> getEscapedReferentiel() { + Set<String> result = Sets.newHashSet( + Iterables.transform(getReferentiel(), ESCAPE_STRING)); + return result; + } + + public Set<String> getEscapedTechnicien() { + Set<String> result = Sets.newHashSet( + Iterables.transform(getTechnicien(), ESCAPE_STRING)); + return result; + } + + public Set<String> getEscapedUtilisateur() { + Set<String> result = Sets.newHashSet( + Iterables.transform(getUtilisateur(), ESCAPE_STRING)); + return result; + } + + public String getEscapedAdministrateur() { + return ESCAPE_STRING.apply(getAdministrateur()); + } + + public Set<String> getUnused() { + return getRole(Role.unused); + } + + public Set<String> getEscapedUnused() { + Set<String> result = Sets.newHashSet( + Iterables.transform(getUnused(), ESCAPE_STRING)); + return result; + } + + public boolean isRole(Role r, String role) { + return r.equals(getRole(role)); + } + + public void setAdministrateur(String administrateur) { + Object oldvalue = this.administrateur; + this.administrateur = administrateur; + firePropertyChange(PROPERTY_ADMINISTRATEUR, oldvalue, administrateur); + } + + public void init(Iterable<String> role) { + map.clear(); + if (role != null) { + for (String r : role) { + // by default let's say that any role is not used + // (make it quicker then to only give correct access) + map.put(r, Role.unused); + } + } + firePropertyChange(PROPERTY_ROLE, null, getRole()); + firePropertyChange(PROPERTY_ASSIGNED, null, getAssigned()); + } + + public void setRole(String name, Role role, boolean fire) { + map.put(name, role); + if (fire) { + if (role != null) { + firePropertyChange(role.name(), null, getRole(role)); + } + firePropertyChange(PROPERTY_ASSIGNED, null, getAssigned()); + } + } + + public void setRole(Iterable<String> roles, Role role) { + for (String r : roles) { + setRole(r, role, false); + } + firePropertyChange(role.name(), null, getRole(role)); + firePropertyChange(PROPERTY_ASSIGNED, null, getAssigned()); + } + + public int getAssigned() { + int count = 0; + for (Map.Entry<String, Role> entry : map.entrySet()) { + if (entry.getValue() != null) { + count++; + } + } + return count; + } + + public void addPropertyChangeListener(PropertyChangeListener listener) { + pcs.addPropertyChangeListener(listener); + } + + public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { + pcs.addPropertyChangeListener(propertyName, listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + pcs.removePropertyChangeListener(listener); + } + + public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { + pcs.removePropertyChangeListener(propertyName, listener); + } + + protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { + pcs.firePropertyChange(propertyName, oldValue, newValue); + } + + protected void firePropertyChange(String propertyName, Object newValue) { + firePropertyChange(propertyName, null, newValue); + } +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/gps/GPSFileReader.java b/observe-application-swing/src/main/java/fr/ird/observe/gps/GPSFileReader.java new file mode 100644 index 0000000..7f78c43 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/gps/GPSFileReader.java @@ -0,0 +1,356 @@ +/* + * #%L + * ObServe :: Business + * %% + * 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% + */ +package fr.ird.observe.gps; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; +import org.xmlpull.v1.XmlPullParserFactory; + +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * Classe responsable de la construction du modèle {@link GPSRoute} à partir + * d'un fichier de traces GPS au format <code>GPX</code>. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.0 + */ +public class GPSFileReader { + + /** log */ + private static final Log log = LogFactory.getLog(GPSFileReader.class); + + public static final String ROUTE_TAG = "trk"; + + public static final String SEGMENT_TAG = "trkseg"; + + public static final String POINT_TAG = "trkpt"; + + public static final String TIME_TAG = "time"; + + public static final String SPEED_TAG = "speed"; + + public static final String LATITUDE_ATTR = "lat"; + + public static final String LONGITUDE_ATTR = "lon"; + + /** le fichier à importer */ + protected final File source; + + /** le délai en minutes acceptable entre deux points */ + protected final int maxDelay; + + /** la vitesse maximum autorisée entre 2 points en noeud */ + protected final float maxSpeed; + + protected final GPSService service; + + public GPSFileReader(GPSService service, + File source, + int maxDelay, + float maxSpeed) { + this.service = service; + this.source = source; + this.maxDelay = maxDelay; + this.maxSpeed = maxSpeed; + } + + public GPSRoute read() throws Exception { + if (source == null) { + throw new NullPointerException("la source ne doit pas être nulle"); + } + if (!source.exists() || !source.isFile()) { + throw new IllegalArgumentException("le fichier source '" + source + "' n'existe pas ou n'est pas un fichier"); + } + + GPSRoute model = new GPSRouteImpl(); + + XmlPullParserFactory factory = XmlPullParserFactory.newInstance( + System.getProperty(XmlPullParserFactory.PROPERTY_NAME), null); + factory.setNamespaceAware(true); + XmlPullParser xpp = factory.newPullParser(); + FileReader fileReader = new FileReader(source); + + try { + xpp.setInput(fileReader); + + parseFile(xpp, model); + } finally { + fileReader.close(); + } + + return model; + } + + /** + * Détecte sur l'ensemble des points de la route ceux qui sont acceptables, + * c'est à dire que l'on accepte uniquement les points dont les intervalles + * de temps ne dépassent pas {@link #maxDelay}. + * <p/> + * Les intervalles de poinbts acceptables seront contenus dans {@link + * GPSRoute#acceptedInterval}, les intervalles rejetés seront sauvés dans + * {@link GPSRoute#rejectedInterval} + * + * @param route la route à traiter + */ + public void detectIntervals(GPSRoute route) { + if (log.isInfoEnabled()) { + log.info("starting... for " + this); + } + List<GPSPointInterval> acceptedList = new ArrayList<GPSPointInterval>(); + List<GPSPointInterval> rejectedList = new ArrayList<GPSPointInterval>(); + GPSPointInterval currentAccepted = null; + GPSPointInterval currentRejected = null; + GPSPoint previous = null; + // le delai acceptable entre deux points en millisecondes + long delay = getMaxSpeedAsMilliSecondes(); + + for (GPSPoint p : route.getPoint()) { + if (log.isTraceEnabled()) { + log.trace("test point " + p); + } + if (previous == null) { + // premeir point rencontré, rien à faire + previous = p; + continue; + } + long delta = service.getDelay(previous, p); + if (delta <= delay) { + // le point courant est acceptable + // on l'enregistre dans l'intervalle accepté + if (log.isDebugEnabled()) { + log.debug("accepted point: " + p + ", delta: " + delta); + } + + if (currentRejected != null) { + // on etait sur un intervalle de rejet + // il faut le fermer et l'enregister dans le modèle + rejectedList.add(currentRejected); + currentRejected = null; + } + if (currentAccepted == null) { + currentAccepted = new GPSPointIntervalImpl(); + currentAccepted.setPoint(new ArrayList<GPSPoint>()); + currentAccepted.addPoint(previous); + } + currentAccepted.addPoint(p); + previous = p; + continue; + } + + // le point courant n'est pas acceptable + // on l'enregistre dans l'intervalle courant de rejet + + if (log.isDebugEnabled()) { + log.debug("rejected point: " + p + ", delta: " + delta); + } + if (currentAccepted != null) { + // on était sur un intervall accepté, on doit le fermer + // et l'enregistre dans le modèle + acceptedList.add(currentAccepted); + currentAccepted = null; + } + if (currentRejected == null) { + // nouvelle intervalle de rejet + currentRejected = new GPSPointIntervalImpl(); + currentRejected.setPoint(new ArrayList<GPSPoint>()); + currentRejected.addPoint(previous); + } + currentRejected.addPoint(p); + previous = p; + } + + if (currentAccepted != null) { + // ajout de l'intervalle accepté + acceptedList.add(currentAccepted); + } + + if (currentRejected != null) { + // ajout de l'intervalle rejeté + rejectedList.add(currentRejected); + } + + // on enregistre les intervalles dans le modèle + if (!acceptedList.isEmpty()) { + route.setAcceptedInterval(acceptedList); + } + if (!rejectedList.isEmpty()) { + route.setRejectedInterval(rejectedList); + } + + } + + @Override + public String toString() { + String result = new ToStringBuilder(this).append("source", source). + append("maxDelay (ms)", getMaxSpeedAsMilliSecondes()). + append("maxSpeed (nd)", maxSpeed). + toString(); + return result; + } + + protected long getMaxSpeedAsMilliSecondes() { + return maxDelay * 60 * 1000; + } + + /** + * Parse le fichier xml donné et construit le modèle. + * <p/> + * Pour le moment on se limite à traiter le premier segment + * (<code>trkseg</code>) de la première route (<code>trk</code>). + * <p/> + * Lors de la découverte des points, on ne retient pas les points dont la + * vitesse par rapport au précédent point dépasse {@link + * #getMaxSpeedAsMilliSecondes()}. + * + * @param xpp le parser xml + * @param model le model à remplir + * @throws IOException + * @throws XmlPullParserException + * @throws ParseException + */ + protected void parseFile(XmlPullParser xpp, + GPSRoute model) throws IOException, XmlPullParserException, ParseException { + List<GPSPoint> points = new ArrayList<GPSPoint>(); + GPSPoint previousPoint = null; + GPSPoint currentPoint = null; + boolean findRoute = false; + boolean findSegment = false; + int elementType; + + String localName; + + if (xpp.getEventType() == XmlPullParser.START_DOCUMENT) { + xpp.next(); + } + + // recherche du premier segment de la première route + while (xpp.next() != XmlPullParser.END_DOCUMENT) { + // nouveau tag + localName = xpp.getName(); + if (ROUTE_TAG.equals(localName)) { + findRoute = true; + break; + } + } + if (!findRoute) { + // aucune route trouvée + return; + } + while ((elementType = xpp.next()) != XmlPullParser.END_DOCUMENT) { + // nouveau tag + localName = xpp.getName(); + if (SEGMENT_TAG.equals(localName)) { + findSegment = true; + break; + } + } + if (!findSegment) { + // aucun segment trouvé + return; + } + + String content; + + //format de type : 2007-11-09T04:54:27.000Z + DateFormat df = new SimpleDateFormat("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'SSSS'Z'"); + + Float f; + while ((elementType = xpp.next()) != XmlPullParser.END_DOCUMENT) { + localName = xpp.getName(); + if (elementType == XmlPullParser.START_TAG) { + // debut d'un tag + if (POINT_TAG.equals(localName)) { + // debut d'un point + currentPoint = new GPSPointImpl(); + content = xpp.getAttributeValue(null, LATITUDE_ATTR); + f = Float.valueOf(content); + currentPoint.setLatitude(f); + content = xpp.getAttributeValue(null, LONGITUDE_ATTR); + f = Float.valueOf(content); + currentPoint.setLongitude(f); + continue; + } + if (TIME_TAG.equals(localName)) { + // tag de time + content = xpp.nextText(); + + Date d = df.parse(content); + currentPoint.setTime(d); + continue; + } + if (SPEED_TAG.equals(localName)) { + // tag de vitesse + content = xpp.nextText(); + f = Float.valueOf(content); + currentPoint.setVitesse(f); + continue; + } + + // les autres tags en ouverture ne sont pas traités pour le moment + continue; + } + if (elementType == XmlPullParser.END_TAG) { + // fin d'un tag + if (POINT_TAG.equals(localName)) { + // fin d'un point + boolean canAccept = true; + if (previousPoint != null) { + // on vérifie que la vitesse entrez les deux points + // est acceptable + float speed = service.getSpeed(previousPoint, currentPoint); + if (speed > maxSpeed) { + // on ne peut pas accepter ce point + canAccept = false; + } + } + if (canAccept) { + // le point est acceptable, on le conserve + points.add(currentPoint); + // et il passe en nouveau point de reference + previousPoint = currentPoint; + } + currentPoint = null; + continue; + } + if (SEGMENT_TAG.equals(localName)) { + // fin du segment + // on a terminé la lecture du premier segment + // on peut quitter le parsing + break; + } + } + } + model.setPoint(points); + } +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/gps/GPSService.java b/observe-application-swing/src/main/java/fr/ird/observe/gps/GPSService.java new file mode 100644 index 0000000..139323b --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/gps/GPSService.java @@ -0,0 +1,115 @@ +/* + * #%L + * ObServe :: Business + * %% + * 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% + */ +package fr.ird.observe.gps; + +import java.io.File; + +/** + * Service de manipulation GPS. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.3 + */ +public class GPSService { + + /** + * Construit la route gps à partir d'un fichier gps donnée et des deux + * indicateurs {@code maxDelay} et {@code maxSpeed} et la retourne. + * + * @param file le fichier contenant les données gps + * @param maxDelay le maximum de temps entre 2 points + * @param maxSpeed le vitesse maximale en 2 points + * @return la route gps calculée + * @throws Exception pour tout probleme lors la construction de la route + */ + public GPSRoute buildRoute(File file, + int maxDelay, + float maxSpeed) throws Exception { + GPSFileReader reader = new GPSFileReader(this, file, maxDelay, maxSpeed); + GPSRoute r = reader.read(); + reader.detectIntervals(r); + return r; + } + + /** + * Calcule la distance entre deux points (en kilometres). + * <p/> + * Il s'agit d'une approxiation utilisant la méthode d'orthodromie. + * <p/> + * http://fr.wikipedia.org/wiki/Orthodromie + * <p/> + * d = R * arccos(cos(lat1) * cos(lat2) *cos(long2 - long1) + sin(lat1) + * *sin(lat2)) + * + * @param p0 le premier point + * @param p1 le second point + * @return la distance calculée entre les deux points en kilometres. + */ + public double getDistanceInKm(GPSPoint p0, GPSPoint p1) { + double d = GpsPoints.getDistanceInKm(p0, p1); + return d; + } + + /** + * Calcule la distance entre deux points (en miles nautique). + * <p/> + * Il s'agit d'une approxiation utilisant la méthode d'orthodromie. + * <p/> + * http://fr.wikipedia.org/wiki/Orthodromie + * <p/> + * d = R * arccos(cos(lat1) * cos(lat2) *cos(long2 - long1) + sin(lat1) + * *sin(lat2)) + * + * @param p0 le premier point + * @param p1 le second point + * @return la distance calculée entre les deux points en noeud. + */ + public double getDistanceInMile(GPSPoint p0, GPSPoint p1) { + double d = GpsPoints.getDistanceInMile(p0, p1); + return d; + } + + /** + * Calcule la vitesse entre deux points (en noeud). + * + * @param p0 le premier point + * @param p1 le second point + * @return la vitesse calculée entre les deux points en noeud. + */ + public float getSpeed(GPSPoint p0, GPSPoint p1) { + float d = GpsPoints.getSpeed(p0, p1); + return d; + + } + + /** + * Calcule le temps écoulé entre deux points (en millisecondes). + * + * @param p0 le premier point + * @param p1 le second point + * @return le temps écoulé entre les deux points en millisecondes. + */ + public long getDelay(GPSPoint p0, GPSPoint p1) { + return GpsPoints.getDelay(p0, p1); + } + +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx index 4adfb63..2e05b68 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx @@ -26,12 +26,12 @@ <import> fr.ird.observe.ObserveConfig fr.ird.observe.db.DataContext - fr.ird.observe.entities.Trip - fr.ird.observe.entities.Activity - fr.ird.observe.entities.Set - fr.ird.observe.entities.seine.Route - fr.ird.observe.entities.referentiel.Program - fr.ird.observe.entities.constants.ReferenceLocale + fr.ird.observe.services.dto.TripDto + fr.ird.observe.services.dto.ActivityDto + fr.ird.observe.services.dto.SetDto + fr.ird.observe.services.dto.seine.RouteDto + fr.ird.observe.services.dto.referential.ProgramDto + fr.ird.observe.services.dto.constants.ReferenceLocale fr.ird.observe.ui.admin.AdminStep fr.ird.observe.ui.content.ContentUIManager diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java index 2360afa..3221063 100755 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java @@ -28,7 +28,7 @@ import fr.ird.observe.ObserveContext; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.impl.H2DataSource; -import fr.ird.observe.entities.constants.ReferenceLocale; +import fr.ird.observe.services.dto.constants.ReferenceLocaleDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUI; import fr.ird.observe.ui.content.ContentUIManager; @@ -208,11 +208,11 @@ public class ObserveMainUIHandler { reloadDecorators = true; } if (!config.getDbLocale().equals( - decoratorService.getReferentielLocale().getLocale())) { + decoratorService.getReferentialLocale().getLocale())) { if (log.isInfoEnabled()) { log.info("re-init db with locale " + config.getDbLocale()); } - decoratorService.setReferentielLocale( + decoratorService.setReferentialLocale( ReferenceLocale.valueOf(config.getDbLocale())); reloadDecorators = true; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/UIHelper.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/UIHelper.java index 38fef86..adaee02 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/UIHelper.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/UIHelper.java @@ -23,6 +23,7 @@ package fr.ird.observe.ui; import fr.ird.observe.DecoratorService; import fr.ird.observe.ObserveContext; +import fr.ird.observe.services.dto.AbstractObserveDto; import fr.ird.observe.ui.util.table.ObserveBooleanTableCellRenderer; import jaxx.runtime.FileChooserUtil; import jaxx.runtime.JAXXObject; @@ -31,7 +32,6 @@ import jaxx.runtime.swing.renderer.DecoratorTableCellRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; -import org.nuiton.topia.persistence.TopiaEntity; import javax.swing.JOptionPane; import javax.swing.JTable; @@ -270,7 +270,7 @@ public class UIHelper extends SwingUtil { * @return {@code true} si l'utilisateur a confitmé la suppression, * {@code false} sinon. */ - public static <E extends TopiaEntity> boolean confirmForEntityDelete( + public static <E extends AbstractObserveDto> boolean confirmForEntityDelete( JAXXObject parent, Class<E> beanClass, E bean) { @@ -289,7 +289,7 @@ public class UIHelper extends SwingUtil { * @return {@code true} si l'utilisateur a confitmé la suppression, * {@code false} sinon. */ - public static <E extends TopiaEntity> boolean confirmForEntityDelete( + public static <E extends AbstractObserveDto> boolean confirmForEntityDelete( JAXXObject parent, Class<E> beanClass, E bean, @@ -311,18 +311,20 @@ public class UIHelper extends SwingUtil { String type = DecoratorService.getEntityLabel(beanClass); type = t(type); - if (bean == null || bean.getTopiaId() == null || decorator == null) { - // delete new entity - messageDelete = t("observe.message.delete.new", type); - } else { - try { - // delete existing entity - beanStr = decorator.toString(bean); - messageDelete = t("observe.message.delete", type, beanStr); - } catch (Exception e) { - messageDelete = t("observe.message.delete.new", type); - } - } + //FIXME +// if (bean == null || bean.getTopiaId() == null || decorator == null) { +// // delete new entity +// messageDelete = t("observe.message.delete.new", type); +// } else { +// try { +// // delete existing entity +// beanStr = decorator.toString(bean); +// messageDelete = t("observe.message.delete", type, beanStr); +// } catch (Exception e) { +// messageDelete = t("observe.message.delete.new", type); +// } +// } + if (extraMessage != null) { messageDelete += '\n' + extraMessage; } @@ -397,11 +399,12 @@ public class UIHelper extends SwingUtil { }); } - public static <E extends TopiaEntity> E getEntity(List<E> list, E entity) { + public static <E extends AbstractObserveDto> E getEntity(List<E> list, E entity) { for (E e : list) { - if (e.getTopiaId().equals(entity.getTopiaId())) { - return e; - } + //FIXME +// if (e.getTopiaId().equals(entity.getTopiaId())) { +// return e; +// } } return null; } diff --git a/observe-application-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 index cd3a226..422913f 100644 --- a/observe-application-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 @@ -25,7 +25,7 @@ package fr.ird.observe.ui.actions; import fr.ird.observe.ObserveConfig; import fr.ird.observe.ObserveConfigOption; import fr.ird.observe.ObserveContext; -import fr.ird.observe.entities.constants.ReferenceLocale; +import fr.ird.observe.services.dto.constants.ReferenceLocaleDto; import fr.ird.observe.ui.*; import fr.ird.observe.ui.ObserveUICallback; import jaxx.runtime.SwingUtil; diff --git a/observe-application-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 index 95fcad1..e95b4c6 100644 --- a/observe-application-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 @@ -29,8 +29,8 @@ import fr.ird.observe.ObserveContext; import fr.ird.observe.ObserveTechnicalException; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; -import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.referentiel.SpeciesList; +import fr.ird.observe.services.dto.EntitiesDto; +import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.ObserveMainUIHandler; import fr.ird.observe.ui.ObserveUICallback; diff --git a/observe-application-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 index e14330b..21b76a7 100644 --- a/observe-application-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 @@ -22,8 +22,8 @@ package fr.ird.observe.ui.actions.shared; import fr.ird.observe.ObserveContext; -import fr.ird.observe.entities.longline.ActivityLongline; -import fr.ird.observe.entities.seine.ActivitySeine; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.content.ContentUI; import fr.ird.observe.ui.content.list.impl.longline.ActivityLonglinesUI; diff --git a/observe-application-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 index 2705d8e..9491dc7 100644 --- a/observe-application-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 @@ -22,8 +22,8 @@ package fr.ird.observe.ui.actions.shared; import fr.ird.observe.ObserveContext; -import fr.ird.observe.entities.longline.ActivityLongline; -import fr.ird.observe.entities.seine.ActivitySeine; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.content.ContentUI; import fr.ird.observe.ui.content.list.impl.longline.ActivityLonglinesUI; diff --git a/observe-application-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 index 23569e8..1cdebea 100644 --- a/observe-application-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 @@ -21,21 +21,13 @@ */ package fr.ird.observe.ui.admin; -import fr.ird.observe.DataService; import fr.ird.observe.ObserveConfig; -import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.ObserveTechnicalException; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceConfig; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DbMode; -import fr.ird.observe.db.impl.H2DataSource; -import fr.ird.observe.db.impl.PGDataSource; import fr.ird.observe.db.model.DataSelectionModel; -import fr.ird.observe.entities.Trips; -import fr.ird.observe.entities.longline.TripLongline; -import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.report.model.Report; import fr.ird.observe.ui.admin.consolidate.ConsolidateModel; import fr.ird.observe.ui.admin.export.ExportModel; import fr.ird.observe.ui.admin.gps.ImportGPSModel; @@ -329,7 +321,9 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { if (getDbMode() == DbMode.USE_REMOTE) { params = t("observe.storage.remote.db") + " " + getRemoteUrl(); } else { - params = t("observe.storage.locale.db") + " " + getH2Config().getDataDirectory().getAbsolutePath(); + //FIXME +// params = t("observe.storage.locale.db") + " " + getH2Config().getDataDirectory().getAbsolutePath(); + params = null; } txt = t(txt, params); return txt; diff --git a/observe-application-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 index ed72580..ea233a1 100644 --- a/observe-application-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 @@ -22,10 +22,10 @@ package fr.ird.observe.ui.admin.consolidate; import fr.ird.observe.db.DataSource; -import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.admin.AdminActionModel; import fr.ird.observe.ui.admin.AdminStep; import org.nuiton.decorator.Decorator; diff --git a/observe-application-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 index ba8e371..205536c 100644 --- a/observe-application-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 @@ -27,11 +27,11 @@ import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.model.DataSelectionModel; -import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.services.dto.EntitiesDto; +import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.admin.AdminStep; import fr.ird.observe.ui.admin.AdminTabUI; import fr.ird.observe.ui.admin.AdminTabUIHandler; diff --git a/observe-application-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 index 2283d7f..7714a60 100644 --- a/observe-application-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 @@ -24,10 +24,10 @@ package fr.ird.observe.ui.admin.export; import com.google.common.collect.ImmutableList; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.model.DataSelectionModel; -import fr.ird.observe.entities.Trip; -import fr.ird.observe.entities.longline.TripLongline; -import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.services.dto.TripDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.admin.AdminActionModel; import fr.ird.observe.ui.admin.AdminStep; import org.apache.commons.collections4.CollectionUtils; diff --git a/observe-application-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 index 7f76253..42cf398 100644 --- a/observe-application-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 @@ -24,10 +24,10 @@ package fr.ird.observe.ui.admin.export; import fr.ird.observe.DecoratorService; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.model.DataSelectionModel; -import fr.ird.observe.entities.Trip; -import fr.ird.observe.entities.longline.TripLongline; -import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.services.dto.TripDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.admin.AdminStep; import fr.ird.observe.ui.admin.AdminTabUI; diff --git a/observe-application-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 index b49ff82..42b9ec9 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.admin.export; -import fr.ird.observe.entities.Trip; +import fr.ird.observe.services.dto.TripDto; import java.io.Serializable; diff --git a/observe-application-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 index 1612302..cc71c7d 100644 --- a/observe-application-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 @@ -21,8 +21,8 @@ */ package fr.ird.observe.ui.admin.export; -import fr.ird.observe.entities.Trip; -import fr.ird.observe.entities.referentiel.Program; +import fr.ird.observe.services.dto.TripDto; +import fr.ird.observe.services.dto.referential.ProgramDto; import javax.swing.table.AbstractTableModel; import java.util.HashSet; diff --git a/observe-application-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 index 04dded3..e2cd70d 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.admin.gps; -import fr.ird.observe.entities.GPSAble; +import fr.ird.observe.services.dto.GPSAbleDto; import org.nuiton.i18n.I18n; import javax.swing.table.AbstractTableModel; diff --git a/observe-application-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 index eaf7d2d..f542906 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.admin.gps; import fr.ird.observe.ObserveContext; -import fr.ird.observe.entities.seine.ActivitySeine; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.gps.GPSPoint; import org.nuiton.decorator.Decorator; import org.nuiton.i18n.I18n; diff --git a/observe-application-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 index 96bfa69..bbc9ccc 100644 --- a/observe-application-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 @@ -27,8 +27,7 @@ <fr.ird.observe.ui.admin.AdminTabUI> <import> - fr.ird.observe.entities.seine.ActivitySeine - fr.ird.observe.entities.seine.ActivitySeineImpl + fr.ird.observe.services.dto.seine.ActivitySeineDto fr.ird.observe.ui.admin.AdminUI fr.ird.observe.ui.admin.AdminStep @@ -45,7 +44,7 @@ <ImportGPSUIHandler id='handler' constructorParams='this'/> - <ActivitySeine id='selectedActivite' javaBean='new ActivitySeineImpl()'/> + <ActivitySeineDto id='selectedActivite' javaBean='new ActivitySeineDto()'/> <ImportGPSModel id='stepModel' initializer='getModel().getImportGPSModel()'/> diff --git a/observe-application-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 index b440c9c..3de45fd 100644 --- a/observe-application-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 @@ -23,10 +23,10 @@ package fr.ird.observe.ui.admin.gps; import fr.ird.observe.DecoratorService; import fr.ird.observe.db.DataSource; -import fr.ird.observe.entities.OpenableEntities; -import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.entities.seine.Route; -import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.services.dto.OpenableEntitiesDto; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.gps.GPSPoint; import fr.ird.observe.gps.GPSPointInterval; import fr.ird.observe.gps.GPSRoute; diff --git a/observe-application-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 index cee1fc3..5aa079d 100644 --- a/observe-application-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 @@ -21,9 +21,8 @@ */ package fr.ird.observe.ui.admin.report; -import fr.ird.observe.report.ReportBuilder; -import fr.ird.observe.report.model.Report; -import fr.ird.observe.report.model.ReportExecute; +import fr.ird.observe.services.service.actions.report.ReportBuilder; +import fr.ird.observe.services.service.actions.report.model.Report; import fr.ird.observe.ui.admin.AdminActionModel; import fr.ird.observe.ui.admin.AdminStep; import org.apache.commons.logging.Log; @@ -98,19 +97,21 @@ public class ReportModel extends AdminActionModel { /** Pour copier les entêtes de colonnes */ protected boolean copyColumnHeaders = true; - protected ReportExecute reportExecute; + //FIXME +// protected ReportExecute reportExecute; public ReportModel() { super(AdminStep.REPORT); variables = new TreeMap<String, Object>(); } - public ReportExecute getReportExecute() { - if (reportExecute == null) { - reportExecute = new ReportExecute(); - } - return reportExecute; - } + //FIXME +// public ReportExecute getReportExecute() { +// if (reportExecute == null) { +// reportExecute = new ReportExecute(); +// } +// return reportExecute; +// } public List<Report> loadReports(URL resource) throws IOException { diff --git a/observe-application-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 index e6ec6d0..6944485 100644 --- a/observe-application-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 @@ -30,7 +30,7 @@ fr.ird.observe.ui.admin.AdminStep fr.ird.observe.ui.admin.AdminTabUI fr.ird.observe.ui.admin.AdminUI - fr.ird.observe.report.model.Report + fr.ird.observe.services.service.actions.report.model.Report java.awt.Dimension diff --git a/observe-application-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 index 770d58c..22737de 100644 --- a/observe-application-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 @@ -24,10 +24,9 @@ package fr.ird.observe.ui.admin.report; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.model.DataSelectionModel; -import fr.ird.observe.report.model.DataMatrix; -import fr.ird.observe.report.model.Report; -import fr.ird.observe.report.model.ReportExecute; -import fr.ird.observe.report.model.ReportVariable; +import fr.ird.observe.services.service.actions.report.model.DataMatrix; +import fr.ird.observe.services.service.actions.report.model.Report; +import fr.ird.observe.services.service.actions.report.model.ReportVariable; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.admin.AdminStep; import fr.ird.observe.ui.admin.AdminTabUI; @@ -47,15 +46,9 @@ import org.nuiton.decorator.JXPathDecorator; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.TimeLog; -import javax.swing.DefaultListCellRenderer; -import javax.swing.JComboBox; -import javax.swing.JList; -import javax.swing.JPanel; -import javax.swing.JTable; -import javax.swing.SwingUtilities; +import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; -import java.awt.Component; -import java.awt.Font; +import java.awt.*; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.beans.PropertyChangeEvent; @@ -392,13 +385,14 @@ public class ReportUIHandler extends AdminTabUIHandler { protected void onVariablesChanges(ReportModel model, Map<String, Object> variables) { - ReportExecute execute = getReportExecute(model); - if (execute == null) { - - // l'executeur n'est plus disponible, on ne fait rien - return; - } - updateValidState(execute, variables); + //FIXME +// ReportExecute execute = getReportExecute(model); +// if (execute == null) { +// +// // l'executeur n'est plus disponible, on ne fait rien +// return; +// } +// updateValidState(execute, variables); } protected void onValidChanged(ReportModel model, boolean valid) { @@ -415,13 +409,14 @@ public class ReportUIHandler extends AdminTabUIHandler { getModel().setBusy(true); try { - ReportExecute execute = getReportExecute(model); - - if (execute == null) { - - // l'executeur n'est plus disponible, on ne fait rien - return; - } + //FIXME +// ReportExecute execute = getReportExecute(model); +// +// if (execute == null) { +// +// // l'executeur n'est plus disponible, on ne fait rien +// return; +// } Report report = null; // nettoyage @@ -430,7 +425,8 @@ public class ReportUIHandler extends AdminTabUIHandler { String mareeId = getModel().getSelectedTrip(); - report = execute.getReport(); + //FIXME +// report = execute.getReport(); if (log.isDebugEnabled()) { log.debug("Build result for report [" + report.getName() + "] on " + mareeId); diff --git a/observe-application-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 index d016552..f6b8f1a 100644 --- a/observe-application-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 @@ -21,8 +21,8 @@ */ package fr.ird.observe.ui.admin.report; -import fr.ird.observe.report.model.DataMatrix; -import fr.ird.observe.report.model.Report; +import fr.ird.observe.services.service.actions.report.model.DataMatrix; +import fr.ird.observe.services.service.actions.report.model.Report; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/observe-application-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 index 699e5b1..73ee654 100644 --- a/observe-application-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 @@ -23,10 +23,10 @@ package fr.ird.observe.ui.admin.save; import fr.ird.observe.ObserveDAOHelper; import fr.ird.observe.db.DataSource; -import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.referentiel.Ocean; -import fr.ird.observe.entities.referentiel.Species; -import fr.ird.observe.entities.referentiel.SpeciesList; +import fr.ird.observe.services.dto.EntitiesDto; +import fr.ird.observe.services.dto.referential.OceanDto; +import fr.ird.observe.services.dto.referential.SpeciesDto; +import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.admin.AdminStep; import fr.ird.observe.ui.admin.AdminTabUIHandler; diff --git a/observe-application-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 index c5671e0..13ad4e5 100644 --- a/observe-application-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 @@ -26,8 +26,8 @@ import fr.ird.observe.ObserveDAOHelper; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; -import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.services.dto.EntitiesDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.admin.AdminStep; import fr.ird.observe.ui.admin.AdminTabUI; diff --git a/observe-application-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 index 799a043..16a32d1 100644 --- a/observe-application-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 @@ -28,9 +28,9 @@ import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.model.DataSelectionModel; -import fr.ird.observe.entities.Trip; -import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.services.dto.TripDto; +import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.admin.AdminStep; import fr.ird.observe.ui.admin.AdminTabUI; diff --git a/observe-application-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 index d88d4d8..c130a47 100644 --- a/observe-application-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 @@ -43,7 +43,7 @@ fr.ird.observe.ui.actions.shared.GoDownUIAction fr.ird.observe.ui.tree.ObserveTreeHelper - org.nuiton.topia.persistence.TopiaEntity + fr.ird.observe.services.dto.AbstractObserveDto org.jdesktop.jxlayer.JXLayer @@ -76,7 +76,7 @@ <ContentUIHandler id='handler' genericType='E' initializer='ContentUIHandler.newHandler(this)'/> - <TopiaEntity id='bean' initializer='model.getBean()'/> + <AbstractObserveDto id='bean' initializer='model.getBean()'/> <!-- icon of the content --> <Icon id='contentIcon' javaBean='null'/> diff --git a/observe-application-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 index 87d4411..27569c9 100644 --- a/observe-application-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 @@ -32,7 +32,8 @@ import fr.ird.observe.db.DataSource; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.db.util.TopiaExecutor; import fr.ird.observe.db.util.TopiaExecutor2; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.services.dto.referential.ReferenceEntityDto; +import fr.ird.observe.services.dto.AbstractObserveDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.actions.shared.AbstractUIAction; import fr.ird.observe.ui.content.ref.ContentReferenceUIHandler; @@ -79,22 +80,23 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public abstract class ContentUIHandler<E extends TopiaEntity> { +public abstract class ContentUIHandler<E extends AbstractObserveDto> { /** Logger */ static private final Log log = LogFactory.getLog(ContentUIHandler.class); protected final String prefix; - private final TopiaExecutor<E> loadExecutor; - - private final TopiaExecutor2<? extends TopiaEntity, E> preCreateExecutor; - - private final TopiaExecutor2<? extends TopiaEntity, E> createExecutor; - - private final TopiaExecutor2<? extends TopiaEntity, E> updateExecutor; - - private final TopiaExecutor2<? extends TopiaEntity, E> deleteExecutor; + //FIXME +// private final TopiaExecutor<E> loadExecutor; +// +// private final TopiaExecutor2<? extends TopiaEntity, E> preCreateExecutor; +// +// private final TopiaExecutor2<? extends TopiaEntity, E> createExecutor; +// +// private final TopiaExecutor2<? extends TopiaEntity, E> updateExecutor; +// +// private final TopiaExecutor2<? extends TopiaEntity, E> deleteExecutor; private final DataContextType parentType; @@ -113,37 +115,42 @@ public abstract class ContentUIHandler<E extends TopiaEntity> { if (log.isDebugEnabled()) { log.debug("New handler [" + this + "] for ui " + prefix); } - loadExecutor = new TopiaExecutor<E>() { - @Override - public void execute(TopiaContext tx, E bean) throws TopiaException { - onLoad(tx, bean); - } - }; - preCreateExecutor = new TopiaExecutor2<TopiaEntity, E>() { - @Override - public E execute(TopiaContext tx, TopiaEntity parentBean, E bean) throws TopiaException { - return onPreCreate(tx, parentBean, bean); - } - }; - createExecutor = new TopiaExecutor2<TopiaEntity, E>() { - @Override - public E execute(TopiaContext tx, TopiaEntity parentBean, E bean) throws TopiaException { - return onCreate(tx, parentBean, bean); - } - }; - updateExecutor = new TopiaExecutor2<TopiaEntity, E>() { - @Override - public E execute(TopiaContext tx, TopiaEntity parentBean, E bean) throws TopiaException { - return onUpdate(tx, parentBean, bean); - } - }; - deleteExecutor = new TopiaExecutor2<TopiaEntity, E>() { - @Override - public E execute(TopiaContext tx, TopiaEntity parentBean, E beanToDelete) throws TopiaException { - onDelete(tx, parentBean, beanToDelete); - return null; - } - }; + //FIXME +// loadExecutor = new TopiaExecutor<E>() { +// @Override +// public void execute(TopiaContext tx, E bean) throws TopiaException { +// onLoad(tx, bean); +// } +// }; + //FIXME +// preCreateExecutor = new TopiaExecutor2<TopiaEntity, E>() { +// @Override +// public E execute(TopiaContext tx, TopiaEntity parentBean, E bean) throws TopiaException { +// return onPreCreate(tx, parentBean, bean); +// } +// }; + //FIXME +// createExecutor = new TopiaExecutor2<TopiaEntity, E>() { +// @Override +// public E execute(TopiaContext tx, TopiaEntity parentBean, E bean) throws TopiaException { +// return onCreate(tx, parentBean, bean); +// } +// }; + //FIXME +// updateExecutor = new TopiaExecutor2<TopiaEntity, E>() { +// @Override +// public E execute(TopiaContext tx, TopiaEntity parentBean, E bean) throws TopiaException { +// return onUpdate(tx, parentBean, bean); +// } +// }; + //FIXME +// deleteExecutor = new TopiaExecutor2<TopiaEntity, E>() { +// @Override +// public E execute(TopiaContext tx, TopiaEntity parentBean, E beanToDelete) throws TopiaException { +// onDelete(tx, parentBean, beanToDelete); +// return null; +// } +// }; errorIcon = UIManager.getIcon("action.error"); } @@ -163,10 +170,10 @@ public abstract class ContentUIHandler<E extends TopiaEntity> { } } - - protected static void attachTopiaContext(DataSource service, TopiaEntityAbstract entity) { - DBHelper.attachTopiaContext(service.getRootCtxt(), entity); - } + //FIXME +// protected static void attachTopiaContext(DataSource service, TopiaEntityAbstract entity) { +// DBHelper.attachTopiaContext(service.getRootCtxt(), entity); +// } public static ObserveTreeHelper getTreeHelper(JAXXContext context) { return context.getContextValue(ObserveTreeHelper.class); @@ -373,7 +380,8 @@ public abstract class ContentUIHandler<E extends TopiaEntity> { //FIXME chemit 20100913 : il vaudrait le faire uniquement lors de l'édition // chaque arrive sur un ecran invalide le cache de validation - ObserveServiceHelper.getValidationContext().cleanCache(); + //FIXME +// ObserveServiceHelper.getValidationContext().cleanCache(); if (log.isDebugEnabled()) { log.debug("ui " + ui.getClass()); @@ -400,15 +408,17 @@ public abstract class ContentUIHandler<E extends TopiaEntity> { return icon; } - protected void onLoad(TopiaContext tx, E bean) throws TopiaException { - - // par defaut on charge l'objet de la base dans le bean d'édition - getLoadBinder().load(bean, getBean(), true); - } +//FIXME +// protected void onLoad(TopiaContext tx, E bean) throws TopiaException { +// +// // par defaut on charge l'objet de la base dans le bean d'édition +// getLoadBinder().load(bean, getBean(), true); +// } - protected E onPreCreate(TopiaContext tx, Object parentBean, E bean) throws TopiaException { - return bean; - } + //FIXME +// protected E onPreCreate(TopiaContext tx, Object parentBean, E bean) throws TopiaException { +// return bean; +// } public void startEditUI(String... binding) { @@ -432,8 +442,8 @@ public abstract class ContentUIHandler<E extends TopiaEntity> { } public void stopEditUI() { - - ObserveServiceHelper.getValidationContext().cleanCache(); +//FIXME +// ObserveServiceHelper.getValidationContext().cleanCache(); ContentUIModel<E> model = getModel(); @@ -525,12 +535,13 @@ public abstract class ContentUIHandler<E extends TopiaEntity> { } } - protected boolean doSave(E bean, - DataService dataService, - DataSource dataSource, - TopiaEntityBinder<E> binder) throws Exception { - return false; - } +//FIXME +// protected boolean doSave(E bean, +// DataService dataService, +// DataSource dataSource, +// TopiaEntityBinder<E> binder) throws Exception { +// return false; +// } protected void afterSave(boolean refresh) { @@ -591,12 +602,13 @@ public abstract class ContentUIHandler<E extends TopiaEntity> { } } - protected boolean doDelete(E bean, - DataService dataService, - DataSource dataSource, - TopiaExecutor2<? extends TopiaEntity, E> deletor) throws Exception { - return false; - } +//FIXME +// protected boolean doDelete(E bean, +// DataService dataService, +// DataSource dataSource, +// TopiaExecutor2<? extends TopiaEntity, E> deletor) throws Exception { +// return false; +// } protected boolean askToDelete(E bean) { boolean accept = diff --git a/observe-application-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 index aad26b8..f38141a 100644 --- a/observe-application-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 @@ -29,9 +29,9 @@ import fr.ird.observe.DecoratorService; import fr.ird.observe.ObserveContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; -import fr.ird.observe.entities.constants.ReferenceStatus; -import fr.ird.observe.entities.referentiel.ReferenceEntities; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.services.dto.constants.ReferenceStatusDto; +import fr.ird.observe.services.dto.referential.ReferenceEntitiesDto; +import fr.ird.observe.services.dto.referential.ReferenceEntityDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.actions.shared.AbstractUIAction; import fr.ird.observe.ui.util.BooleanEditor; diff --git a/observe-application-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 index 74fa1a3..1ecbbcb 100644 --- a/observe-application-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 @@ -21,53 +21,10 @@ */ package fr.ird.observe.ui.content; -import fr.ird.observe.ObserveEntityEnum; -import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.constants.GearType; -import fr.ird.observe.entities.longline.ActivityLongline; -import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.entities.longline.TripLongline; -import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.entities.seine.FloatingObject; -import fr.ird.observe.entities.seine.Route; -import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.ui.ObserveMainUI; -import fr.ird.observe.ui.content.impl.longline.LonglineDetailCompositionUI; -import fr.ird.observe.ui.content.impl.longline.LonglineGlobalCompositionUI; -import fr.ird.observe.ui.content.impl.longline.SetLonglineUI; -import fr.ird.observe.ui.content.impl.seine.ActivitySeineObservedSystemUI; -import fr.ird.observe.ui.content.impl.seine.FloatingObjectTransmittingBuoyOperationUI; -import fr.ird.observe.ui.content.impl.seine.FloatingObjectUI; -import fr.ird.observe.ui.content.impl.seine.SetSeineUI; -import fr.ird.observe.ui.content.list.impl.longline.ActivityLonglinesUI; -import fr.ird.observe.ui.content.list.impl.longline.TripLonglinesUI; -import fr.ird.observe.ui.content.list.impl.seine.ActivitySeinesUI; -import fr.ird.observe.ui.content.list.impl.seine.RoutesUI; -import fr.ird.observe.ui.content.list.impl.seine.TripSeinesUI; -import fr.ird.observe.ui.content.open.impl.longline.ActivityLonglineUI; -import fr.ird.observe.ui.content.open.impl.longline.TripLonglineUI; -import fr.ird.observe.ui.content.open.impl.seine.ActivitySeineUI; -import fr.ird.observe.ui.content.open.impl.seine.RouteUI; -import fr.ird.observe.ui.content.open.impl.seine.TripSeineUI; -import fr.ird.observe.ui.content.ref.ContentReferenceUI; -import fr.ird.observe.ui.content.ref.ReferenceHomeUI; -import fr.ird.observe.ui.content.table.impl.longline.CatchLonglineUI; -import fr.ird.observe.ui.content.table.impl.longline.EncounterUI; -import fr.ird.observe.ui.content.table.impl.longline.GearUseFeaturesLonglineUI; -import fr.ird.observe.ui.content.table.impl.longline.SensorUsedUI; -import fr.ird.observe.ui.content.table.impl.longline.TdrUI; -import fr.ird.observe.ui.content.table.impl.seine.GearUseFeaturesSeineUI; -import fr.ird.observe.ui.content.table.impl.seine.NonTargetCatchUI; -import fr.ird.observe.ui.content.table.impl.seine.NonTargetSampleUI; -import fr.ird.observe.ui.content.table.impl.seine.ObjectObservedSpeciesUI; -import fr.ird.observe.ui.content.table.impl.seine.ObjectSchoolEstimateUI; -import fr.ird.observe.ui.content.table.impl.seine.SchoolEstimateUI; -import fr.ird.observe.ui.content.table.impl.seine.TargetCatchUI; -import fr.ird.observe.ui.content.table.impl.seine.TargetDiscardCatchUI; -import fr.ird.observe.ui.content.table.impl.seine.TargetSampleCaptureUI; -import fr.ird.observe.ui.content.table.impl.seine.TargetSampleRejeteUI; +import fr.ird.observe.services.dto.constants.*; +import fr.ird.observe.services.dto.longline.*; +import fr.ird.observe.services.dto.referential.*; +import fr.ird.observe.services.dto.seine.*; import fr.ird.observe.ui.tree.ObserveNode; import jaxx.runtime.JAXXContext; import jaxx.runtime.context.JAXXInitialContext; @@ -77,8 +34,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaEntity; -import javax.swing.JComponent; -import javax.swing.JPanel; +import javax.swing.*; import java.lang.reflect.Constructor; import java.util.Map; import java.util.TreeMap; @@ -111,97 +67,107 @@ public class ContentUIManager { mapping = new TreeMap<String, Class<? extends ObserveContentUI<?>>>(); // --- Seine data --- // - - addMapping(DATA, Program.class, GearType.seine.name(), TripSeinesUI.class); - - addMapping(DATA, TripSeine.class, TripSeineUI.class); - addMapping(DATA, TripSeine.class, n("observe.tree.tripSeine.unsaved"), TripSeineUI.class); - addMapping(DATA, TripSeine.class, TripSeine.PROPERTY_GEAR_USE_FEATURES_SEINE, GearUseFeaturesSeineUI.class); - addMapping(DATA, TripSeine.class, TripSeine.PROPERTY_ROUTE, RoutesUI.class); - - addMapping(DATA, Route.class, RouteUI.class); - addMapping(DATA, Route.class, n("observe.tree.route.unsaved"), RouteUI.class); - addMapping(DATA, Route.class, Route.PROPERTY_ACTIVITY_SEINE, ActivitySeinesUI.class); - - addMapping(DATA, ActivitySeine.class, ActivitySeineUI.class); - addMapping(DATA, ActivitySeine.class, n("observe.tree.activitySeine.unsaved"), ActivitySeineUI.class); - addMapping(DATA, ActivitySeine.class, ActivitySeine.PROPERTY_OBSERVED_SYSTEM, ActivitySeineObservedSystemUI.class); - - addMapping(DATA, SetSeine.class, SetSeineUI.class); - addMapping(DATA, SetSeine.class, n("observe.tree.setSeine.unsaved"), SetSeineUI.class); - addMapping(DATA, SetSeine.class, SetSeine.PROPERTY_SCHOOL_ESTIMATE, SchoolEstimateUI.class); - addMapping(DATA, SetSeine.class, SetSeine.PROPERTY_TARGET_CATCH, TargetCatchUI.class); - addMapping(DATA, SetSeine.class, SetSeine.PROPERTY_TARGET_DISCARDED, TargetDiscardCatchUI.class); - addMapping(DATA, SetSeine.class, SetSeine.PROPERTY_TARGET_SAMPLE, TargetSampleRejeteUI.class); - addMapping(DATA, SetSeine.class, SetSeine.PROPERTY_TARGET_SAMPLE_CAPTURE, TargetSampleCaptureUI.class); - addMapping(DATA, SetSeine.class, SetSeine.PROPERTY_NON_TARGET_CATCH, NonTargetCatchUI.class); - addMapping(DATA, SetSeine.class, SetSeine.PROPERTY_NON_TARGET_SAMPLE, NonTargetSampleUI.class); - - addMapping(DATA, FloatingObject.class, FloatingObjectUI.class); - addMapping(DATA, FloatingObject.class, n("observe.tree.floatingObject.unsaved"), FloatingObjectUI.class); - addMapping(DATA, FloatingObject.class, FloatingObject.PROPERTY_OBJECT_OPERATION, FloatingObjectTransmittingBuoyOperationUI.class); - addMapping(DATA, FloatingObject.class, FloatingObject.PROPERTY_OBJECT_OBSERVED_SPECIES, ObjectObservedSpeciesUI.class); - addMapping(DATA, FloatingObject.class, FloatingObject.PROPERTY_OBJECT_SCHOOL_ESTIMATE, ObjectSchoolEstimateUI.class); + addMapping(DATA, ProgramDto.class, GearType.seine.name(), TripSeinesUI.class); + + addMapping(DATA, TripSeineDto.class, TripSeineUI.class); + addMapping(DATA, TripSeineDto.class, n("observe.tree.tripSeine.unsaved"), TripSeineUI.class); + //FIXME +// addMapping(DATA, TripSeineDto.class, TripSeineDto.PROPERTY_GEAR_USE_FEATURES_SEINE, GearUseFeaturesSeineUI.class); +// addMapping(DATA, TripSeineDto.class, TripSeineDto.PROPERTY_ROUTE, RoutesUI.class); + + addMapping(DATA, RouteDto.class, RouteUI.class); + addMapping(DATA, RouteDto.class, n("observe.tree.route.unsaved"), RouteUI.class); +//FIXME +// addMapping(DATA, RouteDto.class, RouteDto.PROPERTY_ACTIVITY_SEINE, ActivitySeinesUI.class); + + addMapping(DATA, ActivitySeineDto.class, ActivitySeineUI.class); + addMapping(DATA, ActivitySeineDto.class, n("observe.tree.activitySeine.unsaved"), ActivitySeineUI.class); +//FIXME +// addMapping(DATA, ActivitySeineDto.class, ActivitySeineDto.PROPERTY_OBSERVED_SYSTEM, ActivitySeineObservedSystemUI.class); + + addMapping(DATA, SetSeineDto.class, SetSeineUI.class); + addMapping(DATA, SetSeineDto.class, n("observe.tree.setSeine.unsaved"), SetSeineUI.class); +//FIXME +// addMapping(DATA, SetSeineDto.class, SetSeineDto.PROPERTY_SCHOOL_ESTIMATE, SchoolEstimateUI.class); +// addMapping(DATA, SetSeineDto.class, SetSeineDto.PROPERTY_TARGET_CATCH, TargetCatchUI.class); + addMapping(DATA, SetSeineDto.class, SetSeineDto.PROPERTY_TARGET_DISCARDED, TargetDiscardCatchUI.class); +// addMapping(DATA, SetSeineDto.class, SetSeineDto.PROPERTY_TARGET_SAMPLE, TargetSampleRejeteUI.class); + addMapping(DATA, SetSeineDto.class, SetSeineDto.PROPERTY_TARGET_SAMPLE_CAPTURE, TargetSampleCaptureUI.class); +// addMapping(DATA, SetSeineDto.class, SetSeineDto.PROPERTY_NON_TARGET_CATCH, NonTargetCatchUI.class); +// addMapping(DATA, SetSeineDto.class, SetSeineDto.PROPERTY_NON_TARGET_SAMPLE, NonTargetSampleUI.class); + + addMapping(DATA, FloatingObjectDto.class, FloatingObjectUI.class); + addMapping(DATA, FloatingObjectDto.class, n("observe.tree.floatingObject.unsaved"), FloatingObjectUI.class); + addMapping(DATA, FloatingObjectDto.class, FloatingObjectDto.PROPERTY_OBJECT_OPERATION, FloatingObjectTransmittingBuoyOperationUI.class); +//FIXME +// addMapping(DATA, FloatingObjectDto.class, FloatingObjectDto.PROPERTY_OBJECT_OBSERVED_SPECIES, ObjectObservedSpeciesUI.class); +// addMapping(DATA, FloatingObjectDto.class, FloatingObjectDto.PROPERTY_OBJECT_SCHOOL_ESTIMATE, ObjectSchoolEstimateUI.class); // --- Longline data --- // - addMapping(DATA, Program.class, GearType.longline.name(), TripLonglinesUI.class); + addMapping(DATA, ProgramDto.class, GearType.longline.name(), TripLonglinesUI.class); - addMapping(DATA, TripLongline.class, TripLonglineUI.class); - addMapping(DATA, TripLongline.class, n("observe.tree.tripLongline.unsaved"), TripLonglineUI.class); - addMapping(DATA, TripLongline.class, TripLongline.PROPERTY_GEAR_USE_FEATURES_LONGLINE, GearUseFeaturesLonglineUI.class); - addMapping(DATA, TripLongline.class, TripLongline.PROPERTY_ACTIVITY_LONGLINE, ActivityLonglinesUI.class); + addMapping(DATA, TripLonglineDto.class, TripLonglineUI.class); + addMapping(DATA, TripLonglineDto.class, n("observe.tree.tripLongline.unsaved"), TripLonglineUI.class); +//FIXME +// addMapping(DATA, TripLonglineDto.class, TripLonglineDto.PROPERTY_GEAR_USE_FEATURES_LONGLINE, GearUseFeaturesLonglineUI.class); +// addMapping(DATA, TripLonglineDto.class, TripLonglineDto.PROPERTY_ACTIVITY_LONGLINE, ActivityLonglinesUI.class); - addMapping(DATA, ActivityLongline.class, ActivityLonglineUI.class); - addMapping(DATA, ActivityLongline.class, n("observe.tree.activityLongline.unsaved"), ActivityLonglineUI.class); - addMapping(DATA, ActivityLongline.class, ActivityLongline.PROPERTY_ENCOUNTER, EncounterUI.class); - addMapping(DATA, ActivityLongline.class, ActivityLongline.PROPERTY_SENSOR_USED, SensorUsedUI.class); + addMapping(DATA, ActivityLonglineDto.class, ActivityLonglineUI.class); + addMapping(DATA, ActivityLonglineDto.class, n("observe.tree.activityLongline.unsaved"), ActivityLonglineUI.class); +//FIXME +// addMapping(DATA, ActivityLonglineDto.class, ActivityLonglineDto.PROPERTY_ENCOUNTER, EncounterUI.class); +// addMapping(DATA, ActivityLonglineDto.class, ActivityLonglineDto.PROPERTY_SENSOR_USED, SensorUsedUI.class); - addMapping(DATA, SetLongline.class, SetLonglineUI.class); - addMapping(DATA, SetLongline.class, n("observe.tree.setLongline.unsaved"), SetLonglineUI.class); - addMapping(DATA, SetLongline.class, "longlineGlobalComposition", LonglineGlobalCompositionUI.class); - addMapping(DATA, SetLongline.class, "longlineDetailComposition", LonglineDetailCompositionUI.class); + addMapping(DATA, SetLonglineDto.class, SetLonglineUI.class); + addMapping(DATA, SetLonglineDto.class, n("observe.tree.setLongline.unsaved"), SetLonglineUI.class); +//FIXME +// addMapping(DATA, SetLonglineDto.class, "longlineGlobalComposition", LonglineGlobalCompositionUI.class); +// addMapping(DATA, SetLonglineDto.class, "longlineDetailComposition", LonglineDetailCompositionUI.class); - addMapping(DATA, SetLongline.class, SetLongline.PROPERTY_CATCH_LONGLINE, CatchLonglineUI.class); - addMapping(DATA, SetLongline.class, SetLongline.PROPERTY_TDR, TdrUI.class); +//FIXME +// addMapping(DATA, SetLonglineDto.class, SetLonglineDto.PROPERTY_CATCH_LONGLINE, CatchLonglineUI.class); +// addMapping(DATA, SetLonglineDto.class, SetLonglineDto.PROPERTY_TDR, TdrUI.class); // --- Referential --- // - for (ObserveEntityEnum anEnum : Entities.REFERENCE_COMMON_ENTITIES_LIST) { - Class<? extends TopiaEntity> editType = anEnum.getContract(); - String fqn = ContentReferenceUI.class.getPackage().getName() + ".impl." + editType.getSimpleName() + "UI"; - Class<?> result; - try { - result = Class.forName(fqn); - addMapping(REFERENCE, editType, null, result); - } catch (ClassNotFoundException e) { - throw new IllegalStateException("Could not find " + fqn); - } - } - - for (ObserveEntityEnum anEnum : Entities.REFERENCE_SEINE_ENTITIES_LIST) { - Class<? extends TopiaEntity> editType = anEnum.getContract(); - String fqn = ContentReferenceUI.class.getPackage().getName() + ".impl.seine." + editType.getSimpleName() + "UI"; - Class<?> result; - try { - result = Class.forName(fqn); - addMapping(REFERENCE, editType, null, result); - } catch (ClassNotFoundException e) { - throw new IllegalStateException("Could not find " + fqn); - } - } - - for (ObserveEntityEnum anEnum : Entities.REFERENCE_LONGLINE_ENTITIES_LIST) { - Class<? extends TopiaEntity> editType = anEnum.getContract(); - String fqn = ContentReferenceUI.class.getPackage().getName() + ".impl.longline." + editType.getSimpleName() + "UI"; - Class<?> result; - try { - result = Class.forName(fqn); - addMapping(REFERENCE, editType, null, result); - } catch (ClassNotFoundException e) { - throw new IllegalStateException("Could not find " + fqn); - } - } + //FIXME +// for (ObserveEntityEnum anEnum : Entities.REFERENCE_COMMON_ENTITIES_LIST) { +// Class<? extends TopiaEntity> editType = anEnum.getContract(); +// String fqn = ContentReferenceUI.class.getPackage().getName() + ".impl." + editType.getSimpleName() + "UI"; +// Class<?> result; +// try { +// result = Class.forName(fqn); +// addMapping(REFERENCE, editType, null, result); +// } catch (ClassNotFoundException e) { +// throw new IllegalStateException("Could not find " + fqn); +// } +// } + +// for (ObserveEntityEnum anEnum : Entities.REFERENCE_SEINE_ENTITIES_LIST) { +// Class<? extends TopiaEntity> editType = anEnum.getContract(); +// String fqn = ContentReferenceUI.class.getPackage().getName() + ".impl.seine." + editType.getSimpleName() + "UI"; +// Class<?> result; +// try { +// result = Class.forName(fqn); +// addMapping(REFERENCE, editType, null, result); +// } catch (ClassNotFoundException e) { +// throw new IllegalStateException("Could not find " + fqn); +// } +// } + + //FIXME +// for (ObserveEntityEnum anEnum : Entities.REFERENCE_LONGLINE_ENTITIES_LIST) { +// Class<? extends TopiaEntity> editType = anEnum.getContract(); +// String fqn = ContentReferenceUI.class.getPackage().getName() + ".impl.longline." + editType.getSimpleName() + "UI"; +// Class<?> result; +// try { +// result = Class.forName(fqn); +// addMapping(REFERENCE, editType, null, result); +// } catch (ClassNotFoundException e) { +// throw new IllegalStateException("Could not find " + fqn); +// } +// } addMapping(REFERENCE, null, ReferenceHomeUI.class); diff --git a/observe-application-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 index 7c91935..5a83741 100644 --- a/observe-application-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 @@ -22,14 +22,11 @@ package fr.ird.observe.ui.content; import fr.ird.observe.BinderService; -import fr.ird.observe.ObserveEntityEnum; -import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.ObserveTechnicalException; +import fr.ird.observe.services.dto.AbstractObserveDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.beans.AbstractSerializableBean; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; import org.nuiton.util.beans.BinderModelBuilder; /** @@ -38,7 +35,7 @@ import org.nuiton.util.beans.BinderModelBuilder; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public abstract class ContentUIModel<E extends TopiaEntity> extends AbstractSerializableBean { +public abstract class ContentUIModel<E extends AbstractObserveDto> extends AbstractSerializableBean { public static final String PROPERTY_EDIT_BEAN = "editBean"; @@ -69,7 +66,8 @@ public abstract class ContentUIModel<E extends TopiaEntity> extends AbstractSeri protected final Class<E> beanType; - protected TopiaEntityBinder<E> loadBinder; + //FIXME +// protected TopiaEntityBinder<E> loadBinder; protected E bean; @@ -89,21 +87,22 @@ public abstract class ContentUIModel<E extends TopiaEntity> extends AbstractSeri public ContentUIModel(Class<E> beanType) { this.beanType = beanType; - ObserveEntityEnum constant = ObserveEntityEnum.valueOf(beanType); - if (constant != null) { - try { - setBean((E) constant.getImplementation().newInstance()); - } catch (Exception e) { - // ne devrait jamain arrive - if (log.isErrorEnabled()) { - log.error(e); - } - } - } + //FIXME +// ObserveEntityEnum constant = ObserveEntityEnum.valueOf(beanType); +// if (constant != null) { +// try { +// setBean((E) constant.getImplementation().newInstance()); +// } catch (Exception e) { +// // ne devrait jamain arrive +// if (log.isErrorEnabled()) { +// log.error(e); +// } +// } +// } } - public static <E extends TopiaEntity> ContentUIModel<E> newModel(ObserveContentUI<E> ui) { + public static <E extends AbstractObserveDto> ContentUIModel<E> newModel(ObserveContentUI<E> ui) { String uiName = ui.getClass().getName(); String modelName = uiName + "Model"; @@ -120,33 +119,32 @@ public abstract class ContentUIModel<E extends TopiaEntity> extends AbstractSeri } - public final TopiaEntityBinder<E> getLoadBinder() { - - if (loadBinder == null) { - - BinderService binderService = ObserveServiceHelper.get().getBinderService(); - - String binderName = getClass().getName() + "-open"; - TopiaEntityBinder<E> r = binderService.getTopiaBinder(beanType, binderName); - if (r == null) { - - BinderModelBuilder<E, E> builder = createOpeningBinder(binderService, binderName); - - if (builder != null) { - - r = binderService.registerTopiaBinder(beanType, builder, binderName); - - } - - } - - loadBinder = r; - - } - - return loadBinder; - - } + //FIXME +// public final TopiaEntityBinder<E> getLoadBinder() { +// +// if (loadBinder == null) { +// BinderService binderService = ObserveServiceHelper.get().getBinderService(); +// +// String binderName = getClass().getName() + "-open"; +// TopiaEntityBinder<E> r = binderService.getTopiaBinder(beanType, binderName); +// if (r == null) { +// +// BinderModelBuilder<E, E> builder = createOpeningBinder(binderService, binderName); +// +// if (builder != null) { +// +// r = binderService.registerTopiaBinder(beanType, builder, binderName); +// +// } +// +// } +// loadBinder = r; +// +// } +// +// return loadBinder; +// +// } protected abstract BinderModelBuilder<E, E> createOpeningBinder(BinderService binderService, String binderName); diff --git a/observe-application-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 index 0c30ee3..460c895 100644 --- a/observe-application-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 @@ -24,13 +24,12 @@ package fr.ird.observe.ui.content; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; +import fr.ird.observe.services.dto.AbstractObserveDto; import jaxx.runtime.JAXXObject; import jaxx.runtime.swing.BlockingLayerUI; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; -import org.nuiton.topia.persistence.TopiaEntity; -import javax.swing.Icon; -import javax.swing.JToolBar; +import javax.swing.*; /** * Created on 10/5/14. @@ -38,7 +37,7 @@ import javax.swing.JToolBar; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public interface ObserveContentUI<E extends TopiaEntity> extends JAXXObject { +public interface ObserveContentUI<E extends AbstractObserveDto> extends JAXXObject { String CLIENT_PROPERTY_LIST_PREDICATE = "listPredicate"; diff --git a/observe-application-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 index 434bf81..0ec893b 100644 --- a/observe-application-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 @@ -22,9 +22,8 @@ package fr.ird.observe.ui.content.impl.longline; * #L% */ -import fr.ird.observe.entities.longline.Basket; -import fr.ird.observe.entities.longline.BasketImpl; -import fr.ird.observe.entities.longline.SectionTemplate; +import fr.ird.observe.services.dto.longline.BasketDto; +import fr.ird.observe.services.dto.longline.BasketDto; /** * Created on 12/11/14. @@ -32,7 +31,7 @@ import fr.ird.observe.entities.longline.SectionTemplate; * @author Tony Chemit - chemit@codelutin.com * @since 3.10 */ -public class BasketsTableModel extends LonglineCompositionTableModelSupport<Basket> { +public class BasketsTableModel extends LonglineCompositionTableModelSupport<BasketDto> { private static final long serialVersionUID = 1L; @@ -41,8 +40,8 @@ public class BasketsTableModel extends LonglineCompositionTableModelSupport<Bask } @Override - protected Basket createNewRow() { - return new BasketImpl(); + protected BasketDto createNewRow() { + return new BasketDto(); } @Override @@ -93,7 +92,7 @@ public class BasketsTableModel extends LonglineCompositionTableModelSupport<Bask @Override public Object getValueAt(int rowIndex, int columnIndex) { - Basket row = data.get(rowIndex); + BasketDto row = data.get(rowIndex); Object result; switch (columnIndex) { @@ -128,7 +127,7 @@ public class BasketsTableModel extends LonglineCompositionTableModelSupport<Bask @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { - Basket row = data.get(rowIndex); + BasketDto row = data.get(rowIndex); switch (columnIndex) { case 0: diff --git a/observe-application-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 index c682e7a..01d29dd 100644 --- a/observe-application-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 @@ -20,17 +20,17 @@ #L% --> -<fr.ird.observe.ui.content.ContentUI superGenericType='Branchline' contentTitle='{n("observe.branchline.title")}'> +<fr.ird.observe.ui.content.ContentUI superGenericType='BranchlineDto' contentTitle='{n("observe.branchline.title")}'> <import> - fr.ird.observe.entities.CommentableEntity - fr.ird.observe.entities.longline.Branchline - fr.ird.observe.entities.referentiel.longline.LineType - fr.ird.observe.entities.referentiel.longline.BaitType - fr.ird.observe.entities.referentiel.longline.BaitHaulingStatus - fr.ird.observe.entities.referentiel.longline.BaitSettingStatus - fr.ird.observe.entities.referentiel.longline.HookSize - fr.ird.observe.entities.referentiel.longline.HookType + fr.ird.observe.services.dto.CommentableDto + fr.ird.observe.services.dto.longline.BranchlineDto + fr.ird.observe.services.dto.referential.longline.LineTypeDto + fr.ird.observe.services.dto.referential.longline.BaitTypeDto + fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto + fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto + fr.ird.observe.services.dto.referential.longline.HookSizeDto + fr.ird.observe.services.dto.referential.longline.HookTypeDto fr.ird.observe.ui.actions.shared.ResetEditUIAction fr.ird.observe.ui.actions.shared.SaveEditUIAction @@ -56,17 +56,17 @@ <BranchlineUIModel id='model'/> <!-- edit bean --> - <Branchline id='bean'/> + <BranchlineDto id='bean'/> <!-- validator --> <BeanValidator id='validator' autoField='true' context='n1-update' - beanClass='fr.ird.observe.entities.longline.Branchline' + beanClass='fr.ird.observe.services.dto.longline.BranchlineDto' errorTableModel='{getErrorTableModel()}'> </BeanValidator> <script><![CDATA[ -public void edit(Branchline branchline) { getHandler().edit(branchline); } +public void edit(BranchlineDto branchline) { getHandler().edit(branchline); } ]]> </script> @@ -89,7 +89,7 @@ public void edit(Branchline branchline) { getHandler().edit(branchline); } <JLabel id='topTypeLabel'/> </cell> <cell anchor='east' weightx="1" fill="both" columns="2"> - <BeanComboBox id='topType' constructorParams='this' genericType='LineType'/> + <BeanComboBox id='topType' constructorParams='this' genericType='LineTypeDto'/> </cell> </row> @@ -99,7 +99,7 @@ public void edit(Branchline branchline) { getHandler().edit(branchline); } <JLabel id='tracelineTypeLabel'/> </cell> <cell anchor='east' weightx="1" fill="both" columns="2"> - <BeanComboBox id='tracelineType' constructorParams='this' genericType='LineType'/> + <BeanComboBox id='tracelineType' constructorParams='this' genericType='LineTypeDto'/> </cell> </row> @@ -173,23 +173,23 @@ public void edit(Branchline branchline) { getHandler().edit(branchline); } <JPanel layout='{new BorderLayout()}'> <Table fill="both" constraints='BorderLayout.CENTER'> - <!-- hookType --> + <!-- HookType --> <row> <cell anchor='west'> - <JLabel id='hookTypeLabel'/> + <JLabel id='HookTypeLabel'/> </cell> <cell anchor='east' weightx="1" fill="both" columns="2"> - <BeanComboBox id='hookType' constructorParams='this' genericType='HookType'/> + <BeanComboBox id='HookType' constructorParams='this' genericType='HookTypeDto'/> </cell> </row> - <!-- hookSize --> + <!-- HookSize --> <row> <cell anchor='west'> - <JLabel id='hookSizeLabel'/> + <JLabel id='HookSizeLabel'/> </cell> <cell anchor='east' weightx="1" fill="both" columns="2"> - <BeanComboBox id='hookSize' constructorParams='this' genericType='HookSize'/> + <BeanComboBox id='HookSize' constructorParams='this' genericType='HookSizeDto'/> </cell> </row> @@ -209,7 +209,7 @@ public void edit(Branchline branchline) { getHandler().edit(branchline); } <JLabel id='baitTypeLabel'/> </cell> <cell anchor='east' weightx="1" fill="both" columns="2"> - <BeanComboBox id='baitType' constructorParams='this' genericType='BaitType'/> + <BeanComboBox id='baitType' constructorParams='this' genericType='BaitTypeDto'/> </cell> </row> @@ -219,7 +219,7 @@ public void edit(Branchline branchline) { getHandler().edit(branchline); } <JLabel id='baitSettingStatusLabel'/> </cell> <cell anchor='east' weightx="1" fill="both" columns="2"> - <BeanComboBox id='baitSettingStatus' constructorParams='this' genericType='BaitSettingStatus'/> + <BeanComboBox id='baitSettingStatus' constructorParams='this' genericType='BaitSettingStatusDto'/> </cell> </row> @@ -229,7 +229,7 @@ public void edit(Branchline branchline) { getHandler().edit(branchline); } <JLabel id='baitHaulingStatusLabel'/> </cell> <cell anchor='east' weightx="1" fill="both" columns="2"> - <BeanComboBox id='baitHaulingStatus' constructorParams='this' genericType='BaitHaulingStatus'/> + <BeanComboBox id='baitHaulingStatus' constructorParams='this' genericType='BaitHaulingStatusDto'/> </cell> </row> diff --git a/observe-application-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 index 929b591..f5c746b 100644 --- a/observe-application-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 @@ -22,12 +22,9 @@ package fr.ird.observe.ui.content.impl.longline; * #L% */ -import fr.ird.observe.DataService; -import fr.ird.observe.db.DataContext; -import fr.ird.observe.db.DataSource; -import fr.ird.observe.db.constants.DataContextType; -import fr.ird.observe.entities.longline.ActivityLongline; -import fr.ird.observe.entities.longline.Branchline; +import fr.ird.observe.DataContext; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; @@ -42,7 +39,7 @@ import org.nuiton.i18n.I18n; import org.nuiton.topia.persistence.util.TopiaEntityBinder; import org.nuiton.validator.NuitonValidatorScope; -import javax.swing.JOptionPane; +import javax.swing.*; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import java.util.HashSet; @@ -54,7 +51,7 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.10 */ -public class BranchlineUIHandler extends ContentUIHandler<Branchline> { +public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto> { /** Logger */ static private Log log = LogFactory.getLog(BranchlineUIHandler.class); @@ -70,13 +67,13 @@ public class BranchlineUIHandler extends ContentUIHandler<Branchline> { } }; - private Decorator<Branchline> branchlineDecorator; + private Decorator<BranchlineDto> branchlineDecorator; public BranchlineUIHandler(BranchlineUI ui) { super(ui, DataContextType.SetLongline, null); } - public void edit(Branchline branchline) { + public void edit(BranchlineDto branchline) { if (log.isInfoEnabled()) { log.info("Will edit branchline: " + branchlineDecorator.toString(branchline)); @@ -131,7 +128,7 @@ public class BranchlineUIHandler extends ContentUIHandler<Branchline> { ContentMode contentMode; - if (dataContext.isSelectedOpen(ActivityLongline.class)) { + if (dataContext.isSelectedOpen(ActivityLonglineDto.class)) { // l'activité est ouverte, mode édition contentMode = ContentMode.UPDATE; @@ -149,7 +146,7 @@ public class BranchlineUIHandler extends ContentUIHandler<Branchline> { @Override public void initUI() throws Exception { - branchlineDecorator = getDecoratorService().getDecoratorByType(Branchline.class); + branchlineDecorator = getDecoratorService().getDecoratorByType(BranchlineDto.class); super.initUI(); } @@ -184,7 +181,7 @@ public class BranchlineUIHandler extends ContentUIHandler<Branchline> { @Override public void startEditUI(String... binding) { - ContentUIModel<Branchline> model = getModel(); + ContentUIModel<BranchlineDto> model = getModel(); super.startEditUI(BranchlineUI.BINDING_COMMENT2_TEXT, @@ -218,13 +215,13 @@ public class BranchlineUIHandler extends ContentUIHandler<Branchline> { } @Override - protected boolean doSave(Branchline bean, + protected boolean doSave(BranchlineDto bean, DataService dataService, DataSource dataSource, - TopiaEntityBinder<Branchline> binder) throws Exception { + TopiaEntityBinder<BranchlineDto> binder) throws Exception { // bind back to model branchline - Branchline beanToSave = getModel().getBranchline(); + BranchlineDto beanToSave = getModel().getBranchline(); binder.copy(bean, beanToSave); // for external models @@ -237,7 +234,7 @@ public class BranchlineUIHandler extends ContentUIHandler<Branchline> { @Override public void resetEditUI() { - Branchline branchline = getModel().getBranchline(); + BranchlineDto branchline = getModel().getBranchline(); // on arrete l'edition stopEditUI(); diff --git a/observe-application-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 index 1b7956f..bc23d53 100644 --- a/observe-application-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 @@ -24,7 +24,7 @@ package fr.ird.observe.ui.content.impl.longline; import com.google.common.collect.ImmutableSet; import fr.ird.observe.BinderService; -import fr.ird.observe.entities.longline.Branchline; +import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.ui.content.ContentUIModel; import org.nuiton.util.beans.BinderModelBuilder; @@ -36,7 +36,7 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.10 */ -public class BranchlineUIModel extends ContentUIModel<Branchline> { +public class BranchlineUIModel extends ContentUIModel<BranchlineDto> { public static final String PROPERTY_SAVED = "saved"; @@ -47,65 +47,65 @@ public class BranchlineUIModel extends ContentUIModel<Branchline> { public static final String PROPERTY_HOOK_AND_BAIT_TAB_VALID = "hookAndBaitTabValid"; public static final Set<String> GENERAL_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(Branchline.PROPERTY_TOP_TYPE, - Branchline.PROPERTY_TRACELINE_TYPE, - Branchline.PROPERTY_DEPTH_RECORDER, - Branchline.PROPERTY_HOOK_LOST, - Branchline.PROPERTY_TRACE_CUT_OFF, - Branchline.PROPERTY_TIMER, - Branchline.PROPERTY_TIME_SINCE_CONTACT, - Branchline.PROPERTY_TIMER_TIME_ON_BOARD, - Branchline.PROPERTY_WEIGHTED_SNAP, - Branchline.PROPERTY_SNAP_WEIGHT, - Branchline.PROPERTY_WEIGHTED_SWIVEL, - Branchline.PROPERTY_SWIVEL_WEIGHT).build(); + ImmutableSet.<String>builder().add(BranchlineDto.PROPERTY_TOP_TYPE, + BranchlineDto.PROPERTY_TRACELINE_TYPE, + BranchlineDto.PROPERTY_DEPTH_RECORDER, + BranchlineDto.PROPERTY_HOOK_LOST, + BranchlineDto.PROPERTY_TRACE_CUT_OFF, + BranchlineDto.PROPERTY_TIMER, + BranchlineDto.PROPERTY_TIME_SINCE_CONTACT, + BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD, + BranchlineDto.PROPERTY_WEIGHTED_SNAP, + BranchlineDto.PROPERTY_SNAP_WEIGHT, + BranchlineDto.PROPERTY_WEIGHTED_SWIVEL, + BranchlineDto.PROPERTY_SWIVEL_WEIGHT).build(); public static final Set<String> HOOK_AND_BAIT_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(Branchline.PROPERTY_HOOK_TYPE, - Branchline.PROPERTY_HOOK_SIZE, - Branchline.PROPERTY_HOOK_OFFSET, - Branchline.PROPERTY_BAIT_TYPE, - Branchline.PROPERTY_BAIT_SETTING_STATUS, - Branchline.PROPERTY_BAIT_HAULING_STATUS).build(); + ImmutableSet.<String>builder().add(BranchlineDto.PROPERTY_HOOK_TYPE, + BranchlineDto.PROPERTY_HOOK_SIZE, + BranchlineDto.PROPERTY_HOOK_OFFSET, + BranchlineDto.PROPERTY_BAIT_TYPE, + BranchlineDto.PROPERTY_BAIT_SETTING_STATUS, + BranchlineDto.PROPERTY_BAIT_HAULING_STATUS).build(); - private Branchline branchline; + private BranchlineDto branchlineDto; private boolean generalTabValid; private boolean hookAndBaitTabValid; - public BranchlineUIModel() { - super(Branchline.class); + public BranchlineDtoUIModel() { + super(BranchlineDto.class); } @Override - protected BinderModelBuilder<Branchline, Branchline> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<BranchlineDto, BranchlineDto> createOpeningBinder(BinderService binderService, String binderName) { - BinderModelBuilder<Branchline, Branchline> builder = binderService.newBinderBuilder( - Branchline.class, - Branchline.PROPERTY_COMMENT, + BinderModelBuilder<BranchlineDto, BranchlineDto> builder = binderService.newBinderBuilder( + BranchlineDto.class, + BranchlineDto.PROPERTY_COMMENT, // general tab - Branchline.PROPERTY_TOP_TYPE, - Branchline.PROPERTY_TRACELINE_TYPE, - Branchline.PROPERTY_DEPTH_RECORDER, - Branchline.PROPERTY_HOOK_LOST, - Branchline.PROPERTY_TRACE_CUT_OFF, - Branchline.PROPERTY_WEIGHTED_SWIVEL, - Branchline.PROPERTY_SWIVEL_WEIGHT, - Branchline.PROPERTY_WEIGHTED_SNAP, - Branchline.PROPERTY_SNAP_WEIGHT, - Branchline.PROPERTY_BAIT_TYPE, - Branchline.PROPERTY_TIMER, - Branchline.PROPERTY_TIME_SINCE_CONTACT, - Branchline.PROPERTY_TIMER_TIME_ON_BOARD, + BranchlineDto.PROPERTY_TOP_TYPE, + BranchlineDto.PROPERTY_TRACELINE_TYPE, + BranchlineDto.PROPERTY_DEPTH_RECORDER, + BranchlineDto.PROPERTY_HOOK_LOST, + BranchlineDto.PROPERTY_TRACE_CUT_OFF, + BranchlineDto.PROPERTY_WEIGHTED_SWIVEL, + BranchlineDto.PROPERTY_SWIVEL_WEIGHT, + BranchlineDto.PROPERTY_WEIGHTED_SNAP, + BranchlineDto.PROPERTY_SNAP_WEIGHT, + BranchlineDto.PROPERTY_BAIT_TYPE, + BranchlineDto.PROPERTY_TIMER, + BranchlineDto.PROPERTY_TIME_SINCE_CONTACT, + BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD, // hook and bait tab - Branchline.PROPERTY_HOOK_TYPE, - Branchline.PROPERTY_HOOK_SIZE, - Branchline.PROPERTY_HOOK_OFFSET, - Branchline.PROPERTY_BAIT_SETTING_STATUS, - Branchline.PROPERTY_BAIT_HAULING_STATUS + BranchlineDto.PROPERTY_HOOK_TYPE, + BranchlineDto.PROPERTY_HOOK_SIZE, + BranchlineDto.PROPERTY_HOOK_OFFSET, + BranchlineDto.PROPERTY_BAIT_SETTING_STATUS, + BranchlineDto.PROPERTY_BAIT_HAULING_STATUS ); @@ -113,12 +113,12 @@ public class BranchlineUIModel extends ContentUIModel<Branchline> { } - public Branchline getBranchline() { - return branchline; + public BranchlineDto getBranchlineDto() { + return BranchlineDto; } - public void setBranchline(Branchline branchline) { - this.branchline = branchline; + public void setBranchlineDto(BranchlineDto branchlineDto) { + this.branchlineDto = branchlineDto; } public boolean isGeneralTabValid() { diff --git a/observe-application-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 index 5dbd2c2..c7d9076 100644 --- a/observe-application-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 @@ -22,8 +22,7 @@ package fr.ird.observe.ui.content.impl.longline; * #L% */ -import fr.ird.observe.entities.longline.Branchline; -import fr.ird.observe.entities.longline.BranchlineImpl; +import fr.ird.observe.services.dto.longline.BranchlineDto; import java.util.Date; @@ -33,7 +32,7 @@ import java.util.Date; * @author Tony Chemit - chemit@codelutin.com * @since 3.10 */ -public class BranchlinesTableModel extends LonglineCompositionTableModelSupport<Branchline> { +public class BranchlinesTableModel extends LonglineCompositionTableModelSupport<BranchlineDto> { private static final long serialVersionUID = 1L; @@ -50,9 +49,9 @@ public class BranchlinesTableModel extends LonglineCompositionTableModelSupport< } @Override - protected Branchline createNewRow() { + protected BranchlineDto createNewRow() { - BranchlineImpl branchline = new BranchlineImpl(); + BranchlineDto branchline = new BranchlineDto(); branchline.setTimerTimeOnBoard(defaultDate); branchline.setTimer(useTimer); return branchline; @@ -105,7 +104,7 @@ public class BranchlinesTableModel extends LonglineCompositionTableModelSupport< @Override public Object getValueAt(int rowIndex, int columnIndex) { - Branchline row = data.get(rowIndex); + BranchlineDto row = data.get(rowIndex); Object result; switch (columnIndex) { @@ -140,7 +139,7 @@ public class BranchlinesTableModel extends LonglineCompositionTableModelSupport< @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { - Branchline row = data.get(rowIndex); + BranchlineDto row = data.get(rowIndex); switch (columnIndex) { case 0: diff --git a/observe-application-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 index 5817a98..b37d4e8 100644 --- a/observe-application-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 @@ -22,11 +22,10 @@ package fr.ird.observe.ui.content.impl.longline; * #L% */ -import fr.ird.observe.entities.longline.LonglineCompositionEntity; +import fr.ird.observe.services.dto.AbstractObserveDto; import fr.ird.observe.ui.util.table.EditableTableModelSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.TopiaEntity; import java.util.List; @@ -36,7 +35,10 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.10 */ -public abstract class LonglineCompositionTableModelSupport<E extends TopiaEntity & LonglineCompositionEntity> extends EditableTableModelSupport<E> { +public abstract class LonglineCompositionTableModelSupport<E extends AbstractObserveDto + //FIXME +// & LonglineCompositionEntity + > extends EditableTableModelSupport<E> { /** Logger. */ private static final Log log = LogFactory.getLog(LonglineCompositionTableModelSupport.class); @@ -94,7 +96,8 @@ public abstract class LonglineCompositionTableModelSupport<E extends TopiaEntity if (log.isInfoEnabled()) { log.info("SettingIdentifier : " + index); } - e.setSettingIdentifier(index); + //FIXME +// e.setSettingIdentifier(index); if (generateHaulingIds) { @@ -109,7 +112,8 @@ public abstract class LonglineCompositionTableModelSupport<E extends TopiaEntity if (log.isInfoEnabled()) { log.info("HaulingIdentifier : " + haulingId); } - e.setHaulingIdentifier(haulingId); + //FIXME +// e.setHaulingIdentifier(haulingId); } diff --git a/observe-application-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 index 12d69af..115c5f0 100644 --- a/observe-application-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 @@ -20,12 +20,12 @@ #L% --> -<fr.ird.observe.ui.content.ContentUI superGenericType='SetLongline' +<fr.ird.observe.ui.content.ContentUI superGenericType='SetLonglineDto' contentTitle='{n("observe.longlineDetailComposition.title")}'> <import> fr.ird.observe.ObserveContext - fr.ird.observe.entities.longline.SetLongline + fr.ird.observe.services.dto.longline.SetLonglineDto fr.ird.observe.ui.actions.shared.ResetEditUIAction fr.ird.observe.ui.actions.shared.SaveEditUIAction @@ -58,26 +58,26 @@ <BranchlinesTableModel id='branchlinesTableModel' initializer="getModel().getBranchlinesTableModel()"/> <!-- edit bean --> - <SetLongline id='bean'/> + <SetLonglineDto id='bean'/> <!-- validator --> - <BeanValidator id='validator' autoField='true' beanClass='fr.ird.observe.entities.longline.SetLongline' + <BeanValidator id='validator' autoField='true' beanClass='fr.ird.observe.services.dto.longline.SetLonglineDto' errorTableModel='{getErrorTableModel()}' context='n1-update-longlineDetailComposition'> </BeanValidator> - <BeanValidator id='sectionValidator' beanClass='fr.ird.observe.entities.longline.Section' + <BeanValidator id='sectionValidator' beanClass='fr.ird.observe.services.dto.longline.SectionDto' errorTableModel='{getErrorTableModel()}' context='n1-update-table'> <field name='basket' component='sectionsPane'/> </BeanValidator> - <BeanValidator id='basketValidator' beanClass='fr.ird.observe.entities.longline.Basket' + <BeanValidator id='basketValidator' beanClass='fr.ird.observe.services.dto.longline.BasketDto' errorTableModel='{getErrorTableModel()}' context='n1-update-table'> <field name='branchline' component='basketsPane'/> <field name='floatline1Length' component='basketsPane'/> <field name='floatline2Length' component='basketsPane'/> </BeanValidator> - <BeanValidator id='branchlineValidator' beanClass='fr.ird.observe.entities.longline.Branchline' + <BeanValidator id='branchlineValidator' beanClass='fr.ird.observe.services.dto.longline.BranchlineDto' errorTableModel='{getErrorTableModel()}' context='n1-update-table'> <field name='settingIdentifier' component='branchlinesPane'/> <field name='tracelineLength' component='branchlinesPane'/> diff --git a/observe-application-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 index c7ab282..b3b20e5 100644 --- a/observe-application-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 @@ -22,23 +22,23 @@ package fr.ird.observe.ui.content.impl.longline; * #L% */ -import fr.ird.observe.DataService; import fr.ird.observe.ObserveContext; import fr.ird.observe.ObserveTechnicalException; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DataContextType; -import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.EntityMap; -import fr.ird.observe.entities.longline.ActivityLongline; -import fr.ird.observe.entities.longline.Basket; -import fr.ird.observe.entities.longline.Branchline; -import fr.ird.observe.entities.longline.Section; -import fr.ird.observe.entities.longline.SectionTemplate; -import fr.ird.observe.entities.longline.SectionWithTemplate; -import fr.ird.observe.entities.longline.SectionWithTemplates; -import fr.ird.observe.entities.longline.SetLongline; +import fr.ird.observe.services.dto.longline.BasketDto; +import fr.ird.observe.services.dto.longline.BranchlineDto; +import fr.ird.observe.services.dto.longline.SectionDto; +import fr.ird.observe.services.dto.longline.SectionTemplateDto; +import fr.ird.observe.services.dto.longline.SectionWithTemplateDto; +import fr.ird.observe.services.dto.longline.SectionWithTemplatesDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.longline.BasketDto; +import fr.ird.observe.services.dto.longline.BranchlineDto; +import fr.ird.observe.services.dto.longline.SectionDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; @@ -55,8 +55,7 @@ import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.util.TopiaEntityBinder; import org.nuiton.validator.NuitonValidatorScope; -import javax.swing.JComboBox; -import javax.swing.JOptionPane; +import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.event.TableModelEvent; @@ -76,7 +75,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.8 */ -public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLongline> { +public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLonglineDto> { static final String SECTION_TEMPLATES_EDITOR = "sectionTemplatesEditor"; @@ -159,8 +158,8 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong private final PropertyChangeListener selectedBranchlineChanged = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - Branchline previousValue = (Branchline) evt.getOldValue(); - Branchline newValue = (Branchline) evt.getNewValue(); + BranchlineDto previousValue = (BranchlineDto) evt.getOldValue(); + BranchlineDto newValue = (BranchlineDto) evt.getNewValue(); onSelectedBranchlineChanged(previousValue, newValue); } }; @@ -175,11 +174,11 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong } }; - private Decorator<Section> sectionDecorator; + private Decorator<SectionDto> sectionDecorator; - private Decorator<Basket> basketDecorator; + private Decorator<BasketDto> basketDecorator; - private Decorator<Branchline> branchlineDecorator; + private Decorator<BranchlineDto> branchlineDecorator; /** * To avoid section flush when selected section changes (used when deleting a section). @@ -224,8 +223,8 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong sectionAdjusting = true; try { - Section previousValue = (Section) evt.getOldValue(); - Section newValue = (Section) evt.getNewValue(); + SectionDto previousValue = (SectionDto) evt.getOldValue(); + SectionDto newValue = (SectionDto) evt.getNewValue(); onSelectedSectionChanged(previousValue, newValue); } finally { @@ -246,8 +245,8 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong basketAdjusting = true; try { - Basket previousValue = (Basket) evt.getOldValue(); - Basket newValue = (Basket) evt.getNewValue(); + BasketDto previousValue = (Basket) evt.getOldValue(); + BasketDto newValue = (Basket) evt.getNewValue(); onSelectedBasketChanged(previousValue, newValue); } finally { @@ -316,9 +315,9 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong @Override public void initUI() throws Exception { - this.sectionDecorator = getDecoratorService().getDecoratorByType(Section.class); - this.basketDecorator = getDecoratorService().getDecoratorByType(Basket.class); - this.branchlineDecorator = getDecoratorService().getDecoratorByType(Branchline.class); + this.sectionDecorator = getDecoratorService().getDecoratorByType(SectionDto.class); + this.basketDecorator = getDecoratorService().getDecoratorByType(BasketDto.class); + this.branchlineDecorator = getDecoratorService().getDecoratorByType(BranchlineDto.class); LonglineDetailCompositionUIInitializer uiInitializer = new LonglineDetailCompositionUIInitializer(getUi()); uiInitializer.initUI(getDataSource()); @@ -469,7 +468,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong @Override public void startEditUI(String... binding) { - ContentUIModel<SetLongline> model = getModel(); + ContentUIModel<SetLonglineDto> model = getModel(); addInfoMessage(t("observe.longlineDetailComposition.message.updating")); super.startEditUI(LonglineDetailCompositionUI.BINDING_GENERATE_ALL_ENABLED, @@ -480,10 +479,10 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong } @Override - protected boolean doSave(SetLongline bean, + protected boolean doSave(SetLonglineDto bean, DataService dataService, DataSource dataSource, - TopiaEntityBinder<SetLongline> binder) throws Exception { + TopiaEntityBinder<SetLonglineDto> binder) throws Exception { BranchlineUI branchlineDetailUI = getUi().getBranchlineDetailUI(); @@ -515,13 +514,13 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong } @Override - protected SetLongline onUpdate(TopiaContext tx, Object parentBean, SetLongline beanToSave) throws TopiaException { + protected SetLonglineDto onUpdate(TopiaContext tx, Object parentBean, SetLonglineDto beanToSave) throws TopiaException { - Map<String, Section> existingSectionsByTopiaId = Entities.toIdMap(beanToSave.getSection()); + Map<String, SectionDto> existingSectionsByTopiaId = Entities.toIdMap(beanToSave.getSection()); - TopiaDAO<Section> sectionsDao = getDataSource().getDAO(tx, Section.class); - TopiaDAO<Basket> basketDao = getDataSource().getDAO(tx, Basket.class); - TopiaDAO<Branchline> branchlineDao = getDataSource().getDAO(tx, Branchline.class); + TopiaDAO<SectionDto> sectionsDao = getDataSource().getDAO(tx, SectionDto.class); + TopiaDAO<BasketDto> basketDao = getDataSource().getDAO(tx, BasketDto.class); + TopiaDAO<BranchlineDto> branchlineDao = getDataSource().getDAO(tx, BranchlineDto.class); List<SectionWithTemplate> sections = getSectionsTableModel().getNotEmptyData(); @@ -1293,7 +1292,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong } - protected void onBranchlinesTableModelChanged(List<Branchline> data) { + protected void onBranchlinesTableModelChanged(List<BranchlineDto> data) { if (log.isInfoEnabled()) { log.info("Branchlines was changed, new size: " + data.size()); @@ -1301,7 +1300,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong } - protected void onSelectedBranchlineChanged(Branchline previousBranchline, Branchline newBranchline) { + protected void onSelectedBranchlineChanged(BranchlineDto previousBranchline, BranchlineDto newBranchline) { if (log.isInfoEnabled()) { log.info("New selected branchline: " + branchlineDecorator.toString(newBranchline)); diff --git a/observe-application-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 index 1dec3b2..7845b5f 100644 --- a/observe-application-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 @@ -24,8 +24,8 @@ package fr.ird.observe.ui.content.impl.longline; import fr.ird.observe.DecoratorService; import fr.ird.observe.db.DataSource; -import fr.ird.observe.entities.longline.SectionTemplate; -import fr.ird.observe.entities.longline.SetLongline; +import fr.ird.observe.services.dto.longline.SectionTemplateDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentUIInitializer; import fr.ird.observe.ui.util.table.AutotSelectRowAndShowPopupActionSupport; @@ -51,7 +51,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.10 */ -public class LonglineDetailCompositionUIInitializer extends ContentUIInitializer<SetLongline, LonglineDetailCompositionUI> { +public class LonglineDetailCompositionUIInitializer extends ContentUIInitializer<SetLonglineDto, LonglineDetailCompositionUI> { public LonglineDetailCompositionUIInitializer(LonglineDetailCompositionUI ui) { super(ui); diff --git a/observe-application-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 index 1ccc090..64af4c2 100644 --- a/observe-application-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 @@ -23,13 +23,8 @@ package fr.ird.observe.ui.content.impl.longline; */ import fr.ird.observe.BinderService; -import fr.ird.observe.ObserveServiceHelper; -import fr.ird.observe.entities.longline.Basket; -import fr.ird.observe.entities.longline.Branchline; -import fr.ird.observe.entities.longline.Section; -import fr.ird.observe.entities.longline.SetLongline; +import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.ContentUIModel; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; import org.nuiton.util.beans.BinderModelBuilder; /** @@ -38,7 +33,7 @@ import org.nuiton.util.beans.BinderModelBuilder; * @author Tony Chemit - chemit@codelutin.com * @since 3.8 */ -public class LonglineDetailCompositionUIModel extends ContentUIModel<SetLongline> { +public class LonglineDetailCompositionUIModel extends ContentUIModel<SetLonglineDto> { public static final String PROPERTY_CAN_GENERATE = "canGenerate"; @@ -66,15 +61,16 @@ public class LonglineDetailCompositionUIModel extends ContentUIModel<SetLongline protected boolean branchlineDetailTabValid; - protected TopiaEntityBinder<Section> sectionBinder; - - protected TopiaEntityBinder<Basket> basketBinder; - - protected TopiaEntityBinder<Branchline> branchlineBinder; + //FIXME +// protected TopiaEntityBinder<SectionDto> sectionBinder; +// +// protected TopiaEntityBinder<BasketDto> basketBinder; +// +// protected TopiaEntityBinder<BranchlineDto> branchlineBinder; public LonglineDetailCompositionUIModel() { - super(SetLongline.class); + super(SetLonglineDto.class); this.sectionTemplatesTableModel = new SectionTemplatesTableModel(); this.sectionsTableModel = new SectionsTableModel(this); this.basketsTableModel = new BasketsTableModel(this); @@ -142,123 +138,127 @@ public class LonglineDetailCompositionUIModel extends ContentUIModel<SetLongline firePropertyChange(PROPERTY_GENERATE_TAB_VALID, null, generateTabValid); } - public TopiaEntityBinder<Basket> getBasketBinder() { - - if (basketBinder == null) { - - String binderName = getClass().getName() + "-open"; - - BinderService binderService = ObserveServiceHelper.get().getBinderService(); - basketBinder = binderService.getTopiaBinder(Basket.class, binderName); - - if (basketBinder == null) { - - BinderModelBuilder<Basket, Basket> builderBasket = binderService.newBinderBuilder( - Basket.class, - Basket.PROPERTY_BRANCHLINE, - Basket.PROPERTY_SETTING_IDENTIFIER, - Basket.PROPERTY_HAULING_IDENTIFIER, - Basket.PROPERTY_FLOATLINE1_LENGTH, - Basket.PROPERTY_FLOATLINE2_LENGTH); - builderBasket.addCollectionBinder(getBranchlineBinder(), Basket.PROPERTY_BRANCHLINE); - - basketBinder = binderService.registerTopiaBinder(Basket.class, builderBasket, binderName); - - } - - } - return basketBinder; - } - - public TopiaEntityBinder<Branchline> getBranchlineBinder() { - if (branchlineBinder == null) { - - String binderName = getClass().getName() + "-open"; - - BinderService binderService = ObserveServiceHelper.get().getBinderService(); - branchlineBinder = binderService.getTopiaBinder(Branchline.class, binderName); - - if (branchlineBinder == null) { - - BinderModelBuilder<Branchline, Branchline> builderBranchline = binderService.newBinderBuilder( - Branchline.class, - Branchline.PROPERTY_SETTING_IDENTIFIER, - Branchline.PROPERTY_HAULING_IDENTIFIER, - Branchline.PROPERTY_TRACELINE_LENGTH, - Branchline.PROPERTY_BRANCHLINE_LENGTH, - Branchline.PROPERTY_COMMENT, - Branchline.PROPERTY_TOP_TYPE, - Branchline.PROPERTY_TRACELINE_TYPE, - Branchline.PROPERTY_DEPTH_RECORDER, - Branchline.PROPERTY_HOOK_LOST, - Branchline.PROPERTY_TRACE_CUT_OFF, - Branchline.PROPERTY_WEIGHTED_SWIVEL, - Branchline.PROPERTY_SWIVEL_WEIGHT, - Branchline.PROPERTY_WEIGHTED_SNAP, - Branchline.PROPERTY_SNAP_WEIGHT, - Branchline.PROPERTY_BAIT_TYPE, - Branchline.PROPERTY_BAIT_SETTING_STATUS, - Branchline.PROPERTY_BAIT_HAULING_STATUS, - Branchline.PROPERTY_HOOK_TYPE, - Branchline.PROPERTY_HOOK_SIZE, - Branchline.PROPERTY_HOOK_OFFSET, - Branchline.PROPERTY_TIMER, - Branchline.PROPERTY_TIME_SINCE_CONTACT, - Branchline.PROPERTY_TIMER_TIME_ON_BOARD); - - branchlineBinder = binderService.registerTopiaBinder(Branchline.class, builderBranchline, binderName); - } - - } - return branchlineBinder; - } - - public TopiaEntityBinder<Section> getSectionBinder() { - if (sectionBinder == null) { - - String binderName = getClass().getName() + "-open"; - - BinderService binderService = ObserveServiceHelper.get().getBinderService(); - sectionBinder = binderService.getTopiaBinder(Section.class, binderName); - - if (sectionBinder == null) { - - BinderModelBuilder<Section, Section> builderSection = binderService.newBinderBuilder( - Section.class, - Section.PROPERTY_SET_LONGLINE, - Section.PROPERTY_BASKET, - Section.PROPERTY_SETTING_IDENTIFIER, - Section.PROPERTY_HAULING_IDENTIFIER); - builderSection.addCollectionBinder(getBasketBinder(), Section.PROPERTY_BASKET); - - sectionBinder = binderService.registerTopiaBinder(Section.class, builderSection, binderName); - - } - - } - return sectionBinder; - } + //FIXME +// public TopiaEntityBinder<BasketDto> getBasketBinder() { +// if (basketBinder == null) { +// +// String binderName = getClass().getName() + "-open"; +// +// BinderService binderService = ObserveServiceHelper.get().getBinderService(); +// basketBinder = binderService.getTopiaBinder(Basket.class, binderName); +// +// if (basketBinder == null) { +// +// BinderModelBuilder<BasketDto, BasketDto> builderBasket = binderService.newBinderBuilder( +// BasketDto.class, +// BasketDto.PROPERTY_BRANCHLINE, +// BasketDto.PROPERTY_SETTING_IDENTIFIER, +// BasketDto.PROPERTY_HAULING_IDENTIFIER, +// BasketDto.PROPERTY_FLOATLINE1_LENGTH, +// BasketDto.PROPERTY_FLOATLINE2_LENGTH); +// builderBasket.addCollectionBinder(getBranchlineBinder(), BasketDto.PROPERTY_BRANCHLINE); +// +// basketBinder = binderService.registerTopiaBinder(Basket.class, builderBasket, binderName); +// +// } +// +// } +// return basketBinder; +// } +// + //FIXME +// public TopiaEntityBinder<BranchlineDto> getBranchlineBinder() { +// if (branchlineBinder == null) { +// +// String binderName = getClass().getName() + "-open"; +// +// BinderService binderService = ObserveServiceHelper.get().getBinderService(); +// branchlineBinder = binderService.getTopiaBinder(Branchline.class, binderName); +// +// if (branchlineBinder == null) { +// +// BinderModelBuilder<Branchline, Branchline> builderBranchline = binderService.newBinderBuilder( +// Branchline.class, +// Branchline.PROPERTY_SETTING_IDENTIFIER, +// Branchline.PROPERTY_HAULING_IDENTIFIER, +// Branchline.PROPERTY_TRACELINE_LENGTH, +// Branchline.PROPERTY_BRANCHLINE_LENGTH, +// Branchline.PROPERTY_COMMENT, +// Branchline.PROPERTY_TOP_TYPE, +// Branchline.PROPERTY_TRACELINE_TYPE, +// Branchline.PROPERTY_DEPTH_RECORDER, +// Branchline.PROPERTY_HOOK_LOST, +// Branchline.PROPERTY_TRACE_CUT_OFF, +// Branchline.PROPERTY_WEIGHTED_SWIVEL, +// Branchline.PROPERTY_SWIVEL_WEIGHT, +// Branchline.PROPERTY_WEIGHTED_SNAP, +// Branchline.PROPERTY_SNAP_WEIGHT, +// Branchline.PROPERTY_BAIT_TYPE, +// Branchline.PROPERTY_BAIT_SETTING_STATUS, +// Branchline.PROPERTY_BAIT_HAULING_STATUS, +// Branchline.PROPERTY_HOOK_TYPE, +// Branchline.PROPERTY_HOOK_SIZE, +// Branchline.PROPERTY_HOOK_OFFSET, +// Branchline.PROPERTY_TIMER, +// Branchline.PROPERTY_TIME_SINCE_CONTACT, +// Branchline.PROPERTY_TIMER_TIME_ON_BOARD); +// +// branchlineBinder = binderService.registerTopiaBinder(Branchline.class, builderBranchline, binderName); +// } +// +// } +// return branchlineBinder; +// } + + //FIXME +// public TopiaEntityBinder<Section> getSectionBinder() { +// if (sectionBinder == null) { +// +// String binderName = getClass().getName() + "-open"; +// +// BinderService binderService = ObserveServiceHelper.get().getBinderService(); +// sectionBinder = binderService.getTopiaBinder(Section.class, binderName); +// +// if (sectionBinder == null) { +// +// BinderModelBuilder<Section, Section> builderSection = binderService.newBinderBuilder( +// Section.class, +// Section.PROPERTY_SET_LONGLINE, +// Section.PROPERTY_BASKET, +// Section.PROPERTY_SETTING_IDENTIFIER, +// Section.PROPERTY_HAULING_IDENTIFIER); +// builderSection.addCollectionBinder(getBasketBinder(), Section.PROPERTY_BASKET); +// +// sectionBinder = binderService.registerTopiaBinder(Section.class, builderSection, binderName); +// +// } +// +// } +// return sectionBinder; +// } @Override - protected BinderModelBuilder<SetLongline, SetLongline> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<SetLonglineDto, SetLonglineDto> createOpeningBinder(BinderService binderService, String binderName) { // SetLongline binder - BinderModelBuilder<SetLongline, SetLongline> builderSetLongline = binderService.newBinderBuilder( - SetLongline.class, - SetLongline.PROPERTY_SECTION, - SetLongline.PROPERTY_SETTING_START_TIME_STAMP, - SetLongline.PROPERTY_SETTING_END_TIME_STAMP, - SetLongline.PROPERTY_HAULING_START_TIME_STAMP, - SetLongline.PROPERTY_HAULING_END_TIME_STAMP, - SetLongline.PROPERTY_HAULING_DIRECTION_SAME_AS_SETTING, - SetLongline.PROPERTY_HAULING_BREAKS, - SetLongline.PROPERTY_MONITORED, - SetLongline.PROPERTY_TOTAL_SECTIONS_COUNT, - SetLongline.PROPERTY_BASKETS_PER_SECTION_COUNT, - SetLongline.PROPERTY_BRANCHLINES_PER_BASKET_COUNT + BinderModelBuilder<SetLonglineDto, SetLonglineDto> builderSetLongline = binderService.newBinderBuilder( + SetLonglineDto.class, + //FIXME +// SetLonglineDto.PROPERTY_SECTION, + SetLonglineDto.PROPERTY_SETTING_START_TIME_STAMP, + SetLonglineDto.PROPERTY_SETTING_END_TIME_STAMP, + SetLonglineDto.PROPERTY_HAULING_START_TIME_STAMP, + SetLonglineDto.PROPERTY_HAULING_END_TIME_STAMP, + SetLonglineDto.PROPERTY_HAULING_DIRECTION_SAME_AS_SETTING, + SetLonglineDto.PROPERTY_HAULING_BREAKS, + SetLonglineDto.PROPERTY_MONITORED, + SetLonglineDto.PROPERTY_TOTAL_SECTIONS_COUNT, + SetLonglineDto.PROPERTY_BASKETS_PER_SECTION_COUNT, + SetLonglineDto.PROPERTY_BRANCHLINES_PER_BASKET_COUNT ); - builderSetLongline.addCollectionBinder(getSectionBinder(), SetLongline.PROPERTY_SECTION); + //FIXME +// builderSetLongline.addCollectionBinder(getSectionBinder(), SetLongline.PROPERTY_SECTION); return builderSetLongline; } diff --git a/observe-application-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 index edb6152..580c06c 100644 --- a/observe-application-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 @@ -26,10 +26,10 @@ import com.google.common.base.Predicate; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import fr.ird.observe.DecoratorService; -import fr.ird.observe.entities.longline.Basket; -import fr.ird.observe.entities.longline.Branchline; -import fr.ird.observe.entities.longline.Section; -import fr.ird.observe.entities.longline.SectionWithTemplate; +import fr.ird.observe.services.dto.longline.BasketDto; +import fr.ird.observe.services.dto.longline.BranchlineDto; +import fr.ird.observe.services.dto.longline.SectionDto; +import fr.ird.observe.services.dto.longline.SectionWithTemplateDto; import fr.ird.observe.ui.util.ObserveSwingValidatorMessageTableModel; import jaxx.runtime.validator.swing.SwingValidator; import jaxx.runtime.validator.swing.SwingValidatorMessage; @@ -72,9 +72,9 @@ public class LonglineDetailCompositionUIValidationHelper { public LonglineDetailCompositionUIValidationHelper(LonglineDetailCompositionUI ui, DecoratorService decoratorService) { this.model = ui.getModel(); this.errorTableModel = (ObserveSwingValidatorMessageTableModel) ui.getErrorTableModel(); - SwingValidator<Section> sectionValidator = ui.getSectionValidator(); - SwingValidator<Basket> basketValidator = ui.getBasketValidator(); - SwingValidator<Branchline> branchlineValidator = ui.getBranchlineValidator(); + SwingValidator<SectionDto> sectionValidator = ui.getSectionValidator(); + SwingValidator<BasketDto> basketValidator = ui.getBasketValidator(); + SwingValidator<BranchlineDto> branchlineValidator = ui.getBranchlineValidator(); this.validators = ImmutableSet.<SwingValidator>builder().add( sectionValidator, @@ -175,19 +175,19 @@ public class LonglineDetailCompositionUIValidationHelper { public static class LonglineDetailCompositionValidatorService { - private final SwingValidator<Section> sectionValidator; + private final SwingValidator<SectionDto> sectionValidator; - private final SwingValidator<Basket> basketValidator; + private final SwingValidator<BasketDto> basketValidator; - private final SwingValidator<Branchline> branchlineValidator; + private final SwingValidator<BranchlineDto> branchlineValidator; private final DecoratorService decoratorService; private final Map<SwingValidator, JComponent> validatorEditors; - public LonglineDetailCompositionValidatorService(SwingValidator<Section> sectionValidator, - SwingValidator<Basket> basketValidator, - SwingValidator<Branchline> branchlineValidator, + public LonglineDetailCompositionValidatorService(SwingValidator<SectionDto> sectionValidator, + SwingValidator<BasketDto> basketValidator, + SwingValidator<BranchlineDto> branchlineValidator, Map<SwingValidator, JComponent> validatorEditors, DecoratorService decoratorService) { this.sectionValidator = sectionValidator; @@ -198,7 +198,7 @@ public class LonglineDetailCompositionUIValidationHelper { } - public List<SwingValidatorMessage> validateSections(List<? extends Section> sections) { + public List<SwingValidatorMessage> validateSections(List<? extends SectionDto> sections) { LonglineDetailCompositionValidationContext validationContext = new LonglineDetailCompositionValidationContext(decoratorService, validatorEditors); @@ -206,7 +206,7 @@ public class LonglineDetailCompositionUIValidationHelper { try { - for (Section section : sections) { + for (SectionDto section : sections) { validateSection(validationContext, section); @@ -222,7 +222,7 @@ public class LonglineDetailCompositionUIValidationHelper { } - protected void validateSection(LonglineDetailCompositionValidationContext validationContext, Section section) { + protected void validateSection(LonglineDetailCompositionValidationContext validationContext, SectionDto section) { validationContext.setSection(section); validationContext.setBasket(null); @@ -233,9 +233,9 @@ public class LonglineDetailCompositionUIValidationHelper { if (!section.isBasketEmpty()) { - Basket previousBasket = null; + BasketDto previousBasket = null; - for (Basket basket : section.getBasket()) { + for (BasketDto basket : section.getBasket()) { if (previousBasket != null) { @@ -260,7 +260,7 @@ public class LonglineDetailCompositionUIValidationHelper { } - protected void validateBasket(LonglineDetailCompositionValidationContext validationContext, Basket basket) { + protected void validateBasket(LonglineDetailCompositionValidationContext validationContext, BasketDto basket) { validationContext.setBranchline(null); validationContext.setBasket(basket); @@ -270,7 +270,7 @@ public class LonglineDetailCompositionUIValidationHelper { if (!basket.isBranchlineEmpty()) { - for (Branchline branchline : basket.getBranchline()) { + for (BranchlineDto branchline : basket.getBranchline()) { validateBranchline(validationContext, branchline); @@ -281,7 +281,7 @@ public class LonglineDetailCompositionUIValidationHelper { } - protected void validateBranchline(LonglineDetailCompositionValidationContext validationContext, Branchline branchline) { + protected void validateBranchline(LonglineDetailCompositionValidationContext validationContext, BranchlineDto branchline) { validationContext.setBranchline(branchline); branchlineValidator.setBean(null); @@ -310,11 +310,11 @@ public class LonglineDetailCompositionUIValidationHelper { private static class LonglineDetailCompositionValidationContext implements SimpleBeanValidatorListener { - Section section; + SectionDto section; - Basket basket; + BasketDto basket; - Branchline branchline; + BranchlineDto branchline; String contextLabel; @@ -334,20 +334,20 @@ public class LonglineDetailCompositionUIValidationHelper { return messages; } - public void setSection(Section section) { + public void setSection(SectionDto section) { this.section = section; this.basket = null; this.branchline = null; updateContextLabel(); } - public void setBasket(Basket basket) { + public void setBasket(BasketDto basket) { this.basket = basket; this.branchline = null; updateContextLabel(); } - public void setBranchline(Branchline branchline) { + public void setBranchline(BranchlineDto branchline) { this.branchline = branchline; updateContextLabel(); } diff --git a/observe-application-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 index 511c469..586b563 100644 --- a/observe-application-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 @@ -20,14 +20,14 @@ #L% --> -<fr.ird.observe.ui.content.ContentUI superGenericType='SetLongline' +<fr.ird.observe.ui.content.ContentUI superGenericType='SetLonglineDto' contentTitle='{n("observe.longlineGlobalComposition.title")}'> <import> fr.ird.observe.ObserveContext - fr.ird.observe.entities.CommentableEntity - fr.ird.observe.entities.longline.SetLongline - fr.ird.observe.entities.referentiel.longline.MitigationType + fr.ird.observe.services.dto.CommentableDto + fr.ird.observe.services.dto.longline.SetLonglineDto + fr.ird.observe.services.dto.referential.longline.MitigationTypeDto fr.ird.observe.ui.actions.shared.ResetEditUIAction fr.ird.observe.ui.actions.shared.SaveEditUIAction fr.ird.observe.ui.content.table.impl.longline.BaitsCompositionUI @@ -58,10 +58,10 @@ <LonglineGlobalCompositionUIModel id='model'/> <!-- edit bean --> - <SetLongline id='bean'/> + <SetLonglineDto id='bean'/> <!-- validator --> - <BeanValidator id='validator' autoField='true' beanClass='fr.ird.observe.entities.longline.SetLongline' + <BeanValidator id='validator' autoField='true' beanClass='fr.ird.observe.services.dto.longline.SetLonglineDto' errorTableModel='{getErrorTableModel()}' context='n1-update-globalComposition'> </BeanValidator> @@ -112,7 +112,7 @@ <Table fill='both' constraints='BorderLayout.NORTH'> <row> <cell weighty="1" weightx="1"> - <FilterableDoubleList id='mitigationType' genericType='MitigationType'/> + <FilterableDoubleList id='mitigationType' genericType='MitigationTypeDto'/> </cell> </row> </Table> diff --git a/observe-application-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 index d02be9e..49c7616 100644 --- a/observe-application-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 @@ -26,8 +26,8 @@ import fr.ird.observe.DataService; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.constants.DataContextType; -import fr.ird.observe.entities.longline.ActivityLongline; -import fr.ird.observe.entities.longline.SetLongline; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; import fr.ird.observe.ui.content.table.impl.longline.BaitsCompositionUI; diff --git a/observe-application-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 index 4631e12..6f81cd0 100644 --- a/observe-application-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 @@ -23,9 +23,8 @@ package fr.ird.observe.ui.content.impl.longline; */ import fr.ird.observe.BinderService; -import fr.ird.observe.entities.longline.SetLongline; +import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.ContentUIModel; -import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderModelBuilder; /** @@ -34,23 +33,25 @@ import org.nuiton.util.beans.BinderModelBuilder; * @author Tony Chemit - chemit@codelutin.com * @since 3.8 */ -public class LonglineGlobalCompositionUIModel extends ContentUIModel<SetLongline> { +public class LonglineGlobalCompositionUIModel extends ContentUIModel<SetLonglineDto> { private static final long serialVersionUID = 1L; public LonglineGlobalCompositionUIModel() { - super(SetLongline.class); + super(SetLonglineDto.class); } @Override - protected BinderModelBuilder<SetLongline, SetLongline> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<SetLonglineDto, SetLonglineDto> createOpeningBinder(BinderService binderService, String binderName) { - BinderModelBuilder<SetLongline, SetLongline> builder = binderService.newBinderBuilder( - SetLongline.class, - SetLongline.PROPERTY_MITIGATION_TYPE, - SetLongline.PROPERTY_COMMENT); + BinderModelBuilder<SetLonglineDto, SetLonglineDto> builder = binderService.newBinderBuilder( + SetLonglineDto.class, + //FIXME +// SetLonglineDto.PROPERTY_MITIGATION_TYPE, + SetLonglineDto.PROPERTY_COMMENT); - builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, SetLongline.PROPERTY_MITIGATION_TYPE); + //FIXME +// builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, SetLonglineDto.PROPERTY_MITIGATION_TYPE); return builder; diff --git a/observe-application-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 index b0c0b64..bbd1da2 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.impl.longline; * #L% */ -import fr.ird.observe.entities.longline.SectionTemplate; +import fr.ird.observe.services.dto.longline.SectionTemplateDto; import fr.ird.observe.ui.util.table.EditableTableModelSupport; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; diff --git a/observe-application-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 index 559f71a..b3b3573 100644 --- a/observe-application-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 @@ -22,9 +22,9 @@ package fr.ird.observe.ui.content.impl.longline; * #L% */ -import fr.ird.observe.entities.longline.SectionTemplate; -import fr.ird.observe.entities.longline.SectionWithTemplate; -import fr.ird.observe.entities.longline.SectionWithTemplateImpl; +import fr.ird.observe.services.dto.longline.SectionTemplateDto; +import fr.ird.observe.services.dto.longline.SectionWithTemplateDto; +import fr.ird.observe.services.dto.longline.SectionWithTemplateImplDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/observe-application-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 index de4052d..99d5aa9 100644 --- a/observe-application-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 @@ -20,15 +20,15 @@ #L% --> -<fr.ird.observe.ui.content.ContentUI superGenericType='SetLongline' contentTitle='{n("observe.setLongline.title")}'> +<fr.ird.observe.ui.content.ContentUI superGenericType='SetLonglineDto' contentTitle='{n("observe.setLongline.title")}'> <import> - fr.ird.observe.entities.CommentableEntity - fr.ird.observe.entities.longline.SetLongline - fr.ird.observe.entities.referentiel.longline.SettingShape - fr.ird.observe.entities.referentiel.longline.LineType - fr.ird.observe.entities.referentiel.longline.LightsticksType - fr.ird.observe.entities.referentiel.longline.LightsticksColor + fr.ird.observe.services.dto.CommentableDto + fr.ird.observe.services.dto.longline.SetLonglineDto + fr.ird.observe.services.dto.referential.longline.SettingShapeDto + fr.ird.observe.services.dto.referential.longline.LineTypeDto + fr.ird.observe.services.dto.referential.longline.LightsticksTypeDto + fr.ird.observe.services.dto.referential.longline.LightsticksColorDto fr.ird.observe.ui.actions.shared.CancelCreateUIAction fr.ird.observe.ui.actions.shared.DeleteDataUIAction @@ -62,11 +62,11 @@ <SetLonglineUIModel id='model'/> <!-- edit bean --> - <SetLongline id='bean'/> + <SetLonglineDto id='bean'/> <!-- validator --> <BeanValidator id='validator' autoField='true' context='n1-update' - beanClass='fr.ird.observe.entities.longline.SetLongline' + beanClass='fr.ird.observe.services.dto.longline.SetLonglineDto' errorTableModel='{getErrorTableModel()}'> <field name='settingStartLongitude' component='settingStartCoordinates'/> @@ -170,7 +170,7 @@ <JLabel id='settingShapeLabel'/> </cell> <cell columns="2" fill="both"> - <BeanComboBox id='settingShape' constructorParams='this' genericType='SettingShape'/> + <BeanComboBox id='settingShape' constructorParams='this' genericType='SettingShapeDto'/> </cell> </row> <!-- line type --> @@ -179,7 +179,7 @@ <JLabel id='lineTypeLabel'/> </cell> <cell columns="2"> - <BeanComboBox id='lineType' constructorParams='this' genericType='LineType'/> + <BeanComboBox id='lineType' constructorParams='this' genericType='LineTypeDto'/> </cell> </row> @@ -189,7 +189,7 @@ <JLabel id='lightsticksTypeLabel'/> </cell> <cell columns="2"> - <BeanComboBox id='lightsticksType' constructorParams='this' genericType='LightsticksType'/> + <BeanComboBox id='lightsticksType' constructorParams='this' genericType='LightsticksTypeDto'/> </cell> </row> @@ -199,7 +199,7 @@ <JLabel id='lightsticksColorLabel'/> </cell> <cell columns="2"> - <BeanComboBox id='lightsticksColor' constructorParams='this' genericType='LightsticksColor'/> + <BeanComboBox id='lightsticksColor' constructorParams='this' genericType='LightsticksColorDto'/> </cell> </row> diff --git a/observe-application-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 index 7687c39..aa0117a 100644 --- a/observe-application-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 @@ -28,8 +28,8 @@ import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.db.util.TopiaExecutor2; -import fr.ird.observe.entities.longline.ActivityLongline; -import fr.ird.observe.entities.longline.SetLongline; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; import fr.ird.observe.ui.content.ContentUIModel; diff --git a/observe-application-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 index af4588b..c2f0422 100644 --- a/observe-application-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 @@ -24,7 +24,7 @@ package fr.ird.observe.ui.content.impl.longline; import com.google.common.collect.ImmutableSet; import fr.ird.observe.BinderService; -import fr.ird.observe.entities.longline.SetLongline; +import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.ContentUIModel; import org.nuiton.util.beans.BinderModelBuilder; @@ -36,7 +36,7 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class SetLonglineUIModel extends ContentUIModel<SetLongline> { +public class SetLonglineUIModel extends ContentUIModel<SetLonglineDto> { public static final String PROPERTY_SETTING_TAB_VALID = "settingTabValid"; @@ -45,52 +45,57 @@ public class SetLonglineUIModel extends ContentUIModel<SetLongline> { public static final String PROPERTY_HAULING_TAB_VALID = "haulingTabValid"; public static final Set<String> SETTING_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(SetLongline.PROPERTY_HOME_ID, - SetLongline.PROPERTY_NUMBER, - - SetLongline.PROPERTY_SETTING_START_TIME_STAMP, - SetLongline.PROPERTY_SETTING_START_LATITUDE, - SetLongline.PROPERTY_SETTING_START_LONGITUDE, - SetLongline.PROPERTY_SETTING_START_QUADRANT, - - SetLongline.PROPERTY_SETTING_END_TIME_STAMP, - SetLongline.PROPERTY_SETTING_END_LATITUDE, - SetLongline.PROPERTY_SETTING_END_LONGITUDE, - SetLongline.PROPERTY_SETTING_END_QUADRANT).build(); + ImmutableSet.<String>builder().add(SetLonglineDto.PROPERTY_HOME_ID, + SetLonglineDto.PROPERTY_NUMBER, + + SetLonglineDto.PROPERTY_SETTING_START_TIME_STAMP, + SetLonglineDto.PROPERTY_SETTING_START_LATITUDE, + SetLonglineDto.PROPERTY_SETTING_START_LONGITUDE, + //FIXME +// SetLonglineDto.PROPERTY_SETTING_START_QUADRANT, + + SetLonglineDto.PROPERTY_SETTING_END_TIME_STAMP, + SetLonglineDto.PROPERTY_SETTING_END_LATITUDE, + SetLonglineDto.PROPERTY_SETTING_END_LONGITUDE + //FIXME +// SetLonglineDto.PROPERTY_SETTING_END_QUADRANT + ).build(); public static final Set<String> SETTING_CARACTERISTICS_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(SetLongline.PROPERTY_SETTING_SHAPE, - SetLongline.PROPERTY_LINE_TYPE, - SetLongline.PROPERTY_LIGHTSTICKS_TYPE, - SetLongline.PROPERTY_LIGHTSTICKS_COLOR, - SetLongline.PROPERTY_SETTING_VESSEL_SPEED, - SetLongline.PROPERTY_MAX_DEPTH_TARGETED, - SetLongline.PROPERTY_SHOOTER_USED, - SetLongline.PROPERTY_SHOOTER_SPEED, - SetLongline.PROPERTY_WEIGHTED_SWIVEL, - SetLongline.PROPERTY_SWIVEL_WEIGHT, - SetLongline.PROPERTY_WEIGHTED_SNAP, - SetLongline.PROPERTY_SNAP_WEIGHT, - SetLongline.PROPERTY_MONITORED, - SetLongline.PROPERTY_TIME_BETWEEN_HOOKS, - SetLongline.PROPERTY_BASKETS_PER_SECTION_COUNT, - SetLongline.PROPERTY_BRANCHLINES_PER_BASKET_COUNT, - SetLongline.PROPERTY_LIGHTSTICKS_PER_BASKET_COUNT, - SetLongline.PROPERTY_TOTAL_SECTIONS_COUNT, - SetLongline.PROPERTY_TOTAL_BASKETS_COUNT, - SetLongline.PROPERTY_TOTAL_HOOKS_COUNT).build(); + ImmutableSet.<String>builder().add(SetLonglineDto.PROPERTY_SETTING_SHAPE, + SetLonglineDto.PROPERTY_LINE_TYPE, + SetLonglineDto.PROPERTY_LIGHTSTICKS_TYPE, + SetLonglineDto.PROPERTY_LIGHTSTICKS_COLOR, + SetLonglineDto.PROPERTY_SETTING_VESSEL_SPEED, + SetLonglineDto.PROPERTY_MAX_DEPTH_TARGETED, + SetLonglineDto.PROPERTY_SHOOTER_USED, + SetLonglineDto.PROPERTY_SHOOTER_SPEED, + SetLonglineDto.PROPERTY_WEIGHTED_SWIVEL, + SetLonglineDto.PROPERTY_SWIVEL_WEIGHT, + SetLonglineDto.PROPERTY_WEIGHTED_SNAP, + SetLonglineDto.PROPERTY_SNAP_WEIGHT, + SetLonglineDto.PROPERTY_MONITORED, + SetLonglineDto.PROPERTY_TIME_BETWEEN_HOOKS, + SetLonglineDto.PROPERTY_BASKETS_PER_SECTION_COUNT, + SetLonglineDto.PROPERTY_BRANCHLINES_PER_BASKET_COUNT, + SetLonglineDto.PROPERTY_LIGHTSTICKS_PER_BASKET_COUNT, + SetLonglineDto.PROPERTY_TOTAL_SECTIONS_COUNT, + SetLonglineDto.PROPERTY_TOTAL_BASKETS_COUNT, + SetLonglineDto.PROPERTY_TOTAL_HOOKS_COUNT).build(); public static final Set<String> HAULING_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(SetLongline.PROPERTY_HAULING_DIRECTION_SAME_AS_SETTING, - SetLongline.PROPERTY_HAULING_START_LATITUDE, - SetLongline.PROPERTY_HAULING_START_LONGITUDE, - SetLongline.PROPERTY_HAULING_START_TIME_STAMP, - SetLongline.PROPERTY_HAULING_START_QUADRANT, - SetLongline.PROPERTY_HAULING_END_LATITUDE, - SetLongline.PROPERTY_HAULING_END_LONGITUDE, - SetLongline.PROPERTY_HAULING_END_TIME_STAMP, - SetLongline.PROPERTY_HAULING_END_QUADRANT, - SetLongline.PROPERTY_HAULING_BREAKS).build(); + ImmutableSet.<String>builder().add(SetLonglineDto.PROPERTY_HAULING_DIRECTION_SAME_AS_SETTING, + SetLonglineDto.PROPERTY_HAULING_START_LATITUDE, + SetLonglineDto.PROPERTY_HAULING_START_LONGITUDE, + SetLonglineDto.PROPERTY_HAULING_START_TIME_STAMP, + //FIXME +// SetLonglineDto.PROPERTY_HAULING_START_QUADRANT, + SetLonglineDto.PROPERTY_HAULING_END_LATITUDE, + SetLonglineDto.PROPERTY_HAULING_END_LONGITUDE, + SetLonglineDto.PROPERTY_HAULING_END_TIME_STAMP, + //FIXME +// SetLonglineDto.PROPERTY_HAULING_END_QUADRANT, + SetLonglineDto.PROPERTY_HAULING_BREAKS).build(); private static final long serialVersionUID = 1L; @@ -100,67 +105,71 @@ public class SetLonglineUIModel extends ContentUIModel<SetLongline> { protected boolean haulingTabValid; - public SetLonglineUIModel() { - super(SetLongline.class); + public SetLonglineDtoUIModel() { + super(SetLonglineDto.class); } @Override - protected BinderModelBuilder<SetLongline, SetLongline> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<SetLonglineDto, SetLonglineDto> createOpeningBinder(BinderService binderService, String binderName) { - BinderModelBuilder<SetLongline, SetLongline> builder = binderService.newBinderBuilder( - SetLongline.class, - SetLongline.PROPERTY_COMMENT, + BinderModelBuilder<SetLonglineDto, SetLonglineDto> builder = binderService.newBinderBuilder( + SetLonglineDto.class, + SetLonglineDto.PROPERTY_COMMENT, // setting tab - SetLongline.PROPERTY_HOME_ID, - SetLongline.PROPERTY_NUMBER, + SetLonglineDto.PROPERTY_HOME_ID, + SetLonglineDto.PROPERTY_NUMBER, - SetLongline.PROPERTY_SETTING_START_TIME_STAMP, - SetLongline.PROPERTY_SETTING_START_QUADRANT, - SetLongline.PROPERTY_SETTING_START_LATITUDE, - SetLongline.PROPERTY_SETTING_START_LONGITUDE, + SetLonglineDto.PROPERTY_SETTING_START_TIME_STAMP, + //FIXME +// SetLonglineDto.PROPERTY_SETTING_START_QUADRANT, + SetLonglineDto.PROPERTY_SETTING_START_LATITUDE, + SetLonglineDto.PROPERTY_SETTING_START_LONGITUDE, - SetLongline.PROPERTY_SETTING_END_TIME_STAMP, - SetLongline.PROPERTY_SETTING_END_QUADRANT, - SetLongline.PROPERTY_SETTING_END_LATITUDE, - SetLongline.PROPERTY_SETTING_END_LONGITUDE, + SetLonglineDto.PROPERTY_SETTING_END_TIME_STAMP, + //FIXME +// SetLonglineDto.PROPERTY_SETTING_END_QUADRANT, + SetLonglineDto.PROPERTY_SETTING_END_LATITUDE, + SetLonglineDto.PROPERTY_SETTING_END_LONGITUDE, // setting caracteristics tab - SetLongline.PROPERTY_SETTING_SHAPE, - SetLongline.PROPERTY_LINE_TYPE, - SetLongline.PROPERTY_LIGHTSTICKS_TYPE, - SetLongline.PROPERTY_LIGHTSTICKS_COLOR, - SetLongline.PROPERTY_SETTING_VESSEL_SPEED, - SetLongline.PROPERTY_MAX_DEPTH_TARGETED, - SetLongline.PROPERTY_SHOOTER_USED, - SetLongline.PROPERTY_SHOOTER_SPEED, - SetLongline.PROPERTY_WEIGHTED_SWIVEL, - SetLongline.PROPERTY_SWIVEL_WEIGHT, - SetLongline.PROPERTY_WEIGHTED_SNAP, - SetLongline.PROPERTY_SNAP_WEIGHT, - SetLongline.PROPERTY_MONITORED, - SetLongline.PROPERTY_TIME_BETWEEN_HOOKS, - SetLongline.PROPERTY_BASKETS_PER_SECTION_COUNT, - SetLongline.PROPERTY_BRANCHLINES_PER_BASKET_COUNT, - SetLongline.PROPERTY_LIGHTSTICKS_PER_BASKET_COUNT, - SetLongline.PROPERTY_TOTAL_SECTIONS_COUNT, - SetLongline.PROPERTY_TOTAL_BASKETS_COUNT, - SetLongline.PROPERTY_TOTAL_HOOKS_COUNT, + SetLonglineDto.PROPERTY_SETTING_SHAPE, + SetLonglineDto.PROPERTY_LINE_TYPE, + SetLonglineDto.PROPERTY_LIGHTSTICKS_TYPE, + SetLonglineDto.PROPERTY_LIGHTSTICKS_COLOR, + SetLonglineDto.PROPERTY_SETTING_VESSEL_SPEED, + SetLonglineDto.PROPERTY_MAX_DEPTH_TARGETED, + SetLonglineDto.PROPERTY_SHOOTER_USED, + SetLonglineDto.PROPERTY_SHOOTER_SPEED, + SetLonglineDto.PROPERTY_WEIGHTED_SWIVEL, + SetLonglineDto.PROPERTY_SWIVEL_WEIGHT, + SetLonglineDto.PROPERTY_WEIGHTED_SNAP, + SetLonglineDto.PROPERTY_SNAP_WEIGHT, + SetLonglineDto.PROPERTY_MONITORED, + SetLonglineDto.PROPERTY_TIME_BETWEEN_HOOKS, + SetLonglineDto.PROPERTY_BASKETS_PER_SECTION_COUNT, + SetLonglineDto.PROPERTY_BRANCHLINES_PER_BASKET_COUNT, + SetLonglineDto.PROPERTY_LIGHTSTICKS_PER_BASKET_COUNT, + SetLonglineDto.PROPERTY_TOTAL_SECTIONS_COUNT, + SetLonglineDto.PROPERTY_TOTAL_BASKETS_COUNT, + SetLonglineDto.PROPERTY_TOTAL_HOOKS_COUNT, // hauling tab - SetLongline.PROPERTY_HAULING_DIRECTION_SAME_AS_SETTING, + SetLonglineDto.PROPERTY_HAULING_DIRECTION_SAME_AS_SETTING, - SetLongline.PROPERTY_HAULING_START_QUADRANT, - SetLongline.PROPERTY_HAULING_START_LATITUDE, - SetLongline.PROPERTY_HAULING_START_LONGITUDE, - SetLongline.PROPERTY_HAULING_START_TIME_STAMP, + //FIXME +// SetLonglineDto.PROPERTY_HAULING_START_QUADRANT, + SetLonglineDto.PROPERTY_HAULING_START_LATITUDE, + SetLonglineDto.PROPERTY_HAULING_START_LONGITUDE, + SetLonglineDto.PROPERTY_HAULING_START_TIME_STAMP, - SetLongline.PROPERTY_HAULING_END_QUADRANT, - SetLongline.PROPERTY_HAULING_END_LATITUDE, - SetLongline.PROPERTY_HAULING_END_LONGITUDE, - SetLongline.PROPERTY_HAULING_END_TIME_STAMP, + //FIXME +// SetLonglineDto.PROPERTY_HAULING_END_QUADRANT, + SetLonglineDto.PROPERTY_HAULING_END_LATITUDE, + SetLonglineDto.PROPERTY_HAULING_END_LONGITUDE, + SetLonglineDto.PROPERTY_HAULING_END_TIME_STAMP, - SetLongline.PROPERTY_HAULING_BREAKS); + SetLonglineDto.PROPERTY_HAULING_BREAKS); return builder; diff --git a/observe-application-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 index 32204fa..04f4596 100644 --- a/observe-application-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 @@ -20,11 +20,11 @@ #L% --> -<fr.ird.observe.ui.content.ContentUI superGenericType='ActivitySeine' contentTitle='{n("observe.activitySeineObservedSystem.title")}'> +<fr.ird.observe.ui.content.ContentUI superGenericType='ActivitySeineDto' contentTitle='{n("observe.activitySeineObservedSystem.title")}'> <import> - fr.ird.observe.entities.seine.ActivitySeine - fr.ird.observe.entities.referentiel.seine.ObservedSystem + fr.ird.observe.services.dto.seine.ActivitySeineDto + fr.ird.observe.services.dto.referential.seine.ObservedSystemDto fr.ird.observe.ui.actions.shared.ResetEditUIAction fr.ird.observe.ui.actions.shared.SaveEditUIAction @@ -50,11 +50,11 @@ <ActivitySeineObservedSystemUIModel id='model'/> <!-- edit bean --> - <ActivitySeine id='bean'/> + <ActivitySeineDto id='bean'/> <!-- validator --> <BeanValidator id='validator' - beanClass='fr.ird.observe.entities.seine.ActivitySeine' + beanClass='fr.ird.observe.services.dto.seine.ActivitySeineDto' errorTableModel='{getErrorTableModel()}' context='n1-update-observedSystem'> <field name='observedSystem' component='observedSystemPane'/> @@ -69,7 +69,7 @@ <row> <cell columns="2" fill="both" weighty="0.7"> <JScrollPane id='observedSystemPane' onFocusGained='observedSystem.requestFocus()'> - <FilterableDoubleList id='observedSystem' genericType='ObservedSystem'/> + <FilterableDoubleList id='observedSystem' genericType='ObservedSystemDto'/> </JScrollPane> </cell> </row> diff --git a/observe-application-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 index 51d13ad..6476c6b 100644 --- a/observe-application-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 @@ -25,9 +25,9 @@ import fr.ird.observe.DataService; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.constants.DataContextType; -import fr.ird.observe.entities.constants.seine.SchoolType; -import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.entities.seine.SetSeine; +import fr.ird.observe.services.dto.constants.seine.SchoolTypeDto; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; import org.apache.commons.logging.Log; diff --git a/observe-application-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 index 03f67e9..7147829 100644 --- a/observe-application-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 @@ -23,7 +23,7 @@ package fr.ird.observe.ui.content.impl.seine; */ import fr.ird.observe.BinderService; -import fr.ird.observe.entities.seine.ActivitySeine; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.ui.content.ContentUIModel; import org.nuiton.util.beans.BinderModelBuilder; @@ -33,23 +33,26 @@ import org.nuiton.util.beans.BinderModelBuilder; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class ActivitySeineObservedSystemUIModel extends ContentUIModel<ActivitySeine> { +public class ActivitySeineObservedSystemUIModel extends ContentUIModel<ActivitySeineDto> { private static final long serialVersionUID = 1L; public ActivitySeineObservedSystemUIModel() { - super(ActivitySeine.class); + super(ActivitySeineDto.class); } @Override - protected BinderModelBuilder<ActivitySeine, ActivitySeine> createOpeningBinder(BinderService binderService, String binderName) { - - BinderModelBuilder<ActivitySeine, ActivitySeine> builder = binderService.newBinderBuilder( - ActivitySeine.class, - ActivitySeine.PROPERTY_OBSERVED_SYSTEM, - ActivitySeine.PROPERTY_SET_SEINE, - ActivitySeine.PROPERTY_COMMENT, - ActivitySeine.PROPERTY_OBSERVED_SYSTEM_DISTANCE); + protected BinderModelBuilder<ActivitySeineDto, ActivitySeineDto> createOpeningBinder(BinderService binderService, String binderName) { + + BinderModelBuilder<ActivitySeineDto, ActivitySeineDto> builder = binderService.newBinderBuilder( + ActivitySeineDto.class, + //FIXME +// ActivitySeineDto.PROPERTY_OBSERVED_SYSTEM, +// ActivitySeineDto.PROPERTY_SET_SEINE, + ActivitySeineDto.PROPERTY_COMMENT + //FIXME +// ActivitySeineDto.PROPERTY_OBSERVED_SYSTEM_DISTANCE + ); return builder; diff --git a/observe-application-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 index 4d8b676..0ab8489 100644 --- a/observe-application-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 @@ -20,18 +20,18 @@ #L% --> -<fr.ird.observe.ui.content.ContentUI superGenericType='FloatingObject' +<fr.ird.observe.ui.content.ContentUI superGenericType='FloatingObjectDto' contentTitle='{n("observe.floatingObjectTransmittingBuoyOperation.title")}'> <import> - fr.ird.observe.entities.seine.FloatingObject - fr.ird.observe.entities.seine.TransmittingBuoy - fr.ird.observe.entities.seine.TransmittingBuoyImpl - fr.ird.observe.entities.constants.seine.Ownership - fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperation - fr.ird.observe.entities.referentiel.Country - fr.ird.observe.entities.referentiel.seine.TransmittingBuoyOperation - fr.ird.observe.entities.referentiel.seine.TransmittingBuoyType + fr.ird.observe.services.dto.seine.FloatingObjectDto + fr.ird.observe.services.dto.seine.TransmittingBuoyDto + fr.ird.observe.services.dto.seine.TransmittingBuoyImplDto + fr.ird.observe.services.dto.constants.seine.OwnershipDto + fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperationDto + fr.ird.observe.services.dto.referential.CountryDto + fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto + fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto fr.ird.observe.ui.actions.shared.ResetEditUIAction fr.ird.observe.ui.actions.shared.SaveEditUIAction fr.ird.observe.ui.content.ContentUIModel @@ -50,24 +50,24 @@ <FloatingObjectTransmittingBuoyOperationUIModel id='model'/> <!-- edit bean --> - <FloatingObject id='bean'/> + <FloatingObjectDto id='bean'/> <!-- transmittingBuoy1 edit bean --> - <TransmittingBuoy id='transmittingBuoy1' initializer='new TransmittingBuoyImpl()'/> + <TransmittingBuoyDto id='transmittingBuoy1' initializer='new TransmittingBuoyDto()'/> <!-- transmittingBuoy2 edit bean --> - <TransmittingBuoy id='transmittingBuoy2' initializer='new TransmittingBuoyImpl()'/> + <TransmittingBuoyDto id='transmittingBuoy2' initializer='new TransmittingBuoyDto()'/> <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.seine.FloatingObject' + beanClass='fr.ird.observe.services.dto.seine.FloatingObjectDto' errorTableModel='{getErrorTableModel()}' context='n1-update-objectOperation'> </BeanValidator> <BeanValidator id='validatorBalise1' - beanClass='fr.ird.observe.entities.seine.TransmittingBuoy' + beanClass='fr.ird.observe.services.dto.seine.TransmittingBuoyDto' errorTableModel='{getErrorTableModel()}' parentValidator='{validator}' context='n1-update'> @@ -79,7 +79,7 @@ </BeanValidator> <BeanValidator id='validatorBalise2' - beanClass='fr.ird.observe.entities.seine.TransmittingBuoy' + beanClass='fr.ird.observe.services.dto.seine.TransmittingBuoyDto' errorTableModel='{getErrorTableModel()}' parentValidator='{validator}' context='n1-update'> @@ -102,7 +102,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <EnumEditor id='typeOperation' - genericType='TypeTransmittingBuoyOperation' + genericType='TypeTransmittingBuoyOperationDto' constructorParams='TypeTransmittingBuoyOperation.class' onItemStateChanged='if(event.getStateChange()==ItemEvent.SELECTED && model.isEditing()) { getHandler().changeTypeOperation(typeOperation.getSelectedItem(), true); model.setModified(true); }'/> </cell> @@ -142,7 +142,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <BeanComboBox id='transmittingBuoyOperation1' constructorParams='this' - genericType='TransmittingBuoyOperation'/> + genericType='TransmittingBuoyOperationDto'/> </cell> </row> <row> @@ -151,7 +151,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <BeanComboBox id='transmittingBuoyType1' constructorParams='this' - genericType='TransmittingBuoyType'/> + genericType='TransmittingBuoyTypeDto'/> </cell> </row> <row> @@ -169,7 +169,7 @@ <JLabel id='country1Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='country1' constructorParams='this' genericType='Country'/> + <BeanComboBox id='country1' constructorParams='this' genericType='CountryDto'/> </cell> </row> <row> @@ -199,7 +199,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <BeanComboBox id='transmittingBuoyOperation2' constructorParams='this' - genericType='TransmittingBuoyOperation'/> + genericType='TransmittingBuoyOperationDto'/> </cell> </row> <row> @@ -208,7 +208,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <BeanComboBox id='transmittingBuoyType2' constructorParams='this' - genericType='TransmittingBuoyType'/> + genericType='TransmittingBuoyTypeDto'/> </cell> </row> <row> @@ -217,7 +217,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <EnumEditor id='ownership2' - constructorParams='Ownership.class' + constructorParams='OwnershipDto.class' onItemStateChanged='transmittingBuoy2.setOwnership((Ownership) ownership2.getSelectedItem())'/> </cell> </row> @@ -226,7 +226,7 @@ <JLabel id='country2Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='country2' constructorParams='this' genericType='Country'/> + <BeanComboBox id='country2' constructorParams='this' genericType='CountryDto'/> </cell> </row> <row> diff --git a/observe-application-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 index 3db1541..62cee72 100644 --- a/observe-application-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 @@ -27,14 +27,14 @@ import fr.ird.observe.ObserveDAOHelper; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.constants.DataContextType; -import fr.ird.observe.entities.constants.seine.Ownership; -import fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperation; -import fr.ird.observe.entities.referentiel.Country; -import fr.ird.observe.entities.referentiel.seine.TransmittingBuoyOperation; -import fr.ird.observe.entities.referentiel.seine.TransmittingBuoyType; -import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.entities.seine.FloatingObject; -import fr.ird.observe.entities.seine.TransmittingBuoy; +import fr.ird.observe.services.dto.constants.seine.OwnershipDto; +import fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperationDto; +import fr.ird.observe.services.dto.referential.CountryDto; +import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto; +import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.FloatingObjectDto; +import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; diff --git a/observe-application-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 index 0888a16..75ee3bf 100644 --- a/observe-application-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 @@ -23,12 +23,8 @@ package fr.ird.observe.ui.content.impl.seine; */ import fr.ird.observe.BinderService; -import fr.ird.observe.ObserveServiceHelper; -import fr.ird.observe.entities.seine.FloatingObject; -import fr.ird.observe.entities.seine.TransmittingBuoy; -import fr.ird.observe.entities.seine.TransmittingBuoyImpl; +import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.ui.content.ContentUIModel; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; import org.nuiton.util.beans.BinderModelBuilder; /** @@ -37,52 +33,55 @@ import org.nuiton.util.beans.BinderModelBuilder; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class FloatingObjectTransmittingBuoyOperationUIModel extends ContentUIModel<FloatingObject> { +public class FloatingObjectTransmittingBuoyOperationUIModel extends ContentUIModel<FloatingObjectDto> { private static final long serialVersionUID = 1L; - protected TopiaEntityBinder<TransmittingBuoy> childLoador; + //FIXME +// protected TopiaEntityBinder<TransmittingBuoyDto> childLoador; public FloatingObjectTransmittingBuoyOperationUIModel() { - super(FloatingObject.class); + super(FloatingObjectDto.class); String binderName = getClass().getName() + "-open"; - BinderService binderService = ObserveServiceHelper.get().getBinderService(); + //FIXME +// BinderService binderService = ObserveServiceHelper.get().getBinderService(); - childLoador = binderService.getTopiaBinder(TransmittingBuoy.class, binderName); +// childLoador = binderService.getTopiaBinder(TransmittingBuoyDto.class, binderName); - if (childLoador == null) { +// if (childLoador == null) { - BinderModelBuilder<TransmittingBuoy, TransmittingBuoy> builder = binderService.newBinderBuilder( - TransmittingBuoy.class, - TransmittingBuoy.PROPERTY_CODE, - TransmittingBuoy.PROPERTY_OWNERSHIP, - TransmittingBuoy.PROPERTY_TRANSMITTING_BUOY_TYPE, - TransmittingBuoy.PROPERTY_TRANSMITTING_BUOY_OPERATION, - TransmittingBuoy.PROPERTY_BRAND, - TransmittingBuoy.PROPERTY_COUNTRY); +// BinderModelBuilder<TransmittingBuoy, TransmittingBuoy> builder = binderService.newBinderBuilder( +// TransmittingBuoy.class, +// TransmittingBuoy.PROPERTY_CODE, +// TransmittingBuoy.PROPERTY_OWNERSHIP, +// TransmittingBuoy.PROPERTY_TRANSMITTING_BUOY_TYPE, +// TransmittingBuoy.PROPERTY_TRANSMITTING_BUOY_OPERATION, +// TransmittingBuoy.PROPERTY_BRAND, +// TransmittingBuoy.PROPERTY_COUNTRY); // enregistrement du binder - childLoador = binderService.registerTopiaBinder(TransmittingBuoy.class, builder, binderName); +// childLoador = binderService.registerTopiaBinder(TransmittingBuoy.class, builder, binderName); // positionnement de l'entite empty - childLoador.setEmpty(new TransmittingBuoyImpl()); - } +// childLoador.setEmpty(new TransmittingBuoyImpl()); +// } } - public TopiaEntityBinder<TransmittingBuoy> getChildLoador() { - return childLoador; - } + //FIXME +// public TopiaEntityBinder<TransmittingBuoyDto> getChildLoador() { +// return childLoador; +// } @Override - protected BinderModelBuilder<FloatingObject, FloatingObject> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<FloatingObjectDto, FloatingObjectDto> createOpeningBinder(BinderService binderService, String binderName) { - BinderModelBuilder<FloatingObject, FloatingObject> builder = binderService.newBinderBuilder( - FloatingObject.class, - FloatingObject.PROPERTY_COMMENT, - FloatingObject.PROPERTY_OBJECT_OPERATION + BinderModelBuilder<FloatingObjectDto, FloatingObjectDto> builder = binderService.newBinderBuilder( + FloatingObjectDto.class, + FloatingObjectDto.PROPERTY_COMMENT, + FloatingObjectDto.PROPERTY_OBJECT_OPERATION ); return builder; diff --git a/observe-application-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 index 9ea87dc..11c8416 100644 --- a/observe-application-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 @@ -20,13 +20,13 @@ #L% --> -<fr.ird.observe.ui.content.ContentUI superGenericType='FloatingObject' contentTitle='{n("observe.floatingObject.title")}'> +<fr.ird.observe.ui.content.ContentUI superGenericType='FloatingObjectDto' contentTitle='{n("observe.floatingObject.title")}'> <import> - fr.ird.observe.entities.seine.FloatingObject - fr.ird.observe.entities.referentiel.seine.ObjectFate - fr.ird.observe.entities.referentiel.seine.ObjectOperation - fr.ird.observe.entities.referentiel.seine.ObjectType + fr.ird.observe.services.dto.seine.FloatingObjectDto + fr.ird.observe.services.dto.referential.seine.ObjectFateDto + fr.ird.observe.services.dto.referential.seine.ObjectOperationDto + fr.ird.observe.services.dto.referential.seine.ObjectTypeDto fr.ird.observe.ui.actions.shared.CancelCreateUIAction fr.ird.observe.ui.actions.shared.DeleteDataUIAction fr.ird.observe.ui.actions.shared.ResetEditUIAction @@ -48,11 +48,11 @@ <FloatingObjectUIModel id='model'/> <!-- edit bean --> - <FloatingObject id='bean'/> + <FloatingObjectDto id='bean'/> <!-- validator --> <BeanValidator id='validator' autoField='true' context='n1-create' - beanClass='fr.ird.observe.entities.seine.FloatingObject' + beanClass='fr.ird.observe.services.dto.seine.FloatingObjectDto' errorTableModel='{getErrorTableModel()}'/> <!-- formulaire --> @@ -63,7 +63,7 @@ <JLabel id='objectOperationLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='objectOperation' constructorParams='this' genericType='ObjectOperation'/> + <BeanComboBox id='objectOperation' constructorParams='this' genericType='ObjectOperationDto'/> </cell> </row> <row> @@ -71,7 +71,7 @@ <JLabel id='objectTypeLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='objectType' constructorParams='this' genericType='ObjectType'/> + <BeanComboBox id='objectType' constructorParams='this' genericType='ObjectTypeDto'/> </cell> </row> <row> @@ -79,7 +79,7 @@ <JLabel id='objectFateLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='objectFate' constructorParams='this' genericType='ObjectFate'/> + <BeanComboBox id='objectFate' constructorParams='this' genericType='ObjectFateDto'/> </cell> </row> <row> diff --git a/observe-application-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 index 6787aa7..31c327b 100644 --- a/observe-application-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 @@ -27,9 +27,9 @@ import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.db.util.TopiaExecutor2; -import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.entities.seine.FloatingObject; -import fr.ird.observe.entities.seine.FloatingObjectDAO; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.FloatingObjectDto; +import fr.ird.observe.services.dto.seine.FloatingObjectDAODto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; import fr.ird.observe.ui.content.ContentUIModel; diff --git a/observe-application-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 index 90723e1..ff03301 100644 --- a/observe-application-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 @@ -23,7 +23,7 @@ package fr.ird.observe.ui.content.impl.seine; */ import fr.ird.observe.BinderService; -import fr.ird.observe.entities.seine.FloatingObject; +import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.ui.content.ContentUIModel; import org.nuiton.util.beans.BinderModelBuilder; @@ -33,25 +33,25 @@ import org.nuiton.util.beans.BinderModelBuilder; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class FloatingObjectUIModel extends ContentUIModel<FloatingObject> { +public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> { private static final long serialVersionUID = 1L; public FloatingObjectUIModel() { - super(FloatingObject.class); + super(FloatingObjectDto.class); } @Override - protected BinderModelBuilder<FloatingObject, FloatingObject> createOpeningBinder(BinderService binderService, String binderName) { - - BinderModelBuilder<FloatingObject, FloatingObject> builder = binderService.newBinderBuilder( - FloatingObject.class, - FloatingObject.PROPERTY_OBJECT_TYPE, - FloatingObject.PROPERTY_OBJECT_FATE, - FloatingObject.PROPERTY_OBJECT_OPERATION, - FloatingObject.PROPERTY_COMMENT, - FloatingObject.PROPERTY_SUPPORT_VESSEL_NAME, - FloatingObject.PROPERTY_DAYS_AT_SEA_COUNT); + protected BinderModelBuilder<FloatingObjectDto, FloatingObjectDto> createOpeningBinder(BinderService binderService, String binderName) { + + BinderModelBuilder<FloatingObjectDto, FloatingObjectDto> builder = binderService.newBinderBuilder( + FloatingObjectDto.class, + FloatingObjectDto.PROPERTY_OBJECT_TYPE, + FloatingObjectDto.PROPERTY_OBJECT_FATE, + FloatingObjectDto.PROPERTY_OBJECT_OPERATION, + FloatingObjectDto.PROPERTY_COMMENT, + FloatingObjectDto.PROPERTY_SUPPORT_VESSEL_NAME, + FloatingObjectDto.PROPERTY_DAYS_AT_SEA_COUNT); return builder; diff --git a/observe-application-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 index 55d4b57..f30eb5f 100644 --- a/observe-application-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 @@ -20,12 +20,12 @@ #L% --> -<fr.ird.observe.ui.content.ContentUI superGenericType='SetSeine' contentTitle='{n("observe.setSeine.title")}'> +<fr.ird.observe.ui.content.ContentUI superGenericType='SetSeineDto' contentTitle='{n("observe.setSeine.title")}'> <import> - fr.ird.observe.entities.CommentableEntity - fr.ird.observe.entities.seine.SetSeine - fr.ird.observe.entities.referentiel.seine.ReasonForNullSet + fr.ird.observe.services.dto.CommentableDto + fr.ird.observe.services.dto.seine.SetSeineDto + fr.ird.observe.services.dto.referential.seine.ReasonForNullSetDto fr.ird.observe.ui.actions.shared.CancelCreateUIAction fr.ird.observe.ui.actions.shared.DeleteDataUIAction fr.ird.observe.ui.actions.shared.ResetEditUIAction @@ -54,12 +54,12 @@ <SetSeineUIModel id='model'/> <!-- edit bean --> - <SetSeine id='bean'/> + <SetSeineDto id='bean'/> <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.seine.SetSeine' + beanClass='fr.ird.observe.services.dto.seine.SetSeineDto' errorTableModel='{getErrorTableModel()}' context='n1-update'> </BeanValidator> diff --git a/observe-application-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 index 5a71b4f..73772e0 100644 --- a/observe-application-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 @@ -28,12 +28,12 @@ import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.db.util.TopiaExecutor2; -import fr.ird.observe.entities.constants.seine.SchoolType; -import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.entities.seine.NonTargetSample; -import fr.ird.observe.entities.seine.Route; -import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.entities.seine.TargetSample; +import fr.ird.observe.services.dto.constants.seine.SchoolTypeDto; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.NonTargetSampleDto; +import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.dto.seine.TargetSampleDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; diff --git a/observe-application-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 index 118e103..e072654 100644 --- a/observe-application-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 @@ -24,7 +24,7 @@ package fr.ird.observe.ui.content.impl.seine; import com.google.common.collect.ImmutableSet; import fr.ird.observe.BinderService; -import fr.ird.observe.entities.seine.SetSeine; +import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.ui.content.ContentUIModel; import org.nuiton.util.beans.BinderModelBuilder; @@ -36,31 +36,31 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class SetSeineUIModel extends ContentUIModel<SetSeine> { +public class SetSeineUIModel extends ContentUIModel<SetSeineDto> { public static final String PROPERTY_GENERAL_TAB_VALID = "generalTabValid"; public static final String PROPERTY_MEASUREMENTS_TAB_VALID = "measurementsTabValid"; public static final Set<String> GENERAL_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(SetSeine.PROPERTY_START_TIME, - SetSeine.PROPERTY_END_PURSING_TIME_STAMP, - SetSeine.PROPERTY_END_SET_TIME_STAMP, - SetSeine.PROPERTY_REASON_FOR_NULL_SET, - SetSeine.PROPERTY_SUPPORT_VESSEL_NAME, - SetSeine.PROPERTY_TARGET_DISCARDED, - SetSeine.PROPERTY_NON_TARGET_DISCARDED, - SetSeine.PROPERTY_SCHOOL_TYPE).build(); + ImmutableSet.<String>builder().add(SetSeineDto.PROPERTY_START_TIME, + SetSeineDto.PROPERTY_END_PURSING_TIME_STAMP, + SetSeineDto.PROPERTY_END_SET_TIME_STAMP, + SetSeineDto.PROPERTY_REASON_FOR_NULL_SET, + SetSeineDto.PROPERTY_SUPPORT_VESSEL_NAME, + SetSeineDto.PROPERTY_TARGET_DISCARDED, + SetSeineDto.PROPERTY_NON_TARGET_DISCARDED, + SetSeineDto.PROPERTY_SCHOOL_TYPE).build(); public static final Set<String> MEASUREMENTS_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(SetSeine.PROPERTY_SCHOOL_THICKNESS, - SetSeine.PROPERTY_SCHOOL_MEAN_DEPTH, - SetSeine.PROPERTY_SCHOOL_TOP_DEPTH, - SetSeine.PROPERTY_CURRENT_SPEED, - SetSeine.PROPERTY_CURRENT_DIRECTION, - SetSeine.PROPERTY_CURRENT_MEASURE_DEPTH, - SetSeine.PROPERTY_MAX_GEAR_DEPTH, - SetSeine.PROPERTY_SONAR_USED).build(); + ImmutableSet.<String>builder().add(SetSeineDto.PROPERTY_SCHOOL_THICKNESS, + SetSeineDto.PROPERTY_SCHOOL_MEAN_DEPTH, + SetSeineDto.PROPERTY_SCHOOL_TOP_DEPTH, + SetSeineDto.PROPERTY_CURRENT_SPEED, + SetSeineDto.PROPERTY_CURRENT_DIRECTION, + SetSeineDto.PROPERTY_CURRENT_MEASURE_DEPTH, + SetSeineDto.PROPERTY_MAX_GEAR_DEPTH, + SetSeineDto.PROPERTY_SONAR_USED).build(); private static final long serialVersionUID = 1L; @@ -70,7 +70,7 @@ public class SetSeineUIModel extends ContentUIModel<SetSeine> { public SetSeineUIModel() { - super(SetSeine.class); + super(SetSeineDto.class); } public boolean isMeasurementsTabValid() { @@ -94,29 +94,31 @@ public class SetSeineUIModel extends ContentUIModel<SetSeine> { } @Override - protected BinderModelBuilder<SetSeine, SetSeine> createOpeningBinder(BinderService binderService, String binderName) { - - BinderModelBuilder<SetSeine, SetSeine> builder = binderService.newBinderBuilder( - SetSeine.class, - SetSeine.PROPERTY_COMMENT, - SetSeine.PROPERTY_SUPPORT_VESSEL_NAME, - SetSeine.PROPERTY_START_TIME, - SetSeine.PROPERTY_END_SET_TIME_STAMP, - SetSeine.PROPERTY_END_PURSING_TIME_STAMP, - SetSeine.PROPERTY_CURRENT_DIRECTION, - SetSeine.PROPERTY_CURRENT_SPEED, - SetSeine.PROPERTY_REASON_FOR_NULL_SET, - SetSeine.PROPERTY_SCHOOL_THICKNESS, - SetSeine.PROPERTY_MAX_GEAR_DEPTH, - SetSeine.PROPERTY_SCHOOL_MEAN_DEPTH, - SetSeine.PROPERTY_SCHOOL_TOP_DEPTH, - SetSeine.PROPERTY_CURRENT_MEASURE_DEPTH, - SetSeine.PROPERTY_TARGET_DISCARDED, - SetSeine.PROPERTY_NON_TARGET_DISCARDED, - SetSeine.PROPERTY_SCHOOL_TYPE, - SetSeine.PROPERTY_SONAR_USED, - SetSeine.PROPERTY_TARGET_SAMPLE, - SetSeine.PROPERTY_NON_TARGET_SAMPLE); + protected BinderModelBuilder<SetSeineDto, SetSeineDto> createOpeningBinder(BinderService binderService, String binderName) { + + BinderModelBuilder<SetSeineDto, SetSeineDto> builder = binderService.newBinderBuilder( + SetSeineDto.class, + SetSeineDto.PROPERTY_COMMENT, + SetSeineDto.PROPERTY_SUPPORT_VESSEL_NAME, + SetSeineDto.PROPERTY_START_TIME, + SetSeineDto.PROPERTY_END_SET_TIME_STAMP, + SetSeineDto.PROPERTY_END_PURSING_TIME_STAMP, + SetSeineDto.PROPERTY_CURRENT_DIRECTION, + SetSeineDto.PROPERTY_CURRENT_SPEED, + SetSeineDto.PROPERTY_REASON_FOR_NULL_SET, + SetSeineDto.PROPERTY_SCHOOL_THICKNESS, + SetSeineDto.PROPERTY_MAX_GEAR_DEPTH, + SetSeineDto.PROPERTY_SCHOOL_MEAN_DEPTH, + SetSeineDto.PROPERTY_SCHOOL_TOP_DEPTH, + SetSeineDto.PROPERTY_CURRENT_MEASURE_DEPTH, + SetSeineDto.PROPERTY_TARGET_DISCARDED, + SetSeineDto.PROPERTY_NON_TARGET_DISCARDED, + SetSeineDto.PROPERTY_SCHOOL_TYPE, + SetSeineDto.PROPERTY_SONAR_USED + //FIXME +// SetSeineDto.PROPERTY_TARGET_SAMPLE, +// SetSeineDto.PROPERTY_NON_TARGET_SAMPLE + ); return builder; diff --git a/observe-application-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 index 6a78527..2417ea9 100644 --- a/observe-application-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 @@ -23,13 +23,13 @@ <fr.ird.observe.ui.content.ContentUI abstract='true' superGenericType='E' - genericType='E extends TopiaEntity, C extends TopiaEntity'> + genericType='E extends AbstractObserveDto, C extends AbstractObserveDto'> <import> fr.ird.observe.ui.actions.shared.ReOpenUIAction fr.ird.observe.ui.actions.shared.SelectNodeUIAction - org.nuiton.topia.persistence.TopiaEntity + fr.ird.observe.services.dto.AbstractObserveDto jaxx.runtime.swing.editor.bean.BeanListHeader diff --git a/observe-application-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 index 4ec81be..8dc9dbd 100644 --- a/observe-application-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 @@ -21,10 +21,10 @@ */ package fr.ird.observe.ui.content.list; +import fr.ird.observe.services.dto.AbstractObserveDto; import fr.ird.observe.ui.content.ContentUIModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.TopiaEntity; import java.util.List; @@ -34,7 +34,7 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since .14 */ -public abstract class ContentListUIModel<E extends TopiaEntity, C extends TopiaEntity> extends ContentUIModel<E> { +public abstract class ContentListUIModel<E extends AbstractObserveDto, C extends AbstractObserveDto> extends ContentUIModel<E> { public static final String PROPERTY_DATA = "data"; diff --git a/observe-application-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 index 79f69bb..d3316bc 100644 --- a/observe-application-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 @@ -20,13 +20,13 @@ #L% --> -<fr.ird.observe.ui.content.list.ContentListUI superGenericType='TripLongline, ActivityLongline' +<fr.ird.observe.ui.content.list.ContentListUI superGenericType='TripLonglineDto, ActivityLonglineDto' contentTitle='{n("observe.activityLonglines.title")}' listText='{n("observe.common.activities.list")}' emptyListMessage='{n("observe.message.no.activity.for.trip")}'> <import> - fr.ird.observe.entities.longline.ActivityLongline - fr.ird.observe.entities.longline.TripLongline + fr.ird.observe.services.dto.longline.ActivityLonglineDto + fr.ird.observe.services.dto.longline.TripLonglineDto fr.ird.observe.ui.actions.shared.CloseAndCreateUIAction fr.ird.observe.ui.actions.shared.CloseOpenUIAction fr.ird.observe.ui.actions.shared.SelectOpenNodeUIAction @@ -43,7 +43,7 @@ <ActivityLonglinesUIModel id='model'/> <!-- edit bean --> - <TripLongline id='bean'/> + <TripLonglineDto id='bean'/> <!-- override generic actions --> <JButton id='gotoSelectedChild'/> diff --git a/observe-application-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 index 9112209..1e58026 100644 --- a/observe-application-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 @@ -27,8 +27,8 @@ import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DataContextType; -import fr.ird.observe.entities.longline.ActivityLongline; -import fr.ird.observe.entities.longline.TripLongline; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; diff --git a/observe-application-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 index 5f88dff..0080710 100644 --- a/observe-application-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 @@ -23,10 +23,9 @@ package fr.ird.observe.ui.content.list.impl.longline; */ import fr.ird.observe.BinderService; -import fr.ird.observe.entities.longline.ActivityLongline; -import fr.ird.observe.entities.longline.TripLongline; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.ui.content.list.ContentListUIModel; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; import org.nuiton.util.beans.BinderModelBuilder; /** @@ -35,32 +34,35 @@ import org.nuiton.util.beans.BinderModelBuilder; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class ActivityLonglinesUIModel extends ContentListUIModel<TripLongline, ActivityLongline> { +public class ActivityLonglinesUIModel extends ContentListUIModel<TripLonglineDto, ActivityLonglineDto> { private static final long serialVersionUID = 1L; public ActivityLonglinesUIModel() { - super(TripLongline.class, ActivityLongline.class); + super(TripLonglineDto.class, ActivityLonglineDto.class); } @Override - protected BinderModelBuilder<TripLongline, TripLongline> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<TripLonglineDto, TripLonglineDto> createOpeningBinder(BinderService binderService, String binderName) { - BinderModelBuilder<TripLongline, TripLongline> builder = binderService.newBinderBuilder( - TripLongline.class, - TripLongline.PROPERTY_OPEN, - TripLongline.PROPERTY_ACTIVITY_LONGLINE); + BinderModelBuilder<TripLonglineDto, TripLonglineDto> builder = binderService.newBinderBuilder( + TripLonglineDto.class, + TripLonglineDto.PROPERTY_OPEN + //FIXME +// TripLonglineDto.PROPERTY_ACTIVITY_LONGLINE + ); - BinderModelBuilder<ActivityLongline, ActivityLongline> builder2 = binderService.newBinderBuilder( - ActivityLongline.class, - ActivityLongline.PROPERTY_VESSEL_ACTIVITY_LONGLINE, - ActivityLongline.PROPERTY_TIME_STAMP, - ActivityLongline.PROPERTY_OPEN); + BinderModelBuilder<ActivityLonglineDto, ActivityLonglineDto> builder2 = binderService.newBinderBuilder( + ActivityLonglineDto.class, + ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, + ActivityLonglineDto.PROPERTY_TIME_STAMP, + ActivityLonglineDto.PROPERTY_OPEN); - TopiaEntityBinder<ActivityLongline> binder = - binderService.registerTopiaBinder(ActivityLongline.class, builder2, binderName); - - builder.addCollectionBinder(binder, TripLongline.PROPERTY_ACTIVITY_LONGLINE); + //FIXME +// TopiaEntityBinder<ActivityLongline> binder = +// binderService.registerTopiaBinder(ActivityLongline.class, builder2, binderName); +// +// builder.addCollectionBinder(binder, TripLongline.PROPERTY_ACTIVITY_LONGLINE); return builder; diff --git a/observe-application-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 index 29c9bb9..5256c29 100644 --- a/observe-application-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 @@ -19,14 +19,14 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<fr.ird.observe.ui.content.list.ContentListUI superGenericType='Program, TripLongline' +<fr.ird.observe.ui.content.list.ContentListUI superGenericType='ProgramDto, TripLonglineDto' listText='{n("observe.common.trips.list")}' emptyListMessage='{n("observe.message.no.trip.for.program")}'> <import> - fr.ird.observe.entities.longline.ActivityLongline - fr.ird.observe.entities.longline.TripLongline - fr.ird.observe.entities.referentiel.Program + fr.ird.observe.services.dto.longline.ActivityLonglineDto + fr.ird.observe.services.dto.longline.TripLonglineDto + fr.ird.observe.services.dto.referential.ProgramDto fr.ird.observe.ui.actions.shared.SelectOpenNodeUIAction static org.nuiton.i18n.I18n.n @@ -41,7 +41,7 @@ <TripLonglinesUIModel id='model'/> <!-- edit bean --> - <Program id='bean'/> + <ProgramDto id='bean'/> <!-- override generic actions --> <JButton id='gotoSelectedChild'/> diff --git a/observe-application-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 index 7cbc914..674cbfb 100644 --- a/observe-application-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 @@ -27,8 +27,8 @@ import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DataContextType; -import fr.ird.observe.entities.longline.TripLongline; -import fr.ird.observe.entities.referentiel.Program; +import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; diff --git a/observe-application-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 index 48d95f4..ee571c7 100644 --- a/observe-application-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 @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.list.impl.longline; */ import fr.ird.observe.BinderService; -import fr.ird.observe.entities.longline.TripLongline; -import fr.ird.observe.entities.referentiel.Program; +import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.ui.content.list.ContentListUIModel; import org.nuiton.util.beans.BinderModelBuilder; @@ -34,27 +34,27 @@ import org.nuiton.util.beans.BinderModelBuilder; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class TripLonglinesUIModel extends ContentListUIModel<Program, TripLongline> { +public class TripLonglinesUIModel extends ContentListUIModel<ProgramDto, TripLonglineDto> { private static final long serialVersionUID = 1L; public TripLonglinesUIModel() { - super(Program.class, TripLongline.class); + super(ProgramDto.class, TripLonglineDto.class); } @Override - protected BinderModelBuilder<Program, Program> createOpeningBinder(BinderService binderService, String binderName) { - - BinderModelBuilder<Program, Program> builder = binderService.newBinderBuilder( - Program.class, - Program.PROPERTY_LABEL1, - Program.PROPERTY_LABEL2, - Program.PROPERTY_LABEL3, - Program.PROPERTY_LABEL4, - Program.PROPERTY_LABEL5, - Program.PROPERTY_LABEL6, - Program.PROPERTY_LABEL7, - Program.PROPERTY_LABEL8); + protected BinderModelBuilder<ProgramDto, ProgramDto> createOpeningBinder(BinderService binderService, String binderName) { + + BinderModelBuilder<ProgramDto, ProgramDto> builder = binderService.newBinderBuilder( + ProgramDto.class, + ProgramDto.PROPERTY_LABEL1, + ProgramDto.PROPERTY_LABEL2, + ProgramDto.PROPERTY_LABEL3, + ProgramDto.PROPERTY_LABEL4, + ProgramDto.PROPERTY_LABEL5, + ProgramDto.PROPERTY_LABEL6, + ProgramDto.PROPERTY_LABEL7, + ProgramDto.PROPERTY_LABEL8); return builder; diff --git a/observe-application-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 index 4d3110f..0604942 100644 --- a/observe-application-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 @@ -20,13 +20,13 @@ #L% --> -<fr.ird.observe.ui.content.list.ContentListUI superGenericType='Route, ActivitySeine' +<fr.ird.observe.ui.content.list.ContentListUI superGenericType='RouteDto, ActivitySeineDto' contentTitle='{n("observe.activitySeines.title")}' listText='{n("observe.common.activities.list")}' emptyListMessage='{n("observe.message.no.activity.for.route")}'> <import> - fr.ird.observe.entities.seine.ActivitySeine - fr.ird.observe.entities.seine.Route + fr.ird.observe.services.dto.seine.ActivitySeineDto + fr.ird.observe.services.dto.seine.RouteDto fr.ird.observe.ui.actions.shared.CloseAndCreateUIAction fr.ird.observe.ui.actions.shared.CloseOpenUIAction fr.ird.observe.ui.actions.shared.SelectOpenNodeUIAction @@ -43,7 +43,7 @@ <ActivitySeinesUIModel id='model'/> <!-- edit bean --> - <Route id='bean'/> + <RouteDto id='bean'/> <!-- override generic actions --> <JButton id='gotoSelectedChild'/> diff --git a/observe-application-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 index 2a1aab7..28fa457 100644 --- a/observe-application-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 @@ -26,8 +26,8 @@ import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DataContextType; -import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.entities.seine.Route; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; diff --git a/observe-application-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 index 3036a3d..a6cd5ba 100644 --- a/observe-application-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 @@ -23,10 +23,9 @@ package fr.ird.observe.ui.content.list.impl.seine; */ import fr.ird.observe.BinderService; -import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.entities.seine.Route; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.ui.content.list.ContentListUIModel; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; import org.nuiton.util.beans.BinderModelBuilder; /** @@ -35,37 +34,40 @@ import org.nuiton.util.beans.BinderModelBuilder; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class ActivitySeinesUIModel extends ContentListUIModel<Route, ActivitySeine> { +public class ActivitySeinesUIModel extends ContentListUIModel<RouteDto, ActivitySeineDto> { private static final long serialVersionUID = 1L; public ActivitySeinesUIModel() { - super(Route.class, ActivitySeine.class); + super(RouteDto.class, ActivitySeineDto.class); } @Override - protected BinderModelBuilder<Route, Route> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<RouteDto, RouteDto> createOpeningBinder(BinderService binderService, String binderName) { - BinderModelBuilder<Route, Route> builder = binderService.newBinderBuilder( - Route.class, - Route.PROPERTY_OPEN, - Route.PROPERTY_ACTIVITY_SEINE); + BinderModelBuilder<RouteDto, RouteDto> builder = binderService.newBinderBuilder( + RouteDto.class, + RouteDto.PROPERTY_OPEN + //FIXME +// RouteDto.PROPERTY_ACTIVITY_SEINE + ); // // on ajoute la recopie de l'association route // builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, // Route.PROPERTY_ACTIVITY_SEINE // ); - BinderModelBuilder<ActivitySeine, ActivitySeine> builder2 = binderService.newBinderBuilder( - ActivitySeine.class, - ActivitySeine.PROPERTY_VESSEL_ACTIVITY_SEINE, - ActivitySeine.PROPERTY_TIME, - ActivitySeine.PROPERTY_OPEN); + BinderModelBuilder<ActivitySeineDto, ActivitySeineDto> builder2 = binderService.newBinderBuilder( + ActivitySeineDto.class, + ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, + ActivitySeineDto.PROPERTY_TIME, + ActivitySeineDto.PROPERTY_OPEN); - TopiaEntityBinder<ActivitySeine> binder = - binderService.registerTopiaBinder(ActivitySeine.class, builder2, binderName); - - builder.addCollectionBinder(binder, Route.PROPERTY_ACTIVITY_SEINE); + //FIXME +// TopiaEntityBinder<ActivitySeineDto> binder = +// binderService.registerTopiaBinder(ActivitySeineDto.class, builder2, binderName); +// +// builder.addCollectionBinder(binder, RouteDto.PROPERTY_ACTIVITY_SEINE); return builder; diff --git a/observe-application-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 index 738cd70..2f9815e 100644 --- a/observe-application-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 @@ -20,14 +20,14 @@ #L% --> -<fr.ird.observe.ui.content.list.ContentListUI superGenericType='TripSeine, Route' +<fr.ird.observe.ui.content.list.ContentListUI superGenericType='TripSeineDto, RouteDto' contentTitle='{n("observe.routes.title")}' listText='{n("observe.common.routes.list")}' emptyListMessage='{n("observe.message.no.route.for.maree")}'> <import> - fr.ird.observe.entities.seine.ActivitySeine - fr.ird.observe.entities.seine.TripSeine - fr.ird.observe.entities.seine.Route + fr.ird.observe.services.dto.seine.ActivitySeineDto + fr.ird.observe.services.dto.seine.TripSeineDto + fr.ird.observe.services.dto.seine.RouteDto fr.ird.observe.ui.actions.shared.SelectOpenNodeUIAction static org.nuiton.i18n.I18n.n </import> @@ -41,7 +41,7 @@ <RoutesUIModel id='model'/> <!-- edit bean --> - <TripSeine id='bean'/> + <TripSeineDto id='bean'/> <!-- override generic actions --> <JButton id='gotoSelectedChild'/> diff --git a/observe-application-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 index 3a33ceb..dc8300f 100644 --- a/observe-application-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 @@ -26,8 +26,8 @@ import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DataContextType; -import fr.ird.observe.entities.seine.Route; -import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; diff --git a/observe-application-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 index f778002..548454b 100644 --- a/observe-application-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 @@ -23,10 +23,9 @@ package fr.ird.observe.ui.content.list.impl.seine; */ import fr.ird.observe.BinderService; -import fr.ird.observe.entities.seine.Route; -import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.content.list.ContentListUIModel; -import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderModelBuilder; /** @@ -35,24 +34,27 @@ import org.nuiton.util.beans.BinderModelBuilder; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class RoutesUIModel extends ContentListUIModel<TripSeine, Route> { +public class RoutesUIModel extends ContentListUIModel<TripSeineDto, RouteDto> { private static final long serialVersionUID = 1L; public RoutesUIModel() { - super(TripSeine.class, Route.class); + super(TripSeineDto.class, RouteDto.class); } @Override - protected BinderModelBuilder<TripSeine, TripSeine> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<TripSeineDto, TripSeineDto> createOpeningBinder(BinderService binderService, String binderName) { - BinderModelBuilder<TripSeine, TripSeine> builder = binderService.newBinderBuilder( - TripSeine.class, - TripSeine.PROPERTY_OPEN, - TripSeine.PROPERTY_ROUTE); + BinderModelBuilder<TripSeineDto, TripSeineDto> builder = binderService.newBinderBuilder( + TripSeineDto.class, + TripSeineDto.PROPERTY_OPEN + //FIXME +// TripSeineDto.PROPERTY_ROUTE + ); // on ajoute la recopie de l'association route - builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, TripSeine.PROPERTY_ROUTE); + //FIXME +// builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, TripSeineDto.PROPERTY_ROUTE); return builder; diff --git a/observe-application-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 index 263214b..4e1122b 100644 --- a/observe-application-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 @@ -20,15 +20,15 @@ #L% --> <fr.ird.observe.ui.content.list.ContentListUI - superGenericType='Program, TripSeine' + superGenericType='ProgramDto, TripSeineDto' listText='{n("observe.common.trips.list")}' emptyListMessage='{n("observe.message.no.trip.for.program")}'> <import> - fr.ird.observe.entities.seine.ActivitySeine - fr.ird.observe.entities.seine.TripSeine - fr.ird.observe.entities.seine.Route - fr.ird.observe.entities.referentiel.Program + fr.ird.observe.services.dto.seine.ActivitySeineDto + fr.ird.observe.services.dto.seine.TripSeineDto + fr.ird.observe.services.dto.seine.RouteDto + fr.ird.observe.services.dto.referential.ProgramDto fr.ird.observe.ui.actions.shared.SelectOpenNodeUIAction static org.nuiton.i18n.I18n.n @@ -43,7 +43,7 @@ <TripSeinesUIModel id='model'/> <!-- edit bean --> - <Program id='bean'/> + <ProgramDto id='bean'/> <!-- override generic actions --> <JButton id='gotoSelectedChild'/> diff --git a/observe-application-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 index 7eb1ee1..197838e 100644 --- a/observe-application-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 @@ -26,8 +26,8 @@ import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DataContextType; -import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; diff --git a/observe-application-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 index af7ca80..a9ee14d 100644 --- a/observe-application-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 @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.list.impl.seine; */ import fr.ird.observe.BinderService; -import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.content.list.ContentListUIModel; import org.nuiton.util.beans.BinderModelBuilder; @@ -34,27 +34,27 @@ import org.nuiton.util.beans.BinderModelBuilder; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class TripSeinesUIModel extends ContentListUIModel<Program, TripSeine> { +public class TripSeinesUIModel extends ContentListUIModel<ProgramDto, TripSeineDto> { private static final long serialVersionUID = 1L; public TripSeinesUIModel() { - super(Program.class, TripSeine.class); + super(ProgramDto.class, TripSeineDto.class); } @Override - protected BinderModelBuilder<Program, Program> createOpeningBinder(BinderService binderService, String binderName) { - - BinderModelBuilder<Program, Program> builder = binderService.newBinderBuilder( - Program.class, - Program.PROPERTY_LABEL1, - Program.PROPERTY_LABEL2, - Program.PROPERTY_LABEL3, - Program.PROPERTY_LABEL4, - Program.PROPERTY_LABEL5, - Program.PROPERTY_LABEL6, - Program.PROPERTY_LABEL7, - Program.PROPERTY_LABEL8); + protected BinderModelBuilder<ProgramDto, ProgramDto> createOpeningBinder(BinderService binderService, String binderName) { + + BinderModelBuilder<ProgramDto, ProgramDto> builder = binderService.newBinderBuilder( + ProgramDto.class, + ProgramDto.PROPERTY_LABEL1, + ProgramDto.PROPERTY_LABEL2, + ProgramDto.PROPERTY_LABEL3, + ProgramDto.PROPERTY_LABEL4, + ProgramDto.PROPERTY_LABEL5, + ProgramDto.PROPERTY_LABEL6, + ProgramDto.PROPERTY_LABEL7, + ProgramDto.PROPERTY_LABEL8); return builder; diff --git a/observe-application-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 index a423ef0..caa3af1 100644 --- a/observe-application-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 @@ -23,10 +23,13 @@ <fr.ird.observe.ui.content.ContentUI abstract='true' superGenericType='E' - genericType='E extends org.nuiton.topia.persistence.TopiaEntity & fr.ird.observe.entities.OpenableEntity' + genericType='E extends AbstractObserveDto & OpenableDto'
<import> + fr.ird.observe.services.dto.AbstractObserveDto + fr.ird.observe.services.dto.OpenableDto + fr.ird.observe.ui.actions.shared.CancelCreateUIAction fr.ird.observe.ui.actions.shared.CloseAndCreateUIAction fr.ird.observe.ui.actions.shared.CloseOpenUIAction diff --git a/observe-application-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 index 3755f64..91a6aa5 100644 --- a/observe-application-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 @@ -26,8 +26,8 @@ import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DataContextType; -import fr.ird.observe.entities.OpenableEntity; -import fr.ird.observe.entities.Trip; +import fr.ird.observe.services.dto.OpenableEntityDto; +import fr.ird.observe.services.dto.TripDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; import fr.ird.observe.ui.tree.ObserveNode; diff --git a/observe-application-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 index 1dc3c7f..1d8f522 100644 --- a/observe-application-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 @@ -21,9 +21,8 @@ */ package fr.ird.observe.ui.content.open; -import fr.ird.observe.entities.OpenableEntity; +import fr.ird.observe.services.dto.OpenableDto; import fr.ird.observe.ui.content.ContentUIModel; -import org.nuiton.topia.persistence.TopiaEntity; /** * Le modèle pour un écran d'édition avec des fils. @@ -31,7 +30,7 @@ import org.nuiton.topia.persistence.TopiaEntity; * @author Tony Chemit - chemit@codelutin.com * @since 1.5 */ -public abstract class ContentOpenableUIModel<E extends TopiaEntity & OpenableEntity> extends ContentUIModel<E> { +public abstract class ContentOpenableUIModel<E extends OpenableDto> extends ContentUIModel<E> { public static final String PROPERTY_CAN_REOPEN = "canReopen"; diff --git a/observe-application-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 index c727b42..ecbd9a1 100644 --- a/observe-application-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 @@ -20,17 +20,17 @@ #L% --> -<fr.ird.observe.ui.content.open.ContentOpenableUI superGenericType='ActivityLongline' +<fr.ird.observe.ui.content.open.ContentOpenableUI superGenericType='ActivityLonglineDto' contentTitle='{n("observe.activityLongline.title")}'> <style source="../../../Common.css"/> <import> - fr.ird.observe.entities.CommentableEntity - fr.ird.observe.entities.longline.ActivityLongline - fr.ird.observe.entities.longline.SetLongline - fr.ird.observe.entities.referentiel.FpaZone - fr.ird.observe.entities.referentiel.longline.VesselActivityLongline + fr.ird.observe.services.dto.CommentableDto + fr.ird.observe.services.dto.longline.ActivityLonglineDto + fr.ird.observe.services.dto.longline.SetLonglineDto + fr.ird.observe.services.dto.referential.FpaZoneDto + fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto fr.ird.observe.ui.actions.shared.DeleteDataUIAction jaxx.runtime.swing.editor.NumberEditor @@ -54,12 +54,12 @@ <ActivityLonglineUIModel id='model'/> <!-- edit bean --> - <ActivityLongline id='bean'/> + <ActivityLonglineDto id='bean'/> <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.longline.ActivityLongline' + beanClass='fr.ird.observe.services.dto.longline.ActivityLonglineDto' errorTableModel='{getErrorTableModel()}' context='n1-create'> @@ -93,7 +93,7 @@ <JLabel id='vesselActivityLonglineLabel'/> </cell> <cell anchor='east' fill="both"> - <BeanComboBox id='vesselActivityLongline' genericType='VesselActivityLongline' constructorParams='this'/> + <BeanComboBox id='vesselActivityLongline' genericType='VesselActivityLonglineDto' constructorParams='this'/> </cell> </row> @@ -102,7 +102,7 @@ <JLabel id='fpaZoneLabel'/> </cell> <cell anchor='east' fill="both"> - <BeanComboBox id='fpaZone' genericType='FpaZone' constructorParams='this'/> + <BeanComboBox id='fpaZone' genericType='FpaZoneDto' constructorParams='this'/> </cell> </row> @@ -112,7 +112,7 @@ <JLabel id='seaSurfaceTemperatureLabel'/> </cell> <cell anchor='east' fill="both"> - <NumberEditor id='seaSurfaceTemperature' constructorParams='this'/> + <NumberEditor id='seaSurfaceTemperatureLabel' constructorParams='this'/> </cell> </row> diff --git a/observe-application-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 index 910615e..5396708 100644 --- a/observe-application-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 @@ -30,8 +30,8 @@ import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.db.util.TopiaExecutor2; -import fr.ird.observe.entities.longline.ActivityLongline; -import fr.ird.observe.entities.longline.TripLongline; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIModel; import fr.ird.observe.ui.content.open.ContentOpenableUIHandler; diff --git a/observe-application-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 index 2450ecc..be56f54 100644 --- a/observe-application-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 @@ -23,9 +23,8 @@ package fr.ird.observe.ui.content.open.impl.longline; */ import fr.ird.observe.BinderService; -import fr.ird.observe.entities.longline.ActivityLongline; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; -import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderModelBuilder; /** @@ -34,35 +33,40 @@ import org.nuiton.util.beans.BinderModelBuilder; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class ActivityLonglineUIModel extends ContentOpenableUIModel<ActivityLongline> { +public class ActivityLonglineUIModel extends ContentOpenableUIModel<ActivityLonglineDto> { private static final long serialVersionUID = 1L; public ActivityLonglineUIModel() { - super(ActivityLongline.class); + super(ActivityLonglineDto.class); } @Override - protected BinderModelBuilder<ActivityLongline, ActivityLongline> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<ActivityLonglineDto, ActivityLonglineDto> createOpeningBinder(BinderService binderService, String binderName) { - BinderModelBuilder<ActivityLongline, ActivityLongline> builder = binderService.newBinderBuilder( - ActivityLongline.class, - ActivityLongline.PROPERTY_QUADRANT, - ActivityLongline.PROPERTY_LATITUDE, - ActivityLongline.PROPERTY_LONGITUDE, - ActivityLongline.PROPERTY_TIME_STAMP, - ActivityLongline.PROPERTY_SEA_SURFACE_TEMPERATURE, - ActivityLongline.PROPERTY_COMMENT, - ActivityLongline.PROPERTY_SET_LONGLINE, - ActivityLongline.PROPERTY_VESSEL_ACTIVITY_LONGLINE, - ActivityLongline.PROPERTY_FPA_ZONE, - ActivityLongline.PROPERTY_OPEN, - ActivityLongline.PROPERTY_ENCOUNTER, - ActivityLongline.PROPERTY_SENSOR_USED); + BinderModelBuilder<ActivityLonglineDto, ActivityLonglineDto> builder = binderService.newBinderBuilder( + ActivityLonglineDto.class, + //FIXME +// ActivityLonglineDto.PROPERTY_QUADRANT, + ActivityLonglineDto.PROPERTY_LATITUDE, + ActivityLonglineDto.PROPERTY_LONGITUDE, + ActivityLonglineDto.PROPERTY_TIME_STAMP, + ActivityLonglineDto.PROPERTY_SEA_SURFACE_TEMPERATURE, + ActivityLonglineDto.PROPERTY_COMMENT, + //FIXME +// ActivityLonglineDto.PROPERTY_SET_LONGLINE, + ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, + ActivityLonglineDto.PROPERTY_FPA_ZONE, + ActivityLonglineDto.PROPERTY_OPEN + //FIXME +// ActivityLonglineDto.PROPERTY_ENCOUNTER, +// ActivityLonglineDto.PROPERTY_SENSOR_USED + ); - builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, ActivityLongline.PROPERTY_ENCOUNTER); - - builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, ActivityLongline.PROPERTY_SENSOR_USED); + //FIXME +// builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, ActivityLonglineDto.PROPERTY_ENCOUNTER); + //FIXME +// builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, ActivityLonglineDto.PROPERTY_SENSOR_USED); return builder; diff --git a/observe-application-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 index f011083..c5f1ea5 100644 --- a/observe-application-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 @@ -20,22 +20,22 @@ #L% --> -<fr.ird.observe.ui.content.open.ContentOpenableUI superGenericType='TripLongline' +<fr.ird.observe.ui.content.open.ContentOpenableUI superGenericType='TripLonglineDto' contentTitle='{n("observe.tripLongline.title")}'> <style source="../../../Common.css"/> <import> - fr.ird.observe.entities.CommentableEntity - fr.ird.observe.entities.longline.TripLongline - fr.ird.observe.entities.longline.ActivityLongline - fr.ird.observe.entities.referentiel.Harbour - fr.ird.observe.entities.referentiel.Persons - fr.ird.observe.entities.referentiel.Vessel - fr.ird.observe.entities.referentiel.Vessels - fr.ird.observe.entities.referentiel.Person - fr.ird.observe.entities.referentiel.Ocean - fr.ird.observe.entities.referentiel.longline.TripType + fr.ird.observe.services.dto.CommentableDto + fr.ird.observe.services.dto.longline.TripLonglineDto + fr.ird.observe.services.dto.longline.ActivityLonglineDto + fr.ird.observe.services.dto.referential.HarbourDto + fr.ird.observe.services.dto.referential.PersonDtosDto + fr.ird.observe.services.dto.referential.VesselDto + fr.ird.observe.services.dto.referential.VesselDtosDto + fr.ird.observe.services.dto.referential.PersonDto + fr.ird.observe.services.dto.referential.OceanDto + fr.ird.observe.services.dto.referential.longline.TripTypeDto fr.ird.observe.ui.actions.shared.DeleteDataUIAction fr.ird.observe.ui.util.tripMap.TripMapUI @@ -60,11 +60,11 @@ <TripLonglineUIModel id='model'/> <!-- edit bean --> - <TripLongline id='bean'/> + <TripLonglineDto id='bean'/> <!-- validator --> <BeanValidator id='validator' - beanClass='fr.ird.observe.entities.longline.TripLongline' + beanClass='fr.ird.observe.services.dto.longline.TripLonglineDto' errorTableModel='{getErrorTableModel()}' autoField='true' context='n1-update'> @@ -73,7 +73,7 @@ <script><![CDATA[ -protected boolean canEditOcean(java.util.List<ActivityLongline> activities) { +protected boolean canEditOcean(java.util.List<ActivityLonglineDto> activities) { return activities == null || activities.isEmpty(); } @@ -92,7 +92,7 @@ protected boolean canEditOcean(java.util.List<ActivityLongline> activities) { <JLabel id='tripTypeLabel'/> </cell> <cell anchor='east'> - <BeanComboBox id='tripType' constructorParams='this' genericType='TripType'/> + <BeanComboBox id='tripType' constructorParams='this' genericType='TripTypeDto'/> </cell> </row> @@ -102,7 +102,7 @@ protected boolean canEditOcean(java.util.List<ActivityLongline> activities) { <JLabel id='captainLabel'/> </cell> <cell anchor='east'> - <BeanComboBox id='captain' constructorParams='this' genericType='Person'/> + <BeanComboBox id='captain' constructorParams='this' genericType='PersonDto'/> </cell> </row> @@ -112,7 +112,7 @@ protected boolean canEditOcean(java.util.List<ActivityLongline> activities) { <JLabel id='observerLabel'/> </cell> <cell anchor='east'> - <BeanComboBox id='observer' constructorParams='this' genericType='Person'/> + <BeanComboBox id='observer' constructorParams='this' genericType='PersonDto'/> </cell> </row> @@ -122,7 +122,7 @@ protected boolean canEditOcean(java.util.List<ActivityLongline> activities) { <JLabel id='dataEntryOperatorLabel'/> </cell> <cell anchor='east'> - <BeanComboBox id='dataEntryOperator' constructorParams='this' genericType='Person'/> + <BeanComboBox id='dataEntryOperator' constructorParams='this' genericType='PersonDto'/> </cell> </row> @@ -132,7 +132,7 @@ protected boolean canEditOcean(java.util.List<ActivityLongline> activities) { <JLabel id='vesselLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='vessel' constructorParams='this' genericType='Vessel'/> + <BeanComboBox id='vessel' constructorParams='this' genericType='VesselDto'/> </cell> </row> @@ -142,7 +142,7 @@ protected boolean canEditOcean(java.util.List<ActivityLongline> activities) { <JLabel id='oceanLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='ocean' genericType='Ocean' constructorParams='this'/> + <BeanComboBox id='ocean' genericType='OceanDto' constructorParams='this'/> </cell> </row> @@ -152,7 +152,7 @@ protected boolean canEditOcean(java.util.List<ActivityLongline> activities) { <JLabel id='departureHarbourLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='departureHarbour' genericType='Harbour' constructorParams='this'/> + <BeanComboBox id='departureHarbour' genericType='HarbourDto' constructorParams='this'/> </cell> </row> @@ -162,7 +162,7 @@ protected boolean canEditOcean(java.util.List<ActivityLongline> activities) { <JLabel id='landingHarbourLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='landingHarbour' genericType='Harbour' constructorParams='this'/> + <BeanComboBox id='landingHarbour' genericType='HarbourDto' constructorParams='this'/> </cell> </row> diff --git a/observe-application-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 index f8aa6a6..d8713d9 100644 --- a/observe-application-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 @@ -29,9 +29,9 @@ import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.db.util.TopiaExecutor2; -import fr.ird.observe.entities.longline.ActivityLonglines; -import fr.ird.observe.entities.longline.TripLongline; -import fr.ird.observe.entities.referentiel.Program; +import fr.ird.observe.services.dto.longline.ActivityLonglinesDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.open.ContentOpenableUIHandler; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; diff --git a/observe-application-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 index 5152309..0b83302 100644 --- a/observe-application-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 @@ -23,9 +23,8 @@ package fr.ird.observe.ui.content.open.impl.longline; */ import fr.ird.observe.BinderService; -import fr.ird.observe.entities.longline.TripLongline; +import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; -import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderModelBuilder; /** @@ -34,38 +33,40 @@ import org.nuiton.util.beans.BinderModelBuilder; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class TripLonglineUIModel extends ContentOpenableUIModel<TripLongline> { +public class TripLonglineUIModel extends ContentOpenableUIModel<TripLonglineDto> { private static final long serialVersionUID = 1L; public TripLonglineUIModel() { - super(TripLongline.class); + super(TripLonglineDto.class); } @Override - protected BinderModelBuilder<TripLongline, TripLongline> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<TripLonglineDto, TripLonglineDto> createOpeningBinder(BinderService binderService, String binderName) { - BinderModelBuilder<TripLongline, TripLongline> builder = binderService.newBinderBuilder( - TripLongline.class, - TripLongline.PROPERTY_START_DATE, - TripLongline.PROPERTY_END_DATE, - TripLongline.PROPERTY_TRIP_TYPE, - TripLongline.PROPERTY_HOME_ID, - TripLongline.PROPERTY_COMMENT, - TripLongline.PROPERTY_VESSEL, - TripLongline.PROPERTY_OBSERVER, - TripLongline.PROPERTY_CAPTAIN, - TripLongline.PROPERTY_DATA_ENTRY_OPERATOR, - TripLongline.PROPERTY_TOTAL_FISHING_OPERATIONS_NUMBER, - TripLongline.PROPERTY_OCEAN, - TripLongline.PROPERTY_DEPARTURE_HARBOUR, - TripLongline.PROPERTY_LANDING_HARBOUR, - TripLongline.PROPERTY_PROGRAM, - TripLongline.PROPERTY_ACTIVITY_LONGLINE, - TripLongline.PROPERTY_OPEN); + BinderModelBuilder<TripLonglineDto, TripLonglineDto> builder = binderService.newBinderBuilder( + TripLonglineDto.class, + TripLonglineDto.PROPERTY_START_DATE, + TripLonglineDto.PROPERTY_END_DATE, + TripLonglineDto.PROPERTY_TRIP_TYPE, + TripLonglineDto.PROPERTY_HOME_ID, + TripLonglineDto.PROPERTY_COMMENT, + TripLonglineDto.PROPERTY_VESSEL, + TripLonglineDto.PROPERTY_OBSERVER, + TripLonglineDto.PROPERTY_CAPTAIN, + TripLonglineDto.PROPERTY_DATA_ENTRY_OPERATOR, + TripLonglineDto.PROPERTY_TOTAL_FISHING_OPERATIONS_NUMBER, + TripLonglineDto.PROPERTY_OCEAN, + TripLonglineDto.PROPERTY_DEPARTURE_HARBOUR, + TripLonglineDto.PROPERTY_LANDING_HARBOUR, + TripLonglineDto.PROPERTY_PROGRAM, + //FIXME +// TripLonglineDto.PROPERTY_ACTIVITY_LONGLINE, + TripLonglineDto.PROPERTY_OPEN); // on ajoute la recopie de l'association route - builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, TripLongline.PROPERTY_ACTIVITY_LONGLINE); + //FIXXME +// builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, TripLonglineDto.PROPERTY_ACTIVITY_LONGLINE); return builder; diff --git a/observe-application-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 index 8ab16fb..58b3e55 100644 --- a/observe-application-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 @@ -20,22 +20,22 @@ #L% --> -<fr.ird.observe.ui.content.open.ContentOpenableUI superGenericType='ActivitySeine' +<fr.ird.observe.ui.content.open.ContentOpenableUI superGenericType='ActivitySeineDto' contentTitle='{n("observe.activitySeine.title")}'> <style source="../../../Common.css"/> <import> - fr.ird.observe.entities.CommentableEntity - fr.ird.observe.entities.seine.ActivitySeine - fr.ird.observe.entities.seine.SetSeine - fr.ird.observe.entities.seine.FloatingObject - fr.ird.observe.entities.referentiel.FpaZone - fr.ird.observe.entities.referentiel.seine.VesselActivitySeine - fr.ird.observe.entities.referentiel.seine.SurroundingActivity - fr.ird.observe.entities.referentiel.seine.ReasonForNoFishing - fr.ird.observe.entities.referentiel.seine.DetectionMode - fr.ird.observe.entities.referentiel.seine.Wind + fr.ird.observe.services.dto.CommentableDto + fr.ird.observe.services.dto.seine.ActivitySeineDto + fr.ird.observe.services.dto.seine.SetSeineDto + fr.ird.observe.services.dto.seine.FloatingObjectDto + fr.ird.observe.services.dto.referential.FpaZoneDto + fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto + fr.ird.observe.services.dto.referential.seine.SurroundingActivityDto + fr.ird.observe.services.dto.referential.seine.ReasonForNoFishingDto + fr.ird.observe.services.dto.referential.seine.DetectionModeDto + fr.ird.observe.services.dto.referential.seine.WindDto fr.ird.observe.ui.actions.shared.DeleteDataUIAction @@ -61,12 +61,12 @@ <ActivitySeineUIModel id='model'/> <!-- edit bean --> - <ActivitySeine id='bean'/> + <ActivitySeineDto id='bean'/> <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.seine.ActivitySeine' + beanClass='fr.ird.observe.services.dto.seine.ActivitySeineDto' errorTableModel='{getErrorTableModel()}' context='n1-create'> @@ -127,7 +127,7 @@ void $afterCompleteSetup() { <JLabel id='vesselActivitySeineLabel'/> </cell> <cell anchor='east' weightx="1"> - <BeanComboBox id='vesselActivitySeine' genericType='VesselActivitySeine' constructorParams='this'/> + <BeanComboBox id='vesselActivitySeine' genericType='VesselActivitySeineDto' constructorParams='this'/> </cell> </row> @@ -137,7 +137,7 @@ void $afterCompleteSetup() { <JLabel id='surroundingActivityLabel'/> </cell> <cell anchor='east' weightx="1"> - <BeanComboBox id='surroundingActivity' constructorParams='this' genericType='SurroundingActivity'/> + <BeanComboBox id='surroundingActivity' constructorParams='this' genericType='SurroundingActivityDto'/> </cell> </row> @@ -147,7 +147,7 @@ void $afterCompleteSetup() { <JLabel id='previousFpaZoneLabel'/> </cell> <cell anchor='east' weightx="1"> - <BeanComboBox id='previousFpaZone' constructorParams='this' genericType='FpaZone'/> + <BeanComboBox id='previousFpaZone' constructorParams='this' genericType='FpaZoneDto'/> </cell> </row> @@ -157,7 +157,7 @@ void $afterCompleteSetup() { <JLabel id='currentFpaZoneLabel'/> </cell> <cell anchor='east' weightx="1"> - <BeanComboBox id='currentFpaZone' constructorParams='this' genericType='FpaZone'/> + <BeanComboBox id='currentFpaZone' constructorParams='this' genericType='FpaZoneDto'/> </cell> </row> @@ -167,7 +167,7 @@ void $afterCompleteSetup() { <JLabel id='nextFpaZoneLabel'/> </cell> <cell anchor='east' weightx="1"> - <BeanComboBox id='nextFpaZone' constructorParams='this' genericType='FpaZone'/> + <BeanComboBox id='nextFpaZone' constructorParams='this' genericType='FpaZoneDto'/> </cell> </row> @@ -217,7 +217,7 @@ void $afterCompleteSetup() { <JLabel id='windLabel'/> </cell> <cell anchor='east'> - <BeanComboBox id='wind' genericType='Wind' constructorParams='this'/> + <BeanComboBox id='wind' genericType='WindDto' constructorParams='this'/> </cell> </row> @@ -227,7 +227,7 @@ void $afterCompleteSetup() { <JLabel id='detectionModeLabel'/> </cell> <cell anchor='east'> - <BeanComboBox id='detectionMode' genericType='DetectionMode' constructorParams='this'/> + <BeanComboBox id='detectionMode' genericType='DetectionModeDto' constructorParams='this'/> </cell> </row> @@ -237,7 +237,7 @@ void $afterCompleteSetup() { <JLabel id='reasonForNoFishingLabel'/> </cell> <cell anchor='east'> - <BeanComboBox id='reasonForNoFishing' genericType='ReasonForNoFishing' constructorParams='this'/> + <BeanComboBox id='reasonForNoFishing' genericType='ReasonForNoFishingDto' constructorParams='this'/> </cell> </row> <row> @@ -277,11 +277,11 @@ void $afterCompleteSetup() { <row> <cell weightx="0.5" fill="both"> <JButton id='addSet' - onActionPerformed='getHandler().addChild(SetSeine.class)'/> + onActionPerformed='getHandler().addChild(SetSeineDto.class)'/> </cell> <cell weightx="0.5" fill="both"> <JButton id='addDCP' - onActionPerformed='getHandler().addChild(FloatingObject.class)'/> + onActionPerformed='getHandler().addChild(FloatingObjectDto.class)'/> </cell> </row> </Table> diff --git a/observe-application-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 index 42901f0..1d91adb 100644 --- a/observe-application-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 @@ -28,12 +28,12 @@ import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.db.util.TopiaExecutor2; -import fr.ird.observe.entities.referentiel.FpaZone; -import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; -import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.entities.seine.ActivitySeineImpl; -import fr.ird.observe.entities.seine.Route; -import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.services.dto.referential.FpaZoneDto; +import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.ActivitySeineImplDto; +import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIModel; import fr.ird.observe.ui.content.open.ContentOpenableUIHandler; diff --git a/observe-application-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 index dc7825f..2f2a11c 100644 --- a/observe-application-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 @@ -24,9 +24,8 @@ package fr.ird.observe.ui.content.open.impl.seine; import com.google.common.collect.ImmutableSet; import fr.ird.observe.BinderService; -import fr.ird.observe.entities.seine.ActivitySeine; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; -import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderModelBuilder; import java.util.Set; @@ -37,30 +36,31 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class ActivitySeineUIModel extends ContentOpenableUIModel<ActivitySeine> { +public class ActivitySeineUIModel extends ContentOpenableUIModel<ActivitySeineDto> { public static final String PROPERTY_GENERAL_TAB_VALID = "generalTabValid"; public static final String PROPERTY_MEASUREMENTS_TAB_VALID = "measurementsTabValid"; public static final Set<String> GENERAL_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(ActivitySeine.PROPERTY_TIME, - ActivitySeine.PROPERTY_QUADRANT, - ActivitySeine.PROPERTY_LATITUDE, - ActivitySeine.PROPERTY_LONGITUDE, - ActivitySeine.PROPERTY_VESSEL_ACTIVITY_SEINE, - ActivitySeine.PROPERTY_SURROUNDING_ACTIVITY, - ActivitySeine.PROPERTY_PREVIOUS_FPA_ZONE, - ActivitySeine.PROPERTY_CURRENT_FPA_ZONE, - ActivitySeine.PROPERTY_NEXT_FPA_ZONE, - ActivitySeine.PROPERTY_ERS_ID).build(); + ImmutableSet.<String>builder().add(ActivitySeineDto.PROPERTY_TIME, + //FIXME +// ActivitySeineDto.PROPERTY_QUADRANT, + ActivitySeineDto.PROPERTY_LATITUDE, + ActivitySeineDto.PROPERTY_LONGITUDE, + ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, + ActivitySeineDto.PROPERTY_SURROUNDING_ACTIVITY, + ActivitySeineDto.PROPERTY_PREVIOUS_FPA_ZONE, + ActivitySeineDto.PROPERTY_CURRENT_FPA_ZONE, + ActivitySeineDto.PROPERTY_NEXT_FPA_ZONE, + ActivitySeineDto.PROPERTY_ERS_ID).build(); public static final Set<String> MEASUREMENTS_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(ActivitySeine.PROPERTY_VESSEL_SPEED, - ActivitySeine.PROPERTY_SEA_SURFACE_TEMPERATURE, - ActivitySeine.PROPERTY_WIND, - ActivitySeine.PROPERTY_DETECTION_MODE, - ActivitySeine.PROPERTY_REASON_FOR_NO_FISHING).build(); + ImmutableSet.<String>builder().add(ActivitySeineDto.PROPERTY_VESSEL_SPEED, + ActivitySeineDto.PROPERTY_SEA_SURFACE_TEMPERATURE, + ActivitySeineDto.PROPERTY_WIND, + ActivitySeineDto.PROPERTY_DETECTION_MODE, + ActivitySeineDto.PROPERTY_REASON_FOR_NO_FISHING).build(); private static final long serialVersionUID = 1L; @@ -69,7 +69,7 @@ public class ActivitySeineUIModel extends ContentOpenableUIModel<ActivitySeine> protected boolean measurementsTabValid; public ActivitySeineUIModel() { - super(ActivitySeine.class); + super(ActivitySeineDto.class); } public boolean isMeasurementsTabValid() { @@ -93,35 +93,37 @@ public class ActivitySeineUIModel extends ContentOpenableUIModel<ActivitySeine> } @Override - protected BinderModelBuilder<ActivitySeine, ActivitySeine> createOpeningBinder(BinderService binderService, String binderName) { - - BinderModelBuilder<ActivitySeine, ActivitySeine> builder = binderService.newBinderBuilder( - ActivitySeine.class, -// ActivitySeine.PROPERTY_QUADRANT, - ActivitySeine.PROPERTY_LATITUDE, - ActivitySeine.PROPERTY_LONGITUDE, - ActivitySeine.PROPERTY_ERS_ID, - ActivitySeine.PROPERTY_TIME, - ActivitySeine.PROPERTY_SEA_SURFACE_TEMPERATURE, - ActivitySeine.PROPERTY_REASON_FOR_NO_FISHING, - ActivitySeine.PROPERTY_COMMENT, - ActivitySeine.PROPERTY_VESSEL_SPEED, - ActivitySeine.PROPERTY_OBSERVED_SYSTEM, - ActivitySeine.PROPERTY_OBSERVED_SYSTEM_DISTANCE, - ActivitySeine.PROPERTY_VESSEL_ACTIVITY_SEINE, - ActivitySeine.PROPERTY_SURROUNDING_ACTIVITY, - ActivitySeine.PROPERTY_WIND, - ActivitySeine.PROPERTY_DETECTION_MODE, - ActivitySeine.PROPERTY_SET_SEINE, - ActivitySeine.PROPERTY_FLOATING_OBJECT, - ActivitySeine.PROPERTY_OPEN, - ActivitySeine.PROPERTY_CURRENT_FPA_ZONE, - ActivitySeine.PROPERTY_PREVIOUS_FPA_ZONE, - ActivitySeine.PROPERTY_NEXT_FPA_ZONE); - - builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, ActivitySeine.PROPERTY_OBSERVED_SYSTEM); - - builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, ActivitySeine.PROPERTY_FLOATING_OBJECT); + protected BinderModelBuilder<ActivitySeineDto, ActivitySeineDto> createOpeningBinder(BinderService binderService, String binderName) { + + BinderModelBuilder<ActivitySeineDto, ActivitySeineDto> builder = binderService.newBinderBuilder( + ActivitySeineDto.class, + ActivitySeineDto.PROPERTY_LATITUDE, + ActivitySeineDto.PROPERTY_LONGITUDE, + ActivitySeineDto.PROPERTY_ERS_ID, + ActivitySeineDto.PROPERTY_TIME, + ActivitySeineDto.PROPERTY_SEA_SURFACE_TEMPERATURE, + ActivitySeineDto.PROPERTY_REASON_FOR_NO_FISHING, + ActivitySeineDto.PROPERTY_COMMENT, + ActivitySeineDto.PROPERTY_VESSEL_SPEED, + //FIXME +// ActivitySeineDto.PROPERTY_OBSERVED_SYSTEM, +// ActivitySeineDto.PROPERTY_OBSERVED_SYSTEM_DISTANCE, + ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, + ActivitySeineDto.PROPERTY_SURROUNDING_ACTIVITY, + ActivitySeineDto.PROPERTY_WIND, + ActivitySeineDto.PROPERTY_DETECTION_MODE, + //FIXME +// ActivitySeineDto.PROPERTY_SET_SEINE, +// ActivitySeineDto.PROPERTY_FLOATING_OBJECT, + ActivitySeineDto.PROPERTY_OPEN, + ActivitySeineDto.PROPERTY_CURRENT_FPA_ZONE, + ActivitySeineDto.PROPERTY_PREVIOUS_FPA_ZONE, + ActivitySeineDto.PROPERTY_NEXT_FPA_ZONE); + + //FIXME +// builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, ActivitySeineDto.PROPERTY_OBSERVED_SYSTEM); + //FIXME +// builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, ActivitySeineDto.PROPERTY_FLOATING_OBJECT); return builder; } diff --git a/observe-application-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 index d78c7cd..f7cca18 100644 --- a/observe-application-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 @@ -20,10 +20,10 @@ #L% --> -<fr.ird.observe.ui.content.open.ContentOpenableUI superGenericType='Route' contentTitle='{n("observe.route.title")}'> +<fr.ird.observe.ui.content.open.ContentOpenableUI superGenericType='RouteDto' contentTitle='{n("observe.route.title")}'> <import> - fr.ird.observe.entities.seine.Route + fr.ird.observe.services.dto.seine.RouteDto org.jdesktop.swingx.JXDatePicker @@ -42,12 +42,12 @@ <RouteUIModel id='model'/> <!-- edit bean --> - <Route id='bean'/> + <RouteDto id='bean'/> <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.seine.Route' + beanClass='fr.ird.observe.services.dto.seine.RouteDto' errorTableModel='{getErrorTableModel()}' context='n1-update'> <field name='activitySeine' component='{actionDown}'/> diff --git a/observe-application-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 index 6bea404..2afc7c0 100644 --- a/observe-application-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 @@ -30,12 +30,12 @@ import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.db.util.TopiaExecutor2; -import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; -import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.entities.seine.ActivitySeineImpl; -import fr.ird.observe.entities.seine.ActivitySeines; -import fr.ird.observe.entities.seine.Route; -import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.ActivitySeineImplDto; +import fr.ird.observe.services.dto.seine.ActivitySeinesDto; +import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.open.ContentOpenableUIHandler; diff --git a/observe-application-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 index 78be644..12dccbb 100644 --- a/observe-application-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 @@ -23,10 +23,9 @@ package fr.ird.observe.ui.content.open.impl.seine; */ import fr.ird.observe.BinderService; -import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.entities.seine.Route; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; import org.nuiton.util.beans.BinderModelBuilder; /** @@ -35,43 +34,46 @@ import org.nuiton.util.beans.BinderModelBuilder; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class RouteUIModel extends ContentOpenableUIModel<Route> { +public class RouteUIModel extends ContentOpenableUIModel<RouteDto> { private static final long serialVersionUID = 1L; public RouteUIModel() { - super(Route.class); + super(RouteDto.class); } @Override - protected BinderModelBuilder<Route, Route> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<RouteDto, RouteDto> createOpeningBinder(BinderService binderService, String binderName) { - BinderModelBuilder<Route, Route> builder = binderService.newBinderBuilder( - Route.class, - Route.PROPERTY_DATE, - Route.PROPERTY_START_LOG_VALUE, - Route.PROPERTY_END_LOG_VALUE, - Route.PROPERTY_CHECK_LEVEL, - Route.PROPERTY_ACTIVITY_SEINE, - Route.PROPERTY_OPEN, - Route.PROPERTY_COMMENT); + BinderModelBuilder<RouteDto, RouteDto> builder = binderService.newBinderBuilder( + RouteDto.class, + RouteDto.PROPERTY_DATE, + RouteDto.PROPERTY_START_LOG_VALUE, + RouteDto.PROPERTY_END_LOG_VALUE, + RouteDto.PROPERTY_CHECK_LEVEL, + //FIXME +// RouteDto.PROPERTY_ACTIVITY_SEINE, + RouteDto.PROPERTY_OPEN, + RouteDto.PROPERTY_COMMENT); - BinderModelBuilder<ActivitySeine, ActivitySeine> builder2 = binderService.newBinderBuilder( - ActivitySeine.class, - ActivitySeine.PROPERTY_QUADRANT, - ActivitySeine.PROPERTY_LATITUDE, - ActivitySeine.PROPERTY_LONGITUDE, - ActivitySeine.PROPERTY_TIME, - ActivitySeine.PROPERTY_SEA_SURFACE_TEMPERATURE, - ActivitySeine.PROPERTY_REASON_FOR_NO_FISHING, - ActivitySeine.PROPERTY_VESSEL_ACTIVITY_SEINE, - ActivitySeine.PROPERTY_WIND, - ActivitySeine.PROPERTY_OPEN); + BinderModelBuilder<ActivitySeineDto, ActivitySeineDto> builder2 = binderService.newBinderBuilder( + ActivitySeineDto.class, + //FIXME +// ActivitySeineDto.PROPERTY_QUADRANT, + ActivitySeineDto.PROPERTY_LATITUDE, + ActivitySeineDto.PROPERTY_LONGITUDE, + ActivitySeineDto.PROPERTY_TIME, + ActivitySeineDto.PROPERTY_SEA_SURFACE_TEMPERATURE, + ActivitySeineDto.PROPERTY_REASON_FOR_NO_FISHING, + ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, + ActivitySeineDto.PROPERTY_WIND, + ActivitySeineDto.PROPERTY_OPEN); - TopiaEntityBinder<ActivitySeine> binder = - binderService.registerTopiaBinder(ActivitySeine.class, builder2, binderName); + //FIXME +// TopiaEntityBinder<ActivitySeineDto> binder = +// binderService.registerTopiaBinder(ActivitySeineDto.class, builder2, binderName); - builder.addCollectionBinder(binder, Route.PROPERTY_ACTIVITY_SEINE); +// builder.addCollectionBinder(binder, RouteDto.PROPERTY_ACTIVITY_SEINE); return builder; diff --git a/observe-application-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 index b380f98..8804f52 100644 --- a/observe-application-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 @@ -20,18 +20,18 @@ #L% --> -<fr.ird.observe.ui.content.open.ContentOpenableUI superGenericType='TripSeine' +<fr.ird.observe.ui.content.open.ContentOpenableUI superGenericType='TripSeineDto' contentTitle='{n("observe.tripSeine.title")}'> <import> - fr.ird.observe.entities.seine.TripSeine - fr.ird.observe.entities.seine.Route - fr.ird.observe.entities.referentiel.Harbour - fr.ird.observe.entities.referentiel.Persons - fr.ird.observe.entities.referentiel.Vessel - fr.ird.observe.entities.referentiel.Vessels - fr.ird.observe.entities.referentiel.Person - fr.ird.observe.entities.referentiel.Ocean + fr.ird.observe.services.dto.seine.TripSeineDto + fr.ird.observe.services.dto.seine.RouteDto + fr.ird.observe.services.dto.referential.HarbourDto + fr.ird.observe.services.dto.referential.PersonDtosDto + fr.ird.observe.services.dto.referential.VesselDto + fr.ird.observe.services.dto.referential.VesselDtosDto + fr.ird.observe.services.dto.referential.PersonDto + fr.ird.observe.services.dto.referential.OceanDto fr.ird.observe.ui.util.tripMap.TripMapUI org.jdesktop.swingx.JXDatePicker @@ -55,11 +55,11 @@ <TripSeineUIModel id='model'/> <!-- edit bean --> - <TripSeine id='bean'/> + <TripSeineDto id='bean'/> <!-- validator --> <BeanValidator id='validator' - beanClass='fr.ird.observe.entities.seine.TripSeine' + beanClass='fr.ird.observe.services.dto.seine.TripSeineDto' errorTableModel='{getErrorTableModel()}' autoField='true' context='n1-update'> @@ -68,7 +68,7 @@ <script><![CDATA[ -protected boolean canEditOcean(java.util.List<Route> routes) { +protected boolean canEditOcean(java.util.List<RouteDto> routes) { return routes == null || routes.isEmpty(); } @@ -87,7 +87,7 @@ protected boolean canEditOcean(java.util.List<Route> routes) { <JLabel id='captainLabel'/> </cell> <cell anchor='east'> - <BeanComboBox id='captain' constructorParams='this' genericType='Person'/> + <BeanComboBox id='captain' constructorParams='this' genericType='PersonDto'/> </cell> </row> @@ -97,7 +97,7 @@ protected boolean canEditOcean(java.util.List<Route> routes) { <JLabel id='observerLabel'/> </cell> <cell anchor='east'> - <BeanComboBox id='observer' constructorParams='this' genericType='Person'/> + <BeanComboBox id='observer' constructorParams='this' genericType='PersonDto'/> </cell> </row> @@ -107,7 +107,7 @@ protected boolean canEditOcean(java.util.List<Route> routes) { <JLabel id='dataEntryOperatorLabel'/> </cell> <cell anchor='east'> - <BeanComboBox id='dataEntryOperator' constructorParams='this' genericType='Person'/> + <BeanComboBox id='dataEntryOperator' constructorParams='this' genericType='PersonDto'/> </cell> </row> @@ -117,7 +117,7 @@ protected boolean canEditOcean(java.util.List<Route> routes) { <JLabel id='vesselLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='vessel' constructorParams='this' genericType='Vessel'/> + <BeanComboBox id='vessel' constructorParams='this' genericType='VesselDto'/> </cell> </row> @@ -127,7 +127,7 @@ protected boolean canEditOcean(java.util.List<Route> routes) { <JLabel id='oceanLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='ocean' genericType='Ocean' constructorParams='this'/> + <BeanComboBox id='ocean' genericType='OceanDto' constructorParams='this'/> </cell> </row> @@ -137,7 +137,7 @@ protected boolean canEditOcean(java.util.List<Route> routes) { <JLabel id='departureHarbourLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='departureHarbour' genericType='Harbour' constructorParams='this'/> + <BeanComboBox id='departureHarbour' genericType='HarbourDto' constructorParams='this'/> </cell> </row> @@ -147,7 +147,7 @@ protected boolean canEditOcean(java.util.List<Route> routes) { <JLabel id='landingHarbourLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='landingHarbour' genericType='Harbour' constructorParams='this'/> + <BeanComboBox id='landingHarbour' genericType='HarbourDto' constructorParams='this'/> </cell> </row> diff --git a/observe-application-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 index cbf9dba..66ca931 100644 --- a/observe-application-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 @@ -28,9 +28,9 @@ import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.db.util.TopiaExecutor2; -import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.entities.seine.Routes; -import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.seine.RoutesDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.open.ContentOpenableUIHandler; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; diff --git a/observe-application-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 index ddaab6b..845d616 100644 --- a/observe-application-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 @@ -23,9 +23,8 @@ package fr.ird.observe.ui.content.open.impl.seine; */ import fr.ird.observe.BinderService; -import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; -import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderModelBuilder; /** @@ -34,38 +33,40 @@ import org.nuiton.util.beans.BinderModelBuilder; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class TripSeineUIModel extends ContentOpenableUIModel<TripSeine> { +public class TripSeineUIModel extends ContentOpenableUIModel<TripSeineDto> { private static final long serialVersionUID = 1L; public TripSeineUIModel() { - super(TripSeine.class); + super(TripSeineDto.class); } @Override - protected BinderModelBuilder<TripSeine, TripSeine> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<TripSeineDto, TripSeineDto> createOpeningBinder(BinderService binderService, String binderName) { - BinderModelBuilder<TripSeine, TripSeine> builder = binderService.newBinderBuilder( - TripSeine.class, - TripSeine.PROPERTY_START_DATE, - TripSeine.PROPERTY_END_DATE, - TripSeine.PROPERTY_FORMS_URL, - TripSeine.PROPERTY_REPORTS_URL, - TripSeine.PROPERTY_COMMENT, - TripSeine.PROPERTY_VESSEL, - TripSeine.PROPERTY_OBSERVER, - TripSeine.PROPERTY_CAPTAIN, - TripSeine.PROPERTY_DATA_ENTRY_OPERATOR, - TripSeine.PROPERTY_OCEAN, - TripSeine.PROPERTY_DEPARTURE_HARBOUR, - TripSeine.PROPERTY_LANDING_HARBOUR, - TripSeine.PROPERTY_PROGRAM, - TripSeine.PROPERTY_ROUTE, - TripSeine.PROPERTY_ERS_ID, - TripSeine.PROPERTY_OPEN); + BinderModelBuilder<TripSeineDto, TripSeineDto> builder = binderService.newBinderBuilder( + TripSeineDto.class, + TripSeineDto.PROPERTY_START_DATE, + TripSeineDto.PROPERTY_END_DATE, + TripSeineDto.PROPERTY_FORMS_URL, + TripSeineDto.PROPERTY_REPORTS_URL, + TripSeineDto.PROPERTY_COMMENT, + TripSeineDto.PROPERTY_VESSEL, + TripSeineDto.PROPERTY_OBSERVER, + TripSeineDto.PROPERTY_CAPTAIN, + TripSeineDto.PROPERTY_DATA_ENTRY_OPERATOR, + TripSeineDto.PROPERTY_OCEAN, + TripSeineDto.PROPERTY_DEPARTURE_HARBOUR, + TripSeineDto.PROPERTY_LANDING_HARBOUR, + //FIXME +// TripSeineDto.PROPERTY_PROGRAM, +// TripSeineDto.PROPERTY_ROUTE, + TripSeineDto.PROPERTY_ERS_ID, + TripSeineDto.PROPERTY_OPEN); // on ajoute la recopie de l'association route - builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, TripSeine.PROPERTY_ROUTE); + //FIXME +// builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, TripSeineDto.PROPERTY_ROUTE); return builder; diff --git a/observe-application-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 index c8c23db..20a1b10 100644 --- a/observe-application-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 @@ -22,10 +22,10 @@ <fr.ird.observe.ui.content.ContentUI abstract='true' superGenericType='E' - genericType='E extends ReferenceEntity'> + genericType='E extends ReferenceDto'> <import> - fr.ird.observe.entities.referentiel.ReferenceEntity + fr.ird.observe.services.dto.ReferenceDto fr.ird.observe.ui.UIHelper fr.ird.observe.ui.actions.shared.DeleteReferenceUIAction diff --git a/observe-application-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 index d0a9398..7a78214 100644 --- a/observe-application-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 @@ -21,26 +21,16 @@ */ package fr.ird.observe.ui.content.ref; -import fr.ird.observe.DataService; import fr.ird.observe.DecoratorService; import fr.ird.observe.ObserveContext; -import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; -import fr.ird.observe.db.util.TopiaExecutor2; -import fr.ird.observe.entities.EntityMap; -import fr.ird.observe.entities.constants.ReferenceLocale; -import fr.ird.observe.entities.constants.ReferenceStatus; -import fr.ird.observe.entities.referentiel.I18nReferenceEntity; -import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.entities.referentiel.ReferenceEntity; -import fr.ird.observe.entities.referentiel.VesselSizeCategory; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; import fr.ird.observe.ui.tree.ObserveTreeHelper; -import fr.ird.observe.ui.usage.UsagesUI; import fr.ird.observe.ui.util.SpringUtilities; import fr.ird.observe.validation.ValidationContext; import jaxx.runtime.JAXXContext; @@ -51,12 +41,6 @@ import jaxx.runtime.validator.swing.SwingValidatorUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.util.Loador; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; import javax.swing.JButton; import javax.swing.JComponent; @@ -97,7 +81,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class ContentReferenceUIHandler<E extends ReferenceEntity> extends ContentUIHandler<E> { +public class ContentReferenceUIHandler<E extends ReferentialDto> extends ContentUIHandler<E> { /** Logger */ private static final Log log = @@ -428,7 +412,7 @@ public class ContentReferenceUIHandler<E extends ReferenceEntity> extends Conten public void openUI() throws Exception { super.openUI(); - ContentReferenceUIModel<E> model = getModel(); + ContentReferenceUIModel<EDto> model = getModel(); ContentReferenceUI<E> ui = getUi(); @@ -489,7 +473,7 @@ public class ContentReferenceUIHandler<E extends ReferenceEntity> extends Conten ContentReferenceUI<E> ui = getUi(); - ContentReferenceUIModel<E> model = getModel(); + ContentReferenceUIModel<EDto> model = getModel(); E bean = model.getBean(); ContentMode mode = model.getMode(); @@ -580,7 +564,7 @@ public class ContentReferenceUIHandler<E extends ReferenceEntity> extends Conten public void modifyUI() { - ContentReferenceUIModel<E> model = getModel(); + ContentReferenceUIModel<EDto> model = getModel(); if (model.getMode() != ContentMode.READ) { // force le mode mise a jour @@ -597,7 +581,7 @@ public class ContentReferenceUIHandler<E extends ReferenceEntity> extends Conten super.stopEditUI(); ContentReferenceUI<E> ui = getUi(); - ContentReferenceUIModel<E> model = getModel(); + ContentReferenceUIModel<EDto> model = getModel(); if (model.getMode() != ContentMode.READ) { @@ -621,7 +605,7 @@ public class ContentReferenceUIHandler<E extends ReferenceEntity> extends Conten } public void backToList() { - ContentReferenceUIModel<E> model = getModel(); + ContentReferenceUIModel<EDto> model = getModel(); if (!model.isModified() || checkEdit(getUi())) { getUi().stopEdit(); @@ -638,7 +622,7 @@ public class ContentReferenceUIHandler<E extends ReferenceEntity> extends Conten DataSource dataSource, TopiaEntityBinder<E> binder) throws Exception { - ContentReferenceUIModel<E> model = getModel(); + ContentReferenceUIModel<EDto> model = getModel(); if (bean.getTopiaId() == null) { @@ -731,7 +715,7 @@ public class ContentReferenceUIHandler<E extends ReferenceEntity> extends Conten TopiaExecutor2<? extends TopiaEntity, E> deletor) throws Exception { ContentReferenceUI<E> ui = getUi(); - ContentReferenceUIModel<E> model = getModel(); + ContentReferenceUIModel<EDto> model = getModel(); if (log.isInfoEnabled()) { log.info("entity to be deleted, looking for usage"); diff --git a/observe-application-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 index 0ac9b91..168f553 100644 --- a/observe-application-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 @@ -22,9 +22,9 @@ package fr.ird.observe.ui.content.ref; import fr.ird.observe.BinderService; -import fr.ird.observe.entities.referentiel.I18nReferenceEntity; -import fr.ird.observe.entities.referentiel.LengthWeightParameter; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.services.dto.referential.I18nReferentialDto; +import fr.ird.observe.services.dto.referential.LengthWeightParameterDto; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.ui.content.ContentUIModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -40,7 +40,7 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since .14 */ -public abstract class ContentReferenceUIModel<E extends ReferenceEntity> extends ContentUIModel<E> { +public abstract class ContentReferenceUIModel<E extends ReferentialDto> extends ContentUIModel<E> { public static final String PROPERTY_EMPTY = "empty"; @@ -60,70 +60,70 @@ public abstract class ContentReferenceUIModel<E extends ReferenceEntity> extends /** liste des bindings present sur tous les ecrans du referentiel */ protected final static String[] DEFAULT_DATABINDING = { - ReferenceEntity.PROPERTY_CODE + SUFFIX_TEXT, - ReferenceEntity.PROPERTY_URI + SUFFIX_TEXT, - ReferenceEntity.PROPERTY_STATUS + SUFFIX_SELECTED_INDEX, - ReferenceEntity.PROPERTY_NEED_COMMENT + SUFFIX_SELECTED + ReferentialDto.PROPERTY_CODE + SUFFIX_TEXT, + ReferentialDto.PROPERTY_URI + SUFFIX_TEXT, + ReferentialDto.PROPERTY_STATUS + SUFFIX_SELECTED_INDEX, + ReferentialDto.PROPERTY_NEED_COMMENT + SUFFIX_SELECTED }; /** liste des proprietes presents sur les entites parametrageLengthWeightAble */ protected final static String[] DEFAULT_LENGTH_WEIGHT_PARAMETER_ABLE_DATABINDING = { - LengthWeightParameter.PROPERTY_START_DATE + SUFFIX_DATE, - LengthWeightParameter.PROPERTY_END_DATE + SUFFIX_DATE, - LengthWeightParameter.PROPERTY_SPECIES + SUFFIX_SELECTED_ITEM, - LengthWeightParameter.PROPERTY_OCEAN + SUFFIX_SELECTED_ITEM, - LengthWeightParameter.PROPERTY_SEX + SUFFIX_SELECTED_INDEX, - LengthWeightParameter.PROPERTY_LENGTH_WEIGHT_FORMULA + SUFFIX_TEXT, - LengthWeightParameter.PROPERTY_WEIGHT_LENGTH_FORMULA + SUFFIX_TEXT, - LengthWeightParameter.PROPERTY_COEFFICIENTS + SUFFIX_TEXT, - LengthWeightParameter.PROPERTY_MEAN_LENGTH + SUFFIX_MODEL, - LengthWeightParameter.PROPERTY_MEAN_WEIGHT + SUFFIX_MODEL + LengthWeightParameterDto.PROPERTY_START_DATE + SUFFIX_DATE, + LengthWeightParameterDto.PROPERTY_END_DATE + SUFFIX_DATE, + LengthWeightParameterDto.PROPERTY_SPECIES + SUFFIX_SELECTED_ITEM, + LengthWeightParameterDto.PROPERTY_OCEAN + SUFFIX_SELECTED_ITEM, + LengthWeightParameterDto.PROPERTY_SEX + SUFFIX_SELECTED_INDEX, + LengthWeightParameterDto.PROPERTY_LENGTH_WEIGHT_FORMULA + SUFFIX_TEXT, + LengthWeightParameterDto.PROPERTY_WEIGHT_LENGTH_FORMULA + SUFFIX_TEXT, + LengthWeightParameterDto.PROPERTY_COEFFICIENTS + SUFFIX_TEXT, + LengthWeightParameterDto.PROPERTY_MEAN_LENGTH + SUFFIX_MODEL, + LengthWeightParameterDto.PROPERTY_MEAN_WEIGHT + SUFFIX_MODEL }; /** liste des bindings presents sur les entites i18n */ protected final static String[] DEFAULT_I18N_DATABINDING = { - I18nReferenceEntity.PROPERTY_LABEL1 + SUFFIX_TEXT, - I18nReferenceEntity.PROPERTY_LABEL2 + SUFFIX_TEXT, - I18nReferenceEntity.PROPERTY_LABEL3 + SUFFIX_TEXT, - I18nReferenceEntity.PROPERTY_LABEL4 + SUFFIX_TEXT, - I18nReferenceEntity.PROPERTY_LABEL5 + SUFFIX_TEXT, - I18nReferenceEntity.PROPERTY_LABEL6 + SUFFIX_TEXT, - I18nReferenceEntity.PROPERTY_LABEL7 + SUFFIX_TEXT, - I18nReferenceEntity.PROPERTY_LABEL8 + SUFFIX_TEXT + I18nReferentialDto.PROPERTY_LABEL1 + SUFFIX_TEXT, + I18nReferentialDto.PROPERTY_LABEL2 + SUFFIX_TEXT, + I18nReferentialDto.PROPERTY_LABEL3 + SUFFIX_TEXT, + I18nReferentialDto.PROPERTY_LABEL4 + SUFFIX_TEXT, + I18nReferentialDto.PROPERTY_LABEL5 + SUFFIX_TEXT, + I18nReferentialDto.PROPERTY_LABEL6 + SUFFIX_TEXT, + I18nReferentialDto.PROPERTY_LABEL7 + SUFFIX_TEXT, + I18nReferentialDto.PROPERTY_LABEL8 + SUFFIX_TEXT }; /** liste des proprietes present sur tous les ecrans du referentiel */ protected final static String[] DEFAULT_PROPERTIES = { - ReferenceEntity.PROPERTY_CODE, - ReferenceEntity.PROPERTY_URI, - ReferenceEntity.PROPERTY_STATUS, - ReferenceEntity.PROPERTY_NEED_COMMENT + ReferentialDto.PROPERTY_CODE, + ReferentialDto.PROPERTY_URI, + ReferentialDto.PROPERTY_STATUS, + ReferentialDto.PROPERTY_NEED_COMMENT }; /** liste des proprietes presents sur les entites taillePoidsAble */ protected final static String[] DEFAULT_PARAMETRAGE_TAILLE_POIDS_ABLE_PROPERTIES = { - LengthWeightParameter.PROPERTY_START_DATE, - LengthWeightParameter.PROPERTY_END_DATE, - LengthWeightParameter.PROPERTY_OCEAN, - LengthWeightParameter.PROPERTY_SPECIES, - LengthWeightParameter.PROPERTY_SEX, - LengthWeightParameter.PROPERTY_LENGTH_WEIGHT_FORMULA, - LengthWeightParameter.PROPERTY_WEIGHT_LENGTH_FORMULA, - LengthWeightParameter.PROPERTY_COEFFICIENTS, - LengthWeightParameter.PROPERTY_MEAN_LENGTH, - LengthWeightParameter.PROPERTY_MEAN_WEIGHT + LengthWeightParameterDto.PROPERTY_START_DATE, + LengthWeightParameterDto.PROPERTY_END_DATE, + LengthWeightParameterDto.PROPERTY_OCEAN, + LengthWeightParameterDto.PROPERTY_SPECIES, + LengthWeightParameterDto.PROPERTY_SEX, + LengthWeightParameterDto.PROPERTY_LENGTH_WEIGHT_FORMULA, + LengthWeightParameterDto.PROPERTY_WEIGHT_LENGTH_FORMULA, + LengthWeightParameterDto.PROPERTY_COEFFICIENTS, + LengthWeightParameterDto.PROPERTY_MEAN_LENGTH, + LengthWeightParameterDto.PROPERTY_MEAN_WEIGHT }; /** liste des proprietes presents sur les entites i18n */ protected final static String[] DEFAULT_I18N_PROPERTIES = { - I18nReferenceEntity.PROPERTY_LABEL1, - I18nReferenceEntity.PROPERTY_LABEL2, - I18nReferenceEntity.PROPERTY_LABEL3, - I18nReferenceEntity.PROPERTY_LABEL4, - I18nReferenceEntity.PROPERTY_LABEL5, - I18nReferenceEntity.PROPERTY_LABEL6, - I18nReferenceEntity.PROPERTY_LABEL7, - I18nReferenceEntity.PROPERTY_LABEL8 + I18nReferentialDto.PROPERTY_LABEL1, + I18nReferentialDto.PROPERTY_LABEL2, + I18nReferentialDto.PROPERTY_LABEL3, + I18nReferentialDto.PROPERTY_LABEL4, + I18nReferentialDto.PROPERTY_LABEL5, + I18nReferentialDto.PROPERTY_LABEL6, + I18nReferentialDto.PROPERTY_LABEL7, + I18nReferentialDto.PROPERTY_LABEL8 }; private static final long serialVersionUID = 1L; @@ -227,10 +227,10 @@ public abstract class ContentReferenceUIModel<E extends ReferenceEntity> extends } Class<E> beanType = getBeanType(); - if (I18nReferenceEntity.class.isAssignableFrom(beanType)) { + if (I18nReferentialDto.class.isAssignableFrom(beanType)) { result.addAll(Arrays.asList(DEFAULT_I18N_PROPERTIES)); } - if (LengthWeightParameter.class.isAssignableFrom(beanType)) { + if (LengthWeightParameterDto.class.isAssignableFrom(beanType)) { result.addAll(Arrays.asList(DEFAULT_PARAMETRAGE_TAILLE_POIDS_ABLE_PROPERTIES)); } if (!usedefault) { @@ -259,10 +259,10 @@ public abstract class ContentReferenceUIModel<E extends ReferenceEntity> extends } Class<E> beanType = getBeanType(); - if (I18nReferenceEntity.class.isAssignableFrom(beanType)) { + if (I18nReferentialDto.class.isAssignableFrom(beanType)) { result.addAll(Arrays.asList(DEFAULT_I18N_DATABINDING)); } - if (LengthWeightParameter.class.isAssignableFrom(beanType)) { + if (LengthWeightParameterDto.class.isAssignableFrom(beanType)) { result.addAll(Arrays.asList(DEFAULT_LENGTH_WEIGHT_PARAMETER_ABLE_DATABINDING)); } if (!usedefault) { diff --git a/observe-application-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 index 8dbcaed..6bde997 100644 --- a/observe-application-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 @@ -26,7 +26,7 @@
<import> - fr.ird.observe.entities.referentiel.Program + fr.ird.observe.services.dto.referential.ProgramDto fr.ird.observe.ui.content.ContentMode </import> diff --git a/observe-application-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 index 7f42067..65bdcb0 100644 --- a/observe-application-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 @@ -24,7 +24,7 @@ package fr.ird.observe.ui.content.ref; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; -import fr.ird.observe.entities.referentiel.Program; +import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; diff --git a/observe-application-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 index b9c99f6..0e90168 100644 --- a/observe-application-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 @@ -23,7 +23,7 @@ package fr.ird.observe.ui.content.ref; */ import fr.ird.observe.BinderService; -import fr.ird.observe.entities.referentiel.Program; +import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.ui.content.ContentUIModel; import org.nuiton.util.beans.BinderModelBuilder; @@ -33,16 +33,16 @@ import org.nuiton.util.beans.BinderModelBuilder; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class ReferenceHomeUIModel extends ContentUIModel<Program> { +public class ReferenceHomeUIModel extends ContentUIModel<ProgramDto> { private static final long serialVersionUID = 1L; public ReferenceHomeUIModel() { - super(Program.class); + super(ProgramDto.class); } @Override - protected BinderModelBuilder<Program, Program> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<ProgramDto, ProgramDto> createOpeningBinder(BinderService binderService, String binderName) { return null; } diff --git a/observe-application-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 index 7b8a730..9e4f0c6 100644 --- a/observe-application-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 @@ -23,12 +23,11 @@ package fr.ird.observe.ui.content.ref; */ import com.google.common.base.Predicate; -import fr.ird.observe.DataService; import fr.ird.observe.DecoratorService; import fr.ird.observe.ObserveContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.ui.content.ContentUIInitializer; import fr.ird.observe.ui.content.ObserveContentUI; import jaxx.runtime.swing.editor.bean.BeanListHeader; @@ -51,7 +50,7 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ -public class ReferentialContentUIInitializer<E extends ReferenceEntity, UI extends ContentReferenceUI<E>> extends ContentUIInitializer<E, UI> { +public class ReferentialContentUIInitializer<E extends ReferentialDto, UI extends ContentReferenceUI<E>> extends ContentUIInitializer<E, UI> { /** Logger. */ private static final Log log = LogFactory.getLog(ReferentialContentUIInitializer.class); @@ -88,10 +87,12 @@ public class ReferentialContentUIInitializer<E extends ReferenceEntity, UI exten list.putClientProperty("decorator", decorator); List<E> data; - if (ReferenceEntity.class.isAssignableFrom(entityClass)) { + if (ReferentialDto.class.isAssignableFrom(entityClass)) { Predicate<E> predicate = (Predicate<E>) list.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_LIST_PREDICATE); - data = tx.getDataService().getList(storageService, entityClass, predicate, loador); + //FIXME +// data = tx.getDataService().getList(storageService, entityClass, predicate, loador); + data = null; } else { data = new ArrayList<E>(); @@ -114,8 +115,9 @@ public class ReferentialContentUIInitializer<E extends ReferenceEntity, UI exten // listen on cache modification EntityListPropertyChangeListener<E> listener = new EntityListPropertyChangeListener<E>(entityClass, list); - DataService service = ObserveContext.get().getDataService(); - service.addReferentielPropertyChangeListener(entityClass, listener); + //FIXME +// DataService service = ObserveContext.get().getDataService(); +// service.addReferentielPropertyChangeListener(entityClass, listener); } @SuppressWarnings("unchecked") diff --git a/observe-application-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 index b05eebe..58f5c42 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='Country' + superGenericType='CountryDto' contentTitle='{n("observe.title.content.country")}' listText='{n("observe.list.country")}' createToolTip='{n("observe.action.country.create.tip")}' @@ -36,8 +36,8 @@ <style source="I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.Country + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.CountryDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel static fr.ird.observe.ui.UIHelper.getStringValue @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.Country' + beanClass='fr.ird.observe.services.dto.referential.CountryDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <CountryUIModel id='model'/> <!-- edit bean --> - <Country id='bean'/> + <CountryDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index afa38a4..dca104d 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl; * #L% */ -import fr.ird.observe.entities.referentiel.Country; +import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,13 +31,13 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class CountryUIModel extends ContentReferenceUIModel<Country> { +public class CountryUIModel extends ContentReferenceUIModel<CountryDto> { private static final long serialVersionUID = 1L; public CountryUIModel() { - super(Country.class, - new String[]{Country.PROPERTY_ISO2_CODE, Country.PROPERTY_ISO3_CODE}, + super(CountryDto.class, + new String[]{CountryDto.PROPERTY_ISO2_CODE, CountryDto.PROPERTY_ISO3_CODE}, new String[]{CountryUI.BINDING_ISO2_CODE_TEXT, CountryUI.BINDING_ISO3_CODE_TEXT} ); } diff --git a/observe-application-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 index c7ae64a..e27fba3 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='FpaZone' + superGenericType='FpaZoneDto' contentTitle='{n("observe.title.content.fpaZones")}' listText='{n("observe.list.fpaZone")}' createToolTip='{n("observe.action.fpaZone.create.tip")}' @@ -36,8 +36,8 @@ <style source="I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.FpaZone + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.FpaZoneDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel org.jdesktop.swingx.JXDatePicker @@ -48,7 +48,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.FpaZone' + beanClass='fr.ird.observe.services.dto.referential.FpaZoneDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -56,7 +56,7 @@ <FpaZoneUIModel id='model'/> <!-- edit bean --> - <FpaZone id='bean'/> + <FpaZoneDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 75f8e64..a032e48 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl; * #L% */ -import fr.ird.observe.entities.referentiel.FpaZone; +import fr.ird.observe.services.dto.referential.FpaZoneDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,13 +31,13 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class FpaZoneUIModel extends ContentReferenceUIModel<FpaZone> { +public class FpaZoneUIModel extends ContentReferenceUIModel<FpaZoneDto> { private static final long serialVersionUID = 1L; public FpaZoneUIModel() { - super(FpaZone.class, - new String[]{FpaZone.PROPERTY_START_DATE, FpaZone.PROPERTY_END_DATE}, + super(FpaZoneDto.class, + new String[]{FpaZoneDto.PROPERTY_START_DATE, FpaZoneDto.PROPERTY_END_DATE}, new String[]{FpaZoneUI.BINDING_START_DATE_DATE, FpaZoneUI.BINDING_END_DATE_DATE} ); } diff --git a/observe-application-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 index 978a079..139de6f 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='GearCaracteristicType' + superGenericType='GearCaracteristicTypeDto' contentTitle='{n("observe.title.content.gearCaracteristicTypes")}' listText='{n("observe.list.gearCaracteristicType")}' createToolTip='{n("observe.action.gearCaracteristicType.create.tip")}' @@ -34,8 +34,8 @@ <style source="I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.GearCaracteristicType + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.GearCaracteristicTypeDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel static fr.ird.observe.ui.UIHelper.getStringValue @@ -44,7 +44,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.GearCaracteristicType' + beanClass='fr.ird.observe.services.dto.referential.GearCaracteristicTypeDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -52,7 +52,7 @@ <GearCaracteristicTypeUIModel id='model'/> <!-- edit bean --> - <GearCaracteristicType id='bean'/> + <GearCaracteristicTypeDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 0b2629c..876ff14 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl; * #L% */ -import fr.ird.observe.entities.referentiel.GearCaracteristicType; +import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since 3.16 */ -public class GearCaracteristicTypeUIModel extends ContentReferenceUIModel<GearCaracteristicType> { +public class GearCaracteristicTypeUIModel extends ContentReferenceUIModel<GearCaracteristicTypeDto> { private static final long serialVersionUID = 1L; public GearCaracteristicTypeUIModel() { - super(GearCaracteristicType.class); + super(GearCaracteristicTypeDto.class); } } \ No newline at end of file diff --git a/observe-application-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 index 1b7692a..75a2da5 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='GearCaracteristic' + superGenericType='GearCaracteristicDto' contentTitle='{n("observe.title.content.gearCaracteristics")}' listText='{n("observe.list.gearCaracteristic")}' createToolTip='{n("observe.action.gearCaracteristic.create.tip")}' @@ -34,9 +34,9 @@ <style source="I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.GearCaracteristic - fr.ird.observe.entities.referentiel.GearCaracteristicType + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.GearCaracteristicDto + fr.ird.observe.services.dto.referential.GearCaracteristicTypeDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel jaxx.runtime.swing.editor.bean.BeanComboBox @@ -47,7 +47,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.GearCaracteristic' + beanClass='fr.ird.observe.services.dto.referential.GearCaracteristicDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -55,7 +55,7 @@ <GearCaracteristicUIModel id='model'/> <!-- edit bean --> - <GearCaracteristic id='bean'/> + <GearCaracteristicDto id='bean'/> <Table id='editTable'> @@ -100,7 +100,7 @@ <JLabel id='gearCaracteristicTypeLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='gearCaracteristicType' constructorParams='this' genericType='GearCaracteristicType'/> + <BeanComboBox id='gearCaracteristicType' constructorParams='this' genericType='GearCaracteristicTypeDto'/> </cell> </row> diff --git a/observe-application-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 index 7f16da6..665350e 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl; * #L% */ -import fr.ird.observe.entities.referentiel.GearCaracteristic; +import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,18 +31,18 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since 3.16 */ -public class GearCaracteristicUIModel extends ContentReferenceUIModel<GearCaracteristic> { +public class GearCaracteristicUIModel extends ContentReferenceUIModel<GearCaracteristicDto> { private static final long serialVersionUID = 1L; public GearCaracteristicUIModel() { - super(GearCaracteristic.class, + super(GearCaracteristicDto.class, new String[]{ - GearCaracteristic.PROPERTY_GEAR_CARACTERISTIC_TYPE, - GearCaracteristic.PROPERTY_UNIT, + GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE, + GearCaracteristicDto.PROPERTY_UNIT, }, - new String[]{GearCaracteristic.PROPERTY_GEAR_CARACTERISTIC_TYPE + SUFFIX_SELECTED_ITEM, - GearCaracteristic.PROPERTY_UNIT + SUFFIX_TEXT} + new String[]{GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE + SUFFIX_SELECTED_ITEM, + GearCaracteristicDto.PROPERTY_UNIT + SUFFIX_TEXT} ); } diff --git a/observe-application-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 index 6b96511..ddb42ff 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='Gear' + superGenericType='GearDto' contentTitle='{n("observe.title.content.gears")}' listText='{n("observe.list.gear")}' createToolTip='{n("observe.action.gear.create.tip")}' @@ -34,9 +34,9 @@ <style source="I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.Gear - fr.ird.observe.entities.referentiel.GearCaracteristic + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.GearDto + fr.ird.observe.services.dto.referential.GearCaracteristicDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel org.nuiton.jaxx.widgets.select.FilterableDoubleList @@ -47,7 +47,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.Gear' + beanClass='fr.ird.observe.services.dto.referential.GearDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -55,7 +55,7 @@ <GearUIModel id='model'/> <!-- edit bean --> - <Gear id='bean'/> + <GearDto id='bean'/> <!-- handler --> <GearUIHandler id='handler' constructorParams="this"/> @@ -177,7 +177,7 @@ <row> <cell weightx="1" weighty="1"> <JScrollPane id='gearCaracteristicPane' layout='{new GridLayout(1,1)}'> - <FilterableDoubleList id='gearCaracteristic' genericType='GearCaracteristic'/> + <FilterableDoubleList id='gearCaracteristic' genericType='GearCaracteristicDto'/> </JScrollPane> </cell> </row> diff --git a/observe-application-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 index 017b13d..3a3a664 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl; * #L% */ -import fr.ird.observe.entities.referentiel.Gear; +import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.ui.content.ref.ContentReferenceUI; import fr.ird.observe.ui.content.ref.ContentReferenceUIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; diff --git a/observe-application-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 index d07a3a0..c0f5974 100644 --- a/observe-application-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 @@ -23,7 +23,7 @@ package fr.ird.observe.ui.content.ref.impl; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.entities.referentiel.Gear; +import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; import java.util.Set; @@ -34,7 +34,7 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.16 */ -public class GearUIModel extends ContentReferenceUIModel<Gear> { +public class GearUIModel extends ContentReferenceUIModel<GearDto> { private static final long serialVersionUID = 1L; @@ -43,30 +43,30 @@ public class GearUIModel extends ContentReferenceUIModel<Gear> { public static final String PROPERTY_GEAR_CARACTERISTIC_TAB_VALID = "gearCaracteristicTabValid"; public static final Set<String> GENERAL_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(Gear.PROPERTY_URI, - Gear.PROPERTY_CODE, - Gear.PROPERTY_STATUS, - Gear.PROPERTY_NEED_COMMENT, - Gear.PROPERTY_LABEL1, - Gear.PROPERTY_LABEL2, - Gear.PROPERTY_LABEL3, - Gear.PROPERTY_LABEL4, - Gear.PROPERTY_LABEL5, - Gear.PROPERTY_LABEL6, - Gear.PROPERTY_LABEL7, - Gear.PROPERTY_LABEL8).build(); + ImmutableSet.<String>builder().add(GearDto.PROPERTY_URI, + GearDto.PROPERTY_CODE, + GearDto.PROPERTY_STATUS, + GearDto.PROPERTY_NEED_COMMENT, + GearDto.PROPERTY_LABEL1, + GearDto.PROPERTY_LABEL2, + GearDto.PROPERTY_LABEL3, + GearDto.PROPERTY_LABEL4, + GearDto.PROPERTY_LABEL5, + GearDto.PROPERTY_LABEL6, + GearDto.PROPERTY_LABEL7, + GearDto.PROPERTY_LABEL8).build(); public static final Set<String> GEAR_CARACTERISTIC_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(Gear.PROPERTY_GEAR_CARACTERISTIC).build(); + ImmutableSet.<String>builder().add(GearDto.PROPERTY_GEAR_CARACTERISTIC).build(); protected boolean generalTabValid; protected boolean gearCaracteristicTabValid; public GearUIModel() { - super(Gear.class, - new String[]{Gear.PROPERTY_GEAR_CARACTERISTIC}, - new String[]{Gear.PROPERTY_GEAR_CARACTERISTIC + SUFFIX_SELECTED}); + super(GearDto.class, + new String[]{GearDto.PROPERTY_GEAR_CARACTERISTIC}, + new String[]{GearDto.PROPERTY_GEAR_CARACTERISTIC + SUFFIX_SELECTED}); } public boolean isGearCaracteristicTabValid() { diff --git a/observe-application-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 index 332b43d..9c3eceb 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='Harbour' + superGenericType='HarbourDto' contentTitle='{n("observe.title.content.harbours")}' listText='{n("observe.list.harbour")}' createToolTip='{n("observe.action.harbour.create.tip")}' @@ -35,9 +35,9 @@ <style source="ReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.Harbour - fr.ird.observe.entities.referentiel.Country + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.HarbourDto + fr.ird.observe.services.dto.referential.CountryDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel jaxx.runtime.swing.editor.bean.BeanComboBox @@ -50,7 +50,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' context='n1-create' - beanClass='fr.ird.observe.entities.referentiel.Harbour' + beanClass='fr.ird.observe.services.dto.referential.HarbourDto' errorTableModel='{getErrorTableModel()}'> <field name='longitude' component='coordinates'/> @@ -64,7 +64,7 @@ <HarbourUIModel id='model'/> <!-- edit bean --> - <Harbour id='bean'/> + <HarbourDto id='bean'/> <Table id='editTable'> @@ -121,7 +121,7 @@ <JLabel id='countryLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='country' constructorParams='this' genericType='Country'/> + <BeanComboBox id='country' constructorParams='this' genericType='CountryDto'/> </cell> </row> diff --git a/observe-application-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 index 0b2da20..a127bc5 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl; * #L% */ -import fr.ird.observe.entities.referentiel.Harbour; +import fr.ird.observe.services.dto.referential.HarbourDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,18 +31,18 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since 3.11 */ -public class HarbourUIModel extends ContentReferenceUIModel<Harbour> { +public class HarbourUIModel extends ContentReferenceUIModel<HarbourDto> { private static final long serialVersionUID = 1L; public HarbourUIModel() { super(Harbour.class, - new String[]{Harbour.PROPERTY_NAME, - Harbour.PROPERTY_COUNTRY, - Harbour.PROPERTY_LOCODE, - Harbour.PROPERTY_LATITUDE, - Harbour.PROPERTY_LONGITUDE, - Harbour.PROPERTY_QUADRANT}, + new String[]{HarbourDto.PROPERTY_NAME, + HarbourDto.PROPERTY_COUNTRY, + HarbourDto.PROPERTY_LOCODE, + HarbourDto.PROPERTY_LATITUDE, + HarbourDto.PROPERTY_LONGITUDE, + HarbourDto.PROPERTY_QUADRANT}, new String[]{HarbourUI.BINDING_COUNTRY_SELECTED_ITEM, HarbourUI.BINDING_HARBOUR_NAME_TEXT, HarbourUI.BINDING_LOCODE_TEXT, diff --git a/observe-application-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 index 4f4380b..b27613a 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='LengthWeightParameter' + superGenericType='LengthWeightParameterDto' contentTitle='{n("observe.title.content.lengthWeightParameters")}' listText='{n("observe.list.lengthWeightParameter")}' createToolTip='{n("observe.action.lengthWeightParameter.create.tip")}' @@ -35,11 +35,11 @@ <style source="ReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.Sex - fr.ird.observe.entities.referentiel.Species - fr.ird.observe.entities.referentiel.Ocean - fr.ird.observe.entities.referentiel.LengthWeightParameter + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.SexDto + fr.ird.observe.services.dto.referential.SpeciesDto + fr.ird.observe.services.dto.referential.OceanDto + fr.ird.observe.services.dto.referential.LengthWeightParameterDto fr.ird.observe.ui.UIHelper fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -58,7 +58,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.LengthWeightParameter' + beanClass='fr.ird.observe.services.dto.referential.LengthWeightParameterDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -69,7 +69,7 @@ <LengthWeightParameterUIHandler id='handler' constructorParams="this"/> <!-- edit bean --> - <LengthWeightParameter id='bean'/> + <LengthWeightParameterDto id='bean'/> <script><![CDATA[ @Override @@ -85,7 +85,7 @@ public void decorateUniqueKeyTable(JTable table, table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF); UIHelper.setTableColumnRenderer(table, 1, - UIHelper.newDecorateTableCellRenderer(renderer, Sex.class)); + UIHelper.newDecorateTableCellRenderer(renderer, SexDto.class)); } ]]></script> @@ -103,7 +103,7 @@ public void decorateUniqueKeyTable(JTable table, </cell> <cell anchor='east' weightx="1" fill="both"> <BeanComboBox id='sex' constructorParams='this' - genericType='Sex'/> + genericType='SexDto'/> </cell> </row> @@ -114,7 +114,7 @@ public void decorateUniqueKeyTable(JTable table, </cell> <cell anchor='east' weightx="1" fill="both"> <BeanComboBox id='species' constructorParams='this' - genericType='Species'/> + genericType='SpeciesDto'/> </cell> </row> @@ -125,7 +125,7 @@ public void decorateUniqueKeyTable(JTable table, </cell> <cell anchor='east' weightx="1" fill="both"> <BeanComboBox id='ocean' constructorParams='this' - genericType='Ocean'/> + genericType='OceanDto'/> </cell> </row> diff --git a/observe-application-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 index 432d4d4..9f320e7 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl; * #L% */ -import fr.ird.observe.entities.referentiel.LengthWeightParameter; +import fr.ird.observe.services.dto.referential.LengthWeightParameterDto; import fr.ird.observe.ui.content.ref.ContentReferenceUI; import fr.ird.observe.ui.content.ref.ContentReferenceUIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; diff --git a/observe-application-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 index aeeb862..117868d 100644 --- a/observe-application-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 @@ -23,7 +23,7 @@ package fr.ird.observe.ui.content.ref.impl; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.entities.referentiel.LengthWeightParameter; +import fr.ird.observe.services.dto.referential.LengthWeightParameterDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; import java.util.Set; @@ -34,31 +34,31 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class LengthWeightParameterUIModel extends ContentReferenceUIModel<LengthWeightParameter> { +public class LengthWeightParameterUIModel extends ContentReferenceUIModel<LengthWeightParameterDto> { public static final String PROPERTY_GENERAL_TAB_VALID = "generalTabValid"; public static final String PROPERTY_OTHER_TAB_VALID = "otherTabValid"; public static final Set<String> GENERAL_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(LengthWeightParameter.PROPERTY_URI, - LengthWeightParameter.PROPERTY_CODE, - LengthWeightParameter.PROPERTY_STATUS, - LengthWeightParameter.PROPERTY_SEX, - LengthWeightParameter.PROPERTY_OCEAN, - LengthWeightParameter.PROPERTY_SPECIES, - LengthWeightParameter.PROPERTY_NEED_COMMENT, - LengthWeightParameter.PROPERTY_START_DATE, - LengthWeightParameter.PROPERTY_END_DATE).build(); + ImmutableSet.<String>builder().add(LengthWeightParameterDto.PROPERTY_URI, + LengthWeightParameterDto.PROPERTY_CODE, + LengthWeightParameterDto.PROPERTY_STATUS, + LengthWeightParameterDto.PROPERTY_SEX, + LengthWeightParameterDto.PROPERTY_OCEAN, + LengthWeightParameterDto.PROPERTY_SPECIES, + LengthWeightParameterDto.PROPERTY_NEED_COMMENT, + LengthWeightParameterDto.PROPERTY_START_DATE, + LengthWeightParameterDto.PROPERTY_END_DATE).build(); public static final Set<String> OTHER_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(LengthWeightParameter.PROPERTY_MEAN_LENGTH, - LengthWeightParameter.PROPERTY_MEAN_WEIGHT, - LengthWeightParameter.PROPERTY_WEIGHT_LENGTH_FORMULA, - LengthWeightParameter.PROPERTY_WEIGHT_LENGTH_FORMULA_VALID, - LengthWeightParameter.PROPERTY_LENGTH_WEIGHT_FORMULA, - LengthWeightParameter.PROPERTY_LENGTH_WEIGHT_FORMULA_VALID, - LengthWeightParameter.PROPERTY_COEFFICIENTS).build(); + ImmutableSet.<String>builder().add(LengthWeightParameterDto.PROPERTY_MEAN_LENGTH, + LengthWeightParameterDto.PROPERTY_MEAN_WEIGHT, + LengthWeightParameterDto.PROPERTY_WEIGHT_LENGTH_FORMULA, + LengthWeightParameterDto.PROPERTY_WEIGHT_LENGTH_FORMULA_VALID, + LengthWeightParameterDto.PROPERTY_LENGTH_WEIGHT_FORMULA, + LengthWeightParameterDto.PROPERTY_LENGTH_WEIGHT_FORMULA_VALID, + LengthWeightParameterDto.PROPERTY_COEFFICIENTS).build(); private static final long serialVersionUID = 1L; @@ -67,13 +67,13 @@ public class LengthWeightParameterUIModel extends ContentReferenceUIModel<Length protected boolean otherTabValid; public LengthWeightParameterUIModel() { - super(LengthWeightParameter.class, + super(LengthWeightParameterDto.class, null, new String[]{ - LengthWeightParameter.PROPERTY_SEX, - LengthWeightParameter.PROPERTY_OCEAN, - LengthWeightParameter.PROPERTY_SPECIES, - LengthWeightParameter.PROPERTY_START_DATE, + LengthWeightParameterDto.PROPERTY_SEX, + LengthWeightParameterDto.PROPERTY_OCEAN, + LengthWeightParameterDto.PROPERTY_SPECIES, + LengthWeightParameterDto.PROPERTY_START_DATE, }, null ); diff --git a/observe-application-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 index 0412b80..1cee147 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='Ocean' + superGenericType='OceanDto' contentTitle='{n("observe.title.content.oceans")}' listText='{n("observe.list.ocean")}' createToolTip='{n("observe.action.ocean.create.tip")}' @@ -36,8 +36,8 @@ <style source="I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.Ocean + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.OceanDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel static fr.ird.observe.ui.UIHelper.getStringValue @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.Ocean' + beanClass='fr.ird.observe.services.dto.referential.OceanDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <OceanUIModel id='model'/> <!-- edit bean --> - <Ocean id='bean'/> + <OceanDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 326bc89..9d78273 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl; * #L% */ -import fr.ird.observe.entities.referentiel.Ocean; +import fr.ird.observe.services.dto.referential.OceanDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class OceanUIModel extends ContentReferenceUIModel<Ocean> { +public class OceanUIModel extends ContentReferenceUIModel<OceanDto> { private static final long serialVersionUID = 1L; public OceanUIModel() { - super(Ocean.class); + super(OceanDto.class); } } diff --git a/observe-application-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 index 6b2b6d7..aac836e 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='Organism' + superGenericType='OrganismDto' contentTitle='{n("observe.title.content.organisms")}' listText='{n("observe.list.organism")}' createToolTip='{n("observe.action.organism.create.tip")}' @@ -36,9 +36,9 @@ <style source="I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.Organism - fr.ird.observe.entities.referentiel.Country + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.OrganismDto + fr.ird.observe.services.dto.referential.CountryDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel jaxx.runtime.swing.editor.bean.BeanComboBox @@ -49,7 +49,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.Organism' + beanClass='fr.ird.observe.services.dto.referential.OrganismDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -57,7 +57,7 @@ <OrganismUIModel id='model'/> <!-- edit bean --> - <Organism id='bean'/> + <OrganismDto id='bean'/> <Table id='editTable'> @@ -95,7 +95,7 @@ <JLabel id='countryLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='country' constructorParams='this' genericType='Country'/> + <BeanComboBox id='country' constructorParams='this' genericType='CountryDto'/> </cell> </row> diff --git a/observe-application-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 index 66fbfe6..b11c548 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl; * #L% */ -import fr.ird.observe.entities.referentiel.Organism; +import fr.ird.observe.services.dto.referential.OrganismDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,13 +31,13 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class OrganismUIModel extends ContentReferenceUIModel<Organism> { +public class OrganismUIModel extends ContentReferenceUIModel<OrganismDto> { private static final long serialVersionUID = 1L; public OrganismUIModel() { - super(Organism.class, - new String[]{Organism.PROPERTY_COUNTRY, Organism.PROPERTY_DESCRIPTION}, + super(OrganismDto.class, + new String[]{OrganismDto.PROPERTY_COUNTRY, OrganismDto.PROPERTY_DESCRIPTION}, new String[]{OrganismUI.BINDING_COUNTRY_SELECTED_ITEM, OrganismUI.BINDING_DESCRIPTION_TEXT} ); } diff --git a/observe-application-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 index 9de0b59..df0f8e7 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='Person' + superGenericType='PersonDto' contentTitle='{n("observe.title.content.persons")}' listText='{n("observe.list.person")}' createToolTip='{n("observe.action.person.create.tip")}' @@ -35,9 +35,9 @@ <style source="ReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.Person - fr.ird.observe.entities.referentiel.Country + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.PersonDto + fr.ird.observe.services.dto.referential.CountryDto fr.ird.observe.ui.UIHelper fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -53,7 +53,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.Person' + beanClass='fr.ird.observe.services.dto.referential.PersonDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -61,7 +61,7 @@ <PersonUIModel id='model'/> <!-- edit bean --> - <Person id='bean'/> + <PersonDto id='bean'/> <script><![CDATA[ @Override @@ -129,7 +129,7 @@ public void decorateUniqueKeyTable(JTable table, <JLabel id='countryLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='country' constructorParams='this' genericType='Country'/> + <BeanComboBox id='country' constructorParams='this' genericType='CountryDto'/> </cell> </row> diff --git a/observe-application-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 index 71d7817..40269f5 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl; * #L% */ -import fr.ird.observe.entities.referentiel.Person; +import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,22 +31,22 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class PersonUIModel extends ContentReferenceUIModel<Person> { +public class PersonUIModel extends ContentReferenceUIModel<PersonDto> { private static final long serialVersionUID = 1L; public PersonUIModel() { - super(Person.class, + super(PersonDto.class, new String[]{ - Person.PROPERTY_CODE, - Person.PROPERTY_LAST_NAME, - Person.PROPERTY_FIRST_NAME, - Person.PROPERTY_CAPTAIN, - Person.PROPERTY_OBSERVER, - Person.PROPERTY_DATA_ENTRY_OPERATOR, - Person.PROPERTY_COUNTRY + PersonDto.PROPERTY_CODE, + PersonDto.PROPERTY_LAST_NAME, + PersonDto.PROPERTY_FIRST_NAME, + PersonDto.PROPERTY_CAPTAIN, + PersonDto.PROPERTY_OBSERVER, + PersonDto.PROPERTY_DATA_ENTRY_OPERATOR, + PersonDto.PROPERTY_COUNTRY }, - new String[]{Person.PROPERTY_CODE}, + new String[]{PersonDto.PROPERTY_CODE}, new String[]{PersonUI.BINDING_CODE_TEXT, PersonUI.BINDING_FIRST_NAME_TEXT, PersonUI.BINDING_LAST_NAME_TEXT, diff --git a/observe-application-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 index c8d3341..41721e9 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='Program' + superGenericType='ProgramDto' contentTitle='{n("observe.title.content.programs")}' listText='{n("observe.list.program")}' createToolTip='{n("observe.action.program.create.tip")}' @@ -36,11 +36,11 @@ <style source="I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.constants.GearType + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.constants.GearType fr.ird.observe.ui.content.ref.impl.ProgramObservationEnum - fr.ird.observe.entities.referentiel.Program - fr.ird.observe.entities.referentiel.Organism + fr.ird.observe.services.dto.referential.ProgramDto + fr.ird.observe.services.dto.referential.OrganismDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel jaxx.runtime.swing.editor.bean.BeanComboBox @@ -55,7 +55,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' context='n1-create' - beanClass='fr.ird.observe.entities.referentiel.Program' errorTableModel='{getErrorTableModel()}'/> + beanClass='fr.ird.observe.services.dto.referential.ProgramDto' errorTableModel='{getErrorTableModel()}'/> <!-- model --> <ProgramUIModel id='model'/> @@ -64,7 +64,7 @@ <ProgramUIHandler id='handler' constructorParams="this"/> <!-- edit bean --> - <Program id='bean'/> + <ProgramDto id='bean'/> <Table id="editView" insets="0" fill="both"> <row> @@ -106,7 +106,7 @@ <JLabel id='organismLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='organism' constructorParams='this' genericType="Organism"/> + <BeanComboBox id='organism' constructorParams='this' genericType="OrganismDto"/> </cell> </row> diff --git a/observe-application-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 index 06c57ea..2274dda 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl; * #L% */ -import fr.ird.observe.entities.referentiel.Program; +import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.ui.content.ref.ContentReferenceUI; import fr.ird.observe.ui.content.ref.ContentReferenceUIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; diff --git a/observe-application-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 index c02b20a..a20c38f 100644 --- a/observe-application-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 @@ -23,7 +23,7 @@ package fr.ird.observe.ui.content.ref.impl; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.entities.referentiel.Program; +import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; import java.util.Set; @@ -34,37 +34,37 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class ProgramUIModel extends ContentReferenceUIModel<Program> { +public class ProgramUIModel extends ContentReferenceUIModel<ProgramDto> { public static final String PROPERTY_GENERAL_TAB_VALID = "generalTabValid"; public static final String PROPERTY_OBSERVATIONS_TAB_VALID = "observationsTabValid"; public static final Set<String> GENERAL_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(Program.PROPERTY_URI, - Program.PROPERTY_CODE, - Program.PROPERTY_STATUS, - Program.PROPERTY_NEED_COMMENT, - Program.PROPERTY_GEAR_TYPE, - Program.PROPERTY_ORGANISM, - Program.PROPERTY_LABEL1, - Program.PROPERTY_LABEL2, - Program.PROPERTY_LABEL3, - Program.PROPERTY_LABEL4, - Program.PROPERTY_LABEL5, - Program.PROPERTY_LABEL6, - Program.PROPERTY_LABEL7, - Program.PROPERTY_LABEL8).build(); + ImmutableSet.<String>builder().add(ProgramDto.PROPERTY_URI, + ProgramDto.PROPERTY_CODE, + ProgramDto.PROPERTY_STATUS, + ProgramDto.PROPERTY_NEED_COMMENT, + ProgramDto.PROPERTY_GEAR_TYPE, + ProgramDto.PROPERTY_ORGANISM, + ProgramDto.PROPERTY_LABEL1, + ProgramDto.PROPERTY_LABEL2, + ProgramDto.PROPERTY_LABEL3, + ProgramDto.PROPERTY_LABEL4, + ProgramDto.PROPERTY_LABEL5, + ProgramDto.PROPERTY_LABEL6, + ProgramDto.PROPERTY_LABEL7, + ProgramDto.PROPERTY_LABEL8).build(); public static final Set<String> OBSERVATIONS_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(Program.PROPERTY_DETAILLED_ACTIVITIES_OBSERVATION, - Program.PROPERTY_NON_TARGET_OBSERVATION, - Program.PROPERTY_BAIT_OBSERVATION, - Program.PROPERTY_MAMMALS_OBSERVATION, - Program.PROPERTY_SAMPLES_OBSERVATION, - Program.PROPERTY_OBJECTS_OBSERVATION, - Program.PROPERTY_BIRDS_OBSERVATION, - Program.PROPERTY_TARGET_DISCARDS_OBSERVATION).build(); + ImmutableSet.<String>builder().add(ProgramDto.PROPERTY_DETAILLED_ACTIVITIES_OBSERVATION, + ProgramDto.PROPERTY_NON_TARGET_OBSERVATION, + ProgramDto.PROPERTY_BAIT_OBSERVATION, + ProgramDto.PROPERTY_MAMMALS_OBSERVATION, + ProgramDto.PROPERTY_SAMPLES_OBSERVATION, + ProgramDto.PROPERTY_OBJECTS_OBSERVATION, + ProgramDto.PROPERTY_BIRDS_OBSERVATION, + ProgramDto.PROPERTY_TARGET_DISCARDS_OBSERVATION).build(); private static final long serialVersionUID = 1L; @@ -73,20 +73,20 @@ public class ProgramUIModel extends ContentReferenceUIModel<Program> { protected boolean observationsTabValid; public ProgramUIModel() { - super(Program.class, + super(ProgramDto.class, new String[]{ - Program.PROPERTY_ORGANISM, - Program.PROPERTY_START_DATE, - Program.PROPERTY_END_DATE, - Program.PROPERTY_DETAILLED_ACTIVITIES_OBSERVATION, - Program.PROPERTY_NON_TARGET_OBSERVATION, - Program.PROPERTY_BAIT_OBSERVATION, - Program.PROPERTY_MAMMALS_OBSERVATION, - Program.PROPERTY_SAMPLES_OBSERVATION, - Program.PROPERTY_OBJECTS_OBSERVATION, - Program.PROPERTY_BIRDS_OBSERVATION, - Program.PROPERTY_TARGET_DISCARDS_OBSERVATION, - Program.PROPERTY_GEAR_TYPE}, + ProgramDto.PROPERTY_ORGANISM, + ProgramDto.PROPERTY_START_DATE, + ProgramDto.PROPERTY_END_DATE, + ProgramDto.PROPERTY_DETAILLED_ACTIVITIES_OBSERVATION, + ProgramDto.PROPERTY_NON_TARGET_OBSERVATION, + ProgramDto.PROPERTY_BAIT_OBSERVATION, + ProgramDto.PROPERTY_MAMMALS_OBSERVATION, + ProgramDto.PROPERTY_SAMPLES_OBSERVATION, + ProgramDto.PROPERTY_OBJECTS_OBSERVATION, + ProgramDto.PROPERTY_BIRDS_OBSERVATION, + ProgramDto.PROPERTY_TARGET_DISCARDS_OBSERVATION, + ProgramDto.PROPERTY_GEAR_TYPE}, new String[]{ ProgramUI.BINDING_ORGANISM_SELECTED_ITEM, ProgramUI.BINDING_START_DATE_DATE, diff --git a/observe-application-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 index 54a4a60..ebca2fa 100644 --- a/observe-application-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 @@ -36,8 +36,8 @@ <style source="I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.Sex + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.SexDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel static fr.ird.observe.ui.UIHelper.getStringValue @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.Sex' + beanClass='fr.ird.observe.services.dto.referential.SexDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <SexUIModel id='model'/> <!-- edit bean --> - <Sex id='bean'/> + <SexDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 1078b62..179b9e2 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl; * #L% */ -import fr.ird.observe.entities.referentiel.Sex; +import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class SexUIModel extends ContentReferenceUIModel<Sex> { +public class SexUIModel extends ContentReferenceUIModel<SexDto> { private static final long serialVersionUID = 1L; public SexUIModel() { - super(Sex.class); + super(SexDto.class); } } diff --git a/observe-application-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 index cae78f4..cf1db98 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='SpeciesGroup' + superGenericType='SpeciesGroupDto' contentTitle='{n("observe.title.content.speciesGroupSpeciess")}' listText='{n("observe.list.speciesGroupSpecies")}' createToolTip='{n("observe.action.speciesGroupSpecies.create.tip")}' @@ -36,8 +36,8 @@ <style source="I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.SpeciesGroup + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.SpeciesGroupDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel jaxx.runtime.swing.editor.NumberEditor @@ -48,7 +48,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.SpeciesGroup' + beanClass='fr.ird.observe.services.dto.referential.SpeciesGroupDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -56,7 +56,7 @@ <SpeciesGroupUIModel id='model'/> <!-- edit bean --> - <SpeciesGroup id='bean'/> + <SpeciesGroupDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index fbeaa91..809a647 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl; * #L% */ -import fr.ird.observe.entities.referentiel.SpeciesGroup; +import fr.ird.observe.services.dto.referential.SpeciesGroupDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class SpeciesGroupUIModel extends ContentReferenceUIModel<SpeciesGroup> { +public class SpeciesGroupUIModel extends ContentReferenceUIModel<SpeciesGroupDto> { private static final long serialVersionUID = 1L; public SpeciesGroupUIModel() { - super(SpeciesGroup.class); + super(SpeciesGroupDto.class); } } diff --git a/observe-application-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 index 2510291..83364be 100644 --- a/observe-application-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 @@ -20,7 +20,7 @@ #L% --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='SpeciesList' + superGenericType='SpeciesListDto' contentTitle='{n("observe.title.content.speciesLists")}' listText='{n("observe.list.speciesList")}' createToolTip='{n("observe.action.speciesList.create.tip")}' @@ -35,9 +35,9 @@ <style source="I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.SpeciesList - fr.ird.observe.entities.referentiel.Species + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.SpeciesListDto + fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel jaxx.runtime.swing.editor.bean.BeanComboBox @@ -52,7 +52,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.SpeciesList' + beanClass='fr.ird.observe.services.dto.referential.SpeciesListDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -60,7 +60,7 @@ <SpeciesListUIModel id='model'/> <!-- edit bean --> - <SpeciesList id='bean'/> + <SpeciesListDto id='bean'/> <!-- handler --> <SpeciesListUIHandler id='handler' constructorParams="this"/> @@ -182,7 +182,7 @@ <row> <cell weightx="1" weighty="1"> <JScrollPane id='speciesPane' layout='{new GridLayout(1,1)}'> - <FilterableDoubleList id='species' genericType='Species'/> + <FilterableDoubleList id='species' genericType='SpeciesDto'/> </JScrollPane> </cell> </row> diff --git a/observe-application-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 index 378e137..87a4b59 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl; * #L% */ -import fr.ird.observe.entities.referentiel.SpeciesList; +import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.ui.content.ref.ContentReferenceUI; import fr.ird.observe.ui.content.ref.ContentReferenceUIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; diff --git a/observe-application-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 index b6041b7..0333d7b 100644 --- a/observe-application-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 @@ -23,7 +23,7 @@ package fr.ird.observe.ui.content.ref.impl; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.entities.referentiel.SpeciesList; +import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; import java.util.Set; @@ -34,28 +34,28 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class SpeciesListUIModel extends ContentReferenceUIModel<SpeciesList> { +public class SpeciesListUIModel extends ContentReferenceUIModel<SpeciesListDto> { public static final String PROPERTY_GENERAL_TAB_VALID = "generalTabValid"; public static final String PROPERTY_SPECIES_TAB_VALID = "speciesTabValid"; public static final Set<String> GENERAL_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(SpeciesList.PROPERTY_URI, - SpeciesList.PROPERTY_CODE, - SpeciesList.PROPERTY_STATUS, - SpeciesList.PROPERTY_NEED_COMMENT, - SpeciesList.PROPERTY_LABEL1, - SpeciesList.PROPERTY_LABEL2, - SpeciesList.PROPERTY_LABEL3, - SpeciesList.PROPERTY_LABEL4, - SpeciesList.PROPERTY_LABEL5, - SpeciesList.PROPERTY_LABEL6, - SpeciesList.PROPERTY_LABEL7, - SpeciesList.PROPERTY_LABEL8).build(); + ImmutableSet.<String>builder().add(SpeciesListDto.PROPERTY_URI, + SpeciesListDto.PROPERTY_CODE, + SpeciesListDto.PROPERTY_STATUS, + SpeciesListDto.PROPERTY_NEED_COMMENT, + SpeciesListDto.PROPERTY_LABEL1, + SpeciesListDto.PROPERTY_LABEL2, + SpeciesListDto.PROPERTY_LABEL3, + SpeciesListDto.PROPERTY_LABEL4, + SpeciesListDto.PROPERTY_LABEL5, + SpeciesListDto.PROPERTY_LABEL6, + SpeciesListDto.PROPERTY_LABEL7, + SpeciesListDto.PROPERTY_LABEL8).build(); public static final Set<String> SPECIES_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(SpeciesList.PROPERTY_SPECIES).build(); + ImmutableSet.<String>builder().add(SpeciesListDto.PROPERTY_SPECIES).build(); private static final long serialVersionUID = 1L; @@ -64,9 +64,9 @@ public class SpeciesListUIModel extends ContentReferenceUIModel<SpeciesList> { protected boolean speciesTabValid; public SpeciesListUIModel() { - super(SpeciesList.class, - new String[]{SpeciesList.PROPERTY_SPECIES}, - new String[]{SpeciesList.PROPERTY_SPECIES + SUFFIX_SELECTED}, + super(SpeciesListDto.class, + new String[]{SpeciesListDto.PROPERTY_SPECIES}, + new String[]{SpeciesListDto.PROPERTY_SPECIES + SUFFIX_SELECTED}, null ); } diff --git a/observe-application-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 index d1a360f..761dfe6 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='Species' + superGenericType='SpeciesDto' contentTitle='{n("observe.title.content.speciess")}' listText='{n("observe.list.speciesFaune")}' createToolTip='{n("observe.action.species.create.tip")}' @@ -36,10 +36,10 @@ <style source="I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.Species - fr.ird.observe.entities.referentiel.SpeciesGroup - fr.ird.observe.entities.referentiel.Ocean + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.SpeciesDto + fr.ird.observe.services.dto.referential.SpeciesGroupDto + fr.ird.observe.services.dto.referential.OceanDto jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox @@ -51,7 +51,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.Species' + beanClass='fr.ird.observe.services.dto.referential.SpeciesDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -62,7 +62,7 @@ <SpeciesUIHandler id='handler' constructorParams="this"/> <!-- edit bean --> - <Species id='bean'/> + <SpeciesDto id='bean'/> <Table id="editView" insets="0" fill="both"> <row> @@ -118,7 +118,7 @@ <JLabel id='speciesGroupLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='speciesGroup' constructorParams='this' genericType='SpeciesGroup'/> + <BeanComboBox id='speciesGroup' constructorParams='this' genericType='SpeciesGroupDto'/> </cell> </row> <!-- needComment --> @@ -258,7 +258,7 @@ <row> <cell weightx="1"> <JScrollPane id='oceanPane' layout='{new GridLayout(1,1)}'> - <FilterableDoubleList id='ocean' genericType='Ocean'/> + <FilterableDoubleList id='ocean' genericType='OceanDto'/> </JScrollPane> </cell> </row> diff --git a/observe-application-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 index 08763f1..ca42586 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl; * #L% */ -import fr.ird.observe.entities.referentiel.Species; +import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.ui.content.ref.ContentReferenceUI; import fr.ird.observe.ui.content.ref.ContentReferenceUIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; diff --git a/observe-application-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 index 49fef78..4f4c581 100644 --- a/observe-application-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 @@ -23,7 +23,7 @@ package fr.ird.observe.ui.content.ref.impl; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.entities.referentiel.Species; +import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; import java.util.Set; @@ -34,37 +34,37 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class SpeciesUIModel extends ContentReferenceUIModel<Species> { +public class SpeciesUIModel extends ContentReferenceUIModel<SpeciesDto> { public static final String PROPERTY_GENERAL_TAB_VALID = "generalTabValid"; public static final String PROPERTY_OTHER_TAB_VALID = "otherTabValid"; public static final Set<String> GENERAL_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(Species.PROPERTY_URI, - Species.PROPERTY_CODE, - Species.PROPERTY_STATUS, - Species.PROPERTY_FAO_CODE, - Species.PROPERTY_HOME_ID, - Species.PROPERTY_WORMS_ID, - Species.PROPERTY_NEED_COMMENT, - Species.PROPERTY_SCIENTIFIC_LABEL, - Species.PROPERTY_LABEL1, - Species.PROPERTY_LABEL2, - Species.PROPERTY_LABEL3, - Species.PROPERTY_LABEL4, - Species.PROPERTY_LABEL5, - Species.PROPERTY_LABEL6, - Species.PROPERTY_LABEL7, - Species.PROPERTY_LABEL8).build(); + ImmutableSet.<String>builder().add(SpeciesDto.PROPERTY_URI, + SpeciesDto.PROPERTY_CODE, + SpeciesDto.PROPERTY_STATUS, + SpeciesDto.PROPERTY_FAO_CODE, + SpeciesDto.PROPERTY_HOME_ID, + SpeciesDto.PROPERTY_WORMS_ID, + SpeciesDto.PROPERTY_NEED_COMMENT, + SpeciesDto.PROPERTY_SCIENTIFIC_LABEL, + SpeciesDto.PROPERTY_LABEL1, + SpeciesDto.PROPERTY_LABEL2, + SpeciesDto.PROPERTY_LABEL3, + SpeciesDto.PROPERTY_LABEL4, + SpeciesDto.PROPERTY_LABEL5, + SpeciesDto.PROPERTY_LABEL6, + SpeciesDto.PROPERTY_LABEL7, + SpeciesDto.PROPERTY_LABEL8).build(); public static final Set<String> OTHER_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(Species.PROPERTY_SPECIES_GROUP, - Species.PROPERTY_OCEAN, - Species.PROPERTY_MAX_LENGTH, - Species.PROPERTY_MIN_LENGTH, - Species.PROPERTY_MAX_WEIGHT, - Species.PROPERTY_MIN_WEIGHT).build(); + ImmutableSet.<String>builder().add(SpeciesDto.PROPERTY_SPECIES_GROUP, + SpeciesDto.PROPERTY_OCEAN, + SpeciesDto.PROPERTY_MAX_LENGTH, + SpeciesDto.PROPERTY_MIN_LENGTH, + SpeciesDto.PROPERTY_MAX_WEIGHT, + SpeciesDto.PROPERTY_MIN_WEIGHT).build(); private static final long serialVersionUID = 1L; @@ -74,30 +74,30 @@ public class SpeciesUIModel extends ContentReferenceUIModel<Species> { public SpeciesUIModel() { - super(Species.class, - new String[]{Species.PROPERTY_SPECIES_GROUP, - Species.PROPERTY_OCEAN, - Species.PROPERTY_LENGTH_MEASURE_TYPE, - Species.PROPERTY_MIN_LENGTH, - Species.PROPERTY_MAX_LENGTH, - Species.PROPERTY_MIN_WEIGHT, - Species.PROPERTY_MAX_WEIGHT, - Species.PROPERTY_HOME_ID, - Species.PROPERTY_FAO_CODE, - Species.PROPERTY_WORMS_ID, - Species.PROPERTY_SCIENTIFIC_LABEL}, + super(SpeciesDto.class, + new String[]{SpeciesDto.PROPERTY_SPECIES_GROUP, + SpeciesDto.PROPERTY_OCEAN, + SpeciesDto.PROPERTY_LENGTH_MEASURE_TYPE, + SpeciesDto.PROPERTY_MIN_LENGTH, + SpeciesDto.PROPERTY_MAX_LENGTH, + SpeciesDto.PROPERTY_MIN_WEIGHT, + SpeciesDto.PROPERTY_MAX_WEIGHT, + SpeciesDto.PROPERTY_HOME_ID, + SpeciesDto.PROPERTY_FAO_CODE, + SpeciesDto.PROPERTY_WORMS_ID, + SpeciesDto.PROPERTY_SCIENTIFIC_LABEL}, new String[]{ - Species.PROPERTY_SPECIES_GROUP + SUFFIX_SELECTED_ITEM, - Species.PROPERTY_LENGTH_MEASURE_TYPE + SUFFIX_TEXT, - Species.PROPERTY_MIN_LENGTH + SUFFIX_MODEL, - Species.PROPERTY_MAX_LENGTH + SUFFIX_MODEL, - Species.PROPERTY_MIN_WEIGHT + SUFFIX_MODEL, - Species.PROPERTY_MAX_WEIGHT + SUFFIX_MODEL, - Species.PROPERTY_HOME_ID + SUFFIX_TEXT, - Species.PROPERTY_FAO_CODE + SUFFIX_TEXT, - Species.PROPERTY_WORMS_ID + SUFFIX_TEXT, - Species.PROPERTY_SCIENTIFIC_LABEL + SUFFIX_TEXT, - Species.PROPERTY_OCEAN + SUFFIX_SELECTED} + SpeciesDto.PROPERTY_SPECIES_GROUP + SUFFIX_SELECTED_ITEM, + SpeciesDto.PROPERTY_LENGTH_MEASURE_TYPE + SUFFIX_TEXT, + SpeciesDto.PROPERTY_MIN_LENGTH + SUFFIX_MODEL, + SpeciesDto.PROPERTY_MAX_LENGTH + SUFFIX_MODEL, + SpeciesDto.PROPERTY_MIN_WEIGHT + SUFFIX_MODEL, + SpeciesDto.PROPERTY_MAX_WEIGHT + SUFFIX_MODEL, + SpeciesDto.PROPERTY_HOME_ID + SUFFIX_TEXT, + SpeciesDto.PROPERTY_FAO_CODE + SUFFIX_TEXT, + SpeciesDto.PROPERTY_WORMS_ID + SUFFIX_TEXT, + SpeciesDto.PROPERTY_SCIENTIFIC_LABEL + SUFFIX_TEXT, + SpeciesDto.PROPERTY_OCEAN + SUFFIX_SELECTED} ); } diff --git a/observe-application-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 index 3c34f93..8615c55 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='VesselSizeCategory' + superGenericType='VesselSizeCategoryDto' contentTitle='{n("observe.title.content.vesselSizeCategoryx")}' listText='{n("observe.list.vesselSizeCategory")}' createToolTip='{n("observe.action.vesselSizeCategory.create.tip")}' @@ -36,8 +36,8 @@ <style source="I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.VesselSizeCategory + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.VesselSizeCategoryDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel static fr.ird.observe.ui.UIHelper.getStringValue @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.VesselSizeCategory' + beanClass='fr.ird.observe.services.dto.referential.VesselSizeCategoryDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <VesselSizeCategoryUIModel id='model'/> <!-- edit bean --> - <VesselSizeCategory id='bean'/> + <VesselSizeCategoryDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 2b747d3..2c3a893 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl; * #L% */ -import fr.ird.observe.entities.referentiel.VesselSizeCategory; +import fr.ird.observe.services.dto.referential.VesselSizeCategoryDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,15 +31,15 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class VesselSizeCategoryUIModel extends ContentReferenceUIModel<VesselSizeCategory> { +public class VesselSizeCategoryUIModel extends ContentReferenceUIModel<VesselSizeCategoryDto> { private static final long serialVersionUID = 1L; public VesselSizeCategoryUIModel() { - super(VesselSizeCategory.class, + super(VesselSizeCategoryDto.class, new String[]{ - VesselSizeCategory.PROPERTY_GAUGE_LABEL, - VesselSizeCategory.PROPERTY_CAPACITY_LABEL + VesselSizeCategoryDto.PROPERTY_GAUGE_LABEL, + VesselSizeCategoryDto.PROPERTY_CAPACITY_LABEL }, new String[]{ VesselSizeCategoryUI.BINDING_CAPACITY_LABEL_TEXT, diff --git a/observe-application-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 index a1a6bd4..3e7c780 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='VesselType' + superGenericType='VesselTypeDto' contentTitle='{n("observe.title.content.vesselTypex")}' listText='{n("observe.list.vesselType")}' createToolTip='{n("observe.action.vesselType.create.tip")}' @@ -36,8 +36,8 @@ <style source="I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.VesselType + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.VesselTypeDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel static fr.ird.observe.ui.UIHelper.getStringValue @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.VesselType' + beanClass='fr.ird.observe.services.dto.referential.VesselTypeDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <VesselTypeUIModel id='model'/> <!-- edit bean --> - <VesselType id='bean'/> + <VesselTypeDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index e12065b..78e7ce3 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl; * #L% */ -import fr.ird.observe.entities.referentiel.VesselType; +import fr.ird.observe.services.dto.referential.VesselTypeDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class VesselTypeUIModel extends ContentReferenceUIModel<VesselType> { +public class VesselTypeUIModel extends ContentReferenceUIModel<VesselTypeDto> { private static final long serialVersionUID = 1L; public VesselTypeUIModel() { - super(VesselType.class); + super(VesselTypeDto.class); } } diff --git a/observe-application-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 index 1fb5c87..693adb2 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='Vessel' + superGenericType='VesselDto' contentTitle='{n("observe.title.content.vesselx")}' listText='{n("observe.list.vessel")}' createToolTip='{n("observe.action.vessel.create.tip")}' @@ -36,11 +36,11 @@ <style source="I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.Vessel - fr.ird.observe.entities.referentiel.VesselSizeCategory - fr.ird.observe.entities.referentiel.Country - fr.ird.observe.entities.referentiel.VesselType + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.VesselDto + fr.ird.observe.services.dto.referential.VesselSizeCategoryDto + fr.ird.observe.services.dto.referential.CountryDto + fr.ird.observe.services.dto.referential.VesselTypeDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel jaxx.runtime.swing.editor.NumberEditor @@ -54,7 +54,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' context='n1-create' - beanClass='fr.ird.observe.entities.referentiel.Vessel' errorTableModel='{getErrorTableModel()}'/> + beanClass='fr.ird.observe.services.dto.referential.VesselDto' errorTableModel='{getErrorTableModel()}'/> <!-- model --> <VesselUIModel id='model'/> @@ -63,7 +63,7 @@ <VesselUIHandler id='handler' constructorParams="this"/> <!-- edit bean --> - <Vessel id='bean'/> + <VesselDto id='bean'/> <Table id="editView" insets="0" fill="both"> <row> @@ -118,7 +118,7 @@ <JLabel id='vesselTypeLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='vesselType' constructorParams='this' genericType="VesselType"/> + <BeanComboBox id='vesselType' constructorParams='this' genericType="VesselTypeDto"/> </cell> </row> @@ -128,7 +128,7 @@ <JLabel id='vesselSizeCategoryLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='vesselSizeCategory' constructorParams='this' genericType="VesselSizeCategory"/> + <BeanComboBox id='vesselSizeCategory' constructorParams='this' genericType="VesselSizeCategoryDto"/> </cell> </row> @@ -138,7 +138,7 @@ <JLabel id='flagCountryLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='flagCountry' constructorParams='this' genericType="Country"/> + <BeanComboBox id='flagCountry' constructorParams='this' genericType="CountryDto"/> </cell> </row> diff --git a/observe-application-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 index b55bcf6..057579b 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl; * #L% */ -import fr.ird.observe.entities.referentiel.Vessel; +import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.ui.content.ref.ContentReferenceUI; import fr.ird.observe.ui.content.ref.ContentReferenceUIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; diff --git a/observe-application-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 index 6104995..58d8e6c 100644 --- a/observe-application-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 @@ -23,7 +23,7 @@ package fr.ird.observe.ui.content.ref.impl; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.entities.referentiel.Vessel; +import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; import java.util.Set; @@ -34,40 +34,40 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class VesselUIModel extends ContentReferenceUIModel<Vessel> { +public class VesselUIModel extends ContentReferenceUIModel<VesselDto> { public static final String PROPERTY_GENERAL_TAB_VALID = "generalTabValid"; public static final String PROPERTY_OTHER_TAB_VALID = "otherTabValid"; public static final Set<String> GENERAL_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(Vessel.PROPERTY_URI, - Vessel.PROPERTY_CODE, - Vessel.PROPERTY_STATUS, - Vessel.PROPERTY_KEEL_CODE, - Vessel.PROPERTY_VESSEL_TYPE, - Vessel.PROPERTY_VESSEL_SIZE_CATEGORY, - Vessel.PROPERTY_NEED_COMMENT, - Vessel.PROPERTY_FLAG_COUNTRY, - Vessel.PROPERTY_FLEET_COUNTRY, - Vessel.PROPERTY_LABEL1, - Vessel.PROPERTY_LABEL2, - Vessel.PROPERTY_LABEL3, - Vessel.PROPERTY_LABEL4, - Vessel.PROPERTY_LABEL5, - Vessel.PROPERTY_LABEL6, - Vessel.PROPERTY_LABEL7, - Vessel.PROPERTY_LABEL8).build(); + ImmutableSet.<String>builder().add(VesselDto.PROPERTY_URI, + VesselDto.PROPERTY_CODE, + VesselDto.PROPERTY_STATUS, + VesselDto.PROPERTY_KEEL_CODE, + VesselDto.PROPERTY_VESSEL_TYPE, + VesselDto.PROPERTY_VESSEL_SIZE_CATEGORY, + VesselDto.PROPERTY_NEED_COMMENT, + VesselDto.PROPERTY_FLAG_COUNTRY, + VesselDto.PROPERTY_FLEET_COUNTRY, + VesselDto.PROPERTY_LABEL1, + VesselDto.PROPERTY_LABEL2, + VesselDto.PROPERTY_LABEL3, + VesselDto.PROPERTY_LABEL4, + VesselDto.PROPERTY_LABEL5, + VesselDto.PROPERTY_LABEL6, + VesselDto.PROPERTY_LABEL7, + VesselDto.PROPERTY_LABEL8).build(); public static final Set<String> OTHER_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(Vessel.PROPERTY_CAPACITY, - Vessel.PROPERTY_CHANGE_DATE, - Vessel.PROPERTY_COMMENT, - Vessel.PROPERTY_LENGTH, - Vessel.PROPERTY_LENGTH, - Vessel.PROPERTY_POWER, - Vessel.PROPERTY_SEARCH_MAXIMUM, - Vessel.PROPERTY_YEAR_SERVICE).build(); + ImmutableSet.<String>builder().add(VesselDto.PROPERTY_CAPACITY, + VesselDto.PROPERTY_CHANGE_DATE, + VesselDto.PROPERTY_COMMENT, + VesselDto.PROPERTY_LENGTH, + VesselDto.PROPERTY_LENGTH, + VesselDto.PROPERTY_POWER, + VesselDto.PROPERTY_SEARCH_MAXIMUM, + VesselDto.PROPERTY_YEAR_SERVICE).build(); private static final long serialVersionUID = 1L; @@ -76,19 +76,19 @@ public class VesselUIModel extends ContentReferenceUIModel<Vessel> { protected boolean otherTabValid; public VesselUIModel() { - super(Vessel.class, + super(VesselDto.class, new String[]{ - Vessel.PROPERTY_VESSEL_TYPE, - Vessel.PROPERTY_VESSEL_SIZE_CATEGORY, - Vessel.PROPERTY_FLAG_COUNTRY, - Vessel.PROPERTY_KEEL_CODE, - Vessel.PROPERTY_FLEET_COUNTRY, - Vessel.PROPERTY_YEAR_SERVICE, - Vessel.PROPERTY_LENGTH, - Vessel.PROPERTY_CAPACITY, - Vessel.PROPERTY_POWER, - Vessel.PROPERTY_SEARCH_MAXIMUM, - Vessel.PROPERTY_CHANGE_DATE}, + VesselDto.PROPERTY_VESSEL_TYPE, + VesselDto.PROPERTY_VESSEL_SIZE_CATEGORY, + VesselDto.PROPERTY_FLAG_COUNTRY, + VesselDto.PROPERTY_KEEL_CODE, + VesselDto.PROPERTY_FLEET_COUNTRY, + VesselDto.PROPERTY_YEAR_SERVICE, + VesselDto.PROPERTY_LENGTH, + VesselDto.PROPERTY_CAPACITY, + VesselDto.PROPERTY_POWER, + VesselDto.PROPERTY_SEARCH_MAXIMUM, + VesselDto.PROPERTY_CHANGE_DATE}, new String[]{VesselUI.BINDING_VESSEL_TYPE_SELECTED_ITEM, VesselUI.BINDING_VESSEL_SIZE_CATEGORY_SELECTED_ITEM, VesselUI.BINDING_FLAG_COUNTRY_SELECTED_ITEM, diff --git a/observe-application-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 index 9255cbd..5cd2f67 100644 --- a/observe-application-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 @@ -8,19 +8,19 @@ 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% --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='BaitHaulingStatus' + superGenericType='BaitHaulingStatusDto' contentTitle='{n("observe.title.content.baitHaulingStatuss")}' listText='{n("observe.list.baitHaulingStatus")}' createToolTip='{n("observe.action.baitHaulingStatus.create.tip")}' @@ -35,8 +35,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.longline.BaitHaulingStatus + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.longline.BaitHaulingStatus' + beanClass='fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <BaitHaulingStatusUIModel id='model'/> <!-- edit bean --> - <BaitHaulingStatus id='bean'/> + <BaitHaulingStatusDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 7034c1b..aabe2b5 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.entities.referentiel.longline.BaitHaulingStatus; +import fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class BaitHaulingStatusUIModel extends ContentReferenceUIModel<BaitHaulingStatus> { +public class BaitHaulingStatusUIModel extends ContentReferenceUIModel<BaitHaulingStatusDto> { private static final long serialVersionUID = 1L; public BaitHaulingStatusUIModel() { - super(BaitHaulingStatus.class); + super(BaitHaulingStatusDto.class); } } diff --git a/observe-application-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 index 02b5f35..3542ffb 100644 --- a/observe-application-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 @@ -20,7 +20,7 @@ #L% --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='BaitSettingStatus' + superGenericType='BaitSettingStatusDto' contentTitle='{n("observe.title.content.baitSettingStatuss")}' listText='{n("observe.list.baitSettingStatus")}' createToolTip='{n("observe.action.baitSettingStatus.create.tip")}' @@ -35,8 +35,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.longline.BaitSettingStatus + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.longline.BaitSettingStatus' + beanClass='fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <BaitSettingStatusUIModel id='model'/> <!-- edit bean --> - <BaitSettingStatus id='bean'/> + <BaitSettingStatusDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 098b373..d448137 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.entities.referentiel.longline.BaitSettingStatus; +import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,14 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class BaitSettingStatusUIModel extends ContentReferenceUIModel<BaitSettingStatus> { +public class BaitSettingStatusUIModel extends ContentReferenceUIModel<BaitSettingStatusDto> { private static final long serialVersionUID = 1L; public BaitSettingStatusUIModel() { - super(BaitSettingStatus.class - - ); + super(BaitSettingStatusDto.class); } } diff --git a/observe-application-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 index 3061b05..34d04a9 100644 --- a/observe-application-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 @@ -20,7 +20,7 @@ #L% --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='BaitType' + superGenericType='BaitTypeDto' contentTitle='{n("observe.title.content.baitTypes")}' listText='{n("observe.list.baitType")}' createToolTip='{n("observe.action.baitType.create.tip")}' @@ -35,8 +35,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.longline.BaitType + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.longline.BaitTypeDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.longline.BaitType' + beanClass='fr.ird.observe.services.dto.referential.longline.BaitTypeDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <BaitTypeUIModel id='model'/> <!-- edit bean --> - <BaitType id='bean'/> + <BaitTypeDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 064ddeb..dca3c33 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.entities.referentiel.longline.BaitType; +import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class BaitTypeUIModel extends ContentReferenceUIModel<BaitType> { +public class BaitTypeUIModel extends ContentReferenceUIModel<BaitTypeDto> { private static final long serialVersionUID = 1L; public BaitTypeUIModel() { - super(BaitType.class); + super(BaitTypeDto.class); } } diff --git a/observe-application-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 index 1e53ae9..1475862 100644 --- a/observe-application-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 @@ -20,7 +20,7 @@ #L% --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='CatchFateLongline' + superGenericType='CatchFateLonglineDto' contentTitle='{n("observe.title.content.catchFateLonglines")}' listText='{n("observe.list.catchFateLongline")}' createToolTip='{n("observe.action.catchFateLongline.create.tip")}' @@ -35,8 +35,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.longline.CatchFateLongline + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.longline.CatchFateLongline' + beanClass='fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <CatchFateLonglineUIModel id='model'/> <!-- edit bean --> - <CatchFateLongline id='bean'/> + <CatchFateLonglineDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 2f1049a..5a15cb2 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.entities.referentiel.longline.CatchFateLongline; +import fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class CatchFateLonglineUIModel extends ContentReferenceUIModel<CatchFateLongline> { +public class CatchFateLonglineUIModel extends ContentReferenceUIModel<CatchFateLonglineDto> { private static final long serialVersionUID = 1L; public CatchFateLonglineUIModel() { - super(CatchFateLongline.class); + super(CatchFateLonglineDto.class); } } diff --git a/observe-application-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 index 7f80001..bb0fb41 100644 --- a/observe-application-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 @@ -20,7 +20,7 @@ #L% --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='EncounterType' + superGenericType='EncounterTypeDto' contentTitle='{n("observe.title.content.encounterTypes")}' listText='{n("observe.list.encounterType")}' createToolTip='{n("observe.action.encounterType.create.tip")}' @@ -35,8 +35,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.longline.EncounterType + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.longline.EncounterTypeDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.longline.EncounterType' + beanClass='fr.ird.observe.services.dto.referential.longline.EncounterTypeDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <EncounterTypeUIModel id='model'/> <!-- edit bean --> - <EncounterType id='bean'/> + <EncounterTypeDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 4863fb1..2ee2e64 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.entities.referentiel.longline.EncounterType; +import fr.ird.observe.services.dto.referential.longline.EncounterTypeDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class EncounterTypeUIModel extends ContentReferenceUIModel<EncounterType> { +public class EncounterTypeUIModel extends ContentReferenceUIModel<EncounterTypeDto> { private static final long serialVersionUID = 1L; public EncounterTypeUIModel() { - super(EncounterType.class); + super(EncounterTypeDto.class); } } diff --git a/observe-application-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 index 3a50616..8a09237 100644 --- a/observe-application-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 @@ -20,7 +20,7 @@ #L% --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='Healthness' + superGenericType='HealthnessDto' contentTitle='{n("observe.title.content.healthnesss")}' listText='{n("observe.list.healthness")}' createToolTip='{n("observe.action.healthness.create.tip")}' @@ -35,8 +35,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.longline.Healthness + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.longline.HealthnessDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.longline.Healthness' + beanClass='fr.ird.observe.services.dto.referential.longline.HealthnessDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <HealthnessUIModel id='model'/> <!-- edit bean --> - <Healthness id='bean'/> + <HealthnessDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index bdb92e6..944a9eb 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.entities.referentiel.longline.Healthness; +import fr.ird.observe.services.dto.referential.longline.HealthnessDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class HealthnessUIModel extends ContentReferenceUIModel<Healthness> { +public class HealthnessUIModel extends ContentReferenceUIModel<HealthnessDto> { private static final long serialVersionUID = 1L; public HealthnessUIModel() { - super(Healthness.class); + super(HealthnessDto.class); } } diff --git a/observe-application-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 index d901234..fddeb80 100644 --- a/observe-application-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 @@ -20,7 +20,7 @@ #L% --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='HookPosition' + superGenericType='HookPositionDto' contentTitle='{n("observe.title.content.hookPositions")}' listText='{n("observe.list.hookPosition")}' createToolTip='{n("observe.action.hookPosition.create.tip")}' @@ -35,8 +35,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.longline.HookPosition + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.longline.HookPositionDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.longline.HookPosition' + beanClass='fr.ird.observe.services.dto.referential.longline.HookPositionDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <HookPositionUIModel id='model'/> <!-- edit bean --> - <HookPosition id='bean'/> + <HookPositionDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 87fa6f4..3f6385a 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.entities.referentiel.longline.HookPosition; +import fr.ird.observe.services.dto.referential.longline.HookPositionDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class HookPositionUIModel extends ContentReferenceUIModel<HookPosition> { +public class HookPositionUIModel extends ContentReferenceUIModel<HookPositionDto> { private static final long serialVersionUID = 1L; public HookPositionUIModel() { - super(HookPosition.class); + super(HookPositionDto.class); } } diff --git a/observe-application-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 index 53b0818..f4c9c95 100644 --- a/observe-application-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 @@ -20,14 +20,14 @@ #L% --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='HookSize' - contentTitle='{n("observe.title.content.hookSizes")}' - listText='{n("observe.list.hookSize")}' - createToolTip='{n("observe.action.hookSize.create.tip")}' - detailToolTip='{n("observe.action.hookSize.detail.tip")}' - modifyToolTip='{n("observe.action.hookSize.modify.tip")}' - deleteToolTip='{n("observe.action.hookSize.delete.tip")}' - saveToolTip='{n("observe.action.hookSize.save.tip")}' + superGenericType='HookSizeDto' + contentTitle='{n("observe.title.content.HookSizes")}' + listText='{n("observe.list.HookSize")}' + createToolTip='{n("observe.action.HookSize.create.tip")}' + detailToolTip='{n("observe.action.HookSize.detail.tip")}' + modifyToolTip='{n("observe.action.HookSize.modify.tip")}' + deleteToolTip='{n("observe.action.HookSize.delete.tip")}' + saveToolTip='{n("observe.action.HookSize.save.tip")}'
@@ -35,8 +35,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.longline.HookSize + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.longline.HookSizeDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.longline.HookSize' + beanClass='fr.ird.observe.services.dto.referential.longline.HookSizeDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <HookSizeUIModel id='model'/> <!-- edit bean --> - <HookSize id='bean'/> + <HookSizeDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 270e62e..e5f584e 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.entities.referentiel.longline.HookSize; +import fr.ird.observe.services.dto.referential.longline.HookSizeDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class HookSizeUIModel extends ContentReferenceUIModel<HookSize> { +public class HookSizeUIModel extends ContentReferenceUIModel<HookSizeDto> { private static final long serialVersionUID = 1L; public HookSizeUIModel() { - super(HookSize.class); + super(HookSizeDto.class); } } diff --git a/observe-application-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 index 3d38326..7982ebb 100644 --- a/observe-application-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 @@ -20,14 +20,14 @@ #L% --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='HookType' - contentTitle='{n("observe.title.content.hookTypes")}' - listText='{n("observe.list.hookType")}' - createToolTip='{n("observe.action.hookType.create.tip")}' - detailToolTip='{n("observe.action.hookType.detail.tip")}' - modifyToolTip='{n("observe.action.hookType.modify.tip")}' - deleteToolTip='{n("observe.action.hookType.delete.tip")}' - saveToolTip='{n("observe.action.hookType.save.tip")}' + superGenericType='HookTypeDto' + contentTitle='{n("observe.title.content.HookTypes")}' + listText='{n("observe.list.HookType")}' + createToolTip='{n("observe.action.HookType.create.tip")}' + detailToolTip='{n("observe.action.HookType.detail.tip")}' + modifyToolTip='{n("observe.action.HookType.modify.tip")}' + deleteToolTip='{n("observe.action.HookType.delete.tip")}' + saveToolTip='{n("observe.action.HookType.save.tip")}'
@@ -35,8 +35,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.longline.HookType + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.longline.HookTypeDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.longline.HookType' + beanClass='fr.ird.observe.services.dto.referential.longline.HookTypeDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <HookTypeUIModel id='model'/> <!-- edit bean --> - <HookType id='bean'/> + <HookTypeDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 6c3cc14..1a968a9 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.entities.referentiel.longline.HookType; +import fr.ird.observe.services.dto.referential.longline.HookTypeDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class HookTypeUIModel extends ContentReferenceUIModel<HookType> { +public class HookTypeUIModel extends ContentReferenceUIModel<HookTypeDto> { private static final long serialVersionUID = 1L; public HookTypeUIModel() { - super(HookType.class); + super(HookTypeDto.class); } } diff --git a/observe-application-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 index 926f072..11b0b46 100644 --- a/observe-application-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 @@ -20,7 +20,7 @@ #L% --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='ItemHorizontalPosition' + superGenericType='ItemHorizontalPositionDto' contentTitle='{n("observe.title.content.itemHorizontalPositions")}' listText='{n("observe.list.itemHorizontalPosition")}' createToolTip='{n("observe.action.itemHorizontalPosition.create.tip")}' @@ -35,8 +35,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.longline.ItemHorizontalPosition + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.longline.ItemHorizontalPositionDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.longline.ItemHorizontalPosition' + beanClass='fr.ird.observe.services.dto.referential.longline.ItemHorizontalPositionDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <ItemHorizontalPositionUIModel id='model'/> <!-- edit bean --> - <ItemHorizontalPosition id='bean'/> + <ItemHorizontalPositionDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 8ba7463..0f6633a 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.entities.referentiel.longline.ItemHorizontalPosition; +import fr.ird.observe.services.dto.referential.longline.ItemHorizontalPositionDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class ItemHorizontalPositionUIModel extends ContentReferenceUIModel<ItemHorizontalPosition> { +public class ItemHorizontalPositionUIModel extends ContentReferenceUIModel<ItemHorizontalPositionDto> { private static final long serialVersionUID = 1L; public ItemHorizontalPositionUIModel() { - super(ItemHorizontalPosition.class); + super(ItemHorizontalPositionDto.class); } } diff --git a/observe-application-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 index 03ba98f..b869bfa 100644 --- a/observe-application-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 @@ -20,7 +20,7 @@ #L% --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='ItemVerticalPosition' + superGenericType='ItemVerticalPositionDto' contentTitle='{n("observe.title.content.itemVerticalPositions")}' listText='{n("observe.list.itemVerticalPosition")}' createToolTip='{n("observe.action.itemVerticalPosition.create.tip")}' @@ -35,8 +35,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.longline.ItemVerticalPosition + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.longline.ItemVerticalPositionDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.longline.ItemVerticalPosition' + beanClass='fr.ird.observe.services.dto.referential.longline.ItemVerticalPositionDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <ItemVerticalPositionUIModel id='model'/> <!-- edit bean --> - <ItemVerticalPosition id='bean'/> + <ItemVerticalPositionDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 1945670..8277ad9 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.entities.referentiel.longline.ItemVerticalPosition; +import fr.ird.observe.services.dto.referential.longline.ItemVerticalPositionDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class ItemVerticalPositionUIModel extends ContentReferenceUIModel<ItemVerticalPosition> { +public class ItemVerticalPositionUIModel extends ContentReferenceUIModel<ItemVerticalPositionDto> { private static final long serialVersionUID = 1L; public ItemVerticalPositionUIModel() { - super(ItemVerticalPosition.class); + super(ItemVerticalPositionDto.class); } } diff --git a/observe-application-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 index 1c9f544..30eed55 100644 --- a/observe-application-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 @@ -20,7 +20,7 @@ #L% --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='LightsticksColor' + superGenericType='LightsticksColorDto' contentTitle='{n("observe.title.content.lightsticksColors")}' listText='{n("observe.list.lightsticksColor")}' createToolTip='{n("observe.action.lightsticksColor.create.tip")}' @@ -35,8 +35,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.longline.LightsticksColor + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.longline.LightsticksColorDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.longline.LightsticksColor' + beanClass='fr.ird.observe.services.dto.referential.longline.LightsticksColorDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <LightsticksColorUIModel id='model'/> <!-- edit bean --> - <LightsticksColor id='bean'/> + <LightsticksColorDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index b58ddd7..153f618 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.entities.referentiel.longline.LightsticksColor; +import fr.ird.observe.services.dto.referential.longline.LightsticksColorDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class LightsticksColorUIModel extends ContentReferenceUIModel<LightsticksColor> { +public class LightsticksColorUIModel extends ContentReferenceUIModel<LightsticksColorDto> { private static final long serialVersionUID = 1L; public LightsticksColorUIModel() { - super(LightsticksColor.class); + super(LightsticksColorDto.class); } } diff --git a/observe-application-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 index d4d6afd..57706e9 100644 --- a/observe-application-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 @@ -20,7 +20,7 @@ #L% --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='LightsticksType' + superGenericType='LightsticksTypeDto' contentTitle='{n("observe.title.content.lightsticksTypes")}' listText='{n("observe.list.lightsticksType")}' createToolTip='{n("observe.action.lightsticksType.create.tip")}' @@ -35,8 +35,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.longline.LightsticksType + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.longline.LightsticksTypeDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.longline.LightsticksType' + beanClass='fr.ird.observe.services.dto.referential.longline.LightsticksTypeDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <LightsticksTypeUIModel id='model'/> <!-- edit bean --> - <LightsticksType id='bean'/> + <LightsticksTypeDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 3e46342..a08ffe4 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.entities.referentiel.longline.LightsticksType; +import fr.ird.observe.services.dto.referential.longline.LightsticksTypeDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class LightsticksTypeUIModel extends ContentReferenceUIModel<LightsticksType> { +public class LightsticksTypeUIModel extends ContentReferenceUIModel<LightsticksTypeDto> { private static final long serialVersionUID = 1L; public LightsticksTypeUIModel() { - super(LightsticksType.class); + super(LightsticksTypeDto.class); } } diff --git a/observe-application-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 index 1042ca0..57a5a11 100644 --- a/observe-application-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 @@ -20,7 +20,7 @@ #L% --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='LineType' + superGenericType='LineTypeDto' contentTitle='{n("observe.title.content.lineTypes")}' listText='{n("observe.list.lineType")}' createToolTip='{n("observe.action.lineType.create.tip")}' @@ -35,8 +35,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.longline.LineType + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.longline.LineTypeDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.longline.LineType' + beanClass='fr.ird.observe.services.dto.referential.longline.LineTypeDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <LineTypeUIModel id='model'/> <!-- edit bean --> - <LineType id='bean'/> + <LineTypeDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index a004b30..b3e4355 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.entities.referentiel.longline.LineType; +import fr.ird.observe.services.dto.referential.longline.LineTypeDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class LineTypeUIModel extends ContentReferenceUIModel<LineType> { +public class LineTypeUIModel extends ContentReferenceUIModel<LineTypeDto> { private static final long serialVersionUID = 1L; public LineTypeUIModel() { - super(LineType.class); + super(LineTypeDto.class); } } diff --git a/observe-application-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 index 9678245..0881e14 100644 --- a/observe-application-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 @@ -20,7 +20,7 @@ #L% --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='MaturityStatus' + superGenericType='MaturityStatusDto' contentTitle='{n("observe.title.content.maturityStatuss")}' listText='{n("observe.list.maturityStatus")}' createToolTip='{n("observe.action.maturityStatus.create.tip")}' @@ -35,8 +35,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.longline.MaturityStatus + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.longline.MaturityStatusDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.longline.MaturityStatus' + beanClass='fr.ird.observe.services.dto.referential.longline.MaturityStatusDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <MaturityStatusUIModel id='model'/> <!-- edit bean --> - <MaturityStatus id='bean'/> + <MaturityStatusDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 7bfb4c2..ed86bb8 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.entities.referentiel.longline.MaturityStatus; +import fr.ird.observe.services.dto.referential.longline.MaturityStatusDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,13 +31,13 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class MaturityStatusUIModel extends ContentReferenceUIModel<MaturityStatus> { +public class MaturityStatusUIModel extends ContentReferenceUIModel<MaturityStatusDto> { private static final long serialVersionUID = 1L; public MaturityStatusUIModel() { - super(MaturityStatus.class, - new String[]{MaturityStatus.PROPERTY_LOWER_VALUE, MaturityStatus.PROPERTY_UPPER_VALUE}, + super(MaturityStatusDto.class, + new String[]{MaturityStatusDto.PROPERTY_LOWER_VALUE, MaturityStatusDto.PROPERTY_UPPER_VALUE}, new String[]{MaturityStatusUI.BINDING_LOWER_VALUE_TEXT, MaturityStatusUI.BINDING_UPPER_VALUE_TEXT} ); } diff --git a/observe-application-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 index bafb156..250c5ee 100644 --- a/observe-application-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 @@ -20,7 +20,7 @@ #L% --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='MitigationType' + superGenericType='MitigationTypeDto' contentTitle='{n("observe.title.content.mitigationTypes")}' listText='{n("observe.list.mitigationType")}' createToolTip='{n("observe.action.mitigationType.create.tip")}' @@ -35,8 +35,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.longline.MitigationType + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.longline.MitigationTypeDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.longline.MitigationType' + beanClass='fr.ird.observe.services.dto.referential.longline.MitigationTypeDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <MitigationTypeUIModel id='model'/> <!-- edit bean --> - <MitigationType id='bean'/> + <MitigationTypeDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 8f9d789..f7bb86c 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.entities.referentiel.longline.MitigationType; +import fr.ird.observe.services.dto.referential.longline.MitigationTypeDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class MitigationTypeUIModel extends ContentReferenceUIModel<MitigationType> { +public class MitigationTypeUIModel extends ContentReferenceUIModel<MitigationTypeDto> { private static final long serialVersionUID = 1L; public MitigationTypeUIModel() { - super(MitigationType.class); + super(MitigationTypeDto.class); } } diff --git a/observe-application-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 index ffca324..3cdb7a1 100644 --- a/observe-application-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 @@ -20,7 +20,7 @@ #L% --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='SensorBrand' + superGenericType='SensorBrandDto' contentTitle='{n("observe.title.content.sensorBrands")}' listText='{n("observe.list.sensorBrand")}' createToolTip='{n("observe.action.sensorBrand.create.tip")}' @@ -35,8 +35,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.longline.SensorBrand + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.longline.SensorBrandDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.longline.SensorBrand' + beanClass='fr.ird.observe.services.dto.referential.longline.SensorBrandDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <SensorBrandUIModel id='model'/> <!-- edit bean --> - <SensorBrand id='bean'/> + <SensorBrandDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 4be8e0b..09c1742 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.entities.referentiel.longline.SensorBrand; +import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,13 +31,13 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class SensorBrandUIModel extends ContentReferenceUIModel<SensorBrand> { +public class SensorBrandUIModel extends ContentReferenceUIModel<SensorBrandDto> { private static final long serialVersionUID = 1L; public SensorBrandUIModel() { - super(SensorBrand.class, - new String[]{SensorBrand.PROPERTY_BRAND_NAME}, + super(SensorBrandDto.class, + new String[]{SensorBrandDto.PROPERTY_BRAND_NAME}, new String[]{SensorBrandUI.BINDING_BRAND_NAME_TEXT} ); } diff --git a/observe-application-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 index 5b3008a..277b2d6 100644 --- a/observe-application-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 @@ -20,7 +20,7 @@ #L% --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='SensorDataFormat' + superGenericType='SensorDataFormatDto' contentTitle='{n("observe.title.content.sensorDataFormats")}' listText='{n("observe.list.sensorDataFormat")}' createToolTip='{n("observe.action.sensorDataFormat.create.tip")}' @@ -35,8 +35,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.longline.SensorDataFormat + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.longline.SensorDataFormat' + beanClass='fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <SensorDataFormatUIModel id='model'/> <!-- edit bean --> - <SensorDataFormat id='bean'/> + <SensorDataFormatDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 2aadb67..e495d99 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.entities.referentiel.longline.SensorDataFormat; +import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class SensorDataFormatUIModel extends ContentReferenceUIModel<SensorDataFormat> { +public class SensorDataFormatUIModel extends ContentReferenceUIModel<SensorDataFormatDto> { private static final long serialVersionUID = 1L; public SensorDataFormatUIModel() { - super(SensorDataFormat.class); + super(SensorDataFormatDto.class); } } diff --git a/observe-application-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 index 9efa828..5e09ed3 100644 --- a/observe-application-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 @@ -20,7 +20,7 @@ #L% --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='SensorType' + superGenericType='SensorTypeDto' contentTitle='{n("observe.title.content.sensorTypes")}' listText='{n("observe.list.sensorType")}' createToolTip='{n("observe.action.sensorType.create.tip")}' @@ -35,8 +35,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.longline.SensorType + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.longline.SensorTypeDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.longline.SensorType' + beanClass='fr.ird.observe.services.dto.referential.longline.SensorTypeDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <SensorTypeUIModel id='model'/> <!-- edit bean --> - <SensorType id='bean'/> + <SensorTypeDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index e29363b..ce9199b 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.entities.referentiel.longline.SensorType; +import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class SensorTypeUIModel extends ContentReferenceUIModel<SensorType> { +public class SensorTypeUIModel extends ContentReferenceUIModel<SensorTypeDto> { private static final long serialVersionUID = 1L; public SensorTypeUIModel() { - super(SensorType.class); + super(SensorTypeDto.class); } } diff --git a/observe-application-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 index dbd31b6..772afc5 100644 --- a/observe-application-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 @@ -20,7 +20,7 @@ #L% --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='SettingShape' + superGenericType='SettingShapeDto' contentTitle='{n("observe.title.content.settingShapes")}' listText='{n("observe.list.settingShape")}' createToolTip='{n("observe.action.settingShape.create.tip")}' @@ -35,8 +35,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.longline.SettingShape + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.longline.SettingShapeDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.longline.SettingShape' + beanClass='fr.ird.observe.services.dto.referential.longline.SettingShapeDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <SettingShapeUIModel id='model'/> <!-- edit bean --> - <SettingShape id='bean'/> + <SettingShapeDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 47bda19..42d65f6 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.entities.referentiel.longline.SettingShape; +import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class SettingShapeUIModel extends ContentReferenceUIModel<SettingShape> { +public class SettingShapeUIModel extends ContentReferenceUIModel<SettingShapeDto> { private static final long serialVersionUID = 1L; public SettingShapeUIModel() { - super(SettingShape.class); + super(SettingShapeDto.class); } } diff --git a/observe-application-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 index b8762e4..578aab5 100644 --- a/observe-application-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 @@ -20,7 +20,7 @@ #L% --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='SizeMeasureType' + superGenericType='SizeMeasureTypeDto' contentTitle='{n("observe.title.content.sizeMeasureTypes")}' listText='{n("observe.list.sizeMeasureType")}' createToolTip='{n("observe.action.sizeMeasureType.create.tip")}' @@ -35,8 +35,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.longline.SizeMeasureType + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.longline.SizeMeasureType' + beanClass='fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <SizeMeasureTypeUIModel id='model'/> <!-- edit bean --> - <SizeMeasureType id='bean'/> + <SizeMeasureTypeDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 088faf6..3aab59b 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.entities.referentiel.longline.SizeMeasureType; +import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class SizeMeasureTypeUIModel extends ContentReferenceUIModel<SizeMeasureType> { +public class SizeMeasureTypeUIModel extends ContentReferenceUIModel<SizeMeasureTypeDto> { private static final long serialVersionUID = 1L; public SizeMeasureTypeUIModel() { - super(SizeMeasureType.class); + super(SizeMeasureTypeDto.class); } } diff --git a/observe-application-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 index cc7e16e..1bd53df 100644 --- a/observe-application-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 @@ -20,7 +20,7 @@ #L% --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='StomacFullness' + superGenericType='StomacFullnessDto' contentTitle='{n("observe.title.content.stomacFullnesss")}' listText='{n("observe.list.stomacFullness")}' createToolTip='{n("observe.action.stomacFullness.create.tip")}' @@ -35,8 +35,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.longline.StomacFullness + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.longline.StomacFullnessDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.longline.StomacFullness' + beanClass='fr.ird.observe.services.dto.referential.longline.StomacFullnessDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <StomacFullnessUIModel id='model'/> <!-- edit bean --> - <StomacFullness id='bean'/> + <StomacFullnessDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 522072f..dbd5259 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.entities.referentiel.longline.StomacFullness; +import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class StomacFullnessUIModel extends ContentReferenceUIModel<StomacFullness> { +public class StomacFullnessUIModel extends ContentReferenceUIModel<StomacFullnessDto> { private static final long serialVersionUID = 1L; public StomacFullnessUIModel() { - super(StomacFullness.class); + super(StomacFullnessDto.class); } } diff --git a/observe-application-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 index 4dfdd47..5901158 100644 --- a/observe-application-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 @@ -20,7 +20,7 @@ #L% --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='TripType' + superGenericType='TripTypeDto' contentTitle='{n("observe.title.content.tripTypes")}' listText='{n("observe.list.tripType")}' createToolTip='{n("observe.action.tripType.create.tip")}' @@ -35,8 +35,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.longline.TripType + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.longline.TripTypeDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.longline.TripType' + beanClass='fr.ird.observe.services.dto.referential.longline.TripTypeDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <TripTypeUIModel id='model'/> <!-- edit bean --> - <TripType id='bean'/> + <TripTypeDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index d4a3a16..e3d3073 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.entities.referentiel.longline.TripType; +import fr.ird.observe.services.dto.referential.longline.TripTypeDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class TripTypeUIModel extends ContentReferenceUIModel<TripType> { +public class TripTypeUIModel extends ContentReferenceUIModel<TripTypeDto> { private static final long serialVersionUID = 1L; public TripTypeUIModel() { - super(TripType.class); + super(TripTypeDto.class); } } diff --git a/observe-application-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 index 9add8b5..40bf4d7 100644 --- a/observe-application-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 @@ -20,7 +20,7 @@ #L% --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='VesselActivityLongline' + superGenericType='VesselActivityLonglineDto' contentTitle='{n("observe.title.content.vesselActivityLonglines")}' listText='{n("observe.list.vesselActivityLongline")}' createToolTip='{n("observe.action.vesselActivityLongline.create.tip")}' @@ -35,8 +35,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.longline.VesselActivityLongline + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.longline.VesselActivityLongline' + beanClass='fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <VesselActivityLonglineUIModel id='model'/> <!-- edit bean --> - <VesselActivityLongline id='bean'/> + <VesselActivityLonglineDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 81468d2..c15b747 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.entities.referentiel.longline.VesselActivityLongline; +import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class VesselActivityLonglineUIModel extends ContentReferenceUIModel<VesselActivityLongline> { +public class VesselActivityLonglineUIModel extends ContentReferenceUIModel<VesselActivityLonglineDto> { private static final long serialVersionUID = 1L; public VesselActivityLonglineUIModel() { - super(VesselActivityLongline.class); + super(VesselActivityLonglineDto.class); } } diff --git a/observe-application-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 index ba2ad80..c957994 100644 --- a/observe-application-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 @@ -20,7 +20,7 @@ #L% --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='WeightMeasureType' + superGenericType='WeightMeasureTypeDto' contentTitle='{n("observe.title.content.weightMeasureTypes")}' listText='{n("observe.list.weightMeasureType")}' createToolTip='{n("observe.action.weightMeasureType.create.tip")}' @@ -35,8 +35,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.longline.WeightMeasureType + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.longline.WeightMeasureType' + beanClass='fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <WeightMeasureTypeUIModel id='model'/> <!-- edit bean --> - <WeightMeasureType id='bean'/> + <WeightMeasureTypeDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index ff7c643..8bab194 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.entities.referentiel.longline.WeightMeasureType; +import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class WeightMeasureTypeUIModel extends ContentReferenceUIModel<WeightMeasureType> { +public class WeightMeasureTypeUIModel extends ContentReferenceUIModel<WeightMeasureTypeDto> { private static final long serialVersionUID = 1L; public WeightMeasureTypeUIModel() { - super(WeightMeasureType.class); + super(WeightMeasureTypeDto.class); } } diff --git a/observe-application-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 index 1bc3a48..22ce9e6 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='DetectionMode' + superGenericType='DetectionModeDto' contentTitle='{n("observe.title.content.detectionModes")}' listText='{n("observe.list.detectionMode")}' createToolTip='{n("observe.action.detectionMode.create.tip")}' @@ -36,8 +36,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.seine.DetectionMode + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.seine.DetectionModeDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -47,7 +47,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.seine.DetectionMode' + beanClass='fr.ird.observe.services.dto.referential.seine.DetectionModeDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -55,7 +55,7 @@ <DetectionModeUIModel id='model'/> <!-- edit bean --> - <DetectionMode id='bean'/> + <DetectionModeDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 773c7f4..04e6dfa 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.seine; * #L% */ -import fr.ird.observe.entities.referentiel.seine.DetectionMode; +import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class DetectionModeUIModel extends ContentReferenceUIModel<DetectionMode> { +public class DetectionModeUIModel extends ContentReferenceUIModel<DetectionModeDto> { private static final long serialVersionUID = 1L; public DetectionModeUIModel() { - super(DetectionMode.class); + super(DetectionModeDto.class); } } diff --git a/observe-application-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 index a4e4173..9ead360 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='ObjectFate' + superGenericType='ObjectFateDto' contentTitle='{n("observe.title.content.objectFates")}' listText='{n("observe.list.objectFate")}' createToolTip='{n("observe.action.objectFate.create.tip")}' @@ -36,8 +36,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.seine.ObjectFate + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.seine.ObjectFateDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel static fr.ird.observe.ui.UIHelper.getStringValue @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.seine.ObjectFate' + beanClass='fr.ird.observe.services.dto.referential.seine.ObjectFateDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <ObjectFateUIModel id='model'/> <!-- edit bean --> - <ObjectFate id='bean'/> + <ObjectFateDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 0dad8cd..e162d6d 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.seine; * #L% */ -import fr.ird.observe.entities.referentiel.seine.ObjectFate; +import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class ObjectFateUIModel extends ContentReferenceUIModel<ObjectFate> { +public class ObjectFateUIModel extends ContentReferenceUIModel<ObjectFateDto> { private static final long serialVersionUID = 1L; public ObjectFateUIModel() { - super(ObjectFate.class); + super(ObjectFateDto.class); } } diff --git a/observe-application-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 index 941a8c0..0b0157d 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='ObjectOperation' + superGenericType='ObjectOperationDto' contentTitle='{n("observe.title.content.objectOperations")}' listText='{n("observe.list.objectOperation")}' createToolTip='{n("observe.action.objectOperation.create.tip")}' @@ -36,8 +36,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.seine.ObjectOperation + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.seine.ObjectOperationDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel static fr.ird.observe.ui.UIHelper.getStringValue @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.seine.ObjectOperation' + beanClass='fr.ird.observe.services.dto.referential.seine.ObjectOperationDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <ObjectOperationUIModel id='model'/> <!-- edit bean --> - <ObjectOperation id='bean'/> + <ObjectOperationDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index e5065ea..3cb26a1 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.seine; * #L% */ -import fr.ird.observe.entities.referentiel.seine.ObjectOperation; +import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class ObjectOperationUIModel extends ContentReferenceUIModel<ObjectOperation> { +public class ObjectOperationUIModel extends ContentReferenceUIModel<ObjectOperationDto> { private static final long serialVersionUID = 1L; public ObjectOperationUIModel() { - super(ObjectOperation.class); + super(ObjectOperationDto.class); } } diff --git a/observe-application-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 index 6517a01..f3f505b 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='ObjectType' + superGenericType='ObjectTypeDto' contentTitle='{n("observe.title.content.objectTypes")}' listText='{n("observe.list.objectType")}' createToolTip='{n("observe.action.objectType.create.tip")}' @@ -36,8 +36,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.seine.ObjectType + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.seine.ObjectTypeDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel static fr.ird.observe.ui.UIHelper.getStringValue @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.seine.ObjectType' + beanClass='fr.ird.observe.services.dto.referential.seine.ObjectTypeDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <ObjectTypeUIModel id='model'/> <!-- edit bean --> - <ObjectType id='bean'/> + <ObjectTypeDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 1f6905c..cf2c15d 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.seine; * #L% */ -import fr.ird.observe.entities.referentiel.seine.ObjectType; +import fr.ird.observe.services.dto.referential.seine.ObjectTypeDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class ObjectTypeUIModel extends ContentReferenceUIModel<ObjectType> { +public class ObjectTypeUIModel extends ContentReferenceUIModel<ObjectTypeDto> { private static final long serialVersionUID = 1L; public ObjectTypeUIModel() { - super(ObjectType.class); + super(ObjectTypeDto.class); } } diff --git a/observe-application-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 index e2dacc3..af24152 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='ObservedSystem' + superGenericType='ObservedSystemDto' contentTitle='{n("observe.title.content.observedSystems")}' listText='{n("observe.list.observedSystem")}' createToolTip='{n("observe.action.observedSystem.create.tip")}' @@ -36,9 +36,9 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.constants.seine.SchoolType - fr.ird.observe.entities.referentiel.seine.ObservedSystem + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.constants.seine.SchoolType + fr.ird.observe.services.dto.referential.seine.ObservedSystemDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel static fr.ird.observe.ui.UIHelper.getStringValue @@ -47,7 +47,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.seine.ObservedSystem' + beanClass='fr.ird.observe.services.dto.referential.seine.ObservedSystem' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -55,7 +55,7 @@ <fr.ird.observe.ui.content.ref.impl.seine.ObservedSystemUIModel id='model'/> <!-- edit bean --> - <ObservedSystem id='bean'/> + <ObservedSystemDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index e6ed8da..9c73aae 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.seine; * #L% */ -import fr.ird.observe.entities.referentiel.seine.ObservedSystem; +import fr.ird.observe.services.dto.referential.seine.ObservedSystemDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,13 +31,13 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class ObservedSystemUIModel extends ContentReferenceUIModel<ObservedSystem> { +public class ObservedSystemUIModel extends ContentReferenceUIModel<ObservedSystemDto> { private static final long serialVersionUID = 1L; public ObservedSystemUIModel() { - super(ObservedSystem.class, - new String[]{ObservedSystem.PROPERTY_SCHOOL_TYPE}, + super(ObservedSystemDto.class, + new String[]{ObservedSystemDto.PROPERTY_SCHOOL_TYPE}, new String[]{ObservedSystemUI.BINDING_SCHOOL_TYPE_SELECTED_ITEM} ); } diff --git a/observe-application-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 index 2011143..2424b93 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='ReasonForDiscard' + superGenericType='ReasonForDiscardDto' contentTitle='{n("observe.title.content.reasonForDiscards")}' listText='{n("observe.list.reasonForDiscard")}' createToolTip='{n("observe.action.reasonForDiscard.create.tip")}' @@ -36,8 +36,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.seine.ReasonForDiscard + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel static fr.ird.observe.ui.UIHelper.getStringValue @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.seine.ReasonForDiscard' + beanClass='fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <ReasonForDiscardUIModel id='model'/> <!-- edit bean --> - <ReasonForDiscard id='bean'/> + <ReasonForDiscardDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 29d6ed3..9d98b63 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.seine; * #L% */ -import fr.ird.observe.entities.referentiel.seine.ReasonForDiscard; +import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class ReasonForDiscardUIModel extends ContentReferenceUIModel<ReasonForDiscard> { +public class ReasonForDiscardUIModel extends ContentReferenceUIModel<ReasonForDiscardDto> { private static final long serialVersionUID = 1L; public ReasonForDiscardUIModel() { - super(ReasonForDiscard.class); + super(ReasonForDiscardDto.class); } } diff --git a/observe-application-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 index db13cef..4b6002d 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='ReasonForNoFishing' + superGenericType='ReasonForNoFishingDto' contentTitle='{n("observe.title.content.reasonForNoFishings")}' listText='{n("observe.list.reasonForNoFishing")}' createToolTip='{n("observe.action.reasonForNoFishing.create.tip")}' @@ -36,8 +36,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.seine.ReasonForNoFishing + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.seine.ReasonForNoFishingDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel static fr.ird.observe.ui.UIHelper.getStringValue @@ -47,7 +47,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.seine.ReasonForNoFishing' + beanClass='fr.ird.observe.services.dto.referential.seine.ReasonForNoFishingDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -55,7 +55,7 @@ <ReasonForNoFishingUIModel id='model'/> <!-- edit bean --> - <ReasonForNoFishing id='bean'/> + <ReasonForNoFishingDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index cfa24c0..fa6f3f3 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.seine; * #L% */ -import fr.ird.observe.entities.referentiel.seine.ReasonForNoFishing; +import fr.ird.observe.services.dto.referential.seine.ReasonForNoFishingDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class ReasonForNoFishingUIModel extends ContentReferenceUIModel<ReasonForNoFishing> { +public class ReasonForNoFishingUIModel extends ContentReferenceUIModel<ReasonForNoFishingDto> { private static final long serialVersionUID = 1L; public ReasonForNoFishingUIModel() { - super(ReasonForNoFishing.class); + super(ReasonForNoFishingDto.class); } } diff --git a/observe-application-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 index 28f4157..b26f197 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='ReasonForNullSet' + superGenericType='ReasonForNullSetDto' contentTitle='{n("observe.title.content.reasonForNullSets")}' listText='{n("observe.list.reasonForNullSet")}' createToolTip='{n("observe.action.reasonForNullSet.create.tip")}' @@ -36,8 +36,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.seine.ReasonForNullSet + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.seine.ReasonForNullSetDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel static fr.ird.observe.ui.UIHelper.getStringValue @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.seine.ReasonForNullSet' + beanClass='fr.ird.observe.services.dto.referential.seine.ReasonForNullSetDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <ReasonForNullSetUIModel id='model'/> <!-- edit bean --> - <ReasonForNullSet id='bean'/> + <ReasonForNullSetDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index d40248f..adca93f 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.seine; * #L% */ -import fr.ird.observe.entities.referentiel.seine.ReasonForNullSet; +import fr.ird.observe.services.dto.referential.seine.ReasonForNullSetDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class ReasonForNullSetUIModel extends ContentReferenceUIModel<ReasonForNullSet> { +public class ReasonForNullSetUIModel extends ContentReferenceUIModel<ReasonForNullSetDto> { private static final long serialVersionUID = 1L; public ReasonForNullSetUIModel() { - super(ReasonForNullSet.class); + super(ReasonForNullSetDto.class); } } diff --git a/observe-application-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 index 4e78775..553e22f 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='SpeciesFate' + superGenericType='SpeciesFateDto' contentTitle='{n("observe.title.content.speciesFates")}' listText='{n("observe.list.speciesFate")}' createToolTip='{n("observe.action.speciesFate.create.tip")}' @@ -36,8 +36,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.seine.SpeciesFate + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.seine.SpeciesFateDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel static fr.ird.observe.ui.UIHelper.getStringValue @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.seine.SpeciesFate' + beanClass='fr.ird.observe.services.dto.referential.seine.SpeciesFateDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <SpeciesFateUIModel id='model'/> <!-- edit bean --> - <SpeciesFate id='bean'/> + <SpeciesFateDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 0586183..3b016d7 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.seine; * #L% */ -import fr.ird.observe.entities.referentiel.seine.SpeciesFate; +import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class SpeciesFateUIModel extends ContentReferenceUIModel<SpeciesFate> { +public class SpeciesFateUIModel extends ContentReferenceUIModel<SpeciesFateDto> { private static final long serialVersionUID = 1L; public SpeciesFateUIModel() { - super(SpeciesFate.class); + super(SpeciesFateDto.class); } } diff --git a/observe-application-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 index bc33495..6d6f5bc 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='SpeciesStatus' + superGenericType='SpeciesStatusDto' contentTitle='{n("observe.title.content.speciesStatuss")}' listText='{n("observe.list.speciesStatus")}' createToolTip='{n("observe.action.speciesStatus.create.tip")}' @@ -36,8 +36,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.seine.SpeciesStatus + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel static fr.ird.observe.ui.UIHelper.getStringValue @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.seine.SpeciesStatus' + beanClass='fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <SpeciesStatusUIModel id='model'/> <!-- edit bean --> - <SpeciesStatus id='bean'/> + <SpeciesStatusDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 5a31585..3f5c550 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.seine; * #L% */ -import fr.ird.observe.entities.referentiel.seine.SpeciesStatus; +import fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class SpeciesStatusUIModel extends ContentReferenceUIModel<SpeciesStatus> { +public class SpeciesStatusUIModel extends ContentReferenceUIModel<SpeciesStatusDto> { private static final long serialVersionUID = 1L; public SpeciesStatusUIModel() { - super(SpeciesStatus.class); + super(SpeciesStatusDto.class); } } diff --git a/observe-application-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 index 361861f..e4e0513 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='SurroundingActivity' + superGenericType='SurroundingActivityDto' contentTitle='{n("observe.title.content.surroundingActivitys")}' listText='{n("observe.list.surroundingActivity")}' createToolTip='{n("observe.action.surroundingActivity.create.tip")}' @@ -36,8 +36,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.seine.SurroundingActivity + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.seine.SurroundingActivityDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel static fr.ird.observe.ui.UIHelper.getStringValue @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.seine.SurroundingActivity' + beanClass='fr.ird.observe.services.dto.referential.seine.SurroundingActivityDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <SurroundingActivityUIModel id='model'/> <!-- edit bean --> - <SurroundingActivity id='bean'/> + <SurroundingActivityDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 198d1c8..18e5640 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.seine; * #L% */ -import fr.ird.observe.entities.referentiel.seine.SurroundingActivity; +import fr.ird.observe.services.dto.referential.seine.SurroundingActivityDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class SurroundingActivityUIModel extends ContentReferenceUIModel<SurroundingActivity> { +public class SurroundingActivityUIModel extends ContentReferenceUIModel<SurroundingActivityDto> { private static final long serialVersionUID = 1L; public SurroundingActivityUIModel() { - super(SurroundingActivity.class); + super(SurroundingActivityDto.class); } } diff --git a/observe-application-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 index ec2408f..a6b9685 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='TransmittingBuoyOperation' + superGenericType='TransmittingBuoyOperationDto' contentTitle='{n("observe.title.content.transmittingBuoyOperations")}' listText='{n("observe.list.operation")}' createToolTip='{n("observe.action.transmittingBuoyOperation.create.tip")}' @@ -36,8 +36,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.seine.TransmittingBuoyOperation + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel static fr.ird.observe.ui.UIHelper.getStringValue @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.seine.TransmittingBuoyOperation' + beanClass='fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <fr.ird.observe.ui.content.ref.impl.seine.TransmittingBuoyOperationUIModel id='model'/> <!-- edit bean --> - <TransmittingBuoyOperation id='bean'/> + <TransmittingBuoyOperationDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 9a341ef..430e7c8 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.seine; * #L% */ -import fr.ird.observe.entities.referentiel.seine.TransmittingBuoyOperation; +import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class TransmittingBuoyOperationUIModel extends ContentReferenceUIModel<TransmittingBuoyOperation> { +public class TransmittingBuoyOperationUIModel extends ContentReferenceUIModel<TransmittingBuoyOperationDto> { private static final long serialVersionUID = 1L; public TransmittingBuoyOperationUIModel() { - super(TransmittingBuoyOperation.class); + super(TransmittingBuoyOperationDto.class); } } diff --git a/observe-application-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 index 7b7bc85..f28325e 100644 --- a/observe-application-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 @@ -36,8 +36,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.seine.TransmittingBuoyType + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.seine.TransmittingBuoyType fr.ird.observe.ui.content.ref.ContentReferenceUIModel static fr.ird.observe.ui.UIHelper.getStringValue @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.seine.TransmittingBuoyType' + beanClass='fr.ird.observe.services.dto.referential.seine.TransmittingBuoyType' context='n1-create' errorTableModel='{getErrorTableModel()}'/> diff --git a/observe-application-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 index 4f0689c..add1e13 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.seine; * #L% */ -import fr.ird.observe.entities.referentiel.seine.TransmittingBuoyType; +import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class TransmittingBuoyTypeUIModel extends ContentReferenceUIModel<TransmittingBuoyType> { +public class TransmittingBuoyTypeUIModel extends ContentReferenceUIModel<TransmittingBuoyTypeDto> { private static final long serialVersionUID = 1L; public TransmittingBuoyTypeUIModel() { - super(TransmittingBuoyType.class); + super(TransmittingBuoyTypeDto.class); } } diff --git a/observe-application-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 index 78a7a61..b77c929 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='VesselActivitySeine' + superGenericType='VesselActivitySeineDto' contentTitle='{n("observe.title.content.vesselActivitySeines")}' listText='{n("observe.list.vesselActivitySeine")}' createToolTip='{n("observe.action.vesselActivitySeine.create.tip")}' @@ -36,8 +36,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.seine.VesselActivitySeine + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel static fr.ird.observe.ui.UIHelper.getStringValue @@ -47,7 +47,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.seine.VesselActivitySeine' + beanClass='fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto' errorTableModel='{getErrorTableModel()}' context='n1-create'/> @@ -55,7 +55,7 @@ <VesselActivitySeineUIModel id='model'/> <!-- edit bean --> - <VesselActivitySeine id='bean'/> + <VesselActivitySeineDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index 87d985e..1f26f72 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.seine; * #L% */ -import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; +import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,12 +31,12 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class VesselActivitySeineUIModel extends ContentReferenceUIModel<VesselActivitySeine> { +public class VesselActivitySeineUIModel extends ContentReferenceUIModel<VesselActivitySeineDto> { private static final long serialVersionUID = 1L; public VesselActivitySeineUIModel() { - super(VesselActivitySeine.class); + super(VesselActivitySeineDto.class); } } diff --git a/observe-application-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 index b2fa91f..046db82 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='WeightCategory' + superGenericType='WeightCategoryDto' contentTitle='{n("observe.title.content.weightCategory")}' listText='{n("observe.list.weightCategory")}' createToolTip='{n("observe.action.weightCategory.create.tip")}' @@ -36,9 +36,9 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.seine.WeightCategory - fr.ird.observe.entities.referentiel.Species + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.seine.WeightCategoryDto + fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.ui.UIHelper fr.ird.observe.ui.content.ref.ContentReferenceUIModel @@ -54,7 +54,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.seine.WeightCategory' + beanClass='fr.ird.observe.services.dto.referential.seine.WeightCategoryDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -62,7 +62,7 @@ <WeightCategoryUIModel id='model'/> <!-- edit bean --> - <WeightCategory id='bean'/> + <WeightCategoryDto id='bean'/> <script><![CDATA[ diff --git a/observe-application-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 index 4cd1290..776fdb1 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.seine; * #L% */ -import fr.ird.observe.entities.referentiel.seine.WeightCategory; +import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,14 +31,14 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class WeightCategoryUIModel extends ContentReferenceUIModel<WeightCategory> { +public class WeightCategoryUIModel extends ContentReferenceUIModel<WeightCategoryDto> { private static final long serialVersionUID = 1L; public WeightCategoryUIModel() { - super(WeightCategory.class, - new String[]{WeightCategory.PROPERTY_CODE, WeightCategory.PROPERTY_SPECIES}, - new String[]{WeightCategory.PROPERTY_CODE, WeightCategory.PROPERTY_SPECIES}, + super(WeightCategoryDto.class, + new String[]{WeightCategoryDto.PROPERTY_CODE, WeightCategoryDto.PROPERTY_SPECIES}, + new String[]{WeightCategoryDto.PROPERTY_CODE, WeightCategoryDto.PROPERTY_SPECIES}, new String[]{WeightCategoryUI.BINDING_CODE_TEXT, WeightCategoryUI.BINDING_SPECIES_SELECTED_ITEM} ); } diff --git a/observe-application-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 index f9623fe..f798470 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.ref.ContentReferenceUI - superGenericType='Wind' + superGenericType='WindDto' contentTitle='{n("observe.title.content.windSpeeds")}' listText='{n("observe.list.wind")}' createToolTip='{n("observe.action.wind.create.tip")}' @@ -36,8 +36,8 @@ <style source="../I18nReferenceEntity.css"/> <import> - fr.ird.observe.entities.constants.ReferenceStatus - fr.ird.observe.entities.referentiel.seine.Wind + fr.ird.observe.services.dto.constants.ReferenceStatus + fr.ird.observe.services.dto.referential.seine.WindDto fr.ird.observe.ui.content.ref.ContentReferenceUIModel static fr.ird.observe.ui.UIHelper.getStringValue @@ -46,7 +46,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.referentiel.seine.Wind' + beanClass='fr.ird.observe.services.dto.referential.seine.WindDto' context='n1-create' errorTableModel='{getErrorTableModel()}'/> @@ -54,7 +54,7 @@ <WindUIModel id='model'/> <!-- edit bean --> - <Wind id='bean'/> + <WindDto id='bean'/> <Table id='editTable'> diff --git a/observe-application-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 index b0d50ea..7ffc0a7 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref.impl.seine; * #L% */ -import fr.ird.observe.entities.referentiel.seine.Wind; +import fr.ird.observe.services.dto.referential.seine.WindDto; import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; /** @@ -31,13 +31,13 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class WindUIModel extends ContentReferenceUIModel<Wind> { +public class WindUIModel extends ContentReferenceUIModel<WindDto> { private static final long serialVersionUID = 1L; public WindUIModel() { - super(Wind.class, - new String[]{Wind.PROPERTY_SPEED_RANGE, Wind.PROPERTY_WAVE_HEIGHT}, + super(WindDto.class, + new String[]{WindDto.PROPERTY_SPEED_RANGE, WindDto.PROPERTY_WAVE_HEIGHT}, new String[]{WindUI.BINDING_SPEED_RANGE_TEXT, WindUI.BINDING_WAVE_HEIGHT_TEXT} ); } diff --git a/observe-application-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 index 8f1cb29..a114d48 100644 --- a/observe-application-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 @@ -21,6 +21,7 @@ */ package fr.ird.observe.ui.content.table; +import fr.ird.observe.services.dto.AbstractObserveDto; import fr.ird.observe.ui.UIHelper; import jaxx.runtime.swing.ErrorDialogUI; import jaxx.runtime.validator.swing.SwingValidator; @@ -28,9 +29,6 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.util.EntityListUpdator; -import org.nuiton.topia.persistence.util.Loador; import javax.swing.JOptionPane; import javax.swing.table.AbstractTableModel; @@ -71,7 +69,7 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class ContentTableModel<P extends TopiaEntity, B extends TopiaEntity> extends AbstractTableModel { +public class ContentTableModel<P extends AbstractObserveDto, B extends AbstractObserveDto> extends AbstractTableModel { /** Le nom de la propriété de la ligne en cours d'édition */ public static final String SELECTED_ROW_PROPERTY = "selectedRow"; @@ -142,7 +140,7 @@ public class ContentTableModel<P extends TopiaEntity, B extends TopiaEntity> ext this.metas = Collections.unmodifiableList(metas); } - public static <D extends TopiaEntity> ContentTableMeta<D> newTableMeta( + public static <D extends AbstractObserveDto> ContentTableMeta<D> newTableMeta( Class<D> childType, String property, boolean unmodiableWhenExisting) { diff --git a/observe-application-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 index 1eb98c0..565bbaf 100644 --- a/observe-application-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 @@ -23,7 +23,7 @@ <fr.ird.observe.ui.content.ContentUI abstract='true' superGenericType='E' implements="fr.ird.observe.ui.content.table.ObserveContentTableUI<E,D>" - genericType='E extends TopiaEntity, D extends TopiaEntity'> + genericType='E extends AbstractObserveDto, D extends AbstractObserveDto'> <import> fr.ird.observe.ui.actions.shared.ResetEditUIAction @@ -32,7 +32,7 @@ jaxx.runtime.swing.BlockingLayerUI jaxx.runtime.validator.swing.SwingValidator - org.nuiton.topia.persistence.TopiaEntity + fr.ird.observe.services.dto.AbstractObserveDto java.awt.Dimension @@ -72,7 +72,7 @@ <!-- le bloqueur de l'editeur d'une entrée du tableau --> <BlockingLayerUI id='editorBlockLayerUI'/> - <TopiaEntity id='tableEditBean' initializer='getModel().getTableEditBean()'/> + <AbstractObserveDto id='tableEditBean' initializer='getModel().getTableEditBean()'/> <!-- icone des donnees observees --> <Icon id='iconDataObserve' initializer='SwingUtil.getUIManagerActionIcon("data-observe")'/> diff --git a/observe-application-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 index 1c6c060..dfc2b43 100644 --- a/observe-application-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 @@ -28,7 +28,8 @@ import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DataContextType; -import fr.ird.observe.entities.referentiel.Species2; +import fr.ird.observe.services.dto.AbstractObserveDto; +import fr.ird.observe.services.dto.referential.Species2Dto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; @@ -69,7 +70,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public abstract class ContentTableUIHandler<E extends TopiaEntity, D extends TopiaEntity> extends ContentUIHandler<E> { +public abstract class ContentTableUIHandler<E extends AbstractObserveDto, D extends AbstractObserveDto> extends ContentUIHandler<E> { /** Logger */ private static Log log = LogFactory.getLog(ContentTableUIHandler.class); diff --git a/observe-application-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 index f0b6de4..d864f6e 100644 --- a/observe-application-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 @@ -22,16 +22,12 @@ package fr.ird.observe.ui.content.table; import fr.ird.observe.BinderService; -import fr.ird.observe.ObserveDAOHelper; -import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.ObserveTechnicalException; +import fr.ird.observe.services.dto.AbstractObserveDto; import fr.ird.observe.ui.content.ContentUIModel; import org.apache.commons.lang3.reflect.ConstructorUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.util.EntityListUpdator; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderModelBuilder; @@ -45,7 +41,7 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public abstract class ContentTableUIModel<E extends TopiaEntity, D extends TopiaEntity> extends ContentUIModel<E> { +public abstract class ContentTableUIModel<E extends AbstractObserveDto, D extends AbstractObserveDto> extends ContentUIModel<E> { public static final String PROPERTY_CAN_SAVE_ROW = "canSaveRow"; @@ -89,9 +85,10 @@ public abstract class ContentTableUIModel<E extends TopiaEntity, D extends Topia private ContentTableModel<E, D> tableModel; - private TopiaEntityBinder<D> childLoador; - - private EntityListUpdator<E, D> childsUpdator; + //FIXME +// private TopiaEntityBinder<D> childLoador; + //FIXME +// private EntityListUpdator<E, D> childsUpdator; public ContentTableUIModel(Class<E> beanType, Class<D> childType, @@ -104,7 +101,7 @@ public abstract class ContentTableUIModel<E extends TopiaEntity, D extends Topia this.selectionModel = new ContentTableListSelectionModel(); } - public static <E extends TopiaEntity, D extends TopiaEntity> ContentTableUIModel<E, D> newModel(ObserveContentTableUI<E, D> ui) { + public static <E extends AbstractObserveDto, D extends AbstractObserveDto> ContentTableUIModel<E, D> newModel(ObserveContentTableUI<E, D> ui) { String uiName = ui.getClass().getName(); String modelName = uiName + "Model"; @@ -138,26 +135,28 @@ public abstract class ContentTableUIModel<E extends TopiaEntity, D extends Topia this.tableModel = createTableModel(ui, metas); - this.childsUpdator = EntityListUpdator.newEntityListUpdator( - getBeanType(), - getChildType(), - getParentProperties()[0]); + //FIXME +// this.childsUpdator = EntityListUpdator.newEntityListUpdator( +// getBeanType(), +// getChildType(), +// getParentProperties()[0]); String binderName = getClass().getName() + "-open"; Class<D> childBeanType = getChildType(); - BinderService binderService = ObserveServiceHelper.get().getBinderService(); - - childLoador = binderService.getTopiaBinder(childBeanType, binderName); - - if (childLoador == null) { - - BinderModelBuilder<D, D> builder = prepareChildLoador(binderService, binderName); - - childLoador = binderService.registerTopiaBinder(childBeanType, builder, binderName); - - } + //FIXME +// BinderService binderService = ObserveServiceHelper.get().getBinderService(); +// +// childLoador = binderService.getTopiaBinder(childBeanType, binderName); +// +// if (childLoador == null) { +// +// BinderModelBuilder<D, D> builder = prepareChildLoador(binderService, binderName); +// +// childLoador = binderService.registerTopiaBinder(childBeanType, builder, binderName); +// +// } } @@ -165,13 +164,14 @@ public abstract class ContentTableUIModel<E extends TopiaEntity, D extends Topia return new ContentTableModel<E, D>(ui, metas); } - public final EntityListUpdator<E, D> getChildsUpdator() { - return childsUpdator; - } - - public final TopiaEntityBinder<D> getChildLoador() { - return childLoador; - } + //FIXME +// public final EntityListUpdator<E, D> getChildsUpdator() { +// return childsUpdator; +// } + //FIXME +// public final TopiaEntityBinder<D> getChildLoador() { +// return childLoador; +// } public Class<D> getChildType() { return childType; @@ -210,13 +210,15 @@ public abstract class ContentTableUIModel<E extends TopiaEntity, D extends Topia } public final D newTableEditBean() { - try { - Class<D> klass = - ObserveDAOHelper.getImplementationClass(getChildType()); - return klass.newInstance(); - } catch (Exception ex) { - throw new RuntimeException(ex); - } + //FIXME +// try { +// Class<D> klass = +// ObserveDAOHelper.getImplementationClass(getChildType()); +// return klass.newInstance(); +// } catch (Exception ex) { +// throw new RuntimeException(ex); +// } + return null; } public boolean isCanSaveRow() { diff --git a/observe-application-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 index 11ce553..390c638 100644 --- a/observe-application-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 @@ -22,10 +22,10 @@ package fr.ird.observe.ui.content.table; * #L% */ +import fr.ird.observe.services.dto.AbstractObserveDto; import fr.ird.observe.ui.content.ObserveContentUI; import jaxx.runtime.swing.BlockingLayerUI; import jaxx.runtime.validator.swing.SwingValidator; -import org.nuiton.topia.persistence.TopiaEntity; import javax.swing.JComponent; import javax.swing.JTable; @@ -37,7 +37,7 @@ import javax.swing.ListSelectionModel; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public interface ObserveContentTableUI<E extends TopiaEntity, D extends TopiaEntity> extends ObserveContentUI<E> { +public interface ObserveContentTableUI<E extends AbstractObserveDto, D extends AbstractObserveDto> extends ObserveContentUI<E> { ContentTableUIHandler<E, D> getHandler(); diff --git a/observe-application-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 index be7f502..249bfdf 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.table.ContentTableUI - superGenericType='SetLongline, BaitsComposition' + superGenericType='SetLonglineDto, BaitsCompositionDto' contentTitle='{n("observe.baitsComposition.title")}' saveNewEntryText='{n("observe.baitsComposition.action.create")}' saveNewEntryTip='{n("observe.baitsComposition.action.create.tip")}' @@ -31,10 +31,10 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.entities.longline.SetLongline - fr.ird.observe.entities.longline.BaitsComposition - fr.ird.observe.entities.referentiel.longline.BaitType - fr.ird.observe.entities.referentiel.longline.BaitSettingStatus + fr.ird.observe.services.dto.longline.SetLonglineDto + fr.ird.observe.services.dto.longline.BaitsCompositionDto + fr.ird.observe.services.dto.referential.longline.BaitTypeDto + fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto fr.ird.observe.ui.content.table.* jaxx.runtime.swing.editor.NumberEditor @@ -51,24 +51,24 @@ <BaitsCompositionUIModel id='model'/> <!-- edit bean --> - <SetLongline id='bean'/> + <SetLonglineDto id='bean'/> <!-- table edit bean --> - <BaitsComposition id='tableEditBean'/> + <BaitsCompositionDto id='tableEditBean'/> <!-- table model --> <ContentTableModel id='tableModel'/> <!-- le validateur de l'écran --> <BeanValidator id='validator' autoField='true' context='n1-update-baitsComposition' - beanClass='fr.ird.observe.entities.longline.SetLongline' + beanClass='fr.ird.observe.services.dto.longline.SetLonglineDto' errorTableModel='{getErrorTableModel()}'> <field name="baitsComposition" component="editorPanel"/> </BeanValidator> <!-- le validateur d'une entrée de tableau --> <BeanValidator id='validatorTable' autoField='true' context='n1-update' - beanClass='fr.ird.observe.entities.longline.BaitsComposition' + beanClass='fr.ird.observe.services.dto.longline.BaitsCompositionDto' errorTableModel='{getErrorTableModel()}'/> <Table id='editorPanel' fill='both' insets='1'> @@ -79,7 +79,7 @@ <JLabel id='baitTypeLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='baitType' constructorParams='this' genericType='BaitType'/> + <BeanComboBox id='baitType' constructorParams='this' genericType='BaitTypeDto'/> </cell> </row> @@ -89,7 +89,7 @@ <JLabel id='baitSettingStatusLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='baitSettingStatus' constructorParams='this' genericType='BaitSettingStatus'/> + <BeanComboBox id='baitSettingStatus' constructorParams='this' genericType='BaitSettingStatusDto'/> </cell> </row> diff --git a/observe-application-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 index 73520e3..5cc790d 100644 --- a/observe-application-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 @@ -26,10 +26,10 @@ import fr.ird.observe.DataService; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.constants.DataContextType; -import fr.ird.observe.entities.longline.BaitsComposition; -import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.entities.referentiel.longline.BaitSettingStatus; -import fr.ird.observe.entities.referentiel.longline.BaitType; +import fr.ird.observe.services.dto.longline.BaitsCompositionDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; +import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; diff --git a/observe-application-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 index 45d9795..677e0c4 100644 --- a/observe-application-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 @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.table.impl.longline; */ import com.google.common.collect.Lists; -import fr.ird.observe.entities.longline.BaitsComposition; -import fr.ird.observe.entities.longline.SetLongline; +import fr.ird.observe.services.dto.longline.BaitsCompositionDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIModel; @@ -37,26 +37,26 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ -public class BaitsCompositionUIModel extends ContentTableUIModel<SetLongline, BaitsComposition> { +public class BaitsCompositionUIModel extends ContentTableUIModel<SetLonglineDto, BaitsCompositionDto> { private static final long serialVersionUID = 1L; public BaitsCompositionUIModel(BaitsCompositionUI ui) { - super(SetLongline.class, - BaitsComposition.class, - new String[]{SetLongline.PROPERTY_BAITS_COMPOSITION}, - new String[]{BaitsComposition.PROPERTY_BAIT_TYPE, - BaitsComposition.PROPERTY_BAIT_SETTING_STATUS, - BaitsComposition.PROPERTY_INDIVIDUAL_SIZE, - BaitsComposition.PROPERTY_INDIVIDUAL_WEIGHT, - BaitsComposition.PROPERTY_PROPORTION}); + super(SetLonglineDto.class, + BaitsCompositionDto.class, + new String[]{SetLonglineDto.PROPERTY_BAITS_COMPOSITION}, + new String[]{BaitsCompositionDto.PROPERTY_BAIT_TYPE, + BaitsCompositionDto.PROPERTY_BAIT_SETTING_STATUS, + BaitsCompositionDto.PROPERTY_INDIVIDUAL_SIZE, + BaitsCompositionDto.PROPERTY_INDIVIDUAL_WEIGHT, + BaitsCompositionDto.PROPERTY_PROPORTION}); - List<ContentTableMeta<BaitsComposition>> metas = Lists.newArrayList( - ContentTableModel.newTableMeta(BaitsComposition.class, BaitsComposition.PROPERTY_BAIT_TYPE, false), - ContentTableModel.newTableMeta(BaitsComposition.class, BaitsComposition.PROPERTY_BAIT_SETTING_STATUS, false), - ContentTableModel.newTableMeta(BaitsComposition.class, BaitsComposition.PROPERTY_INDIVIDUAL_SIZE, false), - ContentTableModel.newTableMeta(BaitsComposition.class, BaitsComposition.PROPERTY_INDIVIDUAL_WEIGHT, false), - ContentTableModel.newTableMeta(BaitsComposition.class, BaitsComposition.PROPERTY_PROPORTION, false)); + List<ContentTableMeta<BaitsCompositionDto>> metas = Lists.newArrayList( + ContentTableModel.newTableMeta(BaitsCompositionDto.class, BaitsCompositionDto.PROPERTY_BAIT_TYPE, false), + ContentTableModel.newTableMeta(BaitsCompositionDto.class, BaitsCompositionDto.PROPERTY_BAIT_SETTING_STATUS, false), + ContentTableModel.newTableMeta(BaitsCompositionDto.class, BaitsCompositionDto.PROPERTY_INDIVIDUAL_SIZE, false), + ContentTableModel.newTableMeta(BaitsCompositionDto.class, BaitsCompositionDto.PROPERTY_INDIVIDUAL_WEIGHT, false), + ContentTableModel.newTableMeta(BaitsCompositionDto.class, BaitsCompositionDto.PROPERTY_PROPORTION, false)); initModel(ui, metas); diff --git a/observe-application-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 index 57a6707..1ef846a 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.table.ContentTableUI - superGenericType='SetLongline, BranchlinesComposition' + superGenericType='SetLonglineDto, BranchlinesCompositionDto' contentTitle='{n("observe.branchlinesComposition.title")}' saveNewEntryText='{n("observe.branchlinesComposition.action.create")}' saveNewEntryTip='{n("observe.branchlinesComposition.action.create.tip")}' @@ -31,9 +31,9 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.entities.longline.SetLongline - fr.ird.observe.entities.longline.BranchlinesComposition - fr.ird.observe.entities.referentiel.longline.LineType + fr.ird.observe.services.dto.longline.SetLonglineDto + fr.ird.observe.services.dto.longline.BranchlinesCompositionDto + fr.ird.observe.services.dto.referential.longline.LineTypeDto fr.ird.observe.ui.content.table.* jaxx.runtime.swing.editor.NumberEditor @@ -50,24 +50,24 @@ <BranchlinesCompositionUIModel id='model'/> <!-- edit bean --> - <SetLongline id='bean'/> + <SetLonglineDto id='bean'/> <!-- table edit bean --> - <BranchlinesComposition id='tableEditBean'/> + <BranchlinesCompositionDto id='tableEditBean'/> <!-- table model --> <ContentTableModel id='tableModel'/> <!-- le validateur de l'écran --> <BeanValidator id='validator' autoField='true' context='n1-update-branchlinesComposition' - beanClass='fr.ird.observe.entities.longline.SetLongline' + beanClass='fr.ird.observe.services.dto.longline.SetLonglineDto' errorTableModel='{getErrorTableModel()}'> <field name="branchlinesComposition" component="editorPanel"/> </BeanValidator> <!-- le validateur d'une entrée de tableau --> <BeanValidator id='validatorTable' autoField='true' context='n1-update' - beanClass='fr.ird.observe.entities.longline.BranchlinesComposition' + beanClass='fr.ird.observe.services.dto.longline.BranchlinesCompositionDto' errorTableModel='{getErrorTableModel()}'/> <Table id='editorPanel' fill='both' insets='1'> @@ -78,7 +78,7 @@ <JLabel id='topTypeLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='topType' constructorParams='this' genericType='LineType'/> + <BeanComboBox id='topType' constructorParams='this' genericType='LineTypeDto'/> </cell> </row> @@ -88,7 +88,7 @@ <JLabel id='tracelineTypeLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='tracelineType' constructorParams='this' genericType='LineType'/> + <BeanComboBox id='tracelineType' constructorParams='this' genericType='LineTypeDto'/> </cell> </row> diff --git a/observe-application-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 index 616725a..fcd23fc 100644 --- a/observe-application-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 @@ -26,10 +26,10 @@ import fr.ird.observe.DataService; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.constants.DataContextType; -import fr.ird.observe.entities.longline.BranchlinesComposition; -import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.entities.referentiel.longline.HookSize; -import fr.ird.observe.entities.referentiel.longline.HookType; +import fr.ird.observe.services.dto.longline.BranchlinesCompositionDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.referential.longline.HookSizeDto; +import fr.ird.observe.services.dto.referential.longline.HookTypeDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; diff --git a/observe-application-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 index c038403..bc3109c 100644 --- a/observe-application-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 @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.table.impl.longline; */ import com.google.common.collect.Lists; -import fr.ird.observe.entities.longline.BranchlinesComposition; -import fr.ird.observe.entities.longline.SetLongline; +import fr.ird.observe.services.dto.longline.BranchlinesCompositionDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIModel; @@ -37,24 +37,27 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ -public class BranchlinesCompositionUIModel extends ContentTableUIModel<SetLongline, BranchlinesComposition> { +public class BranchlinesCompositionUIModel extends ContentTableUIModel<SetLonglineDto, BranchlinesCompositionDto> { private static final long serialVersionUID = 1L; public BranchlinesCompositionUIModel(BranchlinesCompositionUI ui) { - super(SetLongline.class, - BranchlinesComposition.class, - new String[]{SetLongline.PROPERTY_BRANCHLINES_COMPOSITION}, - new String[]{BranchlinesComposition.PROPERTY_TOP_TYPE, - BranchlinesComposition.PROPERTY_TRACELINE_TYPE, - BranchlinesComposition.PROPERTY_LENGTH, - BranchlinesComposition.PROPERTY_PROPORTION}); + super(SetLonglineDto.class, + BranchlinesCompositionDto.class, + new String[]{ + //FIXME +// SetLonglineDto.PROPERTY_BRANCHLINES_COMPOSITION + }, + new String[]{BranchlinesCompositionDto.PROPERTY_TOP_TYPE, + BranchlinesCompositionDto.PROPERTY_TRACELINE_TYPE, + BranchlinesCompositionDto.PROPERTY_LENGTH, + BranchlinesCompositionDto.PROPERTY_PROPORTION}); - List<ContentTableMeta<BranchlinesComposition>> metas = Lists.newArrayList( - ContentTableModel.newTableMeta(BranchlinesComposition.class, BranchlinesComposition.PROPERTY_TOP_TYPE, false), - ContentTableModel.newTableMeta(BranchlinesComposition.class, BranchlinesComposition.PROPERTY_TRACELINE_TYPE, false), - ContentTableModel.newTableMeta(BranchlinesComposition.class, BranchlinesComposition.PROPERTY_LENGTH, false), - ContentTableModel.newTableMeta(BranchlinesComposition.class, BranchlinesComposition.PROPERTY_PROPORTION, false)); + List<ContentTableMeta<BranchlinesCompositionDto>> metas = Lists.newArrayList( + ContentTableModel.newTableMeta(BranchlinesCompositionDto.class, BranchlinesCompositionDto.PROPERTY_TOP_TYPE, false), + ContentTableModel.newTableMeta(BranchlinesCompositionDto.class, BranchlinesCompositionDto.PROPERTY_TRACELINE_TYPE, false), + ContentTableModel.newTableMeta(BranchlinesCompositionDto.class, BranchlinesCompositionDto.PROPERTY_LENGTH, false), + ContentTableModel.newTableMeta(BranchlinesCompositionDto.class, BranchlinesCompositionDto.PROPERTY_PROPORTION, false)); initModel(ui, metas); diff --git a/observe-application-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 index 8d27aea..5026fd9 100644 --- a/observe-application-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 @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.table.impl.longline; */ import fr.ird.observe.db.DataSourceException; -import fr.ird.observe.entities.longline.CatchLongline; -import fr.ird.observe.entities.longline.SetLongline; +import fr.ird.observe.services.dto.longline.CatchLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.table.ContentTableUIInitializer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/observe-application-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 index eb88c4f..a133ef4 100644 --- a/observe-application-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 @@ -22,8 +22,8 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.entities.longline.CatchLongline; -import fr.ird.observe.entities.longline.SetLongline; +import fr.ird.observe.services.dto.longline.CatchLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ObserveContentTableUI; @@ -36,12 +36,12 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.8 */ -public class CatchLonglineTableModel extends ContentTableModel<SetLongline, CatchLongline> { +public class CatchLonglineTableModel extends ContentTableModel<SetLonglineDto, CatchLonglineDto> { private static final long serialVersionUID = 1L; - public CatchLonglineTableModel(ObserveContentTableUI<SetLongline, CatchLongline> context, - List<ContentTableMeta<CatchLongline>> contentTableMetas) { + public CatchLonglineTableModel(ObserveContentTableUI<SetLonglineDto, CatchLonglineDto> context, + List<ContentTableMeta<CatchLonglineDto>> contentTableMetas) { super(context, contentTableMetas); } diff --git a/observe-application-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 index 0e37890..030d883 100644 --- a/observe-application-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 @@ -20,7 +20,7 @@ #L% --> -<fr.ird.observe.ui.content.table.ContentTableUI superGenericType='SetLongline, CatchLongline' +<fr.ird.observe.ui.content.table.ContentTableUI superGenericType='SetLonglineDto, CatchLonglineDto' contentTitle='{n("observe.catchLongline.title")}' newEntryText='{n("observe.catchLongline.action.new")}' newEntryTip='{n("observe.catchLongline.action.new.tip")}' @@ -30,21 +30,21 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.entities.CommentableEntity - fr.ird.observe.entities.longline.Basket - fr.ird.observe.entities.longline.Branchline - fr.ird.observe.entities.longline.BranchlineImpl - fr.ird.observe.entities.longline.CatchLongline - fr.ird.observe.entities.longline.Section - fr.ird.observe.entities.longline.SetLongline - fr.ird.observe.entities.referentiel.Species - fr.ird.observe.entities.referentiel.Sex - fr.ird.observe.entities.referentiel.longline.BaitHaulingStatus - fr.ird.observe.entities.referentiel.longline.CatchFateLongline - fr.ird.observe.entities.referentiel.longline.Healthness - fr.ird.observe.entities.referentiel.longline.HookPosition - fr.ird.observe.entities.referentiel.longline.MaturityStatus - fr.ird.observe.entities.referentiel.longline.StomacFullness + fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.longline.BasketDto + fr.ird.observe.services.dto.longline.BranchlineDto + fr.ird.observe.services.dto.longline.BranchlineImplDto + fr.ird.observe.services.dto.longline.CatchLonglineDto + fr.ird.observe.services.dto.longline.SectionDto + fr.ird.observe.services.dto.longline.SetLonglineDto + fr.ird.observe.services.dto.referential.SpeciesDto + fr.ird.observe.services.dto.referential.SexDto + fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto + fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto + fr.ird.observe.services.dto.referential.longline.HealthnessDto + fr.ird.observe.services.dto.referential.longline.HookPositionDto + fr.ird.observe.services.dto.referential.longline.MaturityStatusDto + fr.ird.observe.services.dto.referential.longline.StomacFullnessDto fr.ird.observe.ui.content.table.* jaxx.runtime.swing.editor.NumberEditor @@ -71,32 +71,32 @@ <WeightMeasuresTableModel id='weightMeasuresTableModel' initializer="getModel().getWeightMeasuresTableModel()"/> <!-- edit bean --> - <SetLongline id='bean'/> + <SetLonglineDto id='bean'/> <!-- table edit bean --> - <CatchLongline id='tableEditBean'/> + <CatchLonglineDto id='tableEditBean'/> <!-- table model --> <ContentTableModel id='tableModel'/> <!-- edit branchline --> - <Branchline id='branchlineBean' initializer='new BranchlineImpl()'/> + <BranchlineDto id='branchlineBean' initializer='new BranchlineImpl()'/> <!-- le validateur de l'écran --> <BeanValidator id='validator' context='n1-update-catchLongline' - beanClass='fr.ird.observe.entities.longline.SetLongline' + beanClass='fr.ird.observe.services.dto.longline.SetLonglineDto' errorTableModel='{getErrorTableModel()}'> </BeanValidator> <!-- le validateur d'une entrée de tableau --> <BeanValidator id='validatorTable' autoField='true' context='n1-update' - beanClass='fr.ird.observe.entities.longline.CatchLongline' + beanClass='fr.ird.observe.services.dto.longline.CatchLonglineDto' errorTableModel='{getErrorTableModel()}' parentValidator='{validator}'/> <!-- le validateur de la branchline --> <BeanValidator id='branchlineValidator' context='n1-update-catchLongline' - beanClass='fr.ird.observe.entities.longline.Branchline' + beanClass='fr.ird.observe.services.dto.longline.BranchlineDto' errorTableModel='{getErrorTableModel()}' parentValidator='{validator}'> <field name='depthRecorder' component='depthRecorder'/> @@ -136,7 +136,7 @@ <JLabel id='sectionLabel'/> </cell> <cell fill="both" weightx="1"> - <BeanComboBox id='section' genericType='Section' constructorParams='this'/> + <BeanComboBox id='section' genericType='SectionDto' constructorParams='this'/> </cell> </row> <row> @@ -144,7 +144,7 @@ <JLabel id='basketLabel'/> </cell> <cell fill="both" weightx="1"> - <BeanComboBox id='basket' genericType='Basket' constructorParams='this'/> + <BeanComboBox id='basket' genericType='BasketDto' constructorParams='this'/> </cell> </row> <row> @@ -152,7 +152,7 @@ <JLabel id='branchlineLabel'/> </cell> <cell fill="both" weightx="1"> - <BeanComboBox id='branchline' genericType='Branchline' constructorParams='this'/> + <BeanComboBox id='branchline' genericType='BranchlineDto' constructorParams='this'/> </cell> </row> </Table> @@ -166,7 +166,7 @@ <JLabel id='speciesCatchLabel'/> </cell> <cell weightx='1' anchor='east' columns="3"> - <BeanComboBox id='speciesCatch' genericType='Species' constructorParams='this'/> + <BeanComboBox id='speciesCatch' genericType='SpeciesDto' constructorParams='this'/> </cell> </row> @@ -195,13 +195,13 @@ <JLabel id='catchHealthnessLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='catchHealthness' constructorParams='this' genericType='Healthness'/> + <BeanComboBox id='catchHealthness' constructorParams='this' genericType='HealthnessDto'/> </cell> <cell> <JLabel id='hookPositionLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='hookPosition' constructorParams='this' genericType='HookPosition'/> + <BeanComboBox id='hookPosition' constructorParams='this' genericType='HookPositionDto'/> </cell> </row> @@ -212,13 +212,13 @@ <JLabel id='catchFateLonglineLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='catchFateLongline' constructorParams='this' genericType='CatchFateLongline'/> + <BeanComboBox id='catchFateLongline' constructorParams='this' genericType='CatchFateLonglineDto'/> </cell> <cell> <JLabel id='discardHealthnessLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='discardHealthness' constructorParams='this' genericType='Healthness'/> + <BeanComboBox id='discardHealthness' constructorParams='this' genericType='HealthnessDto'/> </cell> </row> @@ -298,7 +298,7 @@ <JLabel id='sexLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='sex' constructorParams='this' genericType='Sex'/> + <BeanComboBox id='sex' constructorParams='this' genericType='SexDto'/> </cell> </row> @@ -308,7 +308,7 @@ <JLabel id='maturityStatusLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='maturityStatus' constructorParams='this' genericType='MaturityStatus'/> + <BeanComboBox id='maturityStatus' constructorParams='this' genericType='MaturityStatusDto'/> </cell> </row> diff --git a/observe-application-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 index ae4a399..b5a7a73 100644 --- a/observe-application-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 @@ -34,20 +34,20 @@ import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.db.util.TopiaExecutor; import fr.ird.observe.db.util.TopiaExecutor2; -import fr.ird.observe.entities.longline.Basket; -import fr.ird.observe.entities.longline.Branchline; -import fr.ird.observe.entities.longline.CatchLongline; -import fr.ird.observe.entities.longline.Section; -import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.entities.longline.SizeMeasure; -import fr.ird.observe.entities.longline.SizeMeasureDAO; -import fr.ird.observe.entities.longline.WeightMeasure; -import fr.ird.observe.entities.longline.WeightMeasureDAO; -import fr.ird.observe.entities.referentiel.Species; -import fr.ird.observe.entities.referentiel.longline.CatchFateLongline; -import fr.ird.observe.entities.referentiel.longline.Healthness; -import fr.ird.observe.entities.referentiel.longline.SizeMeasureType; -import fr.ird.observe.entities.referentiel.longline.WeightMeasureType; +import fr.ird.observe.services.dto.longline.BasketDto; +import fr.ird.observe.services.dto.longline.BranchlineDto; +import fr.ird.observe.services.dto.longline.CatchLonglineDto; +import fr.ird.observe.services.dto.longline.SectionDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.longline.SizeMeasureDto; +import fr.ird.observe.services.dto.longline.SizeMeasureDAODto; +import fr.ird.observe.services.dto.longline.WeightMeasureDto; +import fr.ird.observe.services.dto.longline.WeightMeasureDAODto; +import fr.ird.observe.services.dto.referential.SpeciesDto; +import fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto; +import fr.ird.observe.services.dto.referential.longline.HealthnessDto; +import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIInitializer; diff --git a/observe-application-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 index aa35ae2..f872dea 100644 --- a/observe-application-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 @@ -25,15 +25,13 @@ package fr.ird.observe.ui.content.table.impl.longline; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import fr.ird.observe.BinderService; -import fr.ird.observe.ObserveServiceHelper; -import fr.ird.observe.entities.longline.Branchline; -import fr.ird.observe.entities.longline.CatchLongline; -import fr.ird.observe.entities.longline.SetLongline; +import fr.ird.observe.services.dto.longline.BranchlineDto; +import fr.ird.observe.services.dto.longline.CatchLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIModel; import fr.ird.observe.ui.content.table.ObserveContentTableUI; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderModelBuilder; @@ -46,7 +44,7 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class CatchLonglineUIModel extends ContentTableUIModel<SetLongline, CatchLongline> { +public class CatchLonglineUIModel extends ContentTableUIModel<SetLonglineDto, CatchLonglineDto> { public static final String PROPERTY_CARACTERISTICS_TAB_VALID = "caracteristicsTabValid"; @@ -59,39 +57,38 @@ public class CatchLonglineUIModel extends ContentTableUIModel<SetLongline, Catch public static final String PROPERTY_SHOW_INDIVIDUAL_TABS = "showIndividualTabs"; public static final Set<String> CARACTERISTIC_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(CatchLongline.PROPERTY_SECTION, - CatchLongline.PROPERTY_BASKET, - CatchLongline.PROPERTY_BRANCHLINE, - - CatchLongline.PROPERTY_SPECIES_CATCH, - CatchLongline.PROPERTY_PHOTO_REFERENCES, - CatchLongline.PROPERTY_COUNT, - CatchLongline.PROPERTY_TOTAL_WEIGHT, - CatchLongline.PROPERTY_CATCH_HEALTHNESS, - CatchLongline.PROPERTY_HOOK_POSITION, - CatchLongline.PROPERTY_CATCH_FATE_LONGLINE, - CatchLongline.PROPERTY_DISCARD_HEALTHNESS, - CatchLongline.PROPERTY_HOOK_WHEN_DISCARDED).build(); + ImmutableSet.<String>builder().add(CatchLonglineDto.PROPERTY_SECTION, + CatchLonglineDto.PROPERTY_BASKET, + CatchLonglineDto.PROPERTY_BRANCHLINE, + CatchLonglineDto.PROPERTY_SPECIES_CATCH, + CatchLonglineDto.PROPERTY_PHOTO_REFERENCES, + CatchLonglineDto.PROPERTY_COUNT, + CatchLonglineDto.PROPERTY_TOTAL_WEIGHT, + CatchLonglineDto.PROPERTY_CATCH_HEALTHNESS, + CatchLonglineDto.PROPERTY_HOOK_POSITION, + CatchLonglineDto.PROPERTY_CATCH_FATE_LONGLINE, + CatchLonglineDto.PROPERTY_DISCARD_HEALTHNESS, + CatchLonglineDto.PROPERTY_HOOK_WHEN_DISCARDED).build(); public static final Set<String> DEPREDATED_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(CatchLongline.PROPERTY_DEPREDATED, - CatchLongline.PROPERTY_BEAT_DIAMETER, - CatchLongline.PROPERTY_PREDATOR).build(); + ImmutableSet.<String>builder().add(CatchLonglineDto.PROPERTY_DEPREDATED, + CatchLonglineDto.PROPERTY_BEAT_DIAMETER, + CatchLonglineDto.PROPERTY_PREDATOR).build(); public static final Set<String> FOOD_AND_SEXUAL_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(CatchLongline.PROPERTY_STOMAC_FULLNESS, - CatchLongline.PROPERTY_SEX, - CatchLongline.PROPERTY_MATURITY_STATUS, - CatchLongline.PROPERTY_GONADE_WEIGHT).build(); + ImmutableSet.<String>builder().add(CatchLonglineDto.PROPERTY_STOMAC_FULLNESS, + CatchLonglineDto.PROPERTY_SEX, + CatchLonglineDto.PROPERTY_MATURITY_STATUS, + CatchLonglineDto.PROPERTY_GONADE_WEIGHT).build(); public static final Set<String> BRANCHLINE_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(Branchline.PROPERTY_DEPTH_RECORDER, - Branchline.PROPERTY_HOOK_LOST, - Branchline.PROPERTY_TRACE_CUT_OFF, - Branchline.PROPERTY_TIMER, - Branchline.PROPERTY_TIME_SINCE_CONTACT, - Branchline.PROPERTY_TIMER_TIME_ON_BOARD, - Branchline.PROPERTY_BAIT_HAULING_STATUS).build(); + ImmutableSet.<String>builder().add(BranchlineDto.PROPERTY_DEPTH_RECORDER, + BranchlineDto.PROPERTY_HOOK_LOST, + BranchlineDto.PROPERTY_TRACE_CUT_OFF, + BranchlineDto.PROPERTY_TIMER, + BranchlineDto.PROPERTY_TIME_SINCE_CONTACT, + BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD, + BranchlineDto.PROPERTY_BAIT_HAULING_STATUS).build(); private static final long serialVersionUID = 1L; @@ -113,52 +110,56 @@ public class CatchLonglineUIModel extends ContentTableUIModel<SetLongline, Catch protected boolean branchlineTabValid; - private TopiaEntityBinder<Branchline> branchlineLoador; + //FIXME +// private TopiaEntityBinder<BranchlineDto> branchlineLoador; public CatchLonglineUIModel(CatchLonglineUI ui) { - super(SetLongline.class, - CatchLongline.class, - new String[]{SetLongline.PROPERTY_CATCH_LONGLINE}, - new String[]{CatchLongline.PROPERTY_SPECIES_CATCH, - CatchLongline.PROPERTY_ACQUISITION_MODE, - CatchLongline.PROPERTY_COUNT, - CatchLongline.PROPERTY_CATCH_HEALTHNESS, - CatchLongline.PROPERTY_CATCH_FATE_LONGLINE, - CatchLongline.PROPERTY_DISCARD_HEALTHNESS, - CatchLongline.PROPERTY_DEPREDATED, - CatchLongline.PROPERTY_NUMBER, - CatchLongline.PROPERTY_HOME_ID, - CatchLongline.PROPERTY_HOOK_POSITION, - CatchLongline.PROPERTY_HOOK_WHEN_DISCARDED, - CatchLongline.PROPERTY_MATURITY_STATUS, - CatchLongline.PROPERTY_PHOTO_REFERENCES, - CatchLongline.PROPERTY_SEX, - CatchLongline.PROPERTY_PREDATOR, - CatchLongline.PROPERTY_STOMAC_FULLNESS, - CatchLongline.PROPERTY_TOTAL_WEIGHT, - CatchLongline.PROPERTY_BEAT_DIAMETER, - CatchLongline.PROPERTY_GONADE_WEIGHT, - CatchLongline.PROPERTY_SECTION, - CatchLongline.PROPERTY_BASKET, - CatchLongline.PROPERTY_BRANCHLINE, - CatchLongline.PROPERTY_COMMENT + super(SetLonglineDto.class, + CatchLonglineDto.class, + new String[]{ + //FIXME +// SetLonglineDto.PROPERTY_CATCH_LONGLINE + }, + new String[]{CatchLonglineDto.PROPERTY_SPECIES_CATCH, + CatchLonglineDto.PROPERTY_ACQUISITION_MODE, + CatchLonglineDto.PROPERTY_COUNT, + CatchLonglineDto.PROPERTY_CATCH_HEALTHNESS, + CatchLonglineDto.PROPERTY_CATCH_FATE_LONGLINE, + CatchLonglineDto.PROPERTY_DISCARD_HEALTHNESS, + CatchLonglineDto.PROPERTY_DEPREDATED, + CatchLonglineDto.PROPERTY_NUMBER, + CatchLonglineDto.PROPERTY_HOME_ID, + CatchLonglineDto.PROPERTY_HOOK_POSITION, + CatchLonglineDto.PROPERTY_HOOK_WHEN_DISCARDED, + CatchLonglineDto.PROPERTY_MATURITY_STATUS, + CatchLonglineDto.PROPERTY_PHOTO_REFERENCES, + CatchLonglineDto.PROPERTY_SEX, + CatchLonglineDto.PROPERTY_PREDATOR, + CatchLonglineDto.PROPERTY_STOMAC_FULLNESS, + CatchLonglineDto.PROPERTY_TOTAL_WEIGHT, + CatchLonglineDto.PROPERTY_BEAT_DIAMETER, + CatchLonglineDto.PROPERTY_GONADE_WEIGHT, + CatchLonglineDto.PROPERTY_SECTION, + CatchLonglineDto.PROPERTY_BASKET, + CatchLonglineDto.PROPERTY_BRANCHLINE, + CatchLonglineDto.PROPERTY_COMMENT }); this.sizeMeasuresTableModel = new SizeMeasuresTableModel(); this.weightMeasuresTableModel = new WeightMeasuresTableModel(); - List<ContentTableMeta<CatchLongline>> metas = Lists.newArrayList( - ContentTableModel.newTableMeta(CatchLongline.class, CatchLongline.PROPERTY_SECTION, false), - ContentTableModel.newTableMeta(CatchLongline.class, CatchLongline.PROPERTY_BASKET, false), - ContentTableModel.newTableMeta(CatchLongline.class, CatchLongline.PROPERTY_BRANCHLINE, false), - ContentTableModel.newTableMeta(CatchLongline.class, CatchLongline.PROPERTY_SPECIES_CATCH, false), - ContentTableModel.newTableMeta(CatchLongline.class, CatchLongline.PROPERTY_ACQUISITION_MODE, false), - ContentTableModel.newTableMeta(CatchLongline.class, CatchLongline.PROPERTY_COUNT, false), - ContentTableModel.newTableMeta(CatchLongline.class, CatchLongline.PROPERTY_CATCH_HEALTHNESS, false), - ContentTableModel.newTableMeta(CatchLongline.class, CatchLongline.PROPERTY_CATCH_FATE_LONGLINE, false), - ContentTableModel.newTableMeta(CatchLongline.class, CatchLongline.PROPERTY_DISCARD_HEALTHNESS, false), - ContentTableModel.newTableMeta(CatchLongline.class, CatchLongline.PROPERTY_DEPREDATED, false), - ContentTableModel.newTableMeta(CatchLongline.class, CatchLongline.PROPERTY_COMMENT, false)); + List<ContentTableMeta<CatchLonglineDto>> metas = Lists.newArrayList( + ContentTableModel.newTableMeta(CatchLonglineDto.class, CatchLonglineDto.PROPERTY_SECTION, false), + ContentTableModel.newTableMeta(CatchLonglineDto.class, CatchLonglineDto.PROPERTY_BASKET, false), + ContentTableModel.newTableMeta(CatchLonglineDto.class, CatchLonglineDto.PROPERTY_BRANCHLINE, false), + ContentTableModel.newTableMeta(CatchLonglineDto.class, CatchLonglineDto.PROPERTY_SPECIES_CATCH, false), + ContentTableModel.newTableMeta(CatchLonglineDto.class, CatchLonglineDto.PROPERTY_ACQUISITION_MODE, false), + ContentTableModel.newTableMeta(CatchLonglineDto.class, CatchLonglineDto.PROPERTY_COUNT, false), + ContentTableModel.newTableMeta(CatchLonglineDto.class, CatchLonglineDto.PROPERTY_CATCH_HEALTHNESS, false), + ContentTableModel.newTableMeta(CatchLonglineDto.class, CatchLonglineDto.PROPERTY_CATCH_FATE_LONGLINE, false), + ContentTableModel.newTableMeta(CatchLonglineDto.class, CatchLonglineDto.PROPERTY_DISCARD_HEALTHNESS, false), + ContentTableModel.newTableMeta(CatchLonglineDto.class, CatchLonglineDto.PROPERTY_DEPREDATED, false), + ContentTableModel.newTableMeta(CatchLonglineDto.class, CatchLonglineDto.PROPERTY_COMMENT, false)); initModel(ui, metas); @@ -218,49 +219,52 @@ public class CatchLonglineUIModel extends ContentTableUIModel<SetLongline, Catch } @Override - protected ContentTableModel<SetLongline, CatchLongline> createTableModel(ObserveContentTableUI<SetLongline, CatchLongline> ui, List<ContentTableMeta<CatchLongline>> contentTableMetas) { + protected ContentTableModel<SetLonglineDto, CatchLonglineDto> createTableModel(ObserveContentTableUI<SetLonglineDto, CatchLonglineDto> ui, List<ContentTableMeta<CatchLonglineDto>> contentTableMetas) { return new CatchLonglineTableModel(ui, contentTableMetas); } @Override - protected BinderModelBuilder<CatchLongline, CatchLongline> prepareChildLoador(BinderService binderService, String binderName) { + protected BinderModelBuilder<CatchLonglineDto, CatchLonglineDto> prepareChildLoador(BinderService binderService, String binderName) { - BinderModelBuilder<CatchLongline, CatchLongline> builder = super.prepareChildLoador(binderService, binderName); + BinderModelBuilder<CatchLonglineDto, CatchLonglineDto> builder = super.prepareChildLoador(binderService, binderName); - builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, CatchLongline.PROPERTY_PREDATOR); + builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, CatchLonglineDto.PROPERTY_PREDATOR); return builder; } @Override - public void initModel(ObserveContentTableUI<SetLongline, CatchLongline> ui, List<ContentTableMeta<CatchLongline>> contentTableMetas) { + public void initModel(ObserveContentTableUI<SetLonglineDto, CatchLonglineDto> ui, List<ContentTableMeta<CatchLonglineDto>> contentTableMetas) { super.initModel(ui, contentTableMetas); - BinderService binderService = ObserveServiceHelper.get().getBinderService(); + //FIXME +// BinderService binderService = ObserveServiceHelper.get().getBinderService(); String binderName = getClass().getName() + "-open"; - branchlineLoador = binderService.getTopiaBinder(Branchline.class, binderName); - - if (branchlineLoador == null) { - - BinderModelBuilder<Branchline, Branchline> builder = - binderService.newBinderBuilder(Branchline.class, - Branchline.PROPERTY_DEPTH_RECORDER, - Branchline.PROPERTY_HOOK_LOST, - Branchline.PROPERTY_TRACE_CUT_OFF, - Branchline.PROPERTY_TIMER, - Branchline.PROPERTY_TIME_SINCE_CONTACT, - Branchline.PROPERTY_TIMER_TIME_ON_BOARD, - Branchline.PROPERTY_BAIT_HAULING_STATUS); - - branchlineLoador = binderService.registerTopiaBinder(Branchline.class, builder, binderName); - - } + //FIXME +// branchlineLoador = binderService.getTopiaBinder(BranchlineDto.class, binderName); + +// if (branchlineLoador == null) { +// +// BinderModelBuilder<Branchline, Branchline> builder = +// binderService.newBinderBuilder(Branchline.class, +// Branchline.PROPERTY_DEPTH_RECORDER, +// Branchline.PROPERTY_HOOK_LOST, +// Branchline.PROPERTY_TRACE_CUT_OFF, +// Branchline.PROPERTY_TIMER, +// Branchline.PROPERTY_TIME_SINCE_CONTACT, +// Branchline.PROPERTY_TIMER_TIME_ON_BOARD, +// Branchline.PROPERTY_BAIT_HAULING_STATUS); +// +// branchlineLoador = binderService.registerTopiaBinder(Branchline.class, builder, binderName); +// +// } } - public TopiaEntityBinder<Branchline> getBranchlineLoador() { - return branchlineLoador; - } + //FIXME +// public TopiaEntityBinder<BranchlineDto> getBranchlineLoador() { +// return branchlineLoador; +// } } diff --git a/observe-application-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 index a10c79e..d5c7342 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.table.ContentTableUI - superGenericType='ActivityLongline, Encounter' + superGenericType='ActivityLonglineDto, EncounterDto' contentTitle='{n("observe.encounter.title")}' saveNewEntryText='{n("observe.encounter.action.create")}' saveNewEntryTip='{n("observe.encounter.action.create.tip")}' @@ -31,11 +31,11 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.entities.CommentableEntity - fr.ird.observe.entities.longline.ActivityLongline - fr.ird.observe.entities.longline.Encounter - fr.ird.observe.entities.referentiel.Species - fr.ird.observe.entities.referentiel.longline.EncounterType + fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.longline.ActivityLonglineDto + fr.ird.observe.services.dto.longline.EncounterDto + fr.ird.observe.services.dto.referential.SpeciesDto + fr.ird.observe.services.dto.referential.longline.EncounterTypeDto fr.ird.observe.ui.content.table.* jaxx.runtime.swing.editor.NumberEditor @@ -54,22 +54,22 @@ <EncounterUIModel id='model'/> <!-- edit bean --> - <ActivityLongline id='bean'/> + <ActivityLonglineDto id='bean'/> <!-- table edit bean --> - <Encounter id='tableEditBean'/> + <EncounterDto id='tableEditBean'/> <!-- table model --> <ContentTableModel id='tableModel'/> <!-- le validateur de l'écran --> <BeanValidator id='validator' autoField='true' context='n1-update-encounter' - beanClass='fr.ird.observe.entities.longline.ActivityLongline' + beanClass='fr.ird.observe.services.dto.longline.ActivityLonglineDto' errorTableModel='{getErrorTableModel()}'/> <!-- le validateur d'une entrée de tableau --> <BeanValidator id='validatorTable' autoField='true' context='n1-update' - beanClass='fr.ird.observe.entities.longline.Encounter' + beanClass='fr.ird.observe.services.dto.longline.EncounterDto' errorTableModel='{getErrorTableModel()}'/> <Table id='editorPanel' fill='both' insets='1'> @@ -80,7 +80,7 @@ <JLabel id='encounterTypeLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='encounterType' constructorParams='this' genericType='EncounterType'/> + <BeanComboBox id='encounterType' constructorParams='this' genericType='EncounterTypeDto'/> </cell> </row> @@ -90,7 +90,7 @@ <JLabel id='speciesLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='species' constructorParams='this' genericType='Species'/> + <BeanComboBox id='species' constructorParams='this' genericType='SpeciesDto'/> </cell> </row> diff --git a/observe-application-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 index 2392b1a..cefdaf3 100644 --- a/observe-application-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 @@ -27,10 +27,10 @@ import fr.ird.observe.ObserveConfig; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.constants.DataContextType; -import fr.ird.observe.entities.longline.ActivityLongline; -import fr.ird.observe.entities.longline.Encounter; -import fr.ird.observe.entities.referentiel.Species; -import fr.ird.observe.entities.referentiel.longline.EncounterType; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.EncounterDto; +import fr.ird.observe.services.dto.referential.SpeciesDto; +import fr.ird.observe.services.dto.referential.longline.EncounterTypeDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; diff --git a/observe-application-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 index 81ef8d2..b18fd05 100644 --- a/observe-application-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 @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.table.impl.longline; */ import com.google.common.collect.Lists; -import fr.ird.observe.entities.longline.ActivityLongline; -import fr.ird.observe.entities.longline.Encounter; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.EncounterDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIModel; @@ -37,25 +37,27 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class EncounterUIModel extends ContentTableUIModel<ActivityLongline, Encounter> { +public class EncounterUIModel extends ContentTableUIModel<ActivityLonglineDto, EncounterDto> { private static final long serialVersionUID = 1L; public EncounterUIModel(EncounterUI ui) { - super(ActivityLongline.class, - Encounter.class, - new String[]{ActivityLongline.PROPERTY_ENCOUNTER, - ActivityLongline.PROPERTY_COMMENT}, - new String[]{Encounter.PROPERTY_SPECIES, - Encounter.PROPERTY_DISTANCE, - Encounter.PROPERTY_COUNT, - Encounter.PROPERTY_ENCOUNTER_TYPE}); + super(ActivityLonglineDto.class, + EncounterDto.class, + new String[]{ + //FIXME +// ActivityLonglineDto.PROPERTY_ENCOUNTER, + ActivityLonglineDto.PROPERTY_COMMENT}, + new String[]{EncounterDto.PROPERTY_SPECIES, + EncounterDto.PROPERTY_DISTANCE, + EncounterDto.PROPERTY_COUNT, + EncounterDto.PROPERTY_ENCOUNTER_TYPE}); - List<ContentTableMeta<Encounter>> metas = Lists.newArrayList( - ContentTableModel.newTableMeta(Encounter.class, Encounter.PROPERTY_ENCOUNTER_TYPE, false), - ContentTableModel.newTableMeta(Encounter.class, Encounter.PROPERTY_SPECIES, false), - ContentTableModel.newTableMeta(Encounter.class, Encounter.PROPERTY_DISTANCE, false), - ContentTableModel.newTableMeta(Encounter.class, Encounter.PROPERTY_COUNT, false)); + List<ContentTableMeta<EncounterDto>> metas = Lists.newArrayList( + ContentTableModel.newTableMeta(EncounterDto.class, EncounterDto.PROPERTY_ENCOUNTER_TYPE, false), + ContentTableModel.newTableMeta(EncounterDto.class, EncounterDto.PROPERTY_SPECIES, false), + ContentTableModel.newTableMeta(EncounterDto.class, EncounterDto.PROPERTY_DISTANCE, false), + ContentTableModel.newTableMeta(EncounterDto.class, EncounterDto.PROPERTY_COUNT, false)); initModel(ui, metas); diff --git a/observe-application-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 index 1880f3e..e068151 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.table.ContentTableUI - superGenericType='SetLongline, FloatlinesComposition' + superGenericType='SetLonglineDto, FloatlinesCompositionDto' contentTitle='{n("observe.floatlinesComposition.title")}' saveNewEntryText='{n("observe.floatlinesComposition.action.create")}' saveNewEntryTip='{n("observe.floatlinesComposition.action.create.tip")}' @@ -31,9 +31,9 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.entities.longline.SetLongline - fr.ird.observe.entities.longline.FloatlinesComposition - fr.ird.observe.entities.referentiel.longline.LineType + fr.ird.observe.services.dto.longline.SetLonglineDto + fr.ird.observe.services.dto.longline.FloatlinesCompositionDto + fr.ird.observe.services.dto.referential.longline.LineTypeDto fr.ird.observe.ui.content.table.* jaxx.runtime.swing.editor.NumberEditor @@ -50,17 +50,17 @@ <FloatlinesCompositionUIModel id='model'/> <!-- edit bean --> - <SetLongline id='bean'/> + <SetLonglineDto id='bean'/> <!-- table edit bean --> - <FloatlinesComposition id='tableEditBean'/> + <FloatlinesCompositionDto id='tableEditBean'/> <!-- table model --> <ContentTableModel id='tableModel'/> <!-- le validateur de l'écran --> <BeanValidator id='validator' context='n1-update-floatlinesComposition' - beanClass='fr.ird.observe.entities.longline.SetLongline' + beanClass='fr.ird.observe.services.dto.longline.SetLonglineDto' errorTableModel='{getErrorTableModel()}'> <field name="floatlinesCompositionProportionSum" component="floatlinesCompositionProportionSum"/> <field name="floatlinesComposition" component="editorPanel"/> @@ -68,7 +68,7 @@ <!-- le validateur d'une entrée de tableau --> <BeanValidator id='validatorTable' autoField='true' context='n1-update' - beanClass='fr.ird.observe.entities.longline.FloatlinesComposition' + beanClass='fr.ird.observe.services.dto.longline.FloatlinesCompositionDto' errorTableModel='{getErrorTableModel()}'/> <Table id='editorPanel' fill='both' insets='1'> @@ -79,7 +79,7 @@ <JLabel id='lineTypeLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='lineType' constructorParams='this' genericType='LineType'/> + <BeanComboBox id='lineType' constructorParams='this' genericType='LineTypeDto'/> </cell> </row> diff --git a/observe-application-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 index d254543..2624131 100644 --- a/observe-application-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 @@ -26,9 +26,9 @@ import fr.ird.observe.DataService; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.constants.DataContextType; -import fr.ird.observe.entities.longline.FloatlinesComposition; -import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.entities.referentiel.longline.LineType; +import fr.ird.observe.services.dto.longline.FloatlinesCompositionDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.referential.longline.LineTypeDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; diff --git a/observe-application-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 index 07f7453..1eba1af 100644 --- a/observe-application-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 @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.table.impl.longline; */ import com.google.common.collect.Lists; -import fr.ird.observe.entities.longline.FloatlinesComposition; -import fr.ird.observe.entities.longline.SetLongline; +import fr.ird.observe.services.dto.longline.FloatlinesCompositionDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIModel; @@ -37,22 +37,25 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ -public class FloatlinesCompositionUIModel extends ContentTableUIModel<SetLongline, FloatlinesComposition> { +public class FloatlinesCompositionUIModel extends ContentTableUIModel<SetLonglineDto, FloatlinesCompositionDto> { private static final long serialVersionUID = 1L; public FloatlinesCompositionUIModel(FloatlinesCompositionUI ui) { - super(SetLongline.class, - FloatlinesComposition.class, - new String[]{SetLongline.PROPERTY_FLOATLINES_COMPOSITION}, - new String[]{FloatlinesComposition.PROPERTY_LINE_TYPE, - FloatlinesComposition.PROPERTY_LENGTH, - FloatlinesComposition.PROPERTY_PROPORTION}); - - List<ContentTableMeta<FloatlinesComposition>> metas = Lists.newArrayList( - ContentTableModel.newTableMeta(FloatlinesComposition.class, FloatlinesComposition.PROPERTY_LINE_TYPE, false), - ContentTableModel.newTableMeta(FloatlinesComposition.class, FloatlinesComposition.PROPERTY_LENGTH, false), - ContentTableModel.newTableMeta(FloatlinesComposition.class, FloatlinesComposition.PROPERTY_PROPORTION, false)); + super(SetLonglineDto.class, + FloatlinesCompositionDto.class, + new String[]{ + //FIXME +// SetLonglineDto.PROPERTY_FLOATLINES_COMPOSITION + }, + new String[]{FloatlinesCompositionDto.PROPERTY_LINE_TYPE, + FloatlinesCompositionDto.PROPERTY_LENGTH, + FloatlinesCompositionDto.PROPERTY_PROPORTION}); + + List<ContentTableMeta<FloatlinesCompositionDto>> metas = Lists.newArrayList( + ContentTableModel.newTableMeta(FloatlinesCompositionDto.class, FloatlinesCompositionDto.PROPERTY_LINE_TYPE, false), + ContentTableModel.newTableMeta(FloatlinesCompositionDto.class, FloatlinesCompositionDto.PROPERTY_LENGTH, false), + ContentTableModel.newTableMeta(FloatlinesCompositionDto.class, FloatlinesCompositionDto.PROPERTY_PROPORTION, false)); initModel(ui, metas); diff --git a/observe-application-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 index 6cb4dba..10209bc 100644 --- a/observe-application-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 @@ -22,10 +22,10 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.entities.referentiel.Gear; -import fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLongline; -import fr.ird.observe.entities.longline.GearUseFeaturesLongline; -import fr.ird.observe.entities.longline.TripLongline; +import fr.ird.observe.services.dto.referential.GearDto; +import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; +import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ObserveContentTableUI; @@ -42,14 +42,14 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.16 */ -public class GearUseFeaturesLonglineTableModel extends ContentTableModel<TripLongline, GearUseFeaturesLongline> { +public class GearUseFeaturesLonglineTableModel extends ContentTableModel<TripLonglineDto, GearUseFeaturesLonglineDto> { private static final long serialVersionUID = 1L; private GearUseFeaturesLonglineUIHandler gearUseFeaturesLonglineUIHandler; - public GearUseFeaturesLonglineTableModel(ObserveContentTableUI<TripLongline, GearUseFeaturesLongline> context, - List<ContentTableMeta<GearUseFeaturesLongline>> contentTableMetas) { + public GearUseFeaturesLonglineTableModel(ObserveContentTableUI<TripLonglineDto, GearUseFeaturesLonglineDto> context, + List<ContentTableMeta<GearUseFeaturesLonglineDto>> contentTableMetas) { super(context, contentTableMetas); } @@ -82,7 +82,7 @@ public class GearUseFeaturesLonglineTableModel extends ContentTableModel<TripLon GearUseFeaturesLonglineUIModel model = getModel(); int editingRow = getSelectedRow(); - GearUseFeaturesLongline rowBean = getRowBean(); + GearUseFeaturesLonglineDto rowBean = getRowBean(); GearUseFeaturesMeasurementLonglinesTableModel measurementsTableModel = model.getMeasurementsTableModel(); if (rowBean.getTopiaId() == null && CollectionUtils.isEmpty(measurementsTableModel.getCacheForRow(editingRow))) { diff --git a/observe-application-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 index bcd4a6d..d008d6d 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.table.ContentTableUI - superGenericType='TripLongline, GearUseFeaturesLongline' + superGenericType='TripLonglineDto, GearUseFeaturesLonglineDto' contentTitle='{n("observe.gearUseFeaturesLongline.title")}' saveNewEntryText='{n("observe.action.create.gearUseFeaturesLongline")}' saveNewEntryTip='{n("observe.action.create.gearUseFeaturesLongline.tip")}'> @@ -29,12 +29,12 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.entities.CommentableEntity - fr.ird.observe.entities.longline.TripLongline - fr.ird.observe.entities.longline.GearUseFeaturesLongline - fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLongline - fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLonglineImpl - fr.ird.observe.entities.referentiel.Gear + fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.longline.TripLonglineDto + fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto + fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto + fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineImplDto + fr.ird.observe.services.dto.referential.GearDto fr.ird.observe.ui.content.table.* fr.ird.observe.ui.util.BooleanEditor @@ -57,24 +57,24 @@ initializer="getModel().getMeasurementsTableModel()"/> <!-- edit bean --> - <TripLongline id='bean'/> + <TripLonglineDto id='bean'/> <!-- table edit bean --> - <GearUseFeaturesLongline id='tableEditBean'/> + <GearUseFeaturesLonglineDto id='tableEditBean'/> <!-- table model --> <ContentTableModel id='tableModel'/> <!-- le validateur de l'écran --> <BeanValidator id='validator' - beanClass='fr.ird.observe.entities.longline.TripLongline' + beanClass='fr.ird.observe.services.dto.longline.TripLonglineDto' errorTableModel='{getErrorTableModel()}' context='n1-update-gearUseFeatures'/> <!-- le validateur d'une entrée de tableau --> <BeanValidator id='validatorTable' autoField='true' - beanClass='fr.ird.observe.entities.longline.GearUseFeaturesLongline' + beanClass='fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto' errorTableModel='{getErrorTableModel()}' context='n1-update'/> @@ -100,7 +100,7 @@ <JLabel id='gearLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='gear' constructorParams='this' genericType='Gear'/> + <BeanComboBox id='gear' constructorParams='this' genericType='GearDto'/> </cell> </row> diff --git a/observe-application-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 index 5380406..e862ff9 100644 --- a/observe-application-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 @@ -30,12 +30,12 @@ import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DataContextType; -import fr.ird.observe.entities.referentiel.Gear; -import fr.ird.observe.entities.referentiel.GearCaracteristic; -import fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLongline; -import fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLonglineDAO; -import fr.ird.observe.entities.longline.GearUseFeaturesLongline; -import fr.ird.observe.entities.longline.TripLongline; +import fr.ird.observe.services.dto.referential.GearDto; +import fr.ird.observe.services.dto.referential.GearCaracteristicDto; +import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; +import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDAODto; +import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; diff --git a/observe-application-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 index 44f98ab..5e2808d 100644 --- a/observe-application-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 @@ -26,9 +26,9 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import fr.ird.observe.BinderService; import fr.ird.observe.ObserveServiceHelper; -import fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLongline; -import fr.ird.observe.entities.longline.GearUseFeaturesLongline; -import fr.ird.observe.entities.longline.TripLongline; +import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; +import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIModel; @@ -48,64 +48,75 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.16 */ -public class GearUseFeaturesLonglineUIModel extends ContentTableUIModel<TripLongline, GearUseFeaturesLongline> { +public class GearUseFeaturesLonglineUIModel extends ContentTableUIModel<TripLonglineDto, GearUseFeaturesLonglineDto> { private static final long serialVersionUID = 1L; public static final String PROPERTY_GENERAL_TAB_VALID = "generalTabValid"; public static final Set<String> GENERAL_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(GearUseFeaturesLongline.PROPERTY_GEAR, - GearUseFeaturesLongline.PROPERTY_NUMBER, - GearUseFeaturesLongline.PROPERTY_USED_IN_TRIP, - GearUseFeaturesLongline.PROPERTY_COMMENT).build(); + ImmutableSet.<String>builder().add(GearUseFeaturesLonglineDto.PROPERTY_GEAR, + GearUseFeaturesLonglineDto.PROPERTY_NUMBER, + GearUseFeaturesLonglineDto.PROPERTY_USED_IN_TRIP + //FIXME +// GearUseFeaturesLonglineDto.PROPERTY_COMMENT + ).build(); protected boolean generalTabValid; - private final GearUseFeaturesMeasurementLonglinesTableModel measurementsTableModel; + //FIXME +// private final GearUseFeaturesMeasurementLonglinesTableModel measurementsTableModel; public GearUseFeaturesLonglineUIModel(GearUseFeaturesLonglineUI ui) { - super(TripLongline.class, - GearUseFeaturesLongline.class, - new String[]{TripLongline.PROPERTY_GEAR_USE_FEATURES_LONGLINE}, + super(TripLonglineDto.class, + GearUseFeaturesLonglineDto.class, new String[]{ - GearUseFeaturesLongline.PROPERTY_COMMENT, - GearUseFeaturesLongline.PROPERTY_GEAR, - GearUseFeaturesLongline.PROPERTY_NUMBER, - GearUseFeaturesLongline.PROPERTY_USED_IN_TRIP}); + //FIXME +// TripLonglineDto.PROPERTY_GEAR_USE_FEATURES_LONGLINE + }, + new String[]{ + //FIXME +// GearUseFeaturesLonglineDto.PROPERTY_COMMENT, + GearUseFeaturesLonglineDto.PROPERTY_GEAR, + GearUseFeaturesLonglineDto.PROPERTY_NUMBER, + GearUseFeaturesLonglineDto.PROPERTY_USED_IN_TRIP}); - BinderService binderService = ObserveServiceHelper.get().getBinderService(); + //FIXME +// BinderService binderService = ObserveServiceHelper.get().getBinderService(); String binderName = getClass().getName() + "-open"; - TopiaEntityBinder<GearUseFeaturesMeasurementLongline> binder = binderService.getTopiaBinder(GearUseFeaturesMeasurementLongline.class, binderName); - - if (binder == null) { - - BinderModelBuilder<GearUseFeaturesMeasurementLongline, GearUseFeaturesMeasurementLongline> builder = - binderService.newBinderBuilder(GearUseFeaturesMeasurementLongline.class, - GearUseFeaturesMeasurementLongline.PROPERTY_GEAR_CARACTERISTIC, - GearUseFeaturesMeasurementLongline.PROPERTY_MEASUREMENT_VALUE); - - binder = binderService.registerTopiaBinder(GearUseFeaturesMeasurementLongline.class, builder, binderName); - - } - - this.measurementsTableModel = new GearUseFeaturesMeasurementLonglinesTableModel(binder); - - List<ContentTableMeta<GearUseFeaturesLongline>> metas = Lists.newArrayList( - ContentTableModel.newTableMeta(GearUseFeaturesLongline.class, GearUseFeaturesLongline.PROPERTY_GEAR, false), - ContentTableModel.newTableMeta(GearUseFeaturesLongline.class, GearUseFeaturesLongline.PROPERTY_NUMBER, false), - ContentTableModel.newTableMeta(GearUseFeaturesLongline.class, GearUseFeaturesLongline.PROPERTY_USED_IN_TRIP, false), - ContentTableModel.newTableMeta(GearUseFeaturesLongline.class, GearUseFeaturesLongline.PROPERTY_COMMENT, false)); + //FIXME +// TopiaEntityBinder<GearUseFeaturesMeasurementLongline> binder = binderService.getTopiaBinder(GearUseFeaturesMeasurementLongline.class, binderName); +// +// if (binder == null) { +// +// BinderModelBuilder<GearUseFeaturesMeasurementLongline, GearUseFeaturesMeasurementLongline> builder = +// binderService.newBinderBuilder(GearUseFeaturesMeasurementLongline.class, +// GearUseFeaturesMeasurementLongline.PROPERTY_GEAR_CARACTERISTIC, +// GearUseFeaturesMeasurementLongline.PROPERTY_MEASUREMENT_VALUE); +// +// binder = binderService.registerTopiaBinder(GearUseFeaturesMeasurementLongline.class, builder, binderName); +// +// } +// +// this.measurementsTableModel = new GearUseFeaturesMeasurementLonglinesTableModel(binder); + + List<ContentTableMeta<GearUseFeaturesLonglineDto>> metas = Lists.newArrayList( + ContentTableModel.newTableMeta(GearUseFeaturesLonglineDto.class, GearUseFeaturesLonglineDto.PROPERTY_GEAR, false), + ContentTableModel.newTableMeta(GearUseFeaturesLonglineDto.class, GearUseFeaturesLonglineDto.PROPERTY_NUMBER, false), + ContentTableModel.newTableMeta(GearUseFeaturesLonglineDto.class, GearUseFeaturesLonglineDto.PROPERTY_USED_IN_TRIP, false) + //FIXME +// ContentTableModel.newTableMeta(GearUseFeaturesLonglineDto.class, GearUseFeaturesLonglineDto.PROPERTY_COMMENT, false) + ); initModel(ui, metas); } @Override - protected GearUseFeaturesLonglineTableModel createTableModel(ObserveContentTableUI<TripLongline, GearUseFeaturesLongline> ui, List<ContentTableMeta<GearUseFeaturesLongline>> contentTableMetas) { + protected GearUseFeaturesLonglineTableModel createTableModel(ObserveContentTableUI<TripLonglineDto, GearUseFeaturesLonglineDto> ui, List<ContentTableMeta<GearUseFeaturesLonglineDto>> contentTableMetas) { return new GearUseFeaturesLonglineTableModel(ui, contentTableMetas); } diff --git a/observe-application-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 index adc32b4..a5b98ae 100644 --- a/observe-application-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 @@ -22,9 +22,9 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.entities.referentiel.GearCaracteristic; -import fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLongline; -import fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLonglineImpl; +import fr.ird.observe.services.dto.referential.GearCaracteristicDto; +import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; +import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineImplDto; import fr.ird.observe.ui.util.table.EditableTableWithCacheTableModelSupport; import org.nuiton.topia.persistence.util.TopiaEntityBinder; diff --git a/observe-application-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 index 635936b..cf97d4f 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.table.ContentTableUI - superGenericType='SetLongline, HooksComposition' + superGenericType='SetLonglineDto, HooksCompositionDto' contentTitle='{n("observe.hooksComposition.title")}' saveNewEntryText='{n("observe.hooksComposition.action.create")}' saveNewEntryTip='{n("observe.hooksComposition.action.create.tip")}' @@ -31,10 +31,10 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.entities.longline.SetLongline - fr.ird.observe.entities.longline.HooksComposition - fr.ird.observe.entities.referentiel.longline.HookType - fr.ird.observe.entities.referentiel.longline.HookSize + fr.ird.observe.services.dto.longline.SetLonglineDto + fr.ird.observe.services.dto.longline.HooksCompositionDto + fr.ird.observe.services.dto.referential.longline.HookTypeDto + fr.ird.observe.services.dto.referential.longline.HookSizeDto fr.ird.observe.ui.content.table.* jaxx.runtime.swing.editor.NumberEditor @@ -51,45 +51,45 @@ <HooksCompositionUIModel id='model'/> <!-- edit bean --> - <SetLongline id='bean'/> + <SetLonglineDto id='bean'/> <!-- table edit bean --> - <HooksComposition id='tableEditBean'/> + <HooksCompositionDto id='tableEditBean'/> <!-- table model --> <ContentTableModel id='tableModel'/> <!-- le validateur de l'écran --> <BeanValidator id='validator' autoField='true' context='n1-update-hooksComposition' - beanClass='fr.ird.observe.entities.longline.SetLongline' + beanClass='fr.ird.observe.services.dto.longline.SetLonglineDto' errorTableModel='{getErrorTableModel()}'> <field name="hooksComposition" component="editorPanel"/> </BeanValidator> <!-- le validateur d'une entrée de tableau --> <BeanValidator id='validatorTable' autoField='true' context='n1-update' - beanClass='fr.ird.observe.entities.longline.HooksComposition' + beanClass='fr.ird.observe.services.dto.longline.HooksCompositionDto' errorTableModel='{getErrorTableModel()}'/> <Table id='editorPanel' fill='both' insets='1'> - <!-- hookType --> + <!-- HookType --> <row> <cell> - <JLabel id='hookTypeLabel'/> + <JLabel id='HookTypeLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='hookType' constructorParams='this' genericType='HookType'/> + <BeanComboBox id='HookType' constructorParams='this' genericType='HookTypeDto'/> </cell> </row> - <!-- hookSize --> + <!-- HookSize --> <row> <cell> - <JLabel id='hookSizeLabel'/> + <JLabel id='HookSizeLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='hookSize' constructorParams='this' genericType='HookSize'/> + <BeanComboBox id='HookSize' constructorParams='this' genericType='HookSizeDto'/> </cell> </row> diff --git a/observe-application-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 index 6146c75..db19994 100644 --- a/observe-application-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 @@ -26,10 +26,10 @@ import fr.ird.observe.DataService; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.constants.DataContextType; -import fr.ird.observe.entities.longline.HooksComposition; -import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.entities.referentiel.longline.HookSize; -import fr.ird.observe.entities.referentiel.longline.HookType; +import fr.ird.observe.services.dto.longline.HooksCompositionDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.referential.longline.HookSizeDto; +import fr.ird.observe.services.dto.referential.longline.HookTypeDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; diff --git a/observe-application-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 index 985a187..f863121 100644 --- a/observe-application-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 @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.table.impl.longline; */ import com.google.common.collect.Lists; -import fr.ird.observe.entities.longline.HooksComposition; -import fr.ird.observe.entities.longline.SetLongline; +import fr.ird.observe.services.dto.longline.HooksCompositionDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIModel; @@ -37,24 +37,27 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ -public class HooksCompositionUIModel extends ContentTableUIModel<SetLongline, HooksComposition> { +public class HooksCompositionUIModel extends ContentTableUIModel<SetLonglineDto, HooksCompositionDto> { private static final long serialVersionUID = 1L; public HooksCompositionUIModel(HooksCompositionUI ui) { - super(SetLongline.class, - HooksComposition.class, - new String[]{SetLongline.PROPERTY_HOOKS_COMPOSITION}, - new String[]{HooksComposition.PROPERTY_HOOK_TYPE, - HooksComposition.PROPERTY_HOOK_SIZE, - HooksComposition.PROPERTY_HOOK_OFFSET, - HooksComposition.PROPERTY_PROPORTION}); + super(SetLonglineDto.class, + HooksCompositionDto.class, + new String[]{ + //FIXME +// SetLonglineDto.PROPERTY_HOOKS_COMPOSITION + }, + new String[]{HooksCompositionDto.PROPERTY_HOOK_TYPE, + HooksCompositionDto.PROPERTY_HOOK_SIZE, + HooksCompositionDto.PROPERTY_HOOK_OFFSET, + HooksCompositionDto.PROPERTY_PROPORTION}); - List<ContentTableMeta<HooksComposition>> metas = Lists.newArrayList( - ContentTableModel.newTableMeta(HooksComposition.class, HooksComposition.PROPERTY_HOOK_TYPE, false), - ContentTableModel.newTableMeta(HooksComposition.class, HooksComposition.PROPERTY_HOOK_SIZE, false), - ContentTableModel.newTableMeta(HooksComposition.class, HooksComposition.PROPERTY_HOOK_OFFSET, false), - ContentTableModel.newTableMeta(HooksComposition.class, HooksComposition.PROPERTY_PROPORTION, false)); + List<ContentTableMeta<HooksCompositionDto>> metas = Lists.newArrayList( + ContentTableModel.newTableMeta(HooksCompositionDto.class, HooksCompositionDto.PROPERTY_HOOK_TYPE, false), + ContentTableModel.newTableMeta(HooksCompositionDto.class, HooksCompositionDto.PROPERTY_HOOK_SIZE, false), + ContentTableModel.newTableMeta(HooksCompositionDto.class, HooksCompositionDto.PROPERTY_HOOK_OFFSET, false), + ContentTableModel.newTableMeta(HooksCompositionDto.class, HooksCompositionDto.PROPERTY_PROPORTION, false)); initModel(ui, metas); diff --git a/observe-application-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 index f2f9e31..3fac437 100644 --- a/observe-application-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 @@ -22,14 +22,14 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.longline.Basket; -import fr.ird.observe.entities.longline.Baskets; -import fr.ird.observe.entities.longline.Branchline; -import fr.ird.observe.entities.longline.Branchlines; -import fr.ird.observe.entities.longline.CatchLongline; -import fr.ird.observe.entities.longline.LonglinePositionAware; -import fr.ird.observe.entities.longline.Section; +import fr.ird.observe.services.dto.EntitiesDto; +import fr.ird.observe.services.dto.longline.BasketDto; +import fr.ird.observe.services.dto.longline.BasketsDto; +import fr.ird.observe.services.dto.longline.BranchlineDto; +import fr.ird.observe.services.dto.longline.BranchlinesDto; +import fr.ird.observe.services.dto.longline.CatchLonglineDto; +import fr.ird.observe.services.dto.longline.LonglinePositionAwareDto; +import fr.ird.observe.services.dto.longline.SectionDto; import jaxx.runtime.swing.editor.bean.BeanComboBox; import org.apache.commons.collections4.CollectionUtils; diff --git a/observe-application-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 index b5e3960..1be3251 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.table.ContentTableUI - superGenericType='ActivityLongline, SensorUsed' + superGenericType='ActivityLonglineDto, SensorUsedDto' contentTitle='{n("observe.sensorUsed.title")}' saveNewEntryText='{n("observe.sensorUsed.action.create")}' saveNewEntryTip='{n("observe.sensorUsed.action.create.tip")}' @@ -31,12 +31,12 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.entities.CommentableEntity - fr.ird.observe.entities.longline.ActivityLongline - fr.ird.observe.entities.longline.SensorUsed - fr.ird.observe.entities.referentiel.longline.SensorType - fr.ird.observe.entities.referentiel.longline.SensorBrand - fr.ird.observe.entities.referentiel.longline.SensorDataFormat + fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.longline.ActivityLonglineDto + fr.ird.observe.services.dto.longline.SensorUsedDto + fr.ird.observe.services.dto.referential.longline.SensorTypeDto + fr.ird.observe.services.dto.referential.longline.SensorBrandDto + fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto fr.ird.observe.ui.content.table.* jaxx.runtime.swing.editor.bean.BeanComboBox @@ -54,22 +54,22 @@ <SensorUsedUIModel id='model'/> <!-- edit bean --> - <ActivityLongline id='bean'/> + <ActivityLonglineDto id='bean'/> <!-- table edit bean --> - <SensorUsed id='tableEditBean'/> + <SensorUsedDto id='tableEditBean'/> <!-- table model --> <ContentTableModel id='tableModel'/> <!-- le validateur de l'écran --> <BeanValidator id='validator' autoField='true' context='n1-update-sensorUsed' - beanClass='fr.ird.observe.entities.longline.ActivityLongline' + beanClass='fr.ird.observe.services.dto.longline.ActivityLonglineDto' errorTableModel='{getErrorTableModel()}'/> <!-- le validateur d'une entrée de tableau --> <BeanValidator id='validatorTable' autoField='true' context='n1-update' - beanClass='fr.ird.observe.entities.longline.SensorUsed' + beanClass='fr.ird.observe.services.dto.longline.SensorUsedDto' errorTableModel='{getErrorTableModel()}'/> <Table id='editorPanel' fill='both' insets='1'> @@ -80,7 +80,7 @@ <JLabel id='sensorTypeLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='sensorType' constructorParams='this' genericType='SensorType'/> + <BeanComboBox id='sensorType' constructorParams='this' genericType='SensorTypeDto'/> </cell> </row> @@ -90,7 +90,7 @@ <JLabel id='sensorDataFormatLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='sensorDataFormat' constructorParams='this' genericType='SensorDataFormat'/> + <BeanComboBox id='sensorDataFormat' constructorParams='this' genericType='SensorDataFormatDto'/> </cell> </row> @@ -100,7 +100,7 @@ <JLabel id='sensorBrandLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='sensorBrand' constructorParams='this' genericType='SensorBrand'/> + <BeanComboBox id='sensorBrand' constructorParams='this' genericType='SensorBrandDto'/> </cell> </row> diff --git a/observe-application-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 index 1a65d27..9cfc7cb 100644 --- a/observe-application-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 @@ -32,11 +32,11 @@ import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DataContextType; -import fr.ird.observe.entities.longline.ActivityLongline; -import fr.ird.observe.entities.longline.SensorUsed; -import fr.ird.observe.entities.referentiel.longline.SensorBrand; -import fr.ird.observe.entities.referentiel.longline.SensorDataFormat; -import fr.ird.observe.entities.referentiel.longline.SensorType; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.SensorUsedDto; +import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; +import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; +import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; diff --git a/observe-application-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 index d3a8d99..2ef7104 100644 --- a/observe-application-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 @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.table.impl.longline; */ import com.google.common.collect.Lists; -import fr.ird.observe.entities.longline.ActivityLongline; -import fr.ird.observe.entities.longline.SensorUsed; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.SensorUsedDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIModel; @@ -37,30 +37,33 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class SensorUsedUIModel extends ContentTableUIModel<ActivityLongline, SensorUsed> { +public class SensorUsedUIModel extends ContentTableUIModel<ActivityLonglineDto, SensorUsedDto> { private static final long serialVersionUID = 1L; public SensorUsedUIModel(SensorUsedUI ui) { - super(ActivityLongline.class, - SensorUsed.class, - new String[]{ActivityLongline.PROPERTY_SENSOR_USED, ActivityLongline.PROPERTY_COMMENT}, - new String[]{SensorUsed.PROPERTY_DATA, - SensorUsed.PROPERTY_DATA_FILENAME, - SensorUsed.PROPERTY_DATA_LOCATION, - SensorUsed.PROPERTY_SENSOR_SERIAL_NO, - SensorUsed.PROPERTY_SENSOR_TYPE, - SensorUsed.PROPERTY_SENSOR_BRAND, - SensorUsed.PROPERTY_SENSOR_DATA_FORMAT}); + super(ActivityLonglineDto.class, + SensorUsedDto.class, + new String[]{ + //FIXME +// ActivityLonglineDto.PROPERTY_SENSOR_USED, + ActivityLonglineDto.PROPERTY_COMMENT}, + new String[]{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}); - List<ContentTableMeta<SensorUsed>> metas = Lists.newArrayList( - ContentTableModel.newTableMeta(SensorUsed.class, SensorUsed.PROPERTY_SENSOR_TYPE, false), - ContentTableModel.newTableMeta(SensorUsed.class, SensorUsed.PROPERTY_SENSOR_BRAND, false), - ContentTableModel.newTableMeta(SensorUsed.class, SensorUsed.PROPERTY_SENSOR_DATA_FORMAT, false), - ContentTableModel.newTableMeta(SensorUsed.class, SensorUsed.PROPERTY_SENSOR_SERIAL_NO, false), - ContentTableModel.newTableMeta(SensorUsed.class, SensorUsed.PROPERTY_DATA, false), - ContentTableModel.newTableMeta(SensorUsed.class, SensorUsed.PROPERTY_DATA_LOCATION, false)); + List<ContentTableMeta<SensorUsedDto>> metas = Lists.newArrayList( + ContentTableModel.newTableMeta(SensorUsedDto.class, SensorUsedDto.PROPERTY_SENSOR_TYPE, false), + ContentTableModel.newTableMeta(SensorUsedDto.class, SensorUsedDto.PROPERTY_SENSOR_BRAND, false), + ContentTableModel.newTableMeta(SensorUsedDto.class, SensorUsedDto.PROPERTY_SENSOR_DATA_FORMAT, false), + ContentTableModel.newTableMeta(SensorUsedDto.class, SensorUsedDto.PROPERTY_SENSOR_SERIAL_NO, false), + ContentTableModel.newTableMeta(SensorUsedDto.class, SensorUsedDto.PROPERTY_DATA, false), + ContentTableModel.newTableMeta(SensorUsedDto.class, SensorUsedDto.PROPERTY_DATA_LOCATION, false)); initModel(ui, metas); diff --git a/observe-application-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 index 3bb120a..d835930 100644 --- a/observe-application-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 @@ -23,9 +23,9 @@ package fr.ird.observe.ui.content.table.impl.longline; */ import fr.ird.observe.ObserveServiceHelper; -import fr.ird.observe.entities.longline.SizeMeasure; -import fr.ird.observe.entities.longline.SizeMeasureImpl; -import fr.ird.observe.entities.referentiel.longline.SizeMeasureType; +import fr.ird.observe.services.dto.longline.SizeMeasureDto; +import fr.ird.observe.services.dto.longline.SizeMeasureImplDto; +import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; import fr.ird.observe.ui.util.table.EditableTableWithCacheTableModelSupport; /** diff --git a/observe-application-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 index 054fbbf..3f4cf75 100644 --- a/observe-application-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 @@ -20,7 +20,7 @@ #L% --> -<fr.ird.observe.ui.content.table.ContentTableUI superGenericType='SetLongline, Tdr' +<fr.ird.observe.ui.content.table.ContentTableUI superGenericType='SetLonglineDto, TdrDto' contentTitle='{n("observe.tdr.title")}' saveNewEntryText='{n("observe.tdr.action.create")}' saveNewEntryTip='{n("observe.tdr.action.create.tip")}' @@ -30,15 +30,15 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.entities.longline.Basket - fr.ird.observe.entities.longline.Branchline - fr.ird.observe.entities.longline.Tdr - fr.ird.observe.entities.longline.Section - fr.ird.observe.entities.longline.SetLongline - fr.ird.observe.entities.referentiel.Species - fr.ird.observe.entities.referentiel.longline.ItemHorizontalPosition - fr.ird.observe.entities.referentiel.longline.ItemVerticalPosition - fr.ird.observe.entities.referentiel.longline.SensorBrand + fr.ird.observe.services.dto.longline.BasketDto + fr.ird.observe.services.dto.longline.BranchlineDto + fr.ird.observe.services.dto.longline.TdrDto + fr.ird.observe.services.dto.longline.SectionDto + fr.ird.observe.services.dto.longline.SetLonglineDto + fr.ird.observe.services.dto.referential.SpeciesDto + fr.ird.observe.services.dto.referential.longline.ItemHorizontalPositionDto + fr.ird.observe.services.dto.referential.longline.ItemVerticalPositionDto + fr.ird.observe.services.dto.referential.longline.SensorBrandDto fr.ird.observe.ui.content.table.* jaxx.runtime.swing.editor.NumberEditor @@ -58,23 +58,23 @@ <TdrUIModel id='model'/> <!-- edit bean --> - <SetLongline id='bean'/> + <SetLonglineDto id='bean'/> <!-- table edit bean --> - <Tdr id='tableEditBean'/> + <TdrDto id='tableEditBean'/> <!-- table model --> <ContentTableModel id='tableModel'/> <!-- le validateur de l'écran --> <BeanValidator id='validator' context='n1-update-tdr' - beanClass='fr.ird.observe.entities.longline.SetLongline' + beanClass='fr.ird.observe.services.dto.longline.SetLonglineDto' errorTableModel='{getErrorTableModel()}'> </BeanValidator> <!-- le validateur d'une entrée de tableau --> <BeanValidator id='validatorTable' autoField='true' context='n1-update' - beanClass='fr.ird.observe.entities.longline.Tdr' + beanClass='fr.ird.observe.services.dto.longline.TdrDto' errorTableModel='{getErrorTableModel()}' parentValidator='{validator}'/> @@ -124,7 +124,7 @@ <JLabel id='sensorBrandLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='sensorBrand' constructorParams='this' genericType='SensorBrand'/> + <BeanComboBox id='sensorBrand' constructorParams='this' genericType='SensorBrandDto'/> </cell> </row> @@ -176,7 +176,7 @@ <JLabel id='sectionLabel'/> </cell> <cell fill="both" weightx="1"> - <BeanComboBox id='section' genericType='Section' constructorParams='this'/> + <BeanComboBox id='section' genericType='SectionDto' constructorParams='this'/> </cell> </row> <row> @@ -184,7 +184,7 @@ <JLabel id='basketLabel'/> </cell> <cell fill="both" weightx="1"> - <BeanComboBox id='basket' genericType='Basket' constructorParams='this'/> + <BeanComboBox id='basket' genericType='BasketDto' constructorParams='this'/> </cell> </row> <row> @@ -192,7 +192,7 @@ <JLabel id='branchlineLabel'/> </cell> <cell fill="both" weightx="1"> - <BeanComboBox id='branchline' genericType='Branchline' constructorParams='this'/> + <BeanComboBox id='branchline' genericType='BranchlineDto' constructorParams='this'/> </cell> </row> </Table> @@ -206,7 +206,7 @@ </cell> <cell weightx='1' anchor='east'> <BeanComboBox id='itemHorizontalPosition' constructorParams='this' - genericType='ItemHorizontalPosition'/> + genericType='ItemHorizontalPositionDto'/> </cell> </row> @@ -217,7 +217,7 @@ </cell> <cell weightx='1' anchor='east'> <BeanComboBox id='itemVerticalPosition' constructorParams='this' - genericType='ItemVerticalPosition'/> + genericType='ItemVerticalPositionDto'/> </cell> </row> @@ -376,7 +376,7 @@ <Table fill='both' constraints='BorderLayout.NORTH'> <row> <cell weighty="1" weightx="1"> - <FilterableDoubleList id='species' genericType='Species'/> + <FilterableDoubleList id='species' genericType='SpeciesDto'/> </cell> </row> </Table> diff --git a/observe-application-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 index f01592f..a3158d8 100644 --- a/observe-application-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 @@ -33,10 +33,10 @@ import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DataContextType; -import fr.ird.observe.entities.longline.Section; -import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.entities.longline.Tdr; -import fr.ird.observe.entities.referentiel.longline.SensorBrand; +import fr.ird.observe.services.dto.longline.SectionDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.longline.TdrDto; +import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; diff --git a/observe-application-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 index 478277b..8c1ebe3 100644 --- a/observe-application-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 @@ -25,8 +25,8 @@ package fr.ird.observe.ui.content.table.impl.longline; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import fr.ird.observe.BinderService; -import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.entities.longline.Tdr; +import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.longline.TdrDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIModel; @@ -42,52 +42,57 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class TdrUIModel extends ContentTableUIModel<SetLongline, Tdr> { +public class TdrUIModel extends ContentTableUIModel<SetLonglineDto, TdrDto> { public static final Set<String> CARACTERISTIC_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(Tdr.PROPERTY_HOME_ID, - Tdr.PROPERTY_SERIAL_NO, - Tdr.PROPERTY_SENSOR_BRAND, - Tdr.PROPERTY_DATA, - Tdr.PROPERTY_DATA_FILENAME, - Tdr.PROPERTY_DATA_LOCATION).build(); + ImmutableSet.<String>builder().add(TdrDto.PROPERTY_HOME_ID, + TdrDto.PROPERTY_SERIAL_NO, + TdrDto.PROPERTY_SENSOR_BRAND, + TdrDto.PROPERTY_DATA, + TdrDto.PROPERTY_DATA_FILENAME, + TdrDto.PROPERTY_DATA_LOCATION).build(); public static final Set<String> LOCALISATION_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(Tdr.PROPERTY_SECTION, - Tdr.PROPERTY_BASKET, - Tdr.PROPERTY_BRANCHLINE, - Tdr.PROPERTY_ITEM_HORIZONTAL_POSITION, - Tdr.PROPERTY_ITEM_VERTICAL_POSITION, - Tdr.PROPERTY_FLOATLINE1_LENGTH, - Tdr.PROPERTY_FLOATLINE2_LENGTH).build(); + ImmutableSet.<String>builder().add(TdrDto.PROPERTY_SECTION, + TdrDto.PROPERTY_BASKET, + TdrDto.PROPERTY_BRANCHLINE, + TdrDto.PROPERTY_ITEM_HORIZONTAL_POSITION, + TdrDto.PROPERTY_ITEM_VERTICAL_POSITION, + TdrDto.PROPERTY_FLOATLINE1_LENGTH, + TdrDto.PROPERTY_FLOATLINE2_LENGTH).build(); public static final Set<String> TIMESTAMP_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(Tdr.PROPERTY_DEPLOYEMENT_START, - Tdr.PROPERTY_DEPLOYEMENT_START_DATE, - Tdr.PROPERTY_DEPLOYEMENT_START_TIME, - Tdr.PROPERTY_DEPLOYEMENT_END, - Tdr.PROPERTY_DEPLOYEMENT_END_DATE, - Tdr.PROPERTY_DEPLOYEMENT_END_TIME, - Tdr.PROPERTY_FISHING_START, - Tdr.PROPERTY_FISHING_START_DATE, - Tdr.PROPERTY_FISHING_START_TIME, - Tdr.PROPERTY_FISHING_END, - Tdr.PROPERTY_FISHING_END_DATE, - Tdr.PROPERTY_FISHING_END_TIME).build(); + ImmutableSet.<String>builder().add(TdrDto.PROPERTY_DEPLOYEMENT_START, + //FIXME +// TdrDto.PROPERTY_DEPLOYEMENT_START_DATE, +// TdrDto.PROPERTY_DEPLOYEMENT_START_TIME, + TdrDto.PROPERTY_DEPLOYEMENT_END, + //FIXME +// TdrDto.PROPERTY_DEPLOYEMENT_END_DATE, +// TdrDto.PROPERTY_DEPLOYEMENT_END_TIME, + TdrDto.PROPERTY_FISHING_START, + //FIXME +// TdrDto.PROPERTY_FISHING_START_DATE, +// TdrDto.PROPERTY_FISHING_START_TIME, + TdrDto.PROPERTY_FISHING_END + //FIXME +// TdrDto.PROPERTY_FISHING_END_DATE, +// TdrDto.PROPERTY_FISHING_END_TIME + ).build(); public static final Set<String> KEY_DATA_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(Tdr.PROPERTY_FISHING_START_DEPTH, - Tdr.PROPERTY_FISHING_END_DEPTH, - Tdr.PROPERTY_MEAN_DEPLOYEMENT_DEPTH, - Tdr.PROPERTY_MEDIAN_DEPLOYEMENT_DEPTH, - Tdr.PROPERTY_MEAN_FISHING_DEPTH, - Tdr.PROPERTY_MEDIAN_FISHING_DEPTH, - Tdr.PROPERTY_MIN_FISHING_DEPTH, - Tdr.PROPERTY_MAX_FISHING_DEPTH).build(); + ImmutableSet.<String>builder().add(TdrDto.PROPERTY_FISHING_START_DEPTH, + TdrDto.PROPERTY_FISHING_END_DEPTH, + TdrDto.PROPERTY_MEAN_DEPLOYEMENT_DEPTH, + TdrDto.PROPERTY_MEDIAN_DEPLOYEMENT_DEPTH, + TdrDto.PROPERTY_MEAN_FISHING_DEPTH, + TdrDto.PROPERTY_MEDIAN_FISHING_DEPTH, + TdrDto.PROPERTY_MIN_FISHING_DEPTH, + TdrDto.PROPERTY_MAX_FISHING_DEPTH).build(); public static final Set<String> SPECIES_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(Tdr.PROPERTY_SPECIES).build(); + ImmutableSet.<String>builder().add(TdrDto.PROPERTY_SPECIES).build(); public static final String PROPERTY_CARACTERISTICS_TAB_VALID = "caracteristicsTabValid"; @@ -112,75 +117,81 @@ public class TdrUIModel extends ContentTableUIModel<SetLongline, Tdr> { protected boolean speciesTabValid; public TdrUIModel(TdrUI ui) { - super(SetLongline.class, - Tdr.class, - new String[]{SetLongline.PROPERTY_TDR, - SetLongline.PROPERTY_SETTING_START_TIME_STAMP, - SetLongline.PROPERTY_SETTING_END_TIME_STAMP, - SetLongline.PROPERTY_HAULING_START_TIME_STAMP, - SetLongline.PROPERTY_HAULING_END_TIME_STAMP}, + super(SetLonglineDto.class, + TdrDto.class, + new String[]{ + //FIXME +// SetLonglineDto.PROPERTY_TDR, + SetLonglineDto.PROPERTY_SETTING_START_TIME_STAMP, + SetLonglineDto.PROPERTY_SETTING_END_TIME_STAMP, + SetLonglineDto.PROPERTY_HAULING_START_TIME_STAMP, + SetLonglineDto.PROPERTY_HAULING_END_TIME_STAMP}, new String[]{ // caracteristics tab - Tdr.PROPERTY_HOME_ID, - Tdr.PROPERTY_SERIAL_NO, - Tdr.PROPERTY_SENSOR_BRAND, - Tdr.PROPERTY_DATA, - Tdr.PROPERTY_DATA_FILENAME, - Tdr.PROPERTY_DATA_LOCATION, + TdrDto.PROPERTY_HOME_ID, + TdrDto.PROPERTY_SERIAL_NO, + TdrDto.PROPERTY_SENSOR_BRAND, + TdrDto.PROPERTY_DATA, + TdrDto.PROPERTY_DATA_FILENAME, + TdrDto.PROPERTY_DATA_LOCATION, // localisation tab - Tdr.PROPERTY_SECTION, - Tdr.PROPERTY_BASKET, - Tdr.PROPERTY_BRANCHLINE, - Tdr.PROPERTY_ITEM_HORIZONTAL_POSITION, - Tdr.PROPERTY_ITEM_VERTICAL_POSITION, - Tdr.PROPERTY_FLOATLINE1_LENGTH, - Tdr.PROPERTY_FLOATLINE2_LENGTH, + TdrDto.PROPERTY_SECTION, + TdrDto.PROPERTY_BASKET, + TdrDto.PROPERTY_BRANCHLINE, + TdrDto.PROPERTY_ITEM_HORIZONTAL_POSITION, + TdrDto.PROPERTY_ITEM_VERTICAL_POSITION, + TdrDto.PROPERTY_FLOATLINE1_LENGTH, + TdrDto.PROPERTY_FLOATLINE2_LENGTH, // timestamp tab - Tdr.PROPERTY_DEPLOYEMENT_START, - Tdr.PROPERTY_DEPLOYEMENT_START_DATE, - Tdr.PROPERTY_DEPLOYEMENT_START_TIME, - Tdr.PROPERTY_DEPLOYEMENT_END, - Tdr.PROPERTY_DEPLOYEMENT_END_DATE, - Tdr.PROPERTY_DEPLOYEMENT_END_TIME, - Tdr.PROPERTY_FISHING_START, - Tdr.PROPERTY_FISHING_START_DATE, - Tdr.PROPERTY_FISHING_START_TIME, - Tdr.PROPERTY_FISHING_END, - Tdr.PROPERTY_FISHING_END_DATE, - Tdr.PROPERTY_FISHING_END_TIME, + TdrDto.PROPERTY_DEPLOYEMENT_START, + //FIXME +// TdrDto.PROPERTY_DEPLOYEMENT_START_DATE, +// TdrDto.PROPERTY_DEPLOYEMENT_START_TIME, + TdrDto.PROPERTY_DEPLOYEMENT_END, + //FIXME +// TdrDto.PROPERTY_DEPLOYEMENT_END_DATE, +// TdrDto.PROPERTY_DEPLOYEMENT_END_TIME, + TdrDto.PROPERTY_FISHING_START, + //FIXME +// TdrDto.PROPERTY_FISHING_START_DATE, +// TdrDto.PROPERTY_FISHING_START_TIME, + TdrDto.PROPERTY_FISHING_END, + //FIXME +// TdrDto.PROPERTY_FISHING_END_DATE, +// TdrDto.PROPERTY_FISHING_END_TIME, // key data tab - Tdr.PROPERTY_FISHING_START_DEPTH, - Tdr.PROPERTY_FISHING_END_DEPTH, - Tdr.PROPERTY_MEAN_DEPLOYEMENT_DEPTH, - Tdr.PROPERTY_MEDIAN_DEPLOYEMENT_DEPTH, - Tdr.PROPERTY_MEAN_FISHING_DEPTH, - Tdr.PROPERTY_MEDIAN_FISHING_DEPTH, - Tdr.PROPERTY_MIN_FISHING_DEPTH, - Tdr.PROPERTY_MAX_FISHING_DEPTH, + TdrDto.PROPERTY_FISHING_START_DEPTH, + TdrDto.PROPERTY_FISHING_END_DEPTH, + TdrDto.PROPERTY_MEAN_DEPLOYEMENT_DEPTH, + TdrDto.PROPERTY_MEDIAN_DEPLOYEMENT_DEPTH, + TdrDto.PROPERTY_MEAN_FISHING_DEPTH, + TdrDto.PROPERTY_MEDIAN_FISHING_DEPTH, + TdrDto.PROPERTY_MIN_FISHING_DEPTH, + TdrDto.PROPERTY_MAX_FISHING_DEPTH, // species tab - Tdr.PROPERTY_SPECIES}); + TdrDto.PROPERTY_SPECIES}); - List<ContentTableMeta<Tdr>> metas = Lists.newArrayList( - ContentTableModel.newTableMeta(Tdr.class, Tdr.PROPERTY_HOME_ID, false), - ContentTableModel.newTableMeta(Tdr.class, Tdr.PROPERTY_SERIAL_NO, false), - ContentTableModel.newTableMeta(Tdr.class, Tdr.PROPERTY_SENSOR_BRAND, false), - ContentTableModel.newTableMeta(Tdr.class, Tdr.PROPERTY_DATA, false)); + List<ContentTableMeta<TdrDto>> metas = Lists.newArrayList( + ContentTableModel.newTableMeta(TdrDto.class, TdrDto.PROPERTY_HOME_ID, false), + ContentTableModel.newTableMeta(TdrDto.class, TdrDto.PROPERTY_SERIAL_NO, false), + ContentTableModel.newTableMeta(TdrDto.class, TdrDto.PROPERTY_SENSOR_BRAND, false), + ContentTableModel.newTableMeta(TdrDto.class, TdrDto.PROPERTY_DATA, false)); initModel(ui, metas); } @Override - protected BinderModelBuilder<Tdr, Tdr> prepareChildLoador(BinderService binderService, String binderName) { + protected BinderModelBuilder<TdrDto, TdrDto> prepareChildLoador(BinderService binderService, String binderName) { - BinderModelBuilder<Tdr, Tdr> builder = super.prepareChildLoador(binderService, binderName); + BinderModelBuilder<TdrDto, TdrDto> builder = super.prepareChildLoador(binderService, binderName); - builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, Tdr.PROPERTY_SPECIES); + builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, TdrDto.PROPERTY_SPECIES); return builder; diff --git a/observe-application-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 index d36086d..7ea091e 100644 --- a/observe-application-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 @@ -23,9 +23,9 @@ package fr.ird.observe.ui.content.table.impl.longline; */ import fr.ird.observe.ObserveServiceHelper; -import fr.ird.observe.entities.longline.WeightMeasure; -import fr.ird.observe.entities.longline.WeightMeasureImpl; -import fr.ird.observe.entities.referentiel.longline.WeightMeasureType; +import fr.ird.observe.services.dto.longline.WeightMeasureDto; +import fr.ird.observe.services.dto.longline.WeightMeasureImplDto; +import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; import fr.ird.observe.ui.util.table.EditableTableWithCacheTableModelSupport; /** diff --git a/observe-application-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 index 6d1cd5c..e505b72 100644 --- a/observe-application-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 @@ -22,9 +22,9 @@ package fr.ird.observe.ui.content.table.impl.seine; * #L% */ -import fr.ird.observe.entities.referentiel.GearCaracteristic; -import fr.ird.observe.entities.referentiel.GearCaracteristicType; -import fr.ird.observe.entities.referentiel.GearCaracteristicTypes; +import fr.ird.observe.services.dto.referential.GearCaracteristicDto; +import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDto; +import fr.ird.observe.services.dto.referential.GearCaracteristicTypesDto; import jaxx.runtime.swing.JAXXWidgetUtil; import jaxx.runtime.swing.editor.cell.NumberCellEditor; diff --git a/observe-application-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 index 5116121..2041e3e 100644 --- a/observe-application-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 @@ -22,9 +22,9 @@ package fr.ird.observe.ui.content.table.impl.seine; * #L% */ -import fr.ird.observe.entities.referentiel.GearCaracteristic; -import fr.ird.observe.entities.referentiel.GearCaracteristicType; -import fr.ird.observe.entities.referentiel.GearCaracteristicTypes; +import fr.ird.observe.services.dto.referential.GearCaracteristicDto; +import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDto; +import fr.ird.observe.services.dto.referential.GearCaracteristicTypesDto; import fr.ird.observe.ui.UIHelper; import javax.swing.JTable; diff --git a/observe-application-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 index 505a1ac..2792d07 100644 --- a/observe-application-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 @@ -22,9 +22,9 @@ package fr.ird.observe.ui.content.table.impl.seine; * #L% */ -import fr.ird.observe.entities.referentiel.GearCaracteristic; -import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; -import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeineImpl; +import fr.ird.observe.services.dto.referential.GearCaracteristicDto; +import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; +import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineImplDto; import fr.ird.observe.ui.util.table.EditableTableWithCacheTableModelSupport; import org.nuiton.topia.persistence.util.TopiaEntityBinder; @@ -34,21 +34,21 @@ import org.nuiton.topia.persistence.util.TopiaEntityBinder; * @author Tony Chemit - chemit@codelutin.com * @since 3.16 */ -public class GearUseFeaturesMeasurementSeinesTableModel extends EditableTableWithCacheTableModelSupport<GearUseFeaturesMeasurementSeine> { +public class GearUseFeaturesMeasurementSeinesTableModel extends EditableTableWithCacheTableModelSupport<GearUseFeaturesMeasurementSeineDto> { private static final long serialVersionUID = 1L; - public GearUseFeaturesMeasurementSeinesTableModel(TopiaEntityBinder<GearUseFeaturesMeasurementSeine> topiaBinder) { + public GearUseFeaturesMeasurementSeinesTableModel(TopiaEntityBinder<GearUseFeaturesMeasurementSeineDto> topiaBinder) { super(topiaBinder); } @Override - public boolean isRowNotEmpty(GearUseFeaturesMeasurementSeine valid) { + public boolean isRowNotEmpty(GearUseFeaturesMeasurementSeineDto valid) { return !(valid.getGearCaracteristic() == null && valid.getMeasurementValue() == null); } @Override - protected boolean isRowValid(GearUseFeaturesMeasurementSeine valid) { + protected boolean isRowValid(GearUseFeaturesMeasurementSeineDto valid) { String size = valid.getMeasurementValue(); return !(valid.getGearCaracteristic() == null || size == null) && !size.isEmpty(); } @@ -61,7 +61,7 @@ public class GearUseFeaturesMeasurementSeinesTableModel extends EditableTableWit @Override public Object getValueAt(int rowIndex, int columnIndex) { - GearUseFeaturesMeasurementSeine measure = data.get(rowIndex); + GearUseFeaturesMeasurementSeineDto measure = data.get(rowIndex); Object result; switch (columnIndex) { case 0: @@ -98,7 +98,7 @@ public class GearUseFeaturesMeasurementSeinesTableModel extends EditableTableWit @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { - GearUseFeaturesMeasurementSeine measure = data.get(rowIndex); + GearUseFeaturesMeasurementSeineDto measure = data.get(rowIndex); switch (columnIndex) { case 0: @@ -129,7 +129,7 @@ public class GearUseFeaturesMeasurementSeinesTableModel extends EditableTableWit } @Override - protected GearUseFeaturesMeasurementSeine createNewRow() { - return new GearUseFeaturesMeasurementSeineImpl(); + protected GearUseFeaturesMeasurementSeineDto createNewRow() { + return new GearUseFeaturesMeasurementSeineDto(); } } \ No newline at end of file diff --git a/observe-application-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 index 07a7b24..eb7d322 100644 --- a/observe-application-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 @@ -22,10 +22,10 @@ package fr.ird.observe.ui.content.table.impl.seine; * #L% */ -import fr.ird.observe.entities.referentiel.Gear; -import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; -import fr.ird.observe.entities.seine.GearUseFeaturesSeine; -import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.services.dto.referential.GearDto; +import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; +import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ObserveContentTableUI; @@ -39,14 +39,14 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.16 */ -public class GearUseFeaturesSeineTableModel extends ContentTableModel<TripSeine, GearUseFeaturesSeine> { +public class GearUseFeaturesSeineTableModel extends ContentTableModel<TripSeineDto, GearUseFeaturesSeineDto> { private static final long serialVersionUID = 1L; private GearUseFeaturesSeineUIHandler gearUseFeaturesSeineUIHandler; - public GearUseFeaturesSeineTableModel(ObserveContentTableUI<TripSeine, GearUseFeaturesSeine> context, - List<ContentTableMeta<GearUseFeaturesSeine>> contentTableMetas) { + public GearUseFeaturesSeineTableModel(ObserveContentTableUI<TripSeineDto, GearUseFeaturesSeineDto> context, + List<ContentTableMeta<GearUseFeaturesSeineDto>> contentTableMetas) { super(context, contentTableMetas); } @@ -79,7 +79,7 @@ public class GearUseFeaturesSeineTableModel extends ContentTableModel<TripSeine, GearUseFeaturesSeineUIModel model = getModel(); int editingRow = getSelectedRow(); - GearUseFeaturesSeine rowBean = getRowBean(); + GearUseFeaturesSeineDto rowBean = getRowBean(); GearUseFeaturesMeasurementSeinesTableModel measurementsTableModel = model.getMeasurementsTableModel(); if (rowBean.getTopiaId() == null && CollectionUtils.isEmpty(measurementsTableModel.getCacheForRow(editingRow))) { @@ -87,7 +87,7 @@ public class GearUseFeaturesSeineTableModel extends ContentTableModel<TripSeine, // new gear usage, add default measurements Gear gear = rowBean.getGear(); - List<GearUseFeaturesMeasurementSeine> measurements = + List<GearUseFeaturesMeasurementSeineDto> measurements = gearUseFeaturesSeineUIHandler.getDefaultGearUseFeaturesMeasurementSeine(gear.getTopiaId()); if (log.isInfoEnabled()) { log.info("Create mode, use default measurements: " + measurements.size()); diff --git a/observe-application-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 index bcac11b..fa0cd18 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.table.ContentTableUI - superGenericType='TripSeine, GearUseFeaturesSeine' + superGenericType='TripSeineDto, GearUseFeaturesSeineDto' contentTitle='{n("observe.gearUseFeaturesSeine.title")}' saveNewEntryText='{n("observe.action.create.gearUseFeaturesSeine")}' saveNewEntryTip='{n("observe.action.create.gearUseFeaturesSeine.tip")}'> @@ -29,12 +29,12 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.entities.CommentableEntity - fr.ird.observe.entities.seine.TripSeine - fr.ird.observe.entities.seine.GearUseFeaturesSeine - fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine - fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeineImpl - fr.ird.observe.entities.referentiel.Gear + fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.seine.TripSeineDto + fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto + fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto + fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineImplDto + fr.ird.observe.services.dto.referential.GearDto fr.ird.observe.ui.content.table.* fr.ird.observe.ui.util.BooleanEditor @@ -57,24 +57,24 @@ initializer="getModel().getMeasurementsTableModel()"/> <!-- edit bean --> - <TripSeine id='bean'/> + <TripSeineDto id='bean'/> <!-- table edit bean --> - <GearUseFeaturesSeine id='tableEditBean'/> + <GearUseFeaturesSeineDto id='tableEditBean'/> <!-- table model --> <ContentTableModel id='tableModel'/> <!-- le validateur de l'écran --> <BeanValidator id='validator' - beanClass='fr.ird.observe.entities.seine.TripSeine' + beanClass='fr.ird.observe.services.dto.seine.TripSeineDto' errorTableModel='{getErrorTableModel()}' context='n1-update-gearUseFeatures'/> <!-- le validateur d'une entrée de tableau --> <BeanValidator id='validatorTable' autoField='true' - beanClass='fr.ird.observe.entities.seine.GearUseFeaturesSeine' + beanClass='fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto' errorTableModel='{getErrorTableModel()}' context='n1-update'/> diff --git a/observe-application-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 index 5fa35cc..84993ab 100644 --- a/observe-application-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 @@ -30,12 +30,12 @@ import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DataContextType; -import fr.ird.observe.entities.referentiel.Gear; -import fr.ird.observe.entities.referentiel.GearCaracteristic; -import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; -import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeineDAO; -import fr.ird.observe.entities.seine.GearUseFeaturesSeine; -import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.services.dto.referential.GearDto; +import fr.ird.observe.services.dto.referential.GearCaracteristicDto; +import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; +import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDAODto; +import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; diff --git a/observe-application-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 index 5e9cd3a..ad16a8e 100644 --- a/observe-application-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 @@ -24,16 +24,12 @@ package fr.ird.observe.ui.content.table.impl.seine; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; -import fr.ird.observe.BinderService; -import fr.ird.observe.ObserveServiceHelper; -import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; -import fr.ird.observe.entities.seine.GearUseFeaturesSeine; -import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIModel; import fr.ird.observe.ui.content.table.ObserveContentTableUI; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; import org.nuiton.util.beans.BinderModelBuilder; import java.util.List; @@ -45,70 +41,74 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.16 */ -public class GearUseFeaturesSeineUIModel extends ContentTableUIModel<TripSeine, GearUseFeaturesSeine> { +public class GearUseFeaturesSeineUIModel extends ContentTableUIModel<TripSeineDto, GearUseFeaturesSeineDto> { private static final long serialVersionUID = 1L; public static final String PROPERTY_GENERAL_TAB_VALID = "generalTabValid"; public static final Set<String> GENERAL_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(GearUseFeaturesSeine.PROPERTY_GEAR, - GearUseFeaturesSeine.PROPERTY_NUMBER, - GearUseFeaturesSeine.PROPERTY_USED_IN_TRIP, - GearUseFeaturesSeine.PROPERTY_COMMENT).build(); + ImmutableSet.<String>builder().add(GearUseFeaturesSeineDto.PROPERTY_GEAR, + GearUseFeaturesSeineDto.PROPERTY_NUMBER, + GearUseFeaturesSeineDto.PROPERTY_USED_IN_TRIP, + GearUseFeaturesSeineDto.PROPERTY_COMMENT).build(); protected boolean generalTabValid; - private final GearUseFeaturesMeasurementSeinesTableModel measurementsTableModel; + //FIXME +// private final GearUseFeaturesMeasurementSeinesTableModel measurementsTableModel; public GearUseFeaturesSeineUIModel(GearUseFeaturesSeineUI ui) { - super(TripSeine.class, - GearUseFeaturesSeine.class, - new String[]{TripSeine.PROPERTY_GEAR_USE_FEATURES_SEINE}, + super(TripSeineDto.class, + GearUseFeaturesSeineDto.class, + new String[]{TripSeineDto.PROPERTY_GEAR_USE_FEATURES_SEINE}, new String[]{ - GearUseFeaturesSeine.PROPERTY_COMMENT, - GearUseFeaturesSeine.PROPERTY_GEAR, - GearUseFeaturesSeine.PROPERTY_NUMBER, - GearUseFeaturesSeine.PROPERTY_USED_IN_TRIP}); + GearUseFeaturesSeineDto.PROPERTY_COMMENT, + GearUseFeaturesSeineDto.PROPERTY_GEAR, + GearUseFeaturesSeineDto.PROPERTY_NUMBER, + GearUseFeaturesSeineDto.PROPERTY_USED_IN_TRIP}); - BinderService binderService = ObserveServiceHelper.get().getBinderService(); + //FIXME +// BinderService binderService = ObserveServiceHelper.get().getBinderService(); String binderName = getClass().getName() + "-open"; - TopiaEntityBinder<GearUseFeaturesMeasurementSeine> binder = binderService.getTopiaBinder(GearUseFeaturesMeasurementSeine.class, binderName); - - if (binder == null) { - - BinderModelBuilder<GearUseFeaturesMeasurementSeine, GearUseFeaturesMeasurementSeine> builder = - binderService.newBinderBuilder(GearUseFeaturesMeasurementSeine.class, - GearUseFeaturesMeasurementSeine.PROPERTY_GEAR_CARACTERISTIC, - GearUseFeaturesMeasurementSeine.PROPERTY_MEASUREMENT_VALUE); - - binder = binderService.registerTopiaBinder(GearUseFeaturesMeasurementSeine.class, builder, binderName); - - } - - this.measurementsTableModel = new GearUseFeaturesMeasurementSeinesTableModel(binder); - - List<ContentTableMeta<GearUseFeaturesSeine>> metas = Lists.newArrayList( - ContentTableModel.newTableMeta(GearUseFeaturesSeine.class, GearUseFeaturesSeine.PROPERTY_GEAR, false), - ContentTableModel.newTableMeta(GearUseFeaturesSeine.class, GearUseFeaturesSeine.PROPERTY_NUMBER, false), - ContentTableModel.newTableMeta(GearUseFeaturesSeine.class, GearUseFeaturesSeine.PROPERTY_USED_IN_TRIP, false), - ContentTableModel.newTableMeta(GearUseFeaturesSeine.class, GearUseFeaturesSeine.PROPERTY_COMMENT, false)); + //FIXME +// TopiaEntityBinder<GearUseFeaturesMeasurementSeine> binder = binderService.getTopiaBinder(GearUseFeaturesMeasurementSeine.class, binderName); +// +// if (binder == null) { +// +// BinderModelBuilder<GearUseFeaturesMeasurementSeine, GearUseFeaturesMeasurementSeine> builder = +// binderService.newBinderBuilder(GearUseFeaturesMeasurementSeine.class, +// GearUseFeaturesMeasurementSeine.PROPERTY_GEAR_CARACTERISTIC, +// GearUseFeaturesMeasurementSeine.PROPERTY_MEASUREMENT_VALUE); +// +// binder = binderService.registerTopiaBinder(GearUseFeaturesMeasurementSeine.class, builder, binderName); +// +// } +// +// this.measurementsTableModel = new GearUseFeaturesMeasurementSeinesTableModel(binder); + + List<ContentTableMeta<GearUseFeaturesSeineDto>> metas = Lists.newArrayList( + ContentTableModel.newTableMeta(GearUseFeaturesSeineDto.class, GearUseFeaturesSeineDto.PROPERTY_GEAR, false), + ContentTableModel.newTableMeta(GearUseFeaturesSeineDto.class, GearUseFeaturesSeineDto.PROPERTY_NUMBER, false), + ContentTableModel.newTableMeta(GearUseFeaturesSeineDto.class, GearUseFeaturesSeineDto.PROPERTY_USED_IN_TRIP, false), + ContentTableModel.newTableMeta(GearUseFeaturesSeineDto.class, GearUseFeaturesSeineDto.PROPERTY_COMMENT, false)); initModel(ui, metas); } @Override - protected GearUseFeaturesSeineTableModel createTableModel(ObserveContentTableUI<TripSeine, GearUseFeaturesSeine> ui, List<ContentTableMeta<GearUseFeaturesSeine>> contentTableMetas) { + protected GearUseFeaturesSeineTableModel createTableModel(ObserveContentTableUI<TripSeineDto, GearUseFeaturesSeineDto> ui, List<ContentTableMeta<GearUseFeaturesSeineDto>> contentTableMetas) { return new GearUseFeaturesSeineTableModel(ui, contentTableMetas); } - public GearUseFeaturesMeasurementSeinesTableModel getMeasurementsTableModel() { - return measurementsTableModel; - } + //FIXME +// public GearUseFeaturesMeasurementSeinesTableModel getMeasurementsTableModel() { +// return measurementsTableModel; +// } public boolean isGeneralTabValid() { return generalTabValid; diff --git a/observe-application-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 index 019129b..1a42d45 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ <fr.ird.observe.ui.content.table.ContentTableUI - superGenericType='SetSeine, NonTargetCatch' + superGenericType='SetSeineDto, NonTargetCatchDto' contentTitle='{n("observe.common.nonTargetCatch")}' saveNewEntryText='{n("observe.action.create.nonTargetCatch")}' saveNewEntryTip='{n("observe.action.create.nonTargetCatch.tip")}' @@ -32,12 +32,12 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.entities.CommentableEntity - fr.ird.observe.entities.seine.SetSeine - fr.ird.observe.entities.seine.NonTargetCatch - fr.ird.observe.entities.referentiel.seine.SpeciesFate - fr.ird.observe.entities.referentiel.Species - fr.ird.observe.entities.referentiel.seine.ReasonForDiscard + fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.seine.SetSeineDto + fr.ird.observe.services.dto.seine.NonTargetCatchDto + fr.ird.observe.services.dto.referential.seine.SpeciesFate + fr.ird.observe.services.dto.referential.SpeciesDto + fr.ird.observe.services.dto.referential.seine.ReasonForDiscard fr.ird.observe.ui.content.table.* fr.ird.observe.validation.ObserveValidator @@ -57,10 +57,10 @@ <NonTargetCatchUIModel id='model' constructorParams='this'/> <!-- edit bean --> - <SetSeine id='bean'/> + <SetSeineDto id='bean'/> <!-- table edit bean --> - <NonTargetCatch id='tableEditBean'/> + <NonTargetCatchDto id='tableEditBean'/> <!-- table model --> <ContentTableModel id='tableModel'/> @@ -68,7 +68,7 @@ <!-- le validateur de l'écran --> <BeanValidator id='validator' - beanClass='fr.ird.observe.entities.seine.SetSeine' + beanClass='fr.ird.observe.services.dto.seine.SetSeineDto' errorTableModel='{getErrorTableModel()}' context='n1-update-nonTargetCatch'> <!-- clef unique --> @@ -78,7 +78,7 @@ <!-- le validateur d'une entrée de tableau --> <BeanValidator id='validatorTable' autoField='true' - beanClass='fr.ird.observe.entities.seine.NonTargetCatch' + beanClass='fr.ird.observe.services.dto.seine.NonTargetCatchDto' errorTableModel='{getErrorTableModel()}' context='n1-update'/> diff --git a/observe-application-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 index 34d7a16..c43ce92 100644 --- a/observe-application-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 @@ -27,17 +27,17 @@ import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DataContextType; -import fr.ird.observe.entities.constants.seine.NonTargetCatchComputedValueSource; -import fr.ird.observe.entities.referentiel.Ocean; -import fr.ird.observe.entities.referentiel.ReferenceEntities; -import fr.ird.observe.entities.referentiel.Species; -import fr.ird.observe.entities.referentiel.Species2; -import fr.ird.observe.entities.referentiel.seine.ReasonForDiscard; -import fr.ird.observe.entities.referentiel.seine.SpeciesFate; -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.SetSeine; +import fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSourceDto; +import fr.ird.observe.services.dto.referential.OceanDto; +import fr.ird.observe.services.dto.referential.ReferenceEntitiesDto; +import fr.ird.observe.services.dto.referential.SpeciesDto; +import fr.ird.observe.services.dto.referential.Species2Dto; +import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; +import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; +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.SetSeineDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.table.ContentTableModel; diff --git a/observe-application-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 index bab2cf4..46f8c4b 100644 --- a/observe-application-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 @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.table.impl.seine; */ import com.google.common.collect.Lists; -import fr.ird.observe.entities.seine.NonTargetCatch; -import fr.ird.observe.entities.seine.SetSeine; +import fr.ird.observe.services.dto.seine.NonTargetCatchDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIModel; @@ -37,38 +37,43 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class NonTargetCatchUIModel extends ContentTableUIModel<SetSeine, NonTargetCatch> { +public class NonTargetCatchUIModel extends ContentTableUIModel<SetSeineDto, NonTargetCatchDto> { private static final long serialVersionUID = 1L; public NonTargetCatchUIModel(NonTargetCatchUI ui) { - super(SetSeine.class, - NonTargetCatch.class, - new String[]{SetSeine.PROPERTY_NON_TARGET_CATCH, - SetSeine.PROPERTY_NON_TARGET_DISCARDED}, - new String[]{NonTargetCatch.PROPERTY_SPECIES, - NonTargetCatch.PROPERTY_CATCH_WEIGHT, - NonTargetCatch.PROPERTY_TOTAL_COUNT, - NonTargetCatch.PROPERTY_MEAN_WEIGHT, - NonTargetCatch.PROPERTY_MEAN_LENGTH, - NonTargetCatch.PROPERTY_REASON_FOR_DISCARD, - NonTargetCatch.PROPERTY_SPECIES_FATE, - NonTargetCatch.PROPERTY_TOTAL_COUNT_COMPUTED_SOURCE, - NonTargetCatch.PROPERTY_MEAN_WEIGHT_COMPUTED_SOURCE, - NonTargetCatch.PROPERTY_CATCH_WEIGHT_COMPUTED_SOURCE, - NonTargetCatch.PROPERTY_MEAN_LENGTH_COMPUTED_SOURCE, - NonTargetCatch.PROPERTY_COMMENT + super(SetSeineDto.class, + NonTargetCatchDto.class, + new String[]{ + //FIXME +// SetSeineDto.PROPERTY_NON_TARGET_CATCH, + SetSeineDto.PROPERTY_NON_TARGET_DISCARDED}, + new String[]{ + //FIXME +// NonTargetCatchDto.PROPERTY_SPECIES, + NonTargetCatchDto.PROPERTY_CATCH_WEIGHT, + NonTargetCatchDto.PROPERTY_TOTAL_COUNT, + NonTargetCatchDto.PROPERTY_MEAN_WEIGHT, + NonTargetCatchDto.PROPERTY_MEAN_LENGTH, + NonTargetCatchDto.PROPERTY_REASON_FOR_DISCARD, + NonTargetCatchDto.PROPERTY_SPECIES_FATE, + NonTargetCatchDto.PROPERTY_TOTAL_COUNT_COMPUTED_SOURCE, + NonTargetCatchDto.PROPERTY_MEAN_WEIGHT_COMPUTED_SOURCE, + NonTargetCatchDto.PROPERTY_CATCH_WEIGHT_COMPUTED_SOURCE, + NonTargetCatchDto.PROPERTY_MEAN_LENGTH_COMPUTED_SOURCE, + NonTargetCatchDto.PROPERTY_COMMENT }); - List<ContentTableMeta<NonTargetCatch>> metas = Lists.newArrayList( - ContentTableModel.newTableMeta(NonTargetCatch.class, NonTargetCatch.PROPERTY_SPECIES, false), - ContentTableModel.newTableMeta(NonTargetCatch.class, NonTargetCatch.PROPERTY_SPECIES_FATE, false), - ContentTableModel.newTableMeta(NonTargetCatch.class, NonTargetCatch.PROPERTY_REASON_FOR_DISCARD, false), - ContentTableModel.newTableMeta(NonTargetCatch.class, NonTargetCatch.PROPERTY_CATCH_WEIGHT, false), - ContentTableModel.newTableMeta(NonTargetCatch.class, NonTargetCatch.PROPERTY_TOTAL_COUNT, false), - ContentTableModel.newTableMeta(NonTargetCatch.class, NonTargetCatch.PROPERTY_MEAN_WEIGHT, false), - ContentTableModel.newTableMeta(NonTargetCatch.class, NonTargetCatch.PROPERTY_MEAN_LENGTH, false), - ContentTableModel.newTableMeta(NonTargetCatch.class, NonTargetCatch.PROPERTY_COMMENT, false)); + List<ContentTableMeta<NonTargetCatchDto>> metas = Lists.newArrayList( + //FIXME +// ContentTableModel.newTableMeta(NonTargetCatchDto.class, NonTargetCatchDto.PROPERTY_SPECIES, false), + ContentTableModel.newTableMeta(NonTargetCatchDto.class, NonTargetCatchDto.PROPERTY_SPECIES_FATE, false), + ContentTableModel.newTableMeta(NonTargetCatchDto.class, NonTargetCatchDto.PROPERTY_REASON_FOR_DISCARD, false), + ContentTableModel.newTableMeta(NonTargetCatchDto.class, NonTargetCatchDto.PROPERTY_CATCH_WEIGHT, false), + ContentTableModel.newTableMeta(NonTargetCatchDto.class, NonTargetCatchDto.PROPERTY_TOTAL_COUNT, false), + ContentTableModel.newTableMeta(NonTargetCatchDto.class, NonTargetCatchDto.PROPERTY_MEAN_WEIGHT, false), + ContentTableModel.newTableMeta(NonTargetCatchDto.class, NonTargetCatchDto.PROPERTY_MEAN_LENGTH, false), + ContentTableModel.newTableMeta(NonTargetCatchDto.class, NonTargetCatchDto.PROPERTY_COMMENT, false)); initModel(ui, metas); diff --git a/observe-application-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 index 5888fab..66a6a8e 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.table.ContentTableUI - superGenericType='NonTargetSample, NonTargetLength' + superGenericType='NonTargetSampleDto, NonTargetLengthDto' contentTitle='{n("observe.common.nonTargetSample")}' saveNewEntryText='{n("observe.action.create.nonTargetSample")}' saveNewEntryTip='{n("observe.action.create.nonTargetSample.tip")}' @@ -32,11 +32,11 @@ <style source="AbstractSampleUI.css"/> <import> - fr.ird.observe.entities.CommentableEntity - fr.ird.observe.entities.referentiel.Sex - fr.ird.observe.entities.referentiel.Species - fr.ird.observe.entities.seine.NonTargetLength - fr.ird.observe.entities.seine.NonTargetSample + fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.referential.SexDto + fr.ird.observe.services.dto.referential.SpeciesDto + fr.ird.observe.services.dto.seine.NonTargetLengthDto + fr.ird.observe.services.dto.seine.NonTargetSampleDto fr.ird.observe.ui.content.table.impl.seine.ModeSaisieEchantillonEnum fr.ird.observe.ui.content.table.* @@ -56,17 +56,17 @@ <NonTargetSampleUIModel id='model' constructorParams='this'/> <!-- edit bean --> - <NonTargetSample id='bean'/> + <NonTargetSampleDto id='bean'/> <!-- table edit bean --> - <NonTargetLength id='tableEditBean'/> + <NonTargetLengthDto id='tableEditBean'/> <!-- table model --> <ContentTableModel id='tableModel'/> <!-- le validateur de l'écran --> <BeanValidator id='validator' - beanClass='fr.ird.observe.entities.seine.NonTargetSample' + beanClass='fr.ird.observe.services.dto.seine.NonTargetSampleDto' errorTableModel='{getErrorTableModel()}' context='n1-update'> <field name='comment'/> @@ -75,7 +75,7 @@ <!-- le validateur d'une entrée de tableau --> <BeanValidator id='validatorTable' autoField='true' - beanClass='fr.ird.observe.entities.seine.NonTargetLength' + beanClass='fr.ird.observe.services.dto.seine.NonTargetLengthDto' errorTableModel='{getErrorTableModel()}' context='n1-update'> </BeanValidator> diff --git a/observe-application-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 index a78c28e..1347ab2 100644 --- a/observe-application-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 @@ -27,11 +27,11 @@ import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DataContextType; -import fr.ird.observe.entities.referentiel.Sex; -import fr.ird.observe.entities.referentiel.Species; -import fr.ird.observe.entities.seine.NonTargetLength; -import fr.ird.observe.entities.seine.NonTargetSample; -import fr.ird.observe.entities.seine.SetSeine; +import fr.ird.observe.services.dto.referential.SexDto; +import fr.ird.observe.services.dto.referential.SpeciesDto; +import fr.ird.observe.services.dto.seine.NonTargetLengthDto; +import fr.ird.observe.services.dto.seine.NonTargetSampleDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.table.ContentTableModel; diff --git a/observe-application-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 index 0a4d3c8..66c8710 100644 --- a/observe-application-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 @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.table.impl.seine; */ import com.google.common.collect.Lists; -import fr.ird.observe.entities.seine.NonTargetLength; -import fr.ird.observe.entities.seine.NonTargetSample; +import fr.ird.observe.services.dto.seine.NonTargetLengthDto; +import fr.ird.observe.services.dto.seine.NonTargetSampleDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIModel; @@ -37,41 +37,43 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class NonTargetSampleUIModel extends ContentTableUIModel<NonTargetSample, NonTargetLength> { +public class NonTargetSampleUIModel extends ContentTableUIModel<NonTargetSampleDto, NonTargetLengthDto> { private static final long serialVersionUID = 1L; public NonTargetSampleUIModel(NonTargetSampleUI ui) { - super(NonTargetSample.class, - NonTargetLength.class, - new String[]{NonTargetSample.PROPERTY_NON_TARGET_LENGTH, NonTargetSample.PROPERTY_COMMENT}, - new String[]{NonTargetLength.PROPERTY_SPECIES, - NonTargetLength.PROPERTY_LENGTH, - NonTargetLength.PROPERTY_LENGTH_SOURCE, - NonTargetLength.PROPERTY_WEIGHT, - NonTargetLength.PROPERTY_WEIGHT_SOURCE, - NonTargetLength.PROPERTY_SEX, - NonTargetLength.PROPERTY_COUNT, - NonTargetLength.PROPERTY_ACQUISITION_MODE, - NonTargetLength.PROPERTY_PICTURES_REFERENCES + super(NonTargetSampleDto.class, + NonTargetLengthDto.class, + new String[]{NonTargetSampleDto.PROPERTY_NON_TARGET_LENGTH, NonTargetSampleDto.PROPERTY_COMMENT}, + new String[]{NonTargetLengthDto.PROPERTY_SPECIES, + NonTargetLengthDto.PROPERTY_LENGTH, + NonTargetLengthDto.PROPERTY_LENGTH_SOURCE, + NonTargetLengthDto.PROPERTY_WEIGHT, + NonTargetLengthDto.PROPERTY_WEIGHT_SOURCE, + //FIXME +// NonTargetLengthDto.PROPERTY_SEX, + NonTargetLengthDto.PROPERTY_COUNT, + NonTargetLengthDto.PROPERTY_ACQUISITION_MODE, + NonTargetLengthDto.PROPERTY_PICTURES_REFERENCES }); - List<ContentTableMeta<NonTargetLength>> metas = Lists.newArrayList( - ContentTableModel.newTableMeta(NonTargetLength.class, NonTargetLength.PROPERTY_SPECIES, false), - ContentTableModel.newTableMeta(NonTargetLength.class, NonTargetLength.PROPERTY_LENGTH, false), - ContentTableModel.newTableMeta(NonTargetLength.class, NonTargetLength.PROPERTY_WEIGHT, false), - ContentTableModel.newTableMeta(NonTargetLength.class, NonTargetLength.PROPERTY_COUNT, false), - new ContentTableMeta<NonTargetLength>(NonTargetLength.class, NonTargetLength.PROPERTY_SEX, false) { - - private static final long serialVersionUID = 1L; - - @Override - public boolean isNullValue(ContentTableModel<?, ?> m, NonTargetLength bean, int row) { - return bean.getSex() != null; - } - }, - ContentTableModel.newTableMeta(NonTargetLength.class, NonTargetLength.PROPERTY_PICTURES_REFERENCES, false)); + List<ContentTableMeta<NonTargetLengthDto>> metas = Lists.newArrayList( + ContentTableModel.newTableMeta(NonTargetLengthDto.class, NonTargetLengthDto.PROPERTY_SPECIES, false), + ContentTableModel.newTableMeta(NonTargetLengthDto.class, NonTargetLengthDto.PROPERTY_LENGTH, false), + ContentTableModel.newTableMeta(NonTargetLengthDto.class, NonTargetLengthDto.PROPERTY_WEIGHT, false), + ContentTableModel.newTableMeta(NonTargetLengthDto.class, NonTargetLengthDto.PROPERTY_COUNT, false), + //FIXME +// new ContentTableMeta<NonTargetLengthDto>(NonTargetLengthDto.class, NonTargetLengthDto.PROPERTY_SEX, false) { +// +// private static final long serialVersionUID = 1L; +// +// @Override +// public boolean isNullValue(ContentTableModel<?, ?> m, NonTargetLength bean, int row) { +// return bean.getSex() != null; +// } +// }, + ContentTableModel.newTableMeta(NonTargetLengthDto.class, NonTargetLengthDto.PROPERTY_PICTURES_REFERENCES, false)); initModel(ui, metas); diff --git a/observe-application-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 index 47ae9d2..ad302b5 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.table.ContentTableUI - superGenericType='FloatingObject, ObjectObservedSpecies' + superGenericType='FloatingObjectDto, ObjectObservedSpeciesDto' contentTitle='{n("observe.common.objectObservedSpecies")}' saveNewEntryText='{n("observe.action.create.objectObservedSpecies")}' saveNewEntryTip='{n("observe.action.create.objectObservedSpecies.tip")}' @@ -31,11 +31,11 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.entities.CommentableEntity - fr.ird.observe.entities.seine.FloatingObject - fr.ird.observe.entities.seine.ObjectObservedSpecies - fr.ird.observe.entities.referentiel.Species - fr.ird.observe.entities.referentiel.seine.SpeciesStatus + fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.seine.FloatingObjectDto + fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto + fr.ird.observe.services.dto.referential.SpeciesDto + fr.ird.observe.services.dto.referential.seine.SpeciesStatus fr.ird.observe.ui.content.table.* jaxx.runtime.swing.editor.NumberEditor @@ -54,10 +54,10 @@ <ObjectObservedSpeciesUIModel id='model' constructorParams='this'/> <!-- edit bean --> - <FloatingObject id='bean'/> + <FloatingObjectDto id='bean'/> <!-- table edit bean --> - <ObjectObservedSpecies id='tableEditBean'/> + <ObjectObservedSpeciesDto id='tableEditBean'/> <!-- table model --> <ContentTableModel id='tableModel'/> @@ -65,14 +65,14 @@ <!-- le validateur de l'écran --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.seine.FloatingObject' + beanClass='fr.ird.observe.services.dto.seine.FloatingObjectDto' errorTableModel='{getErrorTableModel()}' context='n1-update-objectObservedSpecies'/> <!-- le validateur d'une entrée de tableau --> <BeanValidator id='validatorTable' autoField='true' - beanClass='fr.ird.observe.entities.seine.ObjectObservedSpecies' + beanClass='fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto' errorTableModel='{getErrorTableModel()}' context='n1-update'/> diff --git a/observe-application-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 index 9bbbd05..7c29a64 100644 --- a/observe-application-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 @@ -26,10 +26,10 @@ import fr.ird.observe.ObserveConfig; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.constants.DataContextType; -import fr.ird.observe.entities.referentiel.Species; -import fr.ird.observe.entities.referentiel.seine.SpeciesStatus; -import fr.ird.observe.entities.seine.FloatingObject; -import fr.ird.observe.entities.seine.ObjectObservedSpecies; +import fr.ird.observe.services.dto.referential.SpeciesDto; +import fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto; +import fr.ird.observe.services.dto.seine.FloatingObjectDto; +import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; diff --git a/observe-application-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 index 4b31de8..faac82b 100644 --- a/observe-application-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 @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.table.impl.seine; */ import com.google.common.collect.Lists; -import fr.ird.observe.entities.seine.FloatingObject; -import fr.ird.observe.entities.seine.ObjectObservedSpecies; +import fr.ird.observe.services.dto.seine.FloatingObjectDto; +import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIModel; @@ -37,24 +37,27 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class ObjectObservedSpeciesUIModel extends ContentTableUIModel<FloatingObject, ObjectObservedSpecies> { +public class ObjectObservedSpeciesUIModel extends ContentTableUIModel<FloatingObjectDto, ObjectObservedSpeciesDto> { private static final long serialVersionUID = 1L; public ObjectObservedSpeciesUIModel(ObjectObservedSpeciesUI ui) { - super(FloatingObject.class, - ObjectObservedSpecies.class, - new String[]{FloatingObject.PROPERTY_OBJECT_OBSERVED_SPECIES, FloatingObject.PROPERTY_COMMENT}, + super(FloatingObjectDto.class, + ObjectObservedSpeciesDto.class, new String[]{ - ObjectObservedSpecies.PROPERTY_SPECIES, - ObjectObservedSpecies.PROPERTY_SPECIES_STATUS, - ObjectObservedSpecies.PROPERTY_COUNT}); - - List<ContentTableMeta<ObjectObservedSpecies>> metas = Lists.newArrayList( - ContentTableModel.newTableMeta(ObjectObservedSpecies.class, ObjectObservedSpecies.PROPERTY_SPECIES, false), - ContentTableModel.newTableMeta(ObjectObservedSpecies.class, ObjectObservedSpecies.PROPERTY_SPECIES_STATUS, false), - ContentTableModel.newTableMeta(ObjectObservedSpecies.class, ObjectObservedSpecies.PROPERTY_COUNT, false)); + //FIXME +// FloatingObjectDto.PROPERTY_OBJECT_OBSERVED_SPECIES, + FloatingObjectDto.PROPERTY_COMMENT}, + new String[]{ + ObjectObservedSpeciesDto.PROPERTY_SPECIES, + ObjectObservedSpeciesDto.PROPERTY_SPECIES_STATUS, + ObjectObservedSpeciesDto.PROPERTY_COUNT}); + + List<ContentTableMeta<ObjectObservedSpeciesDto>> metas = Lists.newArrayList( + ContentTableModel.newTableMeta(ObjectObservedSpeciesDto.class, ObjectObservedSpeciesDto.PROPERTY_SPECIES, false), + ContentTableModel.newTableMeta(ObjectObservedSpeciesDto.class, ObjectObservedSpeciesDto.PROPERTY_SPECIES_STATUS, false), + ContentTableModel.newTableMeta(ObjectObservedSpeciesDto.class, ObjectObservedSpeciesDto.PROPERTY_COUNT, false)); initModel(ui, metas); diff --git a/observe-application-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 index 40d74a0..194aafd 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.table.ContentTableUI - superGenericType='FloatingObject, ObjectSchoolEstimate' + superGenericType='FloatingObjectDto, ObjectSchoolEstimateDto' contentTitle='{n("observe.common.schoolEstimate")}' saveNewEntryText='{n("observe.action.create.schoolEstimate")}' saveNewEntryTip='{n("observe.action.create.schoolEstimate.tip")}' @@ -31,10 +31,10 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.entities.CommentableEntity - fr.ird.observe.entities.seine.FloatingObject - fr.ird.observe.entities.seine.ObjectSchoolEstimate - fr.ird.observe.entities.referentiel.Species + fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.seine.FloatingObjectDto + fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto + fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.ui.content.table.* jaxx.runtime.swing.editor.NumberEditor @@ -53,10 +53,10 @@ <ObjectSchoolEstimateUIModel id='model' constructorParams='this'/> <!-- edit bean --> - <FloatingObject id='bean'/> + <FloatingObjectDto id='bean'/> <!-- table edit bean --> - <ObjectSchoolEstimate id='tableEditBean'/> + <ObjectSchoolEstimateDto id='tableEditBean'/> <!-- table model --> <ContentTableModel id='tableModel'/> @@ -64,14 +64,14 @@ <!-- le validateur de l'écran --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.seine.FloatingObject' + beanClass='fr.ird.observe.services.dto.seine.FloatingObjectDto' errorTableModel='{getErrorTableModel()}' context='n1-update-schoolEstimate'/> <!-- le validateur d'une entrée de tableau --> <BeanValidator id='validatorTable' autoField='true' - beanClass='fr.ird.observe.entities.seine.ObjectSchoolEstimate' + beanClass='fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto' errorTableModel='{getErrorTableModel()}' context='n1-update'/> diff --git a/observe-application-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 index 4823b5e..4ed0e08 100644 --- a/observe-application-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 @@ -26,9 +26,9 @@ import fr.ird.observe.ObserveConfig; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.constants.DataContextType; -import fr.ird.observe.entities.referentiel.Species; -import fr.ird.observe.entities.seine.FloatingObject; -import fr.ird.observe.entities.seine.ObjectSchoolEstimate; +import fr.ird.observe.services.dto.referential.SpeciesDto; +import fr.ird.observe.services.dto.seine.FloatingObjectDto; +import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; diff --git a/observe-application-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 index 5006765..eab1105 100644 --- a/observe-application-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 @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.table.impl.seine; */ import com.google.common.collect.Lists; -import fr.ird.observe.entities.seine.FloatingObject; -import fr.ird.observe.entities.seine.ObjectSchoolEstimate; +import fr.ird.observe.services.dto.seine.FloatingObjectDto; +import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIModel; @@ -37,21 +37,24 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class ObjectSchoolEstimateUIModel extends ContentTableUIModel<FloatingObject, ObjectSchoolEstimate> { +public class ObjectSchoolEstimateUIModel extends ContentTableUIModel<FloatingObjectDto, ObjectSchoolEstimateDto> { private static final long serialVersionUID = 1L; public ObjectSchoolEstimateUIModel(ObjectSchoolEstimateUI ui) { - super(FloatingObject.class, - ObjectSchoolEstimate.class, - new String[]{FloatingObject.PROPERTY_OBJECT_SCHOOL_ESTIMATE, FloatingObject.PROPERTY_COMMENT}, - new String[]{ObjectSchoolEstimate.PROPERTY_SPECIES, ObjectSchoolEstimate.PROPERTY_TOTAL_WEIGHT} + super(FloatingObjectDto.class, + ObjectSchoolEstimateDto.class, + new String[]{ + //FIXME +// FloatingObjectDto.PROPERTY_OBJECT_SCHOOL_ESTIMATE, + FloatingObjectDto.PROPERTY_COMMENT}, + new String[]{ObjectSchoolEstimateDto.PROPERTY_SPECIES, ObjectSchoolEstimateDto.PROPERTY_TOTAL_WEIGHT} ); - List<ContentTableMeta<ObjectSchoolEstimate>> metas = Lists.newArrayList( - ContentTableModel.newTableMeta(ObjectSchoolEstimate.class, ObjectSchoolEstimate.PROPERTY_SPECIES, false), - ContentTableModel.newTableMeta(ObjectSchoolEstimate.class, ObjectSchoolEstimate.PROPERTY_TOTAL_WEIGHT, false)); + List<ContentTableMeta<ObjectSchoolEstimateDto>> metas = Lists.newArrayList( + ContentTableModel.newTableMeta(ObjectSchoolEstimateDto.class, ObjectSchoolEstimateDto.PROPERTY_SPECIES, false), + ContentTableModel.newTableMeta(ObjectSchoolEstimateDto.class, ObjectSchoolEstimateDto.PROPERTY_TOTAL_WEIGHT, false)); initModel(ui, metas); diff --git a/observe-application-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 index 777ab69..54dcfcc 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.table.ContentTableUI - superGenericType='SetSeine, SchoolEstimate' + superGenericType='SetSeineDto, SchoolEstimateDto' contentTitle='{n("observe.common.schoolEstimate")}' @@ -31,10 +31,10 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.entities.CommentableEntity - fr.ird.observe.entities.seine.SetSeine - fr.ird.observe.entities.seine.SchoolEstimate - fr.ird.observe.entities.referentiel.Species + fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.seine.SetSeineDto + fr.ird.observe.services.dto.seine.SchoolEstimateDto + fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.ui.content.table.* jaxx.runtime.swing.editor.NumberEditor @@ -53,10 +53,10 @@ <SchoolEstimateUIModel id='model' constructorParams='this'/> <!-- edit bean --> - <SetSeine id='bean'/> + <SetSeineDto id='bean'/> <!-- table edit bean --> - <SchoolEstimate id='tableEditBean'/> + <SchoolEstimateDto id='tableEditBean'/> <!-- table model --> <ContentTableModel id='tableModel'/> @@ -64,7 +64,7 @@ <!-- le validateur de l'écran --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.entities.seine.SetSeine' + beanClass='fr.ird.observe.services.dto.seine.SetSeineDto' errorTableModel='{getErrorTableModel()}' context='n1-update-schoolEstimate'> <!-- clef unique --> @@ -74,7 +74,7 @@ <!-- le validateur d'une entrée de tableau --> <BeanValidator id='validatorTable' autoField='true' - beanClass='fr.ird.observe.entities.seine.SchoolEstimate' + beanClass='fr.ird.observe.services.dto.seine.SchoolEstimateDto' errorTableModel='{getErrorTableModel()}' context='n1-update'/> diff --git a/observe-application-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 index b6ae93a..781fd62 100644 --- a/observe-application-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 @@ -27,12 +27,12 @@ import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DataContextType; -import fr.ird.observe.entities.referentiel.Ocean; -import fr.ird.observe.entities.referentiel.ReferenceEntities; -import fr.ird.observe.entities.referentiel.Species; -import fr.ird.observe.entities.referentiel.Species2; -import fr.ird.observe.entities.seine.SchoolEstimate; -import fr.ird.observe.entities.seine.SetSeine; +import fr.ird.observe.services.dto.referential.OceanDto; +import fr.ird.observe.services.dto.referential.ReferenceEntitiesDto; +import fr.ird.observe.services.dto.referential.SpeciesDto; +import fr.ird.observe.services.dto.referential.Species2Dto; +import fr.ird.observe.services.dto.seine.SchoolEstimateDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.table.ContentTableModel; diff --git a/observe-application-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 index b71f77a..5471c35 100644 --- a/observe-application-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 @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.table.impl.seine; */ import com.google.common.collect.Lists; -import fr.ird.observe.entities.seine.SchoolEstimate; -import fr.ird.observe.entities.seine.SetSeine; +import fr.ird.observe.services.dto.seine.SchoolEstimateDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIModel; @@ -37,24 +37,29 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class SchoolEstimateUIModel extends ContentTableUIModel<SetSeine, SchoolEstimate> { +public class SchoolEstimateUIModel extends ContentTableUIModel<SetSeineDto, SchoolEstimateDto> { private static final long serialVersionUID = 1L; public SchoolEstimateUIModel(SchoolEstimateUI ui) { - super(SetSeine.class, - SchoolEstimate.class, - new String[]{SetSeine.PROPERTY_SCHOOL_ESTIMATE, SetSeine.PROPERTY_COMMENT}, - new String[]{SchoolEstimate.PROPERTY_SET_SEINE, - SchoolEstimate.PROPERTY_SPECIES, - SchoolEstimate.PROPERTY_TOTAL_WEIGHT, - SchoolEstimate.PROPERTY_MEAN_WEIGHT}); - - List<ContentTableMeta<SchoolEstimate>> metas = Lists.newArrayList( - ContentTableModel.newTableMeta(SchoolEstimate.class, SchoolEstimate.PROPERTY_SPECIES, false), - ContentTableModel.newTableMeta(SchoolEstimate.class, SchoolEstimate.PROPERTY_TOTAL_WEIGHT, false), - ContentTableModel.newTableMeta(SchoolEstimate.class, SchoolEstimate.PROPERTY_MEAN_WEIGHT, false)); + super(SetSeineDto.class, + SchoolEstimateDto.class, + new String[]{ + //FIXME +// SetSeineDto.PROPERTY_SCHOOL_ESTIMATE, + SetSeineDto.PROPERTY_COMMENT}, + new String[]{ + //FIXME +// SchoolEstimateDto.PROPERTY_SET_SEINE, + SchoolEstimateDto.PROPERTY_SPECIES, + SchoolEstimateDto.PROPERTY_TOTAL_WEIGHT, + SchoolEstimateDto.PROPERTY_MEAN_WEIGHT}); + + List<ContentTableMeta<SchoolEstimateDto>> metas = Lists.newArrayList( + ContentTableModel.newTableMeta(SchoolEstimateDto.class, SchoolEstimateDto.PROPERTY_SPECIES, false), + ContentTableModel.newTableMeta(SchoolEstimateDto.class, SchoolEstimateDto.PROPERTY_TOTAL_WEIGHT, false), + ContentTableModel.newTableMeta(SchoolEstimateDto.class, SchoolEstimateDto.PROPERTY_MEAN_WEIGHT, false)); initModel(ui, metas); diff --git a/observe-application-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 index 0871829..b299164 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.table.ContentTableUI - superGenericType='SetSeine, TargetCatch' + superGenericType='SetSeineDto, TargetCatchDto' contentTitle='{n("observe.common.targetCatch")}' saveNewEntryText='{n("observe.action.create.targetCatch")}' saveNewEntryTip='{n("observe.action.create.targetCatch.tip")}' @@ -31,11 +31,11 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.entities.CommentableEntity - fr.ird.observe.entities.seine.SetSeine - fr.ird.observe.entities.seine.TargetCatch - fr.ird.observe.entities.referentiel.seine.WeightCategory - fr.ird.observe.entities.referentiel.Species + fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.seine.SetSeineDto + fr.ird.observe.services.dto.seine.TargetCatchDto + fr.ird.observe.services.dto.referential.seine.WeightCategory + fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.ui.content.table.* jaxx.runtime.swing.editor.NumberEditor @@ -54,17 +54,17 @@ <TargetCatchUIModel id='model' constructorParams='this'/> <!-- edit bean --> - <SetSeine id='bean'/> + <SetSeineDto id='bean'/> <!-- table edit bean --> - <TargetCatch id='tableEditBean'/> + <TargetCatchDto id='tableEditBean'/> <!-- table model --> <ContentTableModel id='tableModel'/> <!-- le validateur de l'écran --> <BeanValidator id='validator' - beanClass='fr.ird.observe.entities.seine.SetSeine' + beanClass='fr.ird.observe.services.dto.seine.SetSeineDto' errorTableModel='{getErrorTableModel()}' context='n1-update-targetCatch'> <!-- clef unique --> @@ -74,7 +74,7 @@ <!-- le validateur d'une entrée de tableau --> <BeanValidator id='validatorTable' autoField='true' - beanClass='fr.ird.observe.entities.seine.TargetCatch' + beanClass='fr.ird.observe.services.dto.seine.TargetCatchDto' errorTableModel='{getErrorTableModel()}' context='n1-update-targetCatch'/> diff --git a/observe-application-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 index 2068cda..011a2b3 100644 --- a/observe-application-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 @@ -29,15 +29,15 @@ import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.db.util.TopiaExecutor; -import fr.ird.observe.entities.referentiel.Ocean; -import fr.ird.observe.entities.referentiel.ReferenceEntities; -import fr.ird.observe.entities.referentiel.Species; -import fr.ird.observe.entities.referentiel.Species2; -import fr.ird.observe.entities.referentiel.seine.WeightCategory; -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.services.dto.referential.OceanDto; +import fr.ird.observe.services.dto.referential.ReferenceEntitiesDto; +import fr.ird.observe.services.dto.referential.SpeciesDto; +import fr.ird.observe.services.dto.referential.Species2Dto; +import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; +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.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.table.ContentTableModel; diff --git a/observe-application-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 index 83892f0..0aa6217 100644 --- a/observe-application-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 @@ -23,9 +23,9 @@ package fr.ird.observe.ui.content.table.impl.seine; */ import com.google.common.collect.Lists; -import fr.ird.observe.entities.referentiel.seine.WeightCategory; -import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.entities.seine.TargetCatch; +import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.dto.seine.TargetCatchDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIModel; @@ -38,29 +38,34 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class TargetCatchUIModel extends ContentTableUIModel<SetSeine, TargetCatch> { +public class TargetCatchUIModel extends ContentTableUIModel<SetSeineDto, TargetCatchDto> { private static final long serialVersionUID = 1L; public TargetCatchUIModel(TargetCatchUI ui) { - super(SetSeine.class, - TargetCatch.class, - new String[]{SetSeine.PROPERTY_TARGET_CATCH}, - new String[]{TargetCatch.PROPERTY_SET_SEINE, - TargetCatch.PROPERTY_WEIGHT_CATEGORY, - TargetCatch.PROPERTY_CATCH_WEIGHT, - TargetCatch.PROPERTY_WELL, - TargetCatch.PROPERTY_BROUGHT_ON_DECK, - TargetCatch.PROPERTY_DISCARDED, - TargetCatch.PROPERTY_COMMENT}); + super(SetSeineDto.class, + TargetCatchDto.class, + new String[]{ + //FIXME +// SetSeineDto.PROPERTY_TARGET_CATCH + }, + new String[]{ + //FIXME +// TargetCatchDto.PROPERTY_SET_SEINE, + TargetCatchDto.PROPERTY_WEIGHT_CATEGORY, + TargetCatchDto.PROPERTY_CATCH_WEIGHT, + TargetCatchDto.PROPERTY_WELL, + TargetCatchDto.PROPERTY_BROUGHT_ON_DECK, + TargetCatchDto.PROPERTY_DISCARDED, + TargetCatchDto.PROPERTY_COMMENT}); - List<ContentTableMeta<TargetCatch>> metas = Lists.newArrayList( - ContentTableModel.newTableMeta(TargetCatch.class, WeightCategory.PROPERTY_SPECIES, true), - ContentTableModel.newTableMeta(TargetCatch.class, TargetCatch.PROPERTY_WEIGHT_CATEGORY, true), - ContentTableModel.newTableMeta(TargetCatch.class, TargetCatch.PROPERTY_WELL, false), - ContentTableModel.newTableMeta(TargetCatch.class, TargetCatch.PROPERTY_CATCH_WEIGHT, false), - ContentTableModel.newTableMeta(TargetCatch.class, TargetCatch.PROPERTY_COMMENT, false)); + List<ContentTableMeta<TargetCatchDto>> metas = Lists.newArrayList( + ContentTableModel.newTableMeta(TargetCatchDto.class, WeightCategoryDto.PROPERTY_SPECIES, true), + ContentTableModel.newTableMeta(TargetCatchDto.class, TargetCatchDto.PROPERTY_WEIGHT_CATEGORY, true), + ContentTableModel.newTableMeta(TargetCatchDto.class, TargetCatchDto.PROPERTY_WELL, false), + ContentTableModel.newTableMeta(TargetCatchDto.class, TargetCatchDto.PROPERTY_CATCH_WEIGHT, false), + ContentTableModel.newTableMeta(TargetCatchDto.class, TargetCatchDto.PROPERTY_COMMENT, false)); initModel(ui, metas); diff --git a/observe-application-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 index ce1db6b..6311f9a 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.table.ContentTableUI - superGenericType='SetSeine, TargetCatch' + superGenericType='SetSeineDto, TargetCatchDto' contentTitle='{n("observe.common.targetDiscarded")}' saveNewEntryText='{n("observe.action.create.targetDiscarded")}' saveNewEntryTip='{n("observe.action.create.targetDiscarded.tip")}' @@ -31,12 +31,12 @@ <style source="../../CommonTable.css"/> <import> - fr.ird.observe.entities.CommentableEntity - fr.ird.observe.entities.seine.SetSeine - fr.ird.observe.entities.seine.TargetCatch - fr.ird.observe.entities.referentiel.seine.WeightCategory - fr.ird.observe.entities.referentiel.Species - fr.ird.observe.entities.referentiel.seine.ReasonForDiscard + fr.ird.observe.services.dto.CommentableEntityDto + fr.ird.observe.services.dto.seine.SetSeineDto + fr.ird.observe.services.dto.seine.TargetCatchDto + fr.ird.observe.services.dto.referential.seine.WeightCategory + fr.ird.observe.services.dto.referential.SpeciesDto + fr.ird.observe.services.dto.referential.seine.ReasonForDiscard fr.ird.observe.ui.content.table.* fr.ird.observe.ui.util.BooleanEditor @@ -56,17 +56,17 @@ <TargetDiscardCatchUIModel id='model' constructorParams='this'/> <!-- edit bean --> - <SetSeine id='bean'/> + <SetSeineDto id='bean'/> <!-- table edit bean --> - <TargetCatch id='tableEditBean'/> + <TargetCatchDto id='tableEditBean'/> <!-- table model --> <ContentTableModel id='tableModel'/> <!-- le validateur de l'écran --> <BeanValidator id='validator' - beanClass='fr.ird.observe.entities.seine.SetSeine' + beanClass='fr.ird.observe.services.dto.seine.SetSeineDto' errorTableModel='{getErrorTableModel()}' context='n1-update-targetDiscarded'> <!-- clef unique --> @@ -76,7 +76,7 @@ <!-- le validateur d'une entrée de tableau --> <BeanValidator id='validatorTable' autoField='true' - beanClass='fr.ird.observe.entities.seine.TargetCatch' + beanClass='fr.ird.observe.services.dto.seine.TargetCatchDto' errorTableModel='{getErrorTableModel()}' context='n1-update-targetDiscarded'/> diff --git a/observe-application-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 index d9a1ae5..a2955f1 100644 --- a/observe-application-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 @@ -29,16 +29,16 @@ import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.db.util.TopiaExecutor; -import fr.ird.observe.entities.referentiel.Ocean; -import fr.ird.observe.entities.referentiel.ReferenceEntities; -import fr.ird.observe.entities.referentiel.Species; -import fr.ird.observe.entities.referentiel.Species2; -import fr.ird.observe.entities.referentiel.seine.ReasonForDiscard; -import fr.ird.observe.entities.referentiel.seine.WeightCategory; -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.services.dto.referential.OceanDto; +import fr.ird.observe.services.dto.referential.ReferenceEntitiesDto; +import fr.ird.observe.services.dto.referential.SpeciesDto; +import fr.ird.observe.services.dto.referential.Species2Dto; +import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; +import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; +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.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.table.ContentTableModel; diff --git a/observe-application-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 index 807aec5..2b53997 100644 --- a/observe-application-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 @@ -23,9 +23,9 @@ package fr.ird.observe.ui.content.table.impl.seine; */ import com.google.common.collect.Lists; -import fr.ird.observe.entities.referentiel.seine.WeightCategory; -import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.entities.seine.TargetCatch; +import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.dto.seine.TargetCatchDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIModel; @@ -38,30 +38,35 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class TargetDiscardCatchUIModel extends ContentTableUIModel<SetSeine, TargetCatch> { +public class TargetDiscardCatchUIModel extends ContentTableUIModel<SetSeineDto, TargetCatchDto> { private static final long serialVersionUID = 1L; public TargetDiscardCatchUIModel(TargetDiscardCatchUI ui) { - super(SetSeine.class, - TargetCatch.class, - new String[]{SetSeine.PROPERTY_TARGET_CATCH, SetSeine.PROPERTY_TARGET_DISCARDED}, - new String[]{TargetCatch.PROPERTY_SET_SEINE, - TargetCatch.PROPERTY_WEIGHT_CATEGORY, - TargetCatch.PROPERTY_CATCH_WEIGHT, - TargetCatch.PROPERTY_REASON_FOR_DISCARD, - TargetCatch.PROPERTY_DISCARDED, - TargetCatch.PROPERTY_BROUGHT_ON_DECK, - TargetCatch.PROPERTY_COMMENT}); + super(SetSeineDto.class, + TargetCatchDto.class, + new String[]{ + //FIXME +// SetSeineDto.PROPERTY_TARGET_CATCH, + SetSeineDto.PROPERTY_TARGET_DISCARDED}, + new String[]{ + //FIXME +// TargetCatchDto.PROPERTY_SET_SEINE, + TargetCatchDto.PROPERTY_WEIGHT_CATEGORY, + TargetCatchDto.PROPERTY_CATCH_WEIGHT, + TargetCatchDto.PROPERTY_REASON_FOR_DISCARD, + TargetCatchDto.PROPERTY_DISCARDED, + TargetCatchDto.PROPERTY_BROUGHT_ON_DECK, + TargetCatchDto.PROPERTY_COMMENT}); - List<ContentTableMeta<TargetCatch>> metas = Lists.newArrayList( - ContentTableModel.newTableMeta(TargetCatch.class, WeightCategory.PROPERTY_SPECIES, true), - ContentTableModel.newTableMeta(TargetCatch.class, TargetCatch.PROPERTY_WEIGHT_CATEGORY, true), - ContentTableModel.newTableMeta(TargetCatch.class, TargetCatch.PROPERTY_REASON_FOR_DISCARD, true), - ContentTableModel.newTableMeta(TargetCatch.class, TargetCatch.PROPERTY_CATCH_WEIGHT, false), - ContentTableModel.newTableMeta(TargetCatch.class, TargetCatch.PROPERTY_BROUGHT_ON_DECK, false), - ContentTableModel.newTableMeta(TargetCatch.class, TargetCatch.PROPERTY_COMMENT, false)); + List<ContentTableMeta<TargetCatchDto>> metas = Lists.newArrayList( + ContentTableModel.newTableMeta(TargetCatchDto.class, WeightCategoryDto.PROPERTY_SPECIES, true), + ContentTableModel.newTableMeta(TargetCatchDto.class, TargetCatchDto.PROPERTY_WEIGHT_CATEGORY, true), + ContentTableModel.newTableMeta(TargetCatchDto.class, TargetCatchDto.PROPERTY_REASON_FOR_DISCARD, true), + ContentTableModel.newTableMeta(TargetCatchDto.class, TargetCatchDto.PROPERTY_CATCH_WEIGHT, false), + ContentTableModel.newTableMeta(TargetCatchDto.class, TargetCatchDto.PROPERTY_BROUGHT_ON_DECK, false), + ContentTableModel.newTableMeta(TargetCatchDto.class, TargetCatchDto.PROPERTY_COMMENT, false)); initModel(ui, metas); diff --git a/observe-application-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 index 5dd3bb0..d5fb818 100644 --- a/observe-application-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 @@ -21,17 +21,17 @@ --> <fr.ird.observe.ui.content.table.ContentTableUI - superGenericType='TargetSample, TargetLength' + superGenericType='TargetSampleDto, TargetLengthDto' abstract="true"> <style source="AbstractSampleUI.css"/> <import> - fr.ird.observe.entities.seine.TargetSample - fr.ird.observe.entities.seine.TargetLength + fr.ird.observe.services.dto.seine.TargetSampleDto + fr.ird.observe.services.dto.seine.TargetLengthDto fr.ird.observe.ui.content.table.impl.seine.CodeMesureEnum fr.ird.observe.ui.content.table.impl.seine.ModeSaisieEchantillonEnum - fr.ird.observe.entities.referentiel.Species + fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.ui.content.table.* jaxx.runtime.swing.editor.NumberEditor @@ -50,17 +50,17 @@ <TargetSampleUIModel id='model' constructorParams='this'/> <!-- edit bean --> - <TargetSample id='bean'/> + <TargetSampleDto id='bean'/> <!-- table edit bean --> - <TargetLength id='tableEditBean'/> + <TargetLengthDto id='tableEditBean'/> <!-- table model --> <ContentTableModel id='tableModel'/> <!-- le validateur de l'écran --> <BeanValidator id='validator' - beanClass='fr.ird.observe.entities.seine.TargetSample' + beanClass='fr.ird.observe.services.dto.seine.TargetSampleDto' errorTableModel='{getErrorTableModel()}' context='n1-update'> <!-- clef unique --> @@ -71,7 +71,7 @@ <!-- le validateur d'une entrée de tableau --> <BeanValidator id='validatorTable' autoField='true' - beanClass='fr.ird.observe.entities.seine.TargetLength' + beanClass='fr.ird.observe.services.dto.seine.TargetLengthDto' errorTableModel='{getErrorTableModel()}' context='n1-update' parentValidator='{validator}'/> diff --git a/observe-application-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 index 449f10c..7b816ac 100644 --- a/observe-application-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 @@ -27,10 +27,10 @@ import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DataContextType; -import fr.ird.observe.entities.referentiel.Species; -import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.entities.seine.TargetLength; -import fr.ird.observe.entities.seine.TargetSample; +import fr.ird.observe.services.dto.referential.SpeciesDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.dto.seine.TargetLengthDto; +import fr.ird.observe.services.dto.seine.TargetSampleDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.table.ContentTableModel; diff --git a/observe-application-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 index 53ab578..4c05619 100644 --- a/observe-application-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 @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.table.impl.seine; */ import com.google.common.collect.Lists; -import fr.ird.observe.entities.seine.TargetLength; -import fr.ird.observe.entities.seine.TargetSample; +import fr.ird.observe.services.dto.seine.TargetLengthDto; +import fr.ird.observe.services.dto.seine.TargetSampleDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIModel; @@ -37,32 +37,34 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class TargetSampleUIModel extends ContentTableUIModel<TargetSample, TargetLength> { +public class TargetSampleUIModel extends ContentTableUIModel<TargetSampleDto, TargetLengthDto> { private static final long serialVersionUID = 1L; public TargetSampleUIModel(TargetSampleUI ui) { - super(TargetSample.class, - TargetLength.class, - new String[]{TargetSample.PROPERTY_TARGET_LENGTH, TargetSample.PROPERTY_COMMENT}, - new String[]{TargetLength.PROPERTY_TARGET_SAMPLE, - TargetLength.PROPERTY_SPECIES, - TargetLength.PROPERTY_LENGTH, - TargetLength.PROPERTY_LENGTH_SOURCE, - TargetLength.PROPERTY_WEIGHT, - TargetLength.PROPERTY_WEIGHT_SOURCE, - TargetLength.PROPERTY_COUNT, - TargetLength.PROPERTY_MEASURE_TYPE, - TargetLength.PROPERTY_ACQUISITION_MODE}); + super(TargetSampleDto.class, + TargetLengthDto.class, + new String[]{TargetSampleDto.PROPERTY_TARGET_LENGTH, TargetSampleDto.PROPERTY_COMMENT}, + new String[]{ + //FIXME +// TargetLengthDto.PROPERTY_TARGET_SAMPLE, + TargetLengthDto.PROPERTY_SPECIES, + TargetLengthDto.PROPERTY_LENGTH, + TargetLengthDto.PROPERTY_LENGTH_SOURCE, + TargetLengthDto.PROPERTY_WEIGHT, + TargetLengthDto.PROPERTY_WEIGHT_SOURCE, + TargetLengthDto.PROPERTY_COUNT, + TargetLengthDto.PROPERTY_MEASURE_TYPE, + TargetLengthDto.PROPERTY_ACQUISITION_MODE}); - List<ContentTableMeta<TargetLength>> metas = Lists.newArrayList( - ContentTableModel.newTableMeta(TargetLength.class, TargetLength.PROPERTY_SPECIES, true), - ContentTableModel.newTableMeta(TargetLength.class, TargetLength.PROPERTY_MEASURE_TYPE, true), - ContentTableModel.newTableMeta(TargetLength.class, TargetLength.PROPERTY_LENGTH, true), - ContentTableModel.newTableMeta(TargetLength.class, TargetLength.PROPERTY_WEIGHT, true), - ContentTableModel.newTableMeta(TargetLength.class, TargetLength.PROPERTY_COUNT, false), - ContentTableModel.newTableMeta(TargetLength.class, TargetLength.PROPERTY_TOTAL_WEIGHT, true)); + List<ContentTableMeta<TargetLengthDto>> metas = Lists.newArrayList( + ContentTableModel.newTableMeta(TargetLengthDto.class, TargetLengthDto.PROPERTY_SPECIES, true), + ContentTableModel.newTableMeta(TargetLengthDto.class, TargetLengthDto.PROPERTY_MEASURE_TYPE, true), + ContentTableModel.newTableMeta(TargetLengthDto.class, TargetLengthDto.PROPERTY_LENGTH, true), + ContentTableModel.newTableMeta(TargetLengthDto.class, TargetLengthDto.PROPERTY_WEIGHT, true), + ContentTableModel.newTableMeta(TargetLengthDto.class, TargetLengthDto.PROPERTY_COUNT, false), + ContentTableModel.newTableMeta(TargetLengthDto.class, TargetLengthDto.PROPERTY_TOTAL_WEIGHT, true)); initModel(ui, metas); diff --git a/observe-application-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 index 4832fcb..34169aa 100644 --- a/observe-application-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 @@ -21,27 +21,15 @@ */ package fr.ird.observe.ui.storage; -import fr.ird.observe.db.DataSource; -import fr.ird.observe.db.DataSourceConfig; -import fr.ird.observe.db.DataSourceException; -import fr.ird.observe.db.DataSourceFactory; -import fr.ird.observe.db.constants.CreationMode; -import fr.ird.observe.db.impl.PGDataSource; -import fr.ird.observe.db.impl.PGDataSourceConfig; -import fr.ird.observe.db.model.DataSelectionModel; -import fr.ird.observe.db.util.PGInstall; import jaxx.runtime.JAXXContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.version.Version; import org.nuiton.util.version.Versions; -import java.awt.Window; -import java.sql.SQLException; -import java.util.Set; +import java.awt.*; import static org.nuiton.i18n.I18n.n; -import static org.nuiton.i18n.I18n.t; /** * Les différents types d'actions d'administration possible sur une base @@ -62,126 +50,128 @@ public enum ObstunaAdminAction { null) { @Override public RemoteUILauncher newLauncher(JAXXContext context, Window frame) { - return new RemoteUILauncher(this, context, frame, t(getLabel())) { - @Override - protected void init(StorageUI ui) { - StorageUIModel model = ui.getModel(); - - // on autorise le mode de creation import referentiel - // depuis une source distante - model.getPgConfig().setCreationMode(CreationMode.IMPORT_REMOTE_STORAGE); - model.getPgConfig().setCanMigrate(true); - super.init(ui); - } - - protected void checkImportDbVersion(StorageUIModel model, DataSourceConfig dataSourceConfig) throws DataSourceException { - - DataSource importDatasource = DataSourceFactory.newService(dataSourceConfig); - - try { - importDatasource.doOpen(); - - model.checkImportDbVersion(importDatasource); - - } finally { - importDatasource.doClose(false); - } - - } - - protected void initTask(StorageUIModel model, - PGInstall task) throws Exception { - - - PGDataSourceConfig pgConfig = model.getPgConfig(); - - // pas autorise a migrer automatiquement - pgConfig.setCanMigrate(false); - - // references import - pgConfig.setCreationMode(model.getReferentielImportMode()); - - DataSourceConfig importReferenceConfig = model.toImportReferentielSourceConfig(); - pgConfig.setImportConfig(importReferenceConfig); - - if (importReferenceConfig != null) { - - if (log.isInfoEnabled()) { - log.info("Use referentiel import data source " + importReferenceConfig.getLabel()); - } - - checkImportDbVersion(model, importReferenceConfig); - - } - - // data import - - DataSourceConfig importDataConfig = model.toImportDataSourceConfig(); - pgConfig.setImportDataConfig(importDataConfig); - - Set<String> importDataIds = null; - - if (importDataConfig != null) { - - if (log.isInfoEnabled()) { - log.info("Use data import data source " + importDataConfig.getLabel()); - } - - checkImportDbVersion(model, importDataConfig); - - DataSelectionModel dataModel = model.getSelectDataModel(); - - if (!dataModel.isDataFull()) { - // on renseigne les marees a importer uniquement si - // on en a selectionner, de plus si on a selectionne - // toutes les marees, on le les passe pas : car c un dump - // complet de la base. - importDataIds = dataModel.getSelectedData(); - } - pgConfig.setImportDataIds(importDataIds); - } - pgConfig.setImportDataIds(importDataIds); - - super.initTask(model, task); - } - - @Override - protected String getPgLabel() { - return t("observe.storage.label.db.to.create"); - } - - @Override - protected void execute(PGInstall task) throws Exception { - if (log.isInfoEnabled()) { - log.info("Create db..."); - } - - // on commence par supprimer toute table gérée par ObServe - task.dropDb(); - - // ici on ne fait qu'ouvrir la base (qui va créer le schema - // puis importer le référentiel) - PGDataSourceConfig config = task.getDataSourceConfig(); - PGDataSource service = DataSourceFactory.newService(config); - if (log.isInfoEnabled()) { - log.info("Open [" + service.getLabel() + "] and create it."); - } - - try { - service.doOpen(); - } finally { - service.doClose(false); - } - } - - @Override - protected void applySecurity(PGInstall task) throws SQLException { - if (log.isInfoEnabled()) { - log.info("Apply security..."); - } - task.applySecurity(); - } - }; + //FIXME +// return new RemoteUILauncher(this, context, frame, t(getLabel())) { +// @Override +// protected void init(StorageUI ui) { +// StorageUIModel model = ui.getModel(); +// +// // on autorise le mode de creation import referentiel +// // depuis une source distante +// model.getPgConfig().setCreationMode(CreationMode.IMPORT_REMOTE_STORAGE); +// model.getPgConfig().setCanMigrate(true); +// super.init(ui); +// } +// +// protected void checkImportDbVersion(StorageUIModel model, DataSourceConfig dataSourceConfig) throws DataSourceException { +// +// DataSource importDatasource = DataSourceFactory.newService(dataSourceConfig); +// +// try { +// importDatasource.doOpen(); +// +// model.checkImportDbVersion(importDatasource); +// +// } finally { +// importDatasource.doClose(false); +// } +// +// } +// +// protected void initTask(StorageUIModel model, +// PGInstall task) throws Exception { +// +// +// PGDataSourceConfig pgConfig = model.getPgConfig(); +// +// // pas autorise a migrer automatiquement +// pgConfig.setCanMigrate(false); +// +// // references import +// pgConfig.setCreationMode(model.getReferentielImportMode()); +// +// DataSourceConfig importReferenceConfig = model.toImportReferentielSourceConfig(); +// pgConfig.setImportConfig(importReferenceConfig); +// +// if (importReferenceConfig != null) { +// +// if (log.isInfoEnabled()) { +// log.info("Use referentiel import data source " + importReferenceConfig.getLabel()); +// } +// +// checkImportDbVersion(model, importReferenceConfig); +// +// } +// +// // data import +// +// DataSourceConfig importDataConfig = model.toImportDataSourceConfig(); +// pgConfig.setImportDataConfig(importDataConfig); +// +// Set<String> importDataIds = null; +// +// if (importDataConfig != null) { +// +// if (log.isInfoEnabled()) { +// log.info("Use data import data source " + importDataConfig.getLabel()); +// } +// +// checkImportDbVersion(model, importDataConfig); +// +// DataSelectionModel dataModel = model.getSelectDataModel(); +// +// if (!dataModel.isDataFull()) { +// // on renseigne les marees a importer uniquement si +// // on en a selectionner, de plus si on a selectionne +// // toutes les marees, on le les passe pas : car c un dump +// // complet de la base. +// importDataIds = dataModel.getSelectedData(); +// } +// pgConfig.setImportDataIds(importDataIds); +// } +// pgConfig.setImportDataIds(importDataIds); +// +// super.initTask(model, task); +// } +// +// @Override +// protected String getPgLabel() { +// return t("observe.storage.label.db.to.create"); +// } +// +// @Override +// protected void execute(PGInstall task) throws Exception { +// if (log.isInfoEnabled()) { +// log.info("Create db..."); +// } +// +// // on commence par supprimer toute table gérée par ObServe +// task.dropDb(); +// +// // ici on ne fait qu'ouvrir la base (qui va créer le schema +// // puis importer le référentiel) +// PGDataSourceConfig config = task.getDataSourceConfig(); +// PGDataSource service = DataSourceFactory.newService(config); +// if (log.isInfoEnabled()) { +// log.info("Open [" + service.getLabel() + "] and create it."); +// } +// +// try { +// service.doOpen(); +// } finally { +// service.doClose(false); +// } +// } +// +// @Override +// protected void applySecurity(PGInstall task) throws SQLException { +// if (log.isInfoEnabled()) { +// log.info("Apply security..."); +// } +// task.applySecurity(); +// } +// }; + return null; } }, /** @@ -194,38 +184,40 @@ public enum ObstunaAdminAction { Versions.valueOf("1.0")) { @Override public RemoteUILauncher newLauncher(JAXXContext context, Window frame) { - return new RemoteUILauncher(this, context, frame, t(getLabel())) { - - @Override - protected void execute(PGInstall task) throws Exception { - - // ici on ne fait qu'ouvrir la base (qui va faire les mise à jour) - PGDataSourceConfig config = task.getDataSourceConfig(); - PGDataSource service = DataSourceFactory.newService(config); - if (log.isInfoEnabled()) { - log.info("Open [" + service.getLabel() + "] and update it."); - } - - try { - service.doOpen(); - } finally { - service.doClose(false); - } - } - - @Override - protected String getPgLabel() { - return t("observe.storage.label.db.to.update"); - } - - @Override - protected void applySecurity(PGInstall task) throws SQLException { - if (log.isInfoEnabled()) { - log.info("Apply security..."); - } - task.applySecurity(); - } - }; + //FIXME +// return new RemoteUILauncher(this, context, frame, t(getLabel())) { +// +// @Override +// protected void execute(PGInstall task) throws Exception { +// +// // ici on ne fait qu'ouvrir la base (qui va faire les mise à jour) +// PGDataSourceConfig config = task.getDataSourceConfig(); +// PGDataSource service = DataSourceFactory.newService(config); +// if (log.isInfoEnabled()) { +// log.info("Open [" + service.getLabel() + "] and update it."); +// } +// +// try { +// service.doOpen(); +// } finally { +// service.doClose(false); +// } +// } +// +// @Override +// protected String getPgLabel() { +// return t("observe.storage.label.db.to.update"); +// } +// +// @Override +// protected void applySecurity(PGInstall task) throws SQLException { +// if (log.isInfoEnabled()) { +// log.info("Apply security..."); +// } +// task.applySecurity(); +// } +// }; + return null; } }, /** @@ -238,21 +230,23 @@ public enum ObstunaAdminAction { Versions.valueOf("1.4")) { @Override public RemoteUILauncher newLauncher(JAXXContext context, Window frame) { - return new RemoteUILauncher(this, context, frame, t(getLabel())) { - - @Override - protected String getPgLabel() { - return t("observe.storage.label.db.to.update.security"); - } - - @Override - protected void applySecurity(PGInstall task) throws SQLException { - if (log.isInfoEnabled()) { - log.info("Apply security..."); - } - task.applySecurity(); - } - }; + //FIXME +// return new RemoteUILauncher(this, context, frame, t(getLabel())) { +// +// @Override +// protected String getPgLabel() { +// return t("observe.storage.label.db.to.update.security"); +// } +// +// @Override +// protected void applySecurity(PGInstall task) throws SQLException { +// if (log.isInfoEnabled()) { +// log.info("Apply security..."); +// } +// task.applySecurity(); +// } +// }; + return null; } }, /** @@ -264,21 +258,23 @@ public enum ObstunaAdminAction { null) { @Override public RemoteUILauncher newLauncher(JAXXContext context, Window frame) { - return new RemoteUILauncher(this, context, frame, t(getLabel())) { - - @Override - protected String getPgLabel() { - return t("observe.storage.label.db.to.drop"); - } - - @Override - protected void execute(PGInstall task) throws Exception { - if (log.isInfoEnabled()) { - log.info("Drop db..."); - } - task.dropDb(); - } - }; + //FIXME +// return new RemoteUILauncher(this, context, frame, t(getLabel())) { +// +// @Override +// protected String getPgLabel() { +// return t("observe.storage.label.db.to.drop"); +// } +// +// @Override +// protected void execute(PGInstall task) throws Exception { +// if (log.isInfoEnabled()) { +// log.info("Drop db..."); +// } +// task.dropDb(); +// } +// }; + return null; } },; diff --git a/observe-application-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 index 01958be..252fa2e 100644 --- a/observe-application-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 @@ -22,9 +22,7 @@ package fr.ird.observe.ui.storage; import fr.ird.observe.ObserveContext; -import fr.ird.observe.DataService; import fr.ird.observe.db.constants.DbMode; -import fr.ird.observe.db.util.PGInstall; import fr.ird.observe.db.util.SecurityModel; import jaxx.runtime.JAXXContext; import jaxx.runtime.swing.ErrorDialogUI; @@ -67,12 +65,12 @@ public abstract class RemoteUILauncher extends StorageUILauncher { model.setCanUseRemoteService(true); model.setDbMode(DbMode.USE_REMOTE); model.setAdminAction(action); - model.setPgInstall(new PGInstall() { - @Override - public void execute() throws Exception { - RemoteUILauncher.this.execute(this); - } - }); +// model.setPgInstall(new PGInstall() { +// @Override +// public void execute() throws Exception { +// RemoteUILauncher.this.execute(this); +// } +// }); List<StorageStep> steps = new ArrayList<StorageStep>(); steps.add(StorageStep.CONFIG); @@ -105,11 +103,11 @@ public abstract class RemoteUILauncher extends StorageUILauncher { log.info("Will use security model " + securityModel); } - PGInstall install = model.getPgInstall(); +// PGInstall install = model.getPgInstall(); try { - - initTask(model, install); +//FIXME +// initTask(model, install); } catch (Exception e) { if (log.isErrorEnabled()) { log.error("Could not init task.", e); @@ -119,7 +117,8 @@ public abstract class RemoteUILauncher extends StorageUILauncher { } try { - execute(install); + //FIXME +// execute(install); } catch (Exception e) { if (log.isErrorEnabled()) { @@ -130,7 +129,8 @@ public abstract class RemoteUILauncher extends StorageUILauncher { } try { - applySecurity(install); + //FIXME +// applySecurity(install); } catch (Exception e) { if (log.isErrorEnabled()) { log.error("Could not apply security to db.", e); @@ -147,20 +147,20 @@ public abstract class RemoteUILauncher extends StorageUILauncher { // } protected abstract String getPgLabel(); - - protected void initTask(StorageUIModel model, - PGInstall task) throws Exception { - - task.init(model.toPostgresStorageConfig(getPgLabel()), model.getSecurityModel(), false); - } - - protected void execute(PGInstall task) throws Exception { - } - - protected void applySecurity(PGInstall task) throws Exception { - } - - protected DataService getDataService() { - return ObserveContext.get().getDataService(); - } +//FIXME +// protected void initTask(StorageUIModel model, +// PGInstall task) throws Exception { +// +// task.init(model.toPostgresStorageConfig(getPgLabel()), model.getSecurityModel(), false); +// } +//FIXME +// protected void execute(PGInstall task) throws Exception { +// } +////FIXME +// protected void applySecurity(PGInstall task) throws Exception { +// } +////FIXME +// protected DataService getDataService() { +// return ObserveContext.get().getDataService(); +// } } diff --git a/observe-application-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 index 360f72f..3ef78d4 100644 --- a/observe-application-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 @@ -42,10 +42,9 @@ import fr.ird.observe.db.impl.H2DataSourceConfig; import fr.ird.observe.db.impl.PGDataSource; import fr.ird.observe.db.impl.PGDataSourceConfig; import fr.ird.observe.db.model.DataSelectionModel; -import fr.ird.observe.db.util.PGInstall; import fr.ird.observe.db.util.SecurityModel; -import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.storage.tabs.RolesTableModel; diff --git a/observe-application-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 index 5b1a8af..f9419bd 100644 --- a/observe-application-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 @@ -30,10 +30,7 @@ import fr.ird.observe.db.DataSourceFactory; import fr.ird.observe.db.constants.ConnexionStatus; import fr.ird.observe.db.constants.CreationMode; import fr.ird.observe.db.constants.DbMode; -import fr.ird.observe.db.impl.H2DataSourceConfig; -import fr.ird.observe.db.impl.PGDataSourceConfig; import fr.ird.observe.db.model.DataSelectionModel; -import fr.ird.observe.db.util.PGInstall; import fr.ird.observe.db.util.SecurityModel; import jaxx.runtime.JAXXContext; import jaxx.runtime.context.JAXXContextEntryDef; @@ -67,7 +64,7 @@ import static org.nuiton.i18n.I18n.t; public class StorageUIModel extends WizardModel<StorageStep> { /** Logger */ - static private Log log = LogFactory.getLog(StorageUIModel.class); + private static final Log log = LogFactory.getLog(StorageUIModel.class); public static final String DB_MODE_PROPERTY_NAME = "dbMode"; @@ -160,10 +157,12 @@ public class StorageUIModel extends WizardModel<StorageStep> { protected SecurityModel securityModel; /** la configuration d'une base locale */ - protected H2DataSourceConfig h2Config; + //FIXME +// protected H2DataSourceConfig h2Config; /** la configuration d'une base distante */ - protected PGDataSourceConfig pgConfig; + //FIXME +// protected PGDataSourceConfig pgConfig; /** la configuration de l'application */ protected ObserveConfig config; @@ -192,7 +191,8 @@ public class StorageUIModel extends WizardModel<StorageStep> { protected CreationMode dataImportMode; /** l'installateur de base obstuna */ - protected PGInstall pgInstall; + //FIXME +// protected PGInstall pgInstall; public StorageUIModel() { super(StorageStep.class, @@ -201,9 +201,10 @@ public class StorageUIModel extends WizardModel<StorageStep> { StorageStep.CONFIRM ); - pgConfig = new PGDataSourceConfig(I18n.n("observe.storage.label.remote")); - h2Config = new H2DataSourceConfig(I18n.n("observe.storage.label.local")); - h2Config.setImportConfig(pgConfig); +//FIXME +// pgConfig = new PGDataSourceConfig(I18n.n("observe.storage.label.remote")); +// h2Config = new H2DataSourceConfig(I18n.n("observe.storage.label.local")); +// h2Config.setImportConfig(pgConfig); securityModel = new SecurityModel(); } @@ -285,30 +286,32 @@ public class StorageUIModel extends WizardModel<StorageStep> { // on sélectionne ce service DataSourceConfig previousConfig = source.getConfig(); - if (previousConfig instanceof H2DataSourceConfig) { - - // on copie la configuration distante de la configuration - fromStorageConfig(config.toPostgresStorageConfig(pgConfig.getLabel())); - - // on est actuellement connecte sur une base locale - fromStorageConfig((H2DataSourceConfig) previousConfig); - - } else { - - // on copie la configuration locale de la configuration - fromStorageConfig( - config.toH2StorageConfig(pgConfig.getLabel())); - - if (!isLocalStorageExist) { - // aucune base locale, on positionne le mode de création - // de base locale par défaut. - - setCreationMode(mode); - } - - // on est sur une base distante - fromStorageConfig((PGDataSourceConfig) previousConfig); - } + //FIXME +// if (previousConfig instanceof H2DataSourceConfig) { +// +// // on copie la configuration distante de la configuration +// fromStorageConfig(config.toPostgresStorageConfig(pgConfig.getLabel())); +// +// // on est actuellement connecte sur une base locale +// fromStorageConfig((H2DataSourceConfig) previousConfig); +// +// } else { +// +// // on copie la configuration locale de la configuration +// fromStorageConfig( +// config.toH2StorageConfig(pgConfig.getLabel())); +// +// if (!isLocalStorageExist) { +// // aucune base locale, on positionne le mode de création +// // de base locale par défaut. +// +// setCreationMode(mode); +// } +// +// // on est sur une base distante +// //FIXME +// fromStorageConfig((PGDataSourceConfig) previousConfig); +// } if (dataModel != null) { setSelectDataModel(dataModel); @@ -324,10 +327,10 @@ public class StorageUIModel extends WizardModel<StorageStep> { // on utilise la configuration par defaut // ce cas ne devrait arriver uniquement tant qu'aucune // base locale est crée +//FIXME +// fromStorageConfig(config.toH2StorageConfig(pgConfig.getLabel())); - fromStorageConfig(config.toH2StorageConfig(pgConfig.getLabel())); - - fromStorageConfig(config.toPostgresStorageConfig(pgConfig.getLabel())); +// fromStorageConfig(config.toPostgresStorageConfig(pgConfig.getLabel())); DbMode newDbMode = config.getDefaultDbMode(); if (getAdminAction() != null) { @@ -397,30 +400,30 @@ public class StorageUIModel extends WizardModel<StorageStep> { } // on initialise le modèle à partir de la configuration existante - - if (previousConfig instanceof H2DataSourceConfig) { - - // on copie la configuration distante de la configuration - fromStorageConfig(config.toPostgresStorageConfig(pgConfig.getLabel())); - - // on est actuellement connecte sur une base locale - fromStorageConfig((H2DataSourceConfig) previousConfig); - - } else { - - // on copie la configuration locale de la configuration - fromStorageConfig( - config.toH2StorageConfig(pgConfig.getLabel())); - - if (!isLocalStorageExist) { - - // aucune base locale, on ne peut pas utiliser la base locale - setCanUseLocalService(false); - } - - // on est sur une base distante - fromStorageConfig((PGDataSourceConfig) previousConfig); - } +//FIXME +// if (previousConfig instanceof H2DataSourceConfig) { +// +// // on copie la configuration distante de la configuration +// fromStorageConfig(config.toPostgresStorageConfig(pgConfig.getLabel())); +// +// // on est actuellement connecte sur une base locale +// fromStorageConfig((H2DataSourceConfig) previousConfig); +// +// } else { +// +// // on copie la configuration locale de la configuration +// fromStorageConfig( +// config.toH2StorageConfig(pgConfig.getLabel())); +// +// if (!isLocalStorageExist) { +// +// // aucune base locale, on ne peut pas utiliser la base locale +// setCanUseLocalService(false); +// } +// +// // on est sur une base distante +// fromStorageConfig((PGDataSourceConfig) previousConfig); +// } } /** @@ -471,10 +474,10 @@ public class StorageUIModel extends WizardModel<StorageStep> { // on utilise la configuration par defaut // ce cas ne devrait arriver uniquement tant qu'aucune // base locale est crée - - fromStorageConfig(config.toH2StorageConfig(pgConfig.getLabel())); - - fromStorageConfig(config.toPostgresStorageConfig(pgConfig.getLabel())); +//FIXME +// fromStorageConfig(config.toH2StorageConfig(pgConfig.getLabel())); +// +// fromStorageConfig(config.toPostgresStorageConfig(pgConfig.getLabel())); DbMode newDbMode = config.getDefaultDbMode(); if (getAdminAction() != null) { @@ -591,13 +594,15 @@ public class StorageUIModel extends WizardModel<StorageStep> { start(); firePropertyChange(DB_MODE_PROPERTY_NAME, getDbMode()); firePropertyChange(CREATION_MODE_PROPERTY_NAME, getCreationMode()); - firePropertyChange(DUMP_FILE_PROPERTY_NAME, h2Config.getDbDump()); + //FIXME +// firePropertyChange(DUMP_FILE_PROPERTY_NAME, h2Config.getDbDump()); firePropertyChange(BACKUP_FILE_PROPERTY_NAME, getBackupFile()); firePropertyChange(DO_BACKUP_PROPERTY_NAME, isDoBackup()); firePropertyChange(CAN_USE_LOCALE_SERVICE_PROPERTY_NAME, isCanUseLocalService()); firePropertyChange(CAN_CREATE_LOCALE_SERVICE_PROPERTY_NAME, isCanCreateLocalService()); firePropertyChange(CAN_USE_REMOTE_SERVICE_PROPERTY_NAME, isCanUseRemoteService()); - firePropertyChange(CONNEXION_STATUS_PROPERTY_NAME, pgConfig.getConnexionStatus()); + //FIXME +// firePropertyChange(CONNEXION_STATUS_PROPERTY_NAME, pgConfig.getConnexionStatus()); firePropertyChange(PREVIOUS_SERVICE_PROPERTY_NAME, getPreviousService()); firePropertyChange(LOCAL_STORAGE_EXIST_PROPERTY_NAME, isLocalStorageExist()); firePropertyChange(STORE_REMOTE_CONFIG_PROPERTY_NAME, isStoreRemoteConfig()); @@ -629,10 +634,10 @@ public class StorageUIModel extends WizardModel<StorageStep> { public ObstunaAdminAction getAdminAction() { return adminAction; } - - public PGInstall getPgInstall() { - return pgInstall; - } +//FIXME +// public PGInstall getPgInstall() { +// return pgInstall; +// } public CreationMode getReferentielImportMode() { return referentielImportMode; @@ -660,7 +665,9 @@ public class StorageUIModel extends WizardModel<StorageStep> { String params; txt = n("observe.storage.label.import.referentiel"); if (getDbMode() == DbMode.CREATE_LOCAL) { - params = getH2Config().getDataDirectory().getAbsolutePath(); + //FIXME +// params = getH2Config().getDataDirectory().getAbsolutePath(); + params= null; } else { params = getRemoteUrl(); } @@ -690,7 +697,9 @@ public class StorageUIModel extends WizardModel<StorageStep> { String params; txt = n("observe.storage.label.import.data"); if (getDbMode() == DbMode.CREATE_LOCAL) { - params = getH2Config().getDataDirectory().getAbsolutePath(); + //FIXME +// params = getH2Config().getDataDirectory().getAbsolutePath(); + params = null; } else { params = getRemoteUrl(); } @@ -731,8 +740,8 @@ public class StorageUIModel extends WizardModel<StorageStep> { // when doing an admin mode we do not choose db mode, we always work on remote universe.add(StorageStep.CHOOSE_DB_MODE); } - - h2Config.setImportConfig(null); +//FIXME +// h2Config.setImportConfig(null); boolean canBackup = localStorageExist; switch (dbMode) { @@ -746,7 +755,8 @@ public class StorageUIModel extends WizardModel<StorageStep> { break; //case IMPORT_LOCAL_STORAGE: case IMPORT_REMOTE_STORAGE: - h2Config.setImportConfig(pgConfig); + //FIXME +// h2Config.setImportConfig(pgConfig); universe.add(StorageStep.CONFIG); } } @@ -813,13 +823,15 @@ public class StorageUIModel extends WizardModel<StorageStep> { } if (validate && isLocal()) { if (dbMode == DbMode.CREATE_LOCAL) { - validate = h2Config.getCreationMode() != null; + //FIXME +// validate = h2Config.getCreationMode() != null; } } break; case CONFIG: if (dbMode == DbMode.USE_REMOTE) { - validate = pgConfig.isValid(); + //FIXME +// validate = pgConfig.isValid(); //FIXME Il faut savoir si l'utilisateur est le //FIXME propriétaire de la base // if (validate) { @@ -833,7 +845,8 @@ public class StorageUIModel extends WizardModel<StorageStep> { // } // } } else { - validate = h2Config.isValid(); + //FIXME +// validate = h2Config.isValid(); } break; case CONFIG_REFERENTIEL: @@ -868,7 +881,8 @@ public class StorageUIModel extends WizardModel<StorageStep> { // must be able to read references String dbLabel = t("observe.storage.label.reference.import.db"); - validate = centralSourceModel.toPostgresStorageConfig(dbLabel).isCanReadReferentiel(); + //FIXME +// validate = centralSourceModel.toPostgresStorageConfig(dbLabel).isCanReadReferentiel(); } break; } @@ -907,7 +921,8 @@ public class StorageUIModel extends WizardModel<StorageStep> { // must be able to read data String dbLabel = t("observe.storage.label.data.import.db"); - validate = dataSourceModel.toPostgresStorageConfig(dbLabel).isCanReadData(); + //FIXME +// validate = dataSourceModel.toPostgresStorageConfig(dbLabel).isCanReadData(); } break; } @@ -960,8 +975,9 @@ public class StorageUIModel extends WizardModel<StorageStep> { break; case USE_LOCAL: //TODO A tester... - result = h2Config.isValid() && - h2Config.isStorageExists(); + //FIXME +// result = h2Config.isValid() && +// h2Config.isStorageExists(); break; } } @@ -991,23 +1007,27 @@ public class StorageUIModel extends WizardModel<StorageStep> { switch (dbMode) { case USE_LOCAL: case CREATE_LOCAL: - result = h2Config.isCanMigrate(); + //FIXME +// result = h2Config.isCanMigrate(); break; case USE_REMOTE: - result = pgConfig.isCanMigrate(); + //FIXME +// result = pgConfig.isCanMigrate(); } } return result; } public String getLabel() { - String txt; - if (dbMode == DbMode.CREATE_LOCAL) { - txt = h2Config.getLabel(); - } else { - txt = pgConfig.getLabel(); - } - return txt; + //FIXME +// String txt; +// if (dbMode == DbMode.CREATE_LOCAL) { +// txt = h2Config.getLabel(); +// } else { +// txt = pgConfig.getLabel(); +// } +// return txt; + return null; } public boolean isLocalStorageExist() { @@ -1125,17 +1145,19 @@ public class StorageUIModel extends WizardModel<StorageStep> { } public void setShowMigrationSql(boolean showMigrationSql) { - boolean oldValue = pgConfig.isShowMigrationSql(); - pgConfig.setShowMigrationSql(showMigrationSql); - h2Config.setShowMigrationSql(showMigrationSql); - firePropertyChange(SHOW_MIGRATION_SQL_PROPERTY_NAME, oldValue, showMigrationSql); + //FIXME +// boolean oldValue = pgConfig.isShowMigrationSql(); +// pgConfig.setShowMigrationSql(showMigrationSql); +// h2Config.setShowMigrationSql(showMigrationSql); +// firePropertyChange(SHOW_MIGRATION_SQL_PROPERTY_NAME, oldValue, showMigrationSql); } public void setShowMigrationProgression(boolean showMigrationProgression) { - boolean oldValue = pgConfig.isShowMigrationProgression(); - pgConfig.setShowMigrationProgression(showMigrationProgression); - h2Config.setShowMigrationProgression(showMigrationProgression); - firePropertyChange(SHOW_MIGRATION_PROGRESSION_PROPERTY_NAME, oldValue, showMigrationProgression); + //FIXME +// boolean oldValue = pgConfig.isShowMigrationProgression(); +// pgConfig.setShowMigrationProgression(showMigrationProgression); +// h2Config.setShowMigrationProgression(showMigrationProgression); +// firePropertyChange(SHOW_MIGRATION_PROGRESSION_PROPERTY_NAME, oldValue, showMigrationProgression); } // ---------------------------------------------------------- @@ -1148,25 +1170,29 @@ public class StorageUIModel extends WizardModel<StorageStep> { switch (dbMode) { case USE_LOCAL: case CREATE_LOCAL: - result = h2Config.getCreationMode(); + //FIXME +// result = h2Config.getCreationMode(); break; case USE_REMOTE: - result = pgConfig.getCreationMode(); + //FIXME +// result = pgConfig.getCreationMode(); } } return result; } public File getDumpFile() { - URL dbDump = h2Config.getDbDump(); - if (dbDump == null) { - return new File(""); - } - // on remplace les %20 par des speciess car dans l'uri les caracteres - // sont encodes - File file = new File(dbDump.getFile().replaceAll("%20", " ")); - file = new File(file.getAbsolutePath()); - return file; + //FIXME +// URL dbDump = h2Config.getDbDump(); +// if (dbDump == null) { +// return new File(""); +// } +// // on remplace les %20 par des speciess car dans l'uri les caracteres +// // sont encodes +// File file = new File(dbDump.getFile().replaceAll("%20", " ")); +// file = new File(file.getAbsolutePath()); +// return file; + return null; } public void setCreationMode(CreationMode creationMode) { @@ -1176,7 +1202,8 @@ public class StorageUIModel extends WizardModel<StorageStep> { case CREATE_LOCAL: // seul cas ou on peut propager le mode de creation - h2Config.setCreationMode(creationMode); + //FIXME +// h2Config.setCreationMode(creationMode); break; } } @@ -1213,7 +1240,8 @@ public class StorageUIModel extends WizardModel<StorageStep> { " (exist ? : " + new File(filePath).exists() + ')'); } } - h2Config.setDbDump(dumpFile == null ? null : url); + //FIXME +// h2Config.setDbDump(dumpFile == null ? null : url); firePropertyChange(DUMP_FILE_PROPERTY_NAME, oldValue, dumpFile); validate(); } catch (MalformedURLException ex) { @@ -1229,46 +1257,60 @@ public class StorageUIModel extends WizardModel<StorageStep> { // ---------------------------------------------------------- public String getRemoteLogin() { - return pgConfig.getLogin(); + //FIXME +// return pgConfig.getLogin(); + return null; } public char[] getRemotePassword() { - return pgConfig.getPassword(); + //FIXME +// return pgConfig.getPassword(); + return null; } public String getRemoteUrl() { - return pgConfig.getUrl(); + //FIXME +// return pgConfig.getUrl(); + return null; } public boolean isUseSsl() { - return pgConfig.isUseSsl(); + //FIXME +// return pgConfig.isUseSsl(); + return null; } public ConnexionStatus getConnexionStatus() { - return pgConfig.getConnexionStatus(); + //FIXME +// return pgConfig.getConnexionStatus(); + return null; } public void setPreviousService(DataSource previousService) { this.previousService = previousService; } - public H2DataSourceConfig getH2Config() { - return h2Config; - } - - public PGDataSourceConfig getPgConfig() { - return pgConfig; - } + //FIXME +// public H2DataSourceConfig getH2Config() { +// return h2Config; +// } +// + //FIXME +// public PGDataSourceConfig getPgConfig() { +// return pgConfig; +// } public void setRemoteLogin(String remoteLogin) { String oldValue = getRemoteLogin(); - pgConfig.setLogin(remoteLogin); + //FIXME +// pgConfig.setLogin(remoteLogin); firePgConfigChanged(REMOTE_LOGIN_ROPERTY_NAME, oldValue, remoteLogin); } public void setRemotePassword(char[] remotePassword) { char[] oldValue = getRemotePassword(); - pgConfig.setPassword(remotePassword); + //FIXME +// pgConfig.setPassword(remotePassword); firePgConfigChanged(REMOTE_PASSWORD_PROPERTY_NAME, oldValue, remotePassword); } @@ -1292,78 +1334,83 @@ public class StorageUIModel extends WizardModel<StorageStep> { public void setRemoteUrl(String remoteUrl) { String oldValue = getRemoteUrl(); - pgConfig.setUrl(remoteUrl); + //FIXME +// pgConfig.setUrl(remoteUrl); firePgConfigChanged(REMOTE_URL_ROPERTY_NAME, oldValue, remoteUrl); } public void setUseSsl(boolean useSsl) { - boolean oldValue = pgConfig.isUseSsl(); - pgConfig.setUseSsl(useSsl); - firePgConfigChanged(USE_SSL_PROPERTY_NAME, oldValue, useSsl); + //FIXME +// boolean oldValue = pgConfig.isUseSsl(); +// pgConfig.setUseSsl(useSsl); +// firePgConfigChanged(USE_SSL_PROPERTY_NAME, oldValue, useSsl); } // ---------------------------------------------------------- // -- StorageConfigSupport implementation methods // ---------------------------------------------------------- - public void fromStorageConfig(H2DataSourceConfig config) { - setDbMode(config.isStorageExists() ? DbMode.USE_LOCAL : DbMode.CREATE_LOCAL); - config.copyTo(h2Config); - } - - public void fromStorageConfig(PGDataSourceConfig config) { - setDbMode(DbMode.USE_REMOTE); - config.copyTo(pgConfig); - } - - public H2DataSourceConfig toH2StorageConfig(String label) { - - H2DataSourceConfig result = h2Config.clone(); - result.setShortLabel(label); - - if (getDbMode() == DbMode.CREATE_LOCAL) { - - CreationMode m = result.getCreationMode(); - - switch (m) { - case EMPTY: - case IMPORT_EXTERNAL_DUMP: - // rien a faire - break; - case IMPORT_INTERNAL_DUMP: - try { - result.setDbDump( - config.getInitialDbDump().toURI().toURL()); - } catch (MalformedURLException ex) { - throw new IllegalArgumentException( - "can not build url for initialDbDump for " + - "reason " + ex.getMessage(), ex); - } - break; - case IMPORT_LOCAL_STORAGE: - result.getImportConfig().setShortLabel( - n("observe.storage.label.import.local")); - break; - case IMPORT_REMOTE_STORAGE: - result.getImportConfig().setShortLabel( - n("observe.storage.label.import.remote")); - break; - } - } - return result; - } + //FIXME +// public void fromStorageConfig(H2DataSourceConfig config) { +// setDbMode(config.isStorageExists() ? DbMode.USE_LOCAL : DbMode.CREATE_LOCAL); +// config.copyTo(h2Config); +// } +// + //FIXME +// public void fromStorageConfig(PGDataSourceConfig config) { +// setDbMode(DbMode.USE_REMOTE); +// config.copyTo(pgConfig); +// } - public PGDataSourceConfig toPostgresStorageConfig(String label) { - if (log.isDebugEnabled()) { - log.debug("before clone pg : policy = " + pgConfig.getPolicy()); - } - PGDataSourceConfig result = pgConfig.clone(); - if (log.isDebugEnabled()) { - log.debug("after clone pg : policy = " + result.getPolicy()); - } - result.setShortLabel(label); - return result; - } +// public H2DataSourceConfig toH2StorageConfig(String label) { +// +// H2DataSourceConfig result = h2Config.clone(); +// result.setShortLabel(label); +// +// if (getDbMode() == DbMode.CREATE_LOCAL) { +// +// CreationMode m = result.getCreationMode(); +// +// switch (m) { +// case EMPTY: +// case IMPORT_EXTERNAL_DUMP: +// // rien a faire +// break; +// case IMPORT_INTERNAL_DUMP: +// try { +// result.setDbDump( +// config.getInitialDbDump().toURI().toURL()); +// } catch (MalformedURLException ex) { +// throw new IllegalArgumentException( +// "can not build url for initialDbDump for " + +// "reason " + ex.getMessage(), ex); +// } +// break; +// case IMPORT_LOCAL_STORAGE: +// result.getImportConfig().setShortLabel( +// n("observe.storage.label.import.local")); +// break; +// case IMPORT_REMOTE_STORAGE: +// result.getImportConfig().setShortLabel( +// n("observe.storage.label.import.remote")); +// break; +// } +// } +// return result; +// } +// + //FIXME +// public PGDataSourceConfig toPostgresStorageConfig(String label) { +// if (log.isDebugEnabled()) { +// log.debug("before clone pg : policy = " + pgConfig.getPolicy()); +// } +// PGDataSourceConfig result = pgConfig.clone(); +// if (log.isDebugEnabled()) { +// log.debug("after clone pg : policy = " + result.getPolicy()); +// } +// result.setShortLabel(label); +// return result; +// } public DataSelectionModel getSelectDataModel() { return selectDataModel; @@ -1379,15 +1426,19 @@ public class StorageUIModel extends WizardModel<StorageStep> { dst.setBackupFile(getBackupFile()); dst.setDoBackup(isDoBackup()); dst.setStoreRemoteConfig(isStoreRemoteConfig()); - dst.setPreviousService(getPreviousService()); + //FIXME +// dst.setPreviousService(getPreviousService()); dst.setCanCreateLocalService(isCanCreateLocalService()); dst.setCanUseLocalService(isCanUseLocalService()); dst.setCanUseRemoteService(isCanUseRemoteService()); - pgConfig.copyTo(dst.pgConfig); - h2Config.copyTo(dst.h2Config); + //FIXME +// pgConfig.copyTo(dst.pgConfig); + //FIXME +// h2Config.copyTo(dst.h2Config); dst.setSelectDataModel(getSelectDataModel()); dst.setSecurityModel(getSecurityModel()); - dst.setPgInstall(getPgInstall()); + //FIXME +// dst.setPgInstall(getPgInstall()); dst.setAdminAction(getAdminAction()); } @@ -1398,8 +1449,8 @@ public class StorageUIModel extends WizardModel<StorageStep> { firePropertyChange(propertyName, oldValue, newValue); } // always invalidate test when modification, so notify listeners - firePropertyChange(CONNEXION_STATUS_PROPERTY_NAME, - pgConfig.getConnexionStatus()); +// firePropertyChange(CONNEXION_STATUS_PROPERTY_NAME, +// pgConfig.getConnexionStatus()); validate(); } @@ -1411,49 +1462,57 @@ public class StorageUIModel extends WizardModel<StorageStep> { */ public boolean testRemote() { //FIXME tchemit 2010-08-18 : should do this in a thread to be able to stop test if too long - boolean result = getPgConfig().canConnect(); - if (log.isDebugEnabled()) { - log.debug("result : " + result); - } - firePgConfigChanged(CONNEXION_STATUS_PROPERTY_NAME, null, pgConfig.getConnexionStatus()); - - if (result && !getPgConfig().isCanMigrate()) { - - // must check version (can't migrate remote db) - result = getPgConfig().checkVersion(getDbVersion()); - - if (!result) { - - // can't use this remote db - pgConfig.setConnexionStatus(ConnexionStatus.FAILED); - - firePgConfigChanged(CONNEXION_STATUS_PROPERTY_NAME, null, pgConfig.getConnexionStatus()); - } - } - return result; + //FIXME +// boolean result = getPgConfig().canConnect(); +// if (log.isDebugEnabled()) { +// log.debug("result : " + result); +// } +// firePgConfigChanged(CONNEXION_STATUS_PROPERTY_NAME, null, pgConfig.getConnexionStatus()); +// +// if (result && !getPgConfig().isCanMigrate()) { +// +// // must check version (can't migrate remote db) +// result = getPgConfig().checkVersion(getDbVersion()); +// +// if (!result) { +// +// // can't use this remote db +// pgConfig.setConnexionStatus(ConnexionStatus.FAILED); +// +// firePgConfigChanged(CONNEXION_STATUS_PROPERTY_NAME, null, pgConfig.getConnexionStatus()); +// } +// } +// return result; + return false; } public boolean isPgConfigVersionMatch() { - return getDbVersion().equals(pgConfig.getVersion()); + //FIXME +// return getDbVersion().equals(pgConfig.getVersion()); + return false; } public void setSecurityModel(SecurityModel securityModel) { this.securityModel = securityModel; } - public void setPgInstall(PGInstall pgInstall) { - this.pgInstall = pgInstall; - if (pgInstall != null) { - this.pgInstall.init(pgConfig, securityModel, false); - } - } +// public void setPgInstall(PGInstall pgInstall) { +// this.pgInstall = pgInstall; +// if (pgInstall != null) { +// this.pgInstall.init(pgConfig, securityModel, false); +// } +// } public boolean isShowMigrationSql() { - return pgConfig.isShowMigrationSql(); + //FIXME +// return pgConfig.isShowMigrationSql(); + return false; } public boolean isShowMigrationProgression() { - return pgConfig.isShowMigrationProgression(); + //FIXME +// return pgConfig.isShowMigrationProgression(); + return false; } public void setConnexionStatus(ConnexionStatus connexionStatus) { @@ -1491,20 +1550,21 @@ public class StorageUIModel extends WizardModel<StorageStep> { } catch (IOException e) { throw new RuntimeException("Could not create new temporary directory", e); } - - importReferenceConfig = DataSourceFactory.newH2ConfigFromDump(dbLabel, - tempDirectory, - getCentralSourceModel().toH2StorageConfig(dbLabel).getDbDump(), - "sa", - new char[]{'s', 'a'}, - false); +//FIXME +// importReferenceConfig = DataSourceFactory.newH2ConfigFromDump(dbLabel, +// tempDirectory, +// getCentralSourceModel().toH2StorageConfig(dbLabel).getDbDump(), +// "sa", +// new char[]{'s', 'a'}, +// false); break; case IMPORT_REMOTE_STORAGE: // import referentiel from a remote db - importReferenceConfig = getCentralSourceModel().toPostgresStorageConfig(dbLabel); + //FIXME +// importReferenceConfig = getCentralSourceModel().toPostgresStorageConfig(dbLabel); break; @@ -1512,8 +1572,9 @@ public class StorageUIModel extends WizardModel<StorageStep> { throw new IllegalStateException("Can't come here"); } - - importReferenceConfig.setCanMigrate(false); +//FIXME +// importReferenceConfig.setCanMigrate(false); + importReferenceConfig = null; } else { @@ -1544,25 +1605,26 @@ public class StorageUIModel extends WizardModel<StorageStep> { } catch (IOException e) { throw new RuntimeException("Could not create new temporary directory", e); } - - dataSourceConfig = DataSourceFactory.newH2ConfigFromDump(dbLabel, - tempDirectory, - getDataSourceModel().toH2StorageConfig(dbLabel).getDbDump(), - "sa", - new char[]{'s', 'a'}, - false); +//FIXME +// dataSourceConfig = DataSourceFactory.newH2ConfigFromDump(dbLabel, +// tempDirectory, +// getDataSourceModel().toH2StorageConfig(dbLabel).getDbDump(), +// "sa", +// new char[]{'s', 'a'}, +// false); break; case IMPORT_REMOTE_STORAGE: - - dataSourceConfig = getDataSourceModel().toPostgresStorageConfig(dbLabel); +//FIXME +// dataSourceConfig = getDataSourceModel().toPostgresStorageConfig(dbLabel); break; default: throw new IllegalStateException("Can't come here"); } - dataSourceConfig.setCanMigrate(false); + //FIXME +// dataSourceConfig.setCanMigrate(false); } else { diff --git a/observe-application-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 index 0886000..0673721 100644 --- a/observe-application-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 @@ -26,13 +26,13 @@ import fr.ird.observe.DecoratorService; import fr.ird.observe.ObserveContext; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; -import fr.ird.observe.entities.OpenableEntity; -import fr.ird.observe.entities.longline.ActivityLongline; -import fr.ird.observe.entities.longline.TripLongline; -import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.entities.seine.Route; -import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.services.dto.OpenableEntityDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.content.impl.seine.FloatingObjectUI; import fr.ird.observe.ui.content.impl.seine.SetSeineUI; import fr.ird.observe.ui.content.open.impl.longline.ActivityLonglineUI; @@ -218,7 +218,7 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel } // else if (ActivitySeine.class.equals(containerClass)) { // // remonte sur une activity : donc observedSystem -// path = ObservedSystem.class.getName(); +// path = ObservedSystemDto.class.getName(); // } else { // dans le cas d'un sub, il n'y a pas de suffixe possible diff --git a/observe-application-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 index e5aa254..68732e5 100644 --- a/observe-application-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 @@ -25,7 +25,7 @@ package fr.ird.observe.ui.tree; import fr.ird.observe.DataService; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; -import fr.ird.observe.entities.longline.ActivityLongline; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.ui.tree.loadors.ActivityLonglineNodeChildLoador; /** diff --git a/observe-application-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 index bf12f1a..7772654 100644 --- a/observe-application-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 @@ -25,7 +25,7 @@ package fr.ird.observe.ui.tree; import fr.ird.observe.DataService; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; -import fr.ird.observe.entities.seine.ActivitySeine; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.ui.tree.loadors.ActivitySeineNodeChildLoador; /** diff --git a/observe-application-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 index 0f0015c..70b0922 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.tree; -import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.services.dto.seine.TripSeineDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.painter.Painter; diff --git a/observe-application-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 index 93684d4..76b93c0 100644 --- a/observe-application-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 @@ -22,8 +22,8 @@ package fr.ird.observe.ui.tree; import fr.ird.observe.db.model.DataSelectionModel; -import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/observe-application-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 index 123e944..b100223 100644 --- a/observe-application-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 @@ -26,7 +26,7 @@ import fr.ird.observe.DataService; import fr.ird.observe.ObserveContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; -import fr.ird.observe.entities.OpenableEntity; +import fr.ird.observe.services.dto.OpenableEntityDto; import fr.ird.observe.ui.tree.loadors.AbstractNodeChildLoador; import jaxx.runtime.swing.nav.NavBridge; import jaxx.runtime.swing.nav.NavDataProvider; diff --git a/observe-application-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 index bd90005..4717229 100644 --- a/observe-application-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 @@ -25,7 +25,7 @@ package fr.ird.observe.ui.tree; import fr.ird.observe.DataService; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; -import fr.ird.observe.entities.seine.FloatingObject; +import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.ui.tree.loadors.FloatingObjectNodeChildLoador; /** diff --git a/observe-application-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 index ad8811b..cff22db 100644 --- a/observe-application-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 @@ -27,8 +27,8 @@ import fr.ird.observe.DataService; import fr.ird.observe.ObserveTechnicalException; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; -import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.entities.referentiel.Programs; +import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.referential.ProgramsDto; import fr.ird.observe.ui.tree.actions.ChangeTripProgramActionListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/observe-application-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 index 538a095..2c22ba2 100644 --- a/observe-application-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 @@ -21,8 +21,8 @@ */ package fr.ird.observe.ui.tree; -import fr.ird.observe.entities.OpenableEntity; -import fr.ird.observe.entities.Trip; +import fr.ird.observe.services.dto.OpenableEntityDto; +import fr.ird.observe.services.dto.TripDto; import jaxx.runtime.swing.nav.tree.NavTreeNode; import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; import org.apache.commons.logging.Log; diff --git a/observe-application-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 index f334560..746a7cb 100644 --- a/observe-application-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 @@ -28,17 +28,17 @@ import fr.ird.observe.ObserveContext; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.model.DataSelectionModel; -import fr.ird.observe.entities.OpenableEntity; -import fr.ird.observe.entities.longline.ActivityLongline; -import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.entities.longline.TripLongline; -import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.entities.referentiel.Programs; -import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.entities.seine.FloatingObject; -import fr.ird.observe.entities.seine.Route; -import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.services.dto.OpenableEntityDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.referential.ProgramsDto; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.FloatingObjectDto; +import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.tree.loadors.AbstractNodeChildLoador; import fr.ird.observe.ui.tree.loadors.ActivityLonglineNodeChildLoador; diff --git a/observe-application-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 index 813e1b8..7544d6c 100644 --- a/observe-application-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 @@ -25,7 +25,7 @@ package fr.ird.observe.ui.tree; import fr.ird.observe.DataService; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; -import fr.ird.observe.entities.referentiel.Program; +import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.ui.tree.loadors.ProgramLonglineNodeChildLoador; /** diff --git a/observe-application-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 index 5954d1b..8e35230 100644 --- a/observe-application-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 @@ -25,7 +25,7 @@ package fr.ird.observe.ui.tree; import fr.ird.observe.DataService; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; -import fr.ird.observe.entities.referentiel.Program; +import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.ui.tree.loadors.ProgramSeineNodeChildLoador; /** diff --git a/observe-application-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 index ab5d772..6c52947 100644 --- a/observe-application-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 @@ -25,7 +25,7 @@ package fr.ird.observe.ui.tree; import fr.ird.observe.DataService; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; -import fr.ird.observe.entities.seine.Route; +import fr.ird.observe.services.dto.seine.RouteDto; /** * Created on 4/9/15. diff --git a/observe-application-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 index 871c539..dfd4c8b 100644 --- a/observe-application-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 @@ -25,7 +25,7 @@ package fr.ird.observe.ui.tree; import fr.ird.observe.DataService; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; -import fr.ird.observe.entities.longline.SetLongline; +import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.tree.loadors.SetLonglineNodeChildLoador; /** diff --git a/observe-application-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 index 52fcd2f..279956b 100644 --- a/observe-application-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 @@ -25,7 +25,7 @@ package fr.ird.observe.ui.tree; import fr.ird.observe.DataService; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; -import fr.ird.observe.entities.seine.SetSeine; +import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.ui.tree.loadors.SetSeineNodeChildLoador; /** diff --git a/observe-application-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 index d68a8c6..3e689c1 100644 --- a/observe-application-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 @@ -25,7 +25,7 @@ package fr.ird.observe.ui.tree; import fr.ird.observe.DataService; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; -import fr.ird.observe.entities.longline.TripLongline; +import fr.ird.observe.services.dto.longline.TripLonglineDto; /** * Created on 4/9/15. diff --git a/observe-application-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 index 0d62950..7fb4ff3 100644 --- a/observe-application-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 @@ -25,7 +25,7 @@ package fr.ird.observe.ui.tree; import fr.ird.observe.DataService; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; -import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.services.dto.seine.TripSeineDto; /** * Created on 4/9/15. diff --git a/observe-application-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 index 205c074..3b0a74c 100644 --- a/observe-application-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 @@ -23,8 +23,8 @@ package fr.ird.observe.ui.tree.loadors; */ import fr.ird.observe.db.DataSourceException; -import fr.ird.observe.entities.longline.ActivityLongline; -import fr.ird.observe.entities.longline.SetLongline; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.tree.ActivityLonglineNode; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; diff --git a/observe-application-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 index f58994d..c6c8ba3 100644 --- a/observe-application-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 @@ -23,7 +23,7 @@ package fr.ird.observe.ui.tree.loadors; */ import fr.ird.observe.db.DataSource; -import fr.ird.observe.entities.longline.ActivityLongline; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.ui.tree.ActivityLonglineNode; import fr.ird.observe.ui.tree.ObserveDataProvider; import fr.ird.observe.ui.tree.ObserveNode; diff --git a/observe-application-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 index 2144200..f2c6dab 100644 --- a/observe-application-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 @@ -22,9 +22,9 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.db.DataSource; -import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.entities.seine.FloatingObject; -import fr.ird.observe.entities.seine.SetSeine; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.FloatingObjectDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.ui.tree.ActivitySeineNode; import fr.ird.observe.ui.tree.FloatingObjectSeineNode; import fr.ird.observe.ui.tree.ObserveDataProvider; diff --git a/observe-application-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 index e4891d8..989c124 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.db.DataSource; -import fr.ird.observe.entities.seine.ActivitySeine; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.ui.tree.ActivitySeineNode; import fr.ird.observe.ui.tree.ObserveDataProvider; import fr.ird.observe.ui.tree.ObserveNode; diff --git a/observe-application-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 index 0b23ea8..d2366ba 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.db.DataSourceException; -import fr.ird.observe.entities.seine.FloatingObject; +import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import jaxx.runtime.swing.nav.NavDataProvider; diff --git a/observe-application-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 index 5c30a30..2ffdf23 100644 --- a/observe-application-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 @@ -25,7 +25,7 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.DataService; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.model.DataSelectionModel; -import fr.ird.observe.entities.longline.TripLongline; +import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.tree.TripLonglineNode; diff --git a/observe-application-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 index 5409fdd..4de564f 100644 --- a/observe-application-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 @@ -24,7 +24,7 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.DataService; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.model.DataSelectionModel; -import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.tree.TripSeineNode; diff --git a/observe-application-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 index 1c704db..1572af7 100644 --- a/observe-application-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 @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.entities.Entities; +import fr.ird.observe.services.dto.EntitiesDto; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.ui.UIHelper; diff --git a/observe-application-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 index 8181f95..5bb9555 100644 --- a/observe-application-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 @@ -23,7 +23,7 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.db.DataSourceException; -import fr.ird.observe.entities.Entities; +import fr.ird.observe.services.dto.EntitiesDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.tree.ObserveNode; import jaxx.runtime.swing.nav.NavDataProvider; diff --git a/observe-application-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 index 3db8f30..37ffa75 100644 --- a/observe-application-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 @@ -23,7 +23,7 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.db.DataSourceException; -import fr.ird.observe.entities.Entities; +import fr.ird.observe.services.dto.EntitiesDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.tree.ObserveNode; import jaxx.runtime.swing.nav.NavDataProvider; diff --git a/observe-application-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 index 7c8ec84..9c5925c 100644 --- a/observe-application-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 @@ -24,8 +24,8 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.DataService; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.model.DataSelectionModel; -import fr.ird.observe.entities.constants.GearType; -import fr.ird.observe.entities.referentiel.Program; +import fr.ird.observe.services.dto.constants.GearTypeDto; +import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.tree.ProgramLonglineNode; diff --git a/observe-application-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 index 3b1125d..64f544d 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.db.DataSource; -import fr.ird.observe.entities.seine.Route; +import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.ui.tree.ObserveDataProvider; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; diff --git a/observe-application-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 index 698f66e..4b0974c 100644 --- a/observe-application-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 @@ -23,7 +23,7 @@ package fr.ird.observe.ui.tree.loadors; */ import fr.ird.observe.db.DataSourceException; -import fr.ird.observe.entities.longline.SetLongline; +import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import jaxx.runtime.swing.nav.NavDataProvider; diff --git a/observe-application-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 index 2085dc1..11adee4 100644 --- a/observe-application-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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.db.DataSourceException; -import fr.ird.observe.entities.seine.SetSeine; +import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import jaxx.runtime.swing.nav.NavDataProvider; diff --git a/observe-application-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 index 8298ab5..fff52c1 100644 --- a/observe-application-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 @@ -29,7 +29,7 @@ Interface graphique pour afficher la liste des usages d'une entitee donnee. fr.ird.observe.ObserveContext fr.ird.observe.ui.UIHelper - org.nuiton.topia.persistence.TopiaEntity + fr.ird.observe.services.dto.AbstractObserveDto java.awt.Dimension java.util.List @@ -43,7 +43,7 @@ private UsagesUIHandler handler = new UsagesUIHandler(); public void init(String message, String message2, String message3, - Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>> usages) { + Map<Class<? extends TopiaEntity>, List<? extends AbstractObserveDto>> usages) { getHandler().initUI(this, message,message2, message3, usages); } diff --git a/observe-application-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 index 7b01271..b271893 100644 --- a/observe-application-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 @@ -23,7 +23,7 @@ package fr.ird.observe.ui.usage; import fr.ird.observe.DecoratorService; import fr.ird.observe.ObserveContext; -import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.services.dto.referential.ReferenceEntityDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; diff --git a/observe-application-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 index 71ab03b..e9e5e70 100644 --- a/observe-application-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 @@ -27,7 +27,7 @@ import fr.ird.observe.ObserveConfig; import fr.ird.observe.ObserveContext; import fr.ird.observe.ObserveTechnicalException; import fr.ird.observe.db.DataSource; -import fr.ird.observe.entities.Entities; +import fr.ird.observe.services.dto.EntitiesDto; import fr.ird.observe.tripMap.TripMapPoint; import fr.ird.observe.ui.UIHelper; import org.apache.commons.logging.Log; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/validation/ObserveValidator.java b/observe-application-swing/src/main/java/fr/ird/observe/validation/ObserveValidator.java new file mode 100644 index 0000000..ae6b33e --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/validation/ObserveValidator.java @@ -0,0 +1,185 @@ +/* + * #%L + * ObServe :: Business + * %% + * 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% + */ +package fr.ird.observe.validation; + +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.util.ValueStack; +import fr.ird.observe.ObserveApplicationContext; +import fr.ird.observe.ObserveServiceHelper; +import fr.ird.observe.db.DataSourceFactory; +import jaxx.runtime.validator.swing.SwingValidator; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.validator.NuitonValidatorFactory; +import org.nuiton.validator.NuitonValidatorProvider; +import org.nuiton.validator.NuitonValidatorScope; +import org.nuiton.validator.xwork2.XWork2ValidatorUtil; + +/** + * Une surcharge du validateur swing offert par jaxx pour pouvoir ajouter dans + * la stack le DataContext (pour faire de la validation sur le context de + * données d'un niveau supérieur (valider une marée à partir d'une route par + * exemple). + * + * @param <B> le type d'objet a valider + * @author Tony Chemit - chemit@codelutin.com + * @since 1.0 + */ +public class ObserveValidator<B> extends SwingValidator<B> { + + /** Logger */ + private static final Log log = LogFactory.getLog(ObserveValidator.class); + + /** un etat pour initialiser la stack une unique fois la stack */ + private static boolean init; + + private static ValidationContext validationContext; + + public static <B> ObserveValidator<B> newValidator(Class<B> type, + String context, + NuitonValidatorScope... scopes) { + return new ObserveValidator<B>( + type, + context, + scopes + ); + } + + public static <B> ObserveValidator<B> newValidator(NuitonValidatorProvider provider, + Class<B> type, + String context, + NuitonValidatorScope... scopes) { + return new ObserveValidator<B>( + provider, + type, + context, + scopes + ); + } + + public ObserveValidator( + Class<B> type, + String context, + NuitonValidatorScope... scopes) { + super(NuitonValidatorFactory.getDefaultProvider(), type, context, scopes); + } + + public ObserveValidator(NuitonValidatorProvider provider, + Class<B> type, + String context, + NuitonValidatorScope... scopes) { + super(provider, type, context, scopes); + } + + @Override + protected void rebuildDelegateValidator(Class<B> beanType, + String context, + NuitonValidatorScope... scopes) { + super.rebuildDelegateValidator(beanType, context, scopes); + + if (isInit()) { + // deja initialise + return; + } + + // on positionne dans la stack de dataContext pour pouvoir faire de la + // validation sur des objets dans le scope. + + ValidationContext dataContext = getValidationContext(); + if (dataContext == null) { + + // aucun context de validation enregistré + if (log.isDebugEnabled()) { + log.debug("No validation context registred, try in application context..."); + } + ObserveApplicationContext rootContext; + rootContext = ObserveServiceHelper.get(); + if (rootContext == null) { + throw new IllegalStateException( + "pas de context d'application enregistré... utiliser la " + + "methode " + + DataSourceFactory.class.getName() + + "#setApplicationContext(context)"); + } + dataContext = rootContext.getValidationContext(); + } + + reloadDataContext(dataContext, true); + + // on brand pour ne jamais revenir ici + setInit(true); + } + + public static void reloadDataContext(ValidationContext dataContext, + boolean strict) { + if (dataContext != validationContext) { + + // keep this validation context + setValidationContext(dataContext); + } + ValueStack valueStack; + ActionContext context = ActionContext.getContext(); + if (context == null) { + + if (strict) { + throw new IllegalStateException( + "pas de context xworks enregistré... utiliser la methode " + + ActionContext.class.getName() + "#setContext(context)"); + } + + valueStack = XWork2ValidatorUtil.getSharedValueStack(); + if (valueStack == null) { + return; + } + } else { + valueStack = context.getValueStack(); + } + + if (log.isDebugEnabled()) { + log.debug("Enregistrement du context de validation [" + dataContext + "] dans la valueStack de " + + "validation (" + valueStack + ')'); + } + + valueStack.push(dataContext); + } + + public static ValidationContext getValidationContext() { + return validationContext; + } + + public static void setValidationContext(ValidationContext validationContext) { + ObserveValidator.validationContext = validationContext; + // a chaque fois qu'on change le contexte de validation + // il faudra reinitiliser la stack + setInit(false); + } + + private static boolean isInit() { + return init; + } + + private static void setInit(boolean init) { + ObserveValidator.init = init; + } + + +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationContext.java new file mode 100644 index 0000000..47b4842 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationContext.java @@ -0,0 +1,301 @@ +/* + * #%L + * ObServe :: Business + * %% + * 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% + */ +package fr.ird.observe.validation; + +import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.DataSource; +import fr.ird.observe.db.DataSourceException; +import fr.ird.observe.services.dto.ActivityDto; +import fr.ird.observe.services.dto.SetDto; +import fr.ird.observe.services.dto.TripDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.FloatingObjectDto; +import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.TopiaEntity; + +import java.util.List; +import java.util.Map; +import java.util.TreeMap; + +/** + * Contient les objets en cours de validation. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.4 + */ +public class ValidationContext { + + /** Logger */ + static private final Log log = LogFactory.getLog(ValidationContext.class); + + public static final String VALIDATION_TRANSACTION_NAME = "validation"; + + protected DataSource dataSource; + + protected TopiaContext tx; + + protected DataContext dataContext; + + protected Map<String, Object> cache; + + private List<?> referentielList; + + public Map<String, Object> getCache() { + if (cache == null) { + cache = new TreeMap<String, Object>(); + } + return cache; + } + + public void cleanCache() { + getCache().clear(); + referentielList = null; + cleanTransaction(); + } + + public DataSource getDataSource() { + return dataSource; + } + + public void close() { + closeDataSource(); + dataContext = null; + } + + @Override + protected void finalize() throws Throwable { + super.finalize(); + close(); + } + + public void closeDataSource() { + closeTransaction(); + dataSource = null; + } + + protected void closeTransaction() { + if (tx != null) { + if (log.isDebugEnabled()) { + log.debug("close 'validation' transaction"); + } + try { + dataSource.closeTransaction(tx, VALIDATION_TRANSACTION_NAME); + } catch (DataSourceException e) { + if (log.isErrorEnabled()) { + log.error("Could not close transaction", e); + } + } finally { + tx = null; + } + } + } + + protected void cleanTransaction() { + if (tx != null) { + if (log.isDebugEnabled()) { + log.debug("clean 'validation' transaction"); + } + try { + dataSource.rollbackTransaction(tx, VALIDATION_TRANSACTION_NAME); + } catch (DataSourceException e) { + if (log.isErrorEnabled()) { + log.error("Could not clean transaction", e); + } + } + } + } + + public DataContext getDataContext() { + return dataContext; + } + + public void setDataSource(DataSource dataSource) { + if (this.dataSource != null) { + closeDataSource(); + } + if (log.isDebugEnabled()) { + log.debug("Attach data source " + (dataSource == null ? "null" : dataSource.getShortLabel())); + } + this.dataSource = dataSource; + } + + public void setDataContext(DataContext dataContext) { + if (log.isInfoEnabled()) { + log.info("Attach data context " + dataContext); + } + this.dataContext = dataContext; + ObserveValidator.reloadDataContext(this, false); + } + + public Trip getCurrentTrip() { + + Trip result = null; + + String selectedTripId = dataContext.getSelectedTripId(); + if (selectedTripId != null) { + if (selectedTripId.contains("Seine")) { + result = getCurrentTripSeine(); + } else { + result = getCurrentTripLongline(); + } + } + return result; + + } + + public TripSeine getCurrentTripSeine() { + TripSeine result = getEntity(TripSeine.class, dataContext.getSelectedTripId()); + return result; + } + + public TripLongline getCurrentTripLongline() { + TripLongline result = getEntity(TripLongline.class, dataContext.getSelectedTripId()); + return result; + } + + public Route getCurrentRoute() { + Route result = getEntity(Route.class, dataContext.getSelectedRouteId()); + return result; + } + + public Activity getCurrentActivity() { + + Activity result = null; + + String selectedActivityId = dataContext.getSelectedActivityId(); + if (selectedActivityId != null) { + if (selectedActivityId.contains("Seine")) { + result = getCurrentActivitySeine(); + } else { + result = getCurrentActivityLongline(); + } + } + return result; + + } + + public ActivitySeine getCurrentActivitySeine() { + ActivitySeine result = getEntity(ActivitySeine.class, dataContext.getSelectedActivityId()); + return result; + } + + public ActivityLongline getCurrentActivityLongline() { + ActivityLongline result = getEntity(ActivityLongline.class, dataContext.getSelectedActivityId()); + return result; + } + + public Set getCurrentSet() { + + Set result = null; + + String selectedSetId = dataContext.getSelectedSetId(); + if (selectedSetId != null) { + if (selectedSetId.contains("Seine")) { + result = getCurrentSetSeine(); + } else { + result = getCurrentSetLongline(); + } + } + return result; + + } + + public SetSeine getCurrentSetSeine() { + SetSeine result = getEntity(SetSeine.class, dataContext.getSelectedSetId()); + return result; + } + + public SetLongline getCurrentSetLongline() { + SetLongline result = getEntity(SetLongline.class, dataContext.getSelectedSetId()); + return result; + } + + public FloatingObject getCurrentFloatingObject() { + FloatingObject result = getEntity(FloatingObject.class, dataContext.getSelectedFloatingObjectId()); + return result; + } + + public List<?> getEditingReferentielList() { + return referentielList; + } + + public void setEditingReferentielList(List<?> referentielList) { + if (log.isDebugEnabled()) { + log.debug("Add referentielList (size : " + (referentielList == null ? 0 : referentielList.size()) + ")"); + } + this.referentielList = referentielList; + } + + public TopiaContext getTx() throws DataSourceException { + if (tx == null) { + if (dataSource != null) { + if (log.isInfoEnabled()) { + log.info("Open a new transaction " + tx); + } + tx = dataSource.beginTransaction(VALIDATION_TRANSACTION_NAME); + } + } + return tx; + } + + public <E extends TopiaEntity> E getEntity(Class<E> klass, String id) { + + if (dataSource == null || dataContext == null || !dataSource.isOpen() || id == null) { + return null; + } + Object o = getCache().get(id); + if (o != null) { + if (log.isDebugEnabled()) { + log.debug("Use cached entity : " + id); + } + // found in cache + return (E) o; + } + try { + TopiaContext tx = getTx(); + if (tx == null) { + return null; + } + TopiaDAO<E> dao = dataSource.getDAO(tx, klass); + E result = dao.findByTopiaId(id); + if (log.isInfoEnabled()) { + log.info("Put entity into cache : " + id); + } + getCache().put(id, result); + return result; + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Could not obtain " + id, e); + } + return null; + } + } +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationMessageDetector.java b/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationMessageDetector.java new file mode 100644 index 0000000..acef4f2 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationMessageDetector.java @@ -0,0 +1,559 @@ +/* + * #%L + * ObServe :: Business + * %% + * 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% + */ +package fr.ird.observe.validation; + +import fr.ird.observe.ObserveDAOHelper; +import fr.ird.observe.ObserveEntityEnum; +import fr.ird.observe.ObserveServiceHelper; +import fr.ird.observe.db.DataContext; +import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.nuiton.topia.persistence.EntityVisitor; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.util.TopiaEntityRef; +import org.nuiton.validator.bean.simple.SimpleBeanValidator; +import org.nuiton.validator.bean.simple.SimpleBeanValidatorEvent; +import org.nuiton.validator.bean.simple.SimpleBeanValidatorListener; +import org.nuiton.validator.bean.simple.SimpleBeanValidatorMessage; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Deque; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; +import java.util.SortedMap; +import java.util.TreeMap; + +/** + * Le detecteur de messages de validation. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.3 + */ +public class ValidationMessageDetector implements EntityVisitor, + SimpleBeanValidatorListener { + + /** Logger */ + private static final Log log = + LogFactory.getLog(ValidationMessageDetector.class); + + public static final String SEPARATOR = "/"; + + /** le path courant depuis le depart */ + protected Deque<TopiaEntity> path; + + /** le dictionnaire des paths d'entites detectees */ + protected SortedMap<TopiaEntityRef, List<SimpleBeanValidatorMessage<?>>> refs; + + protected StringBuilder accessorExpression; + + protected TopiaEntity root; + + protected TopiaEntityRef currentRef; + + protected Set<TopiaEntity> explored; + + /** le dictionnaire des validateurs utilisables */ + protected final ValidatorsMap validators; + + protected ValidationContext context; + + public ValidationContext getContext() { + if (context == null) { + context = ObserveServiceHelper.getValidationContext(); + } + return context; + } + + public ValidationMessageDetector(ValidatorsMap validators) { + this.validators = validators; + path = new LinkedList<TopiaEntity>(); + explored = new HashSet<TopiaEntity>(); + refs = new TreeMap<TopiaEntityRef, List<SimpleBeanValidatorMessage<?>>>(); + accessorExpression = new StringBuilder(); + for (SimpleBeanValidator<?> v : validators.values()) { + v.setBean(null); + } + } + + public void detectMessages(TopiaEntity... entities) { +// try { + // on reinitialise tous les validateurs +// for (BeanValidator<?> v : validators.values()) { +// v.setBean(null); +//// v.setContextName(contextName); +// } + for (TopiaEntity e : entities) { + if (log.isDebugEnabled()) { + log.debug("start for entity " + e.getTopiaId()); + } + // détection sur l'entité e + try { + e.accept(this); + } catch (TopiaException e1) { + throw new RuntimeException("could not vist entity " + e.getTopiaId(), e1); + } + } + } + + @Override + public void start(TopiaEntity e) { + if (root == null) { + // start come in start method since + // last clear method invocation + root = e; + addPath(e, "$root", -1); + } + explored.add(e); + SimpleBeanValidator<TopiaEntity> validator = getValidator(e); + if (log.isDebugEnabled()) { + log.debug("with entity " + e.getTopiaId() + " : " + accessorExpression); + } + if (validator != null) { + validator.addSimpleBeanValidatorListener(this); + addEntityInContext(e); + try { + currentRef = new TopiaEntityRef( + root, + e, + accessorExpression.toString(), + path.toArray(new TopiaEntity[path.size()])); + validator.setBean(e); + } finally { + validator.removeSimpleBeanValidatorListener(this); + validator.setBean(null); + } + } + } + + @Override + public void end(TopiaEntity e) { + if (root != null && root.equals(e)) { + // global visit is done + root = null; + removePath(); + } + removeEntityFromContext(e); + } + + private void addEntityInContext(TopiaEntity e) { + + DataContext context = getContext().getDataContext(); + + ObserveEntityEnum anEnum = ObserveEntityEnum.valueOf(e); + switch (anEnum) { + case Route: + context.setSelectedRouteId(e.getTopiaId()); + break; + case TripSeine: { + context.setSelectedTripId(e.getTopiaId()); + Program program = ((TripSeine) e).getProgram(); + if (program != null) { + context.setSelectedProgramId(program.getTopiaId()); + } else { + context.setSelectedProgramId(null); + } + } + break; + case ActivitySeine: + context.setSelectedActivityId(e.getTopiaId()); + break; + case SetSeine: + context.setSelectedSetId(e.getTopiaId()); + break; + case TripLongline: { + context.setSelectedTripId(e.getTopiaId()); + Program program = ((TripLongline) e).getProgram(); + if (program != null) { + context.setSelectedProgramId(program.getTopiaId()); + } else { + context.setSelectedProgramId(null); + } + } + break; + case ActivityLongline: + context.setSelectedActivityId(e.getTopiaId()); + break; + case SetLongline: + context.setSelectedSetId(e.getTopiaId()); + break; + case FloatingObject: + context.setSelectedFloatingObjectId(e.getTopiaId()); + break; + case NonTargetLength: + break; + case TargetLength: + break; + case TransmittingBuoy: + break; + case NonTargetCatch: + break; + case TargetCatch: + break; + case NonTargetSample: + break; + case TargetSample: + break; + case ObjectObservedSpecies: + break; + case SchoolEstimate: + break; + case ObjectSchoolEstimate: + break; + case VesselActivitySeine: + break; + case SurroundingActivity: + break; + case Vessel: + break; + case VesselSizeCategory: + break; + case WeightCategory: + break; + case ReasonForNullSet: + break; + case ReasonForNoFishing: + break; + case SpeciesFate: + break; + case ObjectFate: + break; + case Species: + break; + case SpeciesGroup: + break; + case DetectionMode: + break; + case Person: + break; + case Ocean: + break; + case TransmittingBuoyOperation: + break; + case ObjectOperation: + break; + case Organism: + break; + case LengthWeightParameter: + break; + case Country: + break; + case Program: + break; + case ReasonForDiscard: + break; + case SpeciesStatus: + break; + case ObservedSystem: + break; + case TransmittingBuoyType: + break; + case VesselType: + break; + case ObjectType: + break; + case Wind: + break; + } + } + + private void removeEntityFromContext(TopiaEntity e) { + + DataContext context = getContext().getDataContext(); + + ObserveEntityEnum anEnum = ObserveEntityEnum.valueOf(e); + switch (anEnum) { + case Route: + context.setSelectedRouteId(null); + break; + case TripSeine: + context.setSelectedTripId(null); + context.setSelectedProgramId(null); + break; + case ActivitySeine: + context.setSelectedActivityId(null); + break; + case SetSeine: + context.setSelectedSetId(null); + break; + case TripLongline: + context.setSelectedTripId(null); + context.setSelectedProgramId(null); + break; + case ActivityLongline: + context.setSelectedActivityId(null); + break; + case SetLongline: + context.setSelectedSetId(null); + break; + case FloatingObject: + context.setSelectedFloatingObjectId(null); + break; + case NonTargetLength: + break; + case TargetLength: + break; + case TransmittingBuoy: + break; + case NonTargetCatch: + break; + case TargetCatch: + break; + case NonTargetSample: + break; + case TargetSample: + break; + case ObjectObservedSpecies: + break; + case SchoolEstimate: + break; + case ObjectSchoolEstimate: + break; + case VesselActivitySeine: + break; + case SurroundingActivity: + break; + case Vessel: + break; + case VesselSizeCategory: + break; + case WeightCategory: + break; + case ReasonForNullSet: + break; + case ReasonForNoFishing: + break; + case SpeciesFate: + break; + case ObjectFate: + break; + case Species: + break; + case SpeciesGroup: + break; + case DetectionMode: + break; + case Person: + break; + case Ocean: + break; + case TransmittingBuoyOperation: + break; + case ObjectOperation: + break; + case Organism: + break; + case LengthWeightParameter: + break; + case Country: + break; + case Program: + break; + case ReasonForDiscard: + break; + case SpeciesStatus: + break; + case ObservedSystem: + break; + case TransmittingBuoyType: + break; + case VesselType: + break; + case ObjectType: + break; + case Wind: + break; + } + } + + @Override + public void visit(TopiaEntity e, + String name, + Class<?> type, + Object value) { + TopiaEntity e1 = getTopiaValue(value); + if (e1 != null) { + addPath(e1, name, -1); + try { + try { + e1.accept(this); + } catch (TopiaException ex) { + if (log.isErrorEnabled()) { + log.error(ex.getMessage(), ex); + } + } + } finally { + removePath(); + } + } + } + + @Override + public void visit(TopiaEntity e, + String name, + Class<?> collectionType, + Class<?> type, + int index, + Object value) { + TopiaEntity e1 = getTopiaValue(value); + if (e1 != null) { + addPath(e1, name, index); + try { + try { + e1.accept(this); + } catch (TopiaException ex) { + if (log.isErrorEnabled()) { + log.error(ex.getMessage(), ex); + } + } + } finally { + removePath(); + } + } + } + + @Override + public void visit(TopiaEntity e, + String name, + Class<?> collectionType, + Class<?> type, + Object value) { + Collection<?> cValue = (Collection<?>) value; + if (TopiaEntity.class.isAssignableFrom(type) && + cValue != null && !cValue.isEmpty()) { + int i = 0; + for (Object currentValue : cValue) { + visit(e, name, collectionType, type, i++, currentValue); + } + } + } + + public SortedMap<TopiaEntityRef, List<SimpleBeanValidatorMessage<?>>> getRefs() { + // on renvoie toujours une copie + // pour pouvoir au plus tôt nettoyer le detecteur + TreeMap<TopiaEntityRef, List<SimpleBeanValidatorMessage<?>>> result; + result = new TreeMap<TopiaEntityRef, List<SimpleBeanValidatorMessage<?>>>(refs); + return result; + } + + @Override + public void clear() { + path.clear(); + refs.clear(); + root = null; + explored.clear(); + accessorExpression.setLength(0); + } + + protected TopiaEntity getTopiaValue(Object value) { + TopiaEntity topiaEntity = (TopiaEntity) (value != null && + value instanceof TopiaEntity ? value : null); + if (topiaEntity != null && explored.contains(topiaEntity)) { + // entite deja visitee + topiaEntity = null; + } + return topiaEntity; + } + + protected <T extends TopiaEntity> SimpleBeanValidator<T> getValidator(T e) { + Class<T> contractClass; + contractClass = (Class<T>) ObserveDAOHelper.getContractClass(e.getClass()); + return validators.getValidator(contractClass); + } + + protected void addPath(TopiaEntity e, String name, int index) { + path.add(e); + if (accessorExpression.length() > 0) { + accessorExpression.append(SEPARATOR); + } + accessorExpression.append(name); + if (index > -1) { + accessorExpression.append("[@topiaId=\""); + accessorExpression.append(e.getTopiaId()); + accessorExpression.append("\"]"); + } + if (log.isTraceEnabled()) { + log.trace("add to stack : " + e.getTopiaId() + ", new size : " + + path.size() + ", path : " + accessorExpression); + } + } + + protected void removePath() { + TopiaEntity e = path.removeLast(); + if (path.isEmpty()) { + accessorExpression.setLength(0); + } else { + int index = accessorExpression.lastIndexOf(SEPARATOR); + if (index > -1) { + accessorExpression.delete(index, + accessorExpression.length()); + } + } + if (log.isTraceEnabled()) { + log.trace("remove from stack : " + e.getTopiaId() + + ", new size : " + path.size() + ", path : " + + accessorExpression); + } + } + + @Override + public void onFieldChanged(SimpleBeanValidatorEvent event) { + SimpleBeanValidator<?> validator = event.getSource(); + + // on ne traite que les messages a ajouter + String[] messagesToAdd = event.getMessagesToAdd(); + + if (messagesToAdd == null || messagesToAdd.length == 0) { + return; + } + + if (log.isDebugEnabled()) { + log.debug("will add " + Arrays.toString(messagesToAdd) + + " for " + currentRef.getAccessorExpression()); + } + List<SimpleBeanValidatorMessage<?>> list = refs.get(currentRef); + if (list == null) { + // first time for this entity + list = new ArrayList<SimpleBeanValidatorMessage<?>>(); + refs.put(currentRef, list); + } + for (String m : messagesToAdd) { + SimpleBeanValidatorMessage<?> message; + message = new SimpleBeanValidatorMessage( + validator, + event.getField(), + m, + event.getScope()); + if (log.isDebugEnabled()) { + log.debug("add message " + message); + } + list.add(message); + } + } +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationModelMode.java b/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationModelMode.java new file mode 100644 index 0000000..e649381 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationModelMode.java @@ -0,0 +1,85 @@ +/* + * #%L + * ObServe :: Business + * %% + * 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% + */ +package fr.ird.observe.validation; + +import fr.ird.observe.services.dto.EntitiesDto; +import fr.ird.observe.ObserveEntityEnum; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.util.TopiaEntityHelper; + +import static org.nuiton.i18n.I18n.n; + +/** + * Pour caractériser le type de modele de validation a utiliser. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.3 + */ +public enum ValidationModelMode { + + /** validation du referentiel */ + REFERENTIEL( + n("observe.validation.model.type.referentiel"), + n("observe.validation.model.type.referentiel.description"), + Entities.REFERENCE_ENTITIES + ), + + /** validation de donnees observer */ + DATA( + n("observe.validation.model.type.data"), + n("observe.validation.model.type.data.description"), + Entities.DATA_ENTITIES + ), + + /** validation du referentiel et de donnees observer */ + ALL( + n("observe.validation.model.type.all"), + n("observe.validation.model.type.all.description"), + Entities.ALL_ENTITIES + ); + + private final String label; + + private final String description; + + private final Class<? extends TopiaEntity>[] contracts; + + ValidationModelMode(String label, + String description, + ObserveEntityEnum... contracts) { + this.label = label; + this.description = description; + this.contracts = TopiaEntityHelper.getContracts(contracts); + } + + public String getLabel() { + return label; + } + + public String getDescription() { + return description; + } + + public Class<? extends TopiaEntity>[] getContracts() { + return contracts; + } +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationService.java b/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationService.java new file mode 100644 index 0000000..84a71e8 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationService.java @@ -0,0 +1,155 @@ +/* + * #%L + * ObServe :: Business + * %% + * 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% + */ +package fr.ird.observe.validation; + +import fr.ird.observe.ObserveEntityEnum; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.util.TopiaEntityHelper; +import org.nuiton.validator.NuitonValidatorScope; +import org.nuiton.validator.bean.simple.SimpleBeanValidator; + +import java.util.Set; + +/** + * Contrat du service de validation des données. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.3 + */ +public class ValidationService { + + /** Logger */ + private static final Log log = + LogFactory.getLog(ValidationService.class); + + /** + * Obtenir le validateur d'un type objet + * + * @param context le lastName du context de validation + * @param scopes les scopes autorisés + * @param klass type de l'objet à valider + * @param <B> type de l'objet à valider + * @return le validateur trouvé ou {@code null} + */ + public <B> SimpleBeanValidator<B> getValidator(String context, + NuitonValidatorScope[] scopes, + Class<B> klass) { + + SimpleBeanValidator<B> valitator = SimpleBeanValidator.newValidator( + klass, + context, + scopes + ); + + Set<NuitonValidatorScope> resultScopes = valitator.getEffectiveScopes(); + if (resultScopes.isEmpty()) { + valitator = null; + if (log.isDebugEnabled()) { + log.debug(klass + " : validator skip (no scopes detected)"); + } + } else { + if (log.isDebugEnabled()) { + log.debug(klass + " : keep validator " + valitator); + } + } + return valitator; + } + + /** + * Obtenir le dictionnaire des validateurs pour les types d'entités donnés. + * + * @param contextName le lastName du context de validation + * @param scopes les scopes autorisés + * @param beanclass types des entités + * @return le dictionnaire des validateurs par type d'entité. + */ + public ValidatorsMap getValidators( + String contextName, + NuitonValidatorScope[] scopes, + Class<?>... beanclass) { + ValidatorsMap map = detectValidators( + contextName, + scopes, + beanclass + ); + return map; + } + + /** + * Obtenir le dictionnaire des validateurs pour les entités donnés. + * <p/> + * <b>Note:</b> On effectue un parcours des entités pour connaitre les types + * d'objets à valider, il faut donc des les collections des entités soient + * toutes chargées (ou l'objet attaché à une transaction...). + * + * @param contextName le lastName du context de validation + * @param scopes les scopes autorisés + * @param entities les entités + * @return le dictionnaire des validateurs par type d'entité. + */ + public ValidatorsMap getValidators( + String contextName, + NuitonValidatorScope[] scopes, + TopiaEntity... entities) { + + Set<Class<? extends TopiaEntity>> types; + try { + types = TopiaEntityHelper.detectTypes( + ObserveEntityEnum.values(), + entities + ); + } catch (TopiaException e) { + throw new IllegalArgumentException( + "could not obtains types for reason " + e.getMessage(), e); + } + + ValidatorsMap result = detectValidators( + contextName, + scopes, + types.toArray(new Class<?>[types.size()]) + ); + return result; + } + + @SuppressWarnings("unchecked") + public <T> ValidatorsMap detectValidators( + String context, + NuitonValidatorScope[] scopes, + Class<?>... types) { + + ValidatorsMap result = new ValidatorsMap(); + + for (Class<?> c : types) { + // on cherche le validateur + SimpleBeanValidator<T> validator = (SimpleBeanValidator<T>) + getValidator(context, scopes, c); + if (validator != null) { + // on enregistre le validateur + result.put(c, validator); + } + } + return result; + } +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidatorsMap.java b/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidatorsMap.java new file mode 100644 index 0000000..c4f1a03 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidatorsMap.java @@ -0,0 +1,121 @@ +/* + * #%L + * ObServe :: Business + * %% + * Copyright (C) 2008 - 2010 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% + */ +package fr.ird.observe.validation; + +import org.nuiton.validator.NuitonValidatorScope; +import org.nuiton.validator.bean.simple.SimpleBeanValidator; + +import java.util.Collection; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +/** + * Un dictionnaire de validateurs ordonnees par le type de leur bean. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 2.1 + */ +public class ValidatorsMap implements Map<Class<?>, SimpleBeanValidator<?>> { + + protected final Map<Class<?>, SimpleBeanValidator<?>> delegate; + + public ValidatorsMap() { + delegate = new HashMap<Class<?>, SimpleBeanValidator<?>>(); + } + + public NuitonValidatorScope[] getScopes() { + EnumSet<NuitonValidatorScope> result = + EnumSet.noneOf(NuitonValidatorScope.class); + for (SimpleBeanValidator<?> b : values()) { + result.addAll(b.getScopes()); + } + return result.toArray(new NuitonValidatorScope[result.size()]); + } + + public <X> SimpleBeanValidator<X> getValidator(Class<X> klass) { + SimpleBeanValidator<X> beanValidator = (SimpleBeanValidator<X>) get(klass); + return beanValidator; + } + + @Override + public int size() { + return delegate.size(); + } + + @Override + public boolean isEmpty() { + return delegate.isEmpty(); + } + + @Override + public boolean containsKey(Object key) { + return delegate.containsKey(key); + } + + @Override + public boolean containsValue(Object value) { + return delegate.containsValue(value); + } + + @Override + public SimpleBeanValidator<?> get(Object key) { + return delegate.get(key); + } + + @Override + public SimpleBeanValidator<?> put(Class<?> key, SimpleBeanValidator<?> value) { + return delegate.put(key, value); + } + + @Override + public SimpleBeanValidator<?> remove(Object key) { + return delegate.remove(key); + } + + @Override + public void putAll(Map<? extends Class<?>, ? extends SimpleBeanValidator<?>> m) { + delegate.putAll(m); + } + + @Override + public void clear() { + delegate.clear(); + } + + @Override + public Set<Class<?>> keySet() { + return delegate.keySet(); + } + + @Override + public Collection<SimpleBeanValidator<?>> values() { + return delegate.values(); + } + + @Override + public Set<Entry<Class<?>, SimpleBeanValidator<?>>> entrySet() { + return delegate.entrySet(); + } + +} diff --git a/observe-application-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 index f3532b1..a02d7c5 100644 --- a/observe-application-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 @@ -25,12 +25,12 @@ package fr.ird.observe.ui.content.impl.longline; import fr.ird.observe.DecoratorService; import fr.ird.observe.ObserveApplicationContext; import fr.ird.observe.ObserveServiceHelper; -import fr.ird.observe.entities.constants.ReferenceLocale; -import fr.ird.observe.entities.longline.Basket; -import fr.ird.observe.entities.longline.BasketImpl; -import fr.ird.observe.entities.longline.Branchline; -import fr.ird.observe.entities.longline.Section; -import fr.ird.observe.entities.longline.SectionImpl; +import fr.ird.observe.services.dto.constants.ReferenceLocaleDto; +import fr.ird.observe.services.dto.longline.BasketDto; +import fr.ird.observe.services.dto.longline.BasketImplDto; +import fr.ird.observe.services.dto.longline.BranchlineDto; +import fr.ird.observe.services.dto.longline.SectionDto; +import fr.ird.observe.services.dto.longline.SectionImplDto; import fr.ird.observe.validation.ObserveValidator; import jaxx.runtime.validator.swing.SwingValidator; import jaxx.runtime.validator.swing.SwingValidatorMessage; diff --git a/pom.xml b/pom.xml index 4526469..cf9b610 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ <module>observe-services-rest</module> <module>observe-services-runner</module> <module>observe-application-web</module> - <!--<module>observe-application-swing</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>.